소스 검색

Rename org-export-footnotes-markers to org-export-footnotes-seen

* lisp/org-exp.el (org-export-footnotes-data): change docstring.
(org-export-footnotes-seen): renamed from
org-export-footnotes-markers.
* lisp/org-ascii.el (org-export-as-ascii): apply change.
* lisp/org-docbook.el (org-export-as-docbook): apply change.
* lisp/org-footnote.el (org-footnote-normalize): apply change.
* lisp/org-html.el (org-export-as-html): apply change.
* lisp/org-latex.el (org-export-as-latex): apply change.
Nicolas Goaziou 13 년 전
부모
커밋
39d4bfa0e8
6개의 변경된 파일12개의 추가작업 그리고 11개의 파일을 삭제
  1. 1 1
      lisp/org-ascii.el
  2. 1 1
      lisp/org-docbook.el
  3. 4 3
      lisp/org-exp.el
  4. 3 3
      lisp/org-footnote.el
  5. 1 1
      lisp/org-html.el
  6. 2 2
      lisp/org-latex.el

+ 1 - 1
lisp/org-ascii.el

@@ -291,7 +291,7 @@ publishing directory."
 	  (buffer-substring
 	   (if (org-region-active-p) (region-beginning) (point-min))
 	   (if (org-region-active-p) (region-end) (point-max))))
-	 (org-export-footnotes-markers nil)
+	 (org-export-footnotes-seen nil)
 	 (org-export-footnotes-data (org-footnote-all-labels 'with-defs))
 	 (lines (org-split-string
 		 (org-export-preprocess-string

+ 1 - 1
lisp/org-docbook.el

@@ -524,7 +524,7 @@ publishing directory."
 	  (buffer-substring
 	   (if region-p (region-beginning) (point-min))
 	   (if region-p (region-end) (point-max))))
-	 (org-export-footnotes-markers nil)
+	 (org-export-footnotes-seen nil)
 	 (org-export-footnotes-data (org-footnote-all-labels 'with-defs))
 	 (lines
 	  (org-split-string

+ 4 - 3
lisp/org-exp.el

@@ -623,10 +623,11 @@ table.el tables."
 (defvar org-last-level nil) ; dynamically scoped variable
 (defvar org-min-level nil) ; dynamically scoped variable
 (defvar org-levels-open nil) ; dynamically scoped parameter
-(defvar org-export-footnotes-markers nil
-  "Alist of markers used for footnotes, along with their associated definition.")
 (defvar org-export-footnotes-data nil
-  "Alist of labels used in buffers, along with their associated definition.")
+  "Alist of labels used in buffers, along with their definition.")
+(defvar org-export-footnotes-seen nil
+  "Alist of labels encountered so far by the exporter, along with their definition.")
+
 
 (defconst org-export-plist-vars
   '((:link-up		      nil	  org-export-html-link-up)

+ 3 - 3
lisp/org-footnote.el

@@ -508,7 +508,7 @@ Additional note on `org-footnote-insert-pos-for-preprocessor':
 	 (outline-regexp
 	  (concat "\\*" (if nstars (format "\\{1,%d\\} " nstars) "+ ")))
 	 ;; Determine the highest marker used so far.
-	 (ref-table (when pre-process-p org-export-footnotes-markers))
+	 (ref-table (when pre-process-p org-export-footnotes-seen))
 	 (count (if (and pre-process-p ref-table)
 		    (apply 'max (mapcar (lambda (e) (nth 1 e)) ref-table))
 		  0))
@@ -628,9 +628,9 @@ Additional note on `org-footnote-insert-pos-for-preprocessor':
 			   ref-table "\n\n")
 		"\n\n")
        ;; When exporting, add newly insert markers along with their
-       ;; associated definition to `org-export-footnotes-markers'.
+       ;; associated definition to `org-export-footnotes-seen'.
 	(when pre-process-p
-	  (setq org-export-footnotes-markers ref-table)))
+	  (setq org-export-footnotes-seen ref-table)))
        ;; Else, insert each definition at the end of the section
        ;; containing their first reference. Happens only in Org
        ;; files with no special footnote section, and only when

+ 1 - 1
lisp/org-html.el

@@ -1183,7 +1183,7 @@ PUB-DIR is set, use this as the publishing directory."
 	   (if region-p (region-beginning) (point-min))
 	   (if region-p (region-end) (point-max))))
 	 (org-export-have-math nil)
-	 (org-export-footnotes-markers nil)
+	 (org-export-footnotes-seen nil)
 	 (org-export-footnotes-data (org-footnote-all-labels 'with-defs))
 	 (lines
 	  (org-split-string

+ 2 - 2
lisp/org-latex.el

@@ -775,7 +775,7 @@ when PUB-DIR is set, use this as the publishing directory."
   (org-export-latex-set-initial-vars ext-plist arg)
   (setq org-export-opt-plist org-export-latex-options-plist
 	org-export-footnotes-data (org-footnote-all-labels 'with-defs)
-	org-export-footnotes-markers nil
+	org-export-footnotes-seen nil
 	org-export-latex-footmark-seen nil)
   (org-install-letbind)
   (run-hooks 'org-export-latex-after-initial-vars-hook)
@@ -2431,7 +2431,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	       (lbl (car ref))
 	       (def (nth 1 (assoc (string-to-number lbl)
 				  (mapcar (lambda (e) (cdr e))
-					  org-export-footnotes-markers)))))
+					  org-export-footnotes-seen)))))
 	  ;; Fix body for footnotes ending on a link or a list and
 	  ;; remove definition from buffer.
 	  (setq def