Merge branch 'maint'

lisp/ox.el

@@ -3355,9 +3355,9 @@ Return the new label."
   (goto-char (1+ ref-begin))
   (buffer-substring (point)
 		    (progn
-		      (if digit-label (insert (format "fn:%d-" id))
+		      (if digit-label (insert (format "fn:--%d-" id))
 			(forward-char 3)
-			(insert (format "%d-" id)))
+			(insert (format "-%d-" id)))
 		      (1- (search-forward "]")))))
 
 (defun org-export--prepare-file-contents
@@ -3370,20 +3370,20 @@ lines, include only those lines.
 Optional argument IND, when non-nil, is an integer specifying the
 global indentation of returned contents.  Since its purpose is to
 allow an included file to stay in the same environment it was
-created \(i.e. a list item), it doesn't apply past the first
+created (e.g., a list item), it doesn't apply past the first
 headline encountered.
 
 Optional argument MINLEVEL, when non-nil, is an integer
 specifying the level that any top-level headline in the included
 file should have.
+
 Optional argument ID is an integer that will be inserted before
 each footnote definition and reference if FILE is an Org file.
 This is useful to avoid conflicts when more than one Org file
 with footnotes is included in a document.
 
 Optional argument FOOTNOTES is a hash-table to store footnotes in
-the included document.
-"
+the included document."
   (with-temp-buffer
     (insert-file-contents file)
     (when lines
@@ -3412,7 +3412,7 @@ the included document.
     (delete-region (point) (point-max))
     ;; If IND is set, preserve indentation of include keyword until
     ;; the first headline encountered.
-    (when ind
+    (when (and ind (> ind 0))
       (unless (eq major-mode 'org-mode)
 	(let ((org-inhibit-startup t)) (org-mode)))
       (goto-char (point-min))
@@ -3434,21 +3434,23 @@ the included document.
        (let ((levels (org-map-entries
 		      (lambda () (org-reduced-level (org-current-level))))))
 	 (when levels
-	   (let ((offset (- minlevel (apply 'min levels))))
+	   (let ((offset (- minlevel (apply #'min levels))))
 	     (unless (zerop offset)
 	       (when org-odd-levels-only (setq offset (* offset 2)))
 	       ;; Only change stars, don't bother moving whole
 	       ;; sections.
 	       (org-map-entries
-		(lambda () (if (< offset 0) (delete-char (abs offset))
-			(insert (make-string offset ?*)))))))))))
+		(lambda ()
+		  (if (< offset 0) (delete-char (abs offset))
+		    (insert (make-string offset ?*)))))))))))
     ;; Append ID to all footnote references and definitions, so they
     ;; become file specific and cannot collide with footnotes in other
     ;; included files.  Further, collect relevant footnotes outside of
     ;; LINES.
     (when id
       (let ((marker-min (point-min-marker))
-	    (marker-max (point-max-marker)))
+	    (marker-max (point-max-marker))
+	    seen)
 	(goto-char (point-min))
 	(while (re-search-forward org-footnote-re nil t)
 	  (let ((reference (org-element-context)))
@@ -3460,12 +3462,15 @@ the included document.
 		;; the new label, which is only used for footnotes
 		;; outsides LINES.
 		(when label
-		  ;; If label is akin to [1] convert it to [fn:ID-1].
-		  ;; Otherwise add "ID-" after "fn:".
+		  ;; If label is akin to [1] convert it to
+		  ;; [fn:--ID-1].  Otherwise add "-ID-" after "fn:".
 		  (let ((new-label (org-export--update-footnote-label
 				    (org-element-property :begin reference)
 				    digit-label id)))
-		    (unless (eq (org-element-property :type reference) 'inline)
+		    (unless (or (eq (org-element-property :type reference)
+				    'inline)
+				(member label seen))
+		      (push label seen)
 		      (org-with-wide-buffer
 		       (let* ((definition (org-footnote-get-definition label))
 			      (beginning (nth 1 definition)))
@@ -3474,7 +3479,7 @@ the included document.
 			    "Definition not found for footnote %s in file %s"
 			    label file))
 			 (if (or (< beginning marker-min)
-				 (> beginning marker-max))
+				 (>= beginning marker-max))
 			     ;; Store since footnote-definition is
 			     ;; outside of LINES.
 			     (puthash new-label

testing/lisp/test-ox.el

@@ -970,7 +970,7 @@ text
       (length
        (delete-dups
 	(let ((contents "
-Footnotes[fn:1], [fn:test] and [fn:inline:anonymous footnote].
+Footnotes[fn:1], [fn:test], [fn:test] and [fn:inline:anonymous footnote].
 \[fn:1] Footnote 1
 \[fn:test] Footnote \"test\""))
 	  (org-test-with-temp-text-in-file contents
@@ -983,8 +983,7 @@ Footnotes[fn:1], [fn:test] and [fn:inline:anonymous footnote].
 		    (org-export-expand-include-keyword)
 		    (org-element-map (org-element-parse-buffer)
 			'footnote-reference
-		      (lambda (ref)
-			(org-element-property :label ref)))))))))))))
+		      (lambda (r) (org-element-property :label r)))))))))))))
   ;; Footnotes labels are not local to each include keyword.
   (should
    (= 4