diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-12-16 18:38:53 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-12-22 16:55:17 +0100 |
commit | 8eb318f2d0ae3840d14d9b0985853b11bfe27995 (patch) | |
tree | b84efc135f7fb8aa9e5b24c01f11af8abefcddc7 | |
parent | deafe565548992fb56a4fe7d613996fcd18d038f (diff) | |
download | org-mode-8eb318f2d0ae3840d14d9b0985853b11bfe27995.tar.gz |
org-footnote: Update library wrt new footnote syntax
* lisp/org-footnote.el (org-footnote-re):
(org-footnote-definition-re): Do not match [1]-like constructs.
(org-footnote): Fix typo.
(org-footnote-auto-label): Do not offer to create [1]-like constructs
anymore.
(org-footnote-new): Remove reference to obsolete value in
`org-footnote-auto-label'.
(org-footnote-at-reference-p):
(org-footnote-get-next-reference):
(org-footnote-next-reference-or-definition):
(org-footnote-goto-definition):
(org-footnote-goto-previous-reference): Use new regexp.
(org-footnote-normalize-label): Remove "fn:" prefix instead of adding
it.
(org-footnote-get-definition):
(org-footnote-all-labels):
(org-footnote-unique-label): Small refactoring.
(org-footnote-create-definition):
(org-footnote-delete-definitions):
(org-footnote--clear-footnote-section):
(org-footnote--collect-references):
(org-footnote--collect-definitions):
(org-footnote--set-label):
(org-footnote-sort): New functions.
(org-footnote-auto-adjust-maybe):
(org-footnote-action): Use new functions. Small refactoring.
(org-footnote-renumber-fn:N): Refactor code. Handle nested footnotes.
(org-footnote-normalize): Turn footnotes into [fn:N] construct instead
of [N].
* testing/lisp/test-org-footnote.el (test-org-footnote/delete):
(test-org-footnote/goto-definition):
(test-org-footnote/normalize): Update test
(test-org-footnote/sort):
(test-org-footnote/renumber-fn:N): New tests.
(test-org-footnote/normalize-outside-org): Remove test.
-rw-r--r-- | lisp/org-footnote.el | 971 | ||||
-rw-r--r-- | testing/lisp/test-org-footnote.el | 510 |
2 files changed, 818 insertions, 663 deletions
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index 5f9ca06..2387f55 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -24,33 +24,25 @@ ;; ;;; Commentary: -;; This file contains the code dealing with footnotes in Org-mode. -;; The code can also be used in arbitrary text modes to provide -;; footnotes. Compared to Steven L Baur's footnote.el it provides -;; better support for resuming editing. It is less configurable than -;; Steve's code, though. +;; This file contains the code dealing with footnotes in Org mode. ;;; Code: -(eval-when-compile - (require 'cl)) +;;;; Declarations + +(require 'cl-lib) (require 'org-macs) (require 'org-compat) -(declare-function message-point-in-header-p "message" ()) (declare-function org-at-comment-p "org" ()) (declare-function org-at-heading-p "org" (&optional ignored)) (declare-function org-back-over-empty-lines "org" ()) -(declare-function org-back-to-heading "org" (&optional invisible-ok)) -(declare-function org-combine-plists "org" (&rest plists)) (declare-function org-edit-footnote-reference "org-src" ()) (declare-function org-element-context "org-element" (&optional element)) (declare-function org-element-property "org-element" (property element)) (declare-function org-element-type "org-element" (element)) (declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading)) (declare-function org-fill-paragraph "org" (&optional justify)) -(declare-function org-icompleting-read "org" (&rest args)) -(declare-function org-id-uuid "org-id" ()) (declare-function org-in-block-p "org" (names)) (declare-function org-in-regexp "org" (re &optional nlines visually)) (declare-function org-in-verbatim-emphasis "org" ()) @@ -58,13 +50,11 @@ (declare-function org-inside-latex-macro-p "org" ()) (declare-function org-mark-ring-push "org" (&optional pos buffer)) (declare-function org-show-context "org" (&optional key)) -(declare-function org-skip-whitespace "org" ()) -(declare-function org-skip-whitespace "org" ()) (declare-function org-trim "org" (s)) (declare-function outline-next-heading "outline") -(defvar message-cite-prefix-regexp) ; defined in message.el -(defvar message-signature-separator) ; defined in message.el +(defvar electric-indent-mode) +(defvar org-blank-before-new-entry) ; defined in org.el (defvar org-bracket-link-regexp) ; defined in org.el (defvar org-complex-heading-regexp) ; defined in org.el (defvar org-element-all-elements) ; defined in org-element.el @@ -73,30 +63,28 @@ (defvar org-outline-regexp) ; defined in org.el (defvar org-outline-regexp-bol) ; defined in org.el + +;;;; Constants + (defconst org-footnote-re - ;; Only [1]-like footnotes are closed in this regexp, as footnotes - ;; from other types might contain square brackets (i.e. links) in - ;; their definition. - ;; - ;; `org-re' is used for regexp compatibility with XEmacs. - (concat "\\[\\(?:" - ;; Match inline footnotes. - (org-re "fn:\\([-_[:word:]]+\\)?:\\|") - ;; Match other footnotes. - "\\(?:\\([0-9]+\\)\\]\\)\\|" - (org-re "\\(fn:[-_[:word:]]+\\)") - "\\)") - "Regular expression for matching footnotes.") - -(defconst org-footnote-definition-re - (org-re "^\\[\\([0-9]+\\|fn:[-_[:word:]]+\\)\\]") - "Regular expression matching the definition of a footnote.") + "\\[fn:\\(?:\\(?1:[-_[:word:]]+\\)?\\(:\\)\\|\\(?1:[-_[:word:]]+\\)\\]\\)" + "Regular expression for matching footnotes. +Match group 1 contains footnote's label. It is nil for anonymous +footnotes. Match group 2 is non-nil only when footnote is +inline, i.e., it contains its own definition.") + +(defconst org-footnote-definition-re "^\\[fn:\\([-_[:word:]]+\\)\\]" + "Regular expression matching the definition of a footnote. +Match group 1 contains definition's label.") (defconst org-footnote-forbidden-blocks '("comment" "example" "export" "src") "Names of blocks where footnotes are not allowed.") + +;;;; Customization + (defgroup org-footnote nil - "Footnotes in Org-mode." + "Footnotes in Org mode." :tag "Org Footnote" :group 'org) @@ -160,15 +148,13 @@ t Create unique labels of the form [fn:1], [fn:2], etc. confirm Like t, but let the user edit the created value. The label can be removed from the minibuffer to create an anonymous footnote. -random Automatically generate a unique, random label. -plain Automatically create plain number labels like [1]." +random Automatically generate a unique, random label." :group 'org-footnote :type '(choice (const :tag "Prompt for label" nil) (const :tag "Create automatic [fn:N]" t) (const :tag "Offer automatic [fn:N] for editing" confirm) - (const :tag "Create a random label" random) - (const :tag "Create automatic [N]" plain))) + (const :tag "Create a random label" random))) (defcustom org-footnote-auto-adjust nil "Non-nil means automatically adjust footnotes after insert/delete. @@ -196,6 +182,9 @@ extracted will be filled again." :group 'org-footnote :type 'boolean) + +;;;; Predicates + (defun org-footnote-in-valid-context-p () "Is point in a context where footnotes are allowed?" (save-match-data @@ -224,13 +213,9 @@ positions, and the definition, when inlined." (or (looking-at org-footnote-re) (org-in-regexp org-footnote-re) (save-excursion (re-search-backward org-footnote-re nil t))) - (/= (match-beginning 0) (point-at-bol))) + (/= (match-beginning 0) (line-beginning-position))) (let* ((beg (match-beginning 0)) - (label (or (org-match-string-no-properties 2) - (org-match-string-no-properties 3) - ;; Anonymous footnotes don't have labels - (and (match-string 1) - (concat "fn:" (org-match-string-no-properties 1))))) + (label (match-string-no-properties 1)) ;; Inline footnotes don't end at (match-end 0) as ;; `org-footnote-re' stops just after the second colon. ;; Find the real ending with `scan-sexps', so Org doesn't @@ -238,7 +223,8 @@ positions, and the definition, when inlined." (end (ignore-errors (scan-sexps beg 1)))) ;; Point is really at a reference if it's located before true ;; ending of the footnote. - (when (and end (< (point) end) + (when (and end + (< (point) end) ;; Verify match isn't a part of a link. (not (save-excursion (goto-char beg) @@ -250,9 +236,10 @@ positions, and the definition, when inlined." (not (org-inside-latex-macro-p))) (list label beg end ;; Definition: ensure this is an inline footnote first. - (and (or (not label) (match-string 1)) - (org-trim (buffer-substring-no-properties - (match-end 0) (1- end))))))))) + (and (match-end 2) + (org-trim + (buffer-substring-no-properties + (match-end 0) (1- end))))))))) (defun org-footnote-at-definition-p () "Is point within a footnote definition? @@ -295,6 +282,204 @@ otherwise." (list label beg end (org-trim (buffer-substring-no-properties beg-def end))))))))) + +;;;; Internal functions + +(defun org-footnote--allow-reference-p () + "Non-nil when a footnote reference can be inserted at point." + ;; XXX: This is similar to `org-footnote-in-valid-context-p' but + ;; more accurate and usually faster, except in some corner cases. + ;; It may replace it after doing proper benchmarks as it would be + ;; used in fontification. + (unless (bolp) + (let* ((context (org-element-context)) + (type (org-element-type context))) + (cond + ;; No footnote reference in attributes. + ((let ((post (org-element-property :post-affiliated context))) + (and post (< (point) post))) + nil) + ;; Paragraphs and blank lines at top of document are fine. + ((memq type '(nil paragraph))) + ;; So are contents of verse blocks. + ((eq type 'verse-block) + (and (>= (point) (org-element-property :contents-begin context)) + (< (point) (org-element-property :contents-end context)))) + ;; In an headline or inlinetask, point must be either on the + ;; heading itself or on the blank lines below. + ((memq type '(headline inlinetask)) + (or (not (org-at-heading-p)) + (and (save-excursion (beginning-of-line) + (and (let ((case-fold-search t)) + (not (looking-at "\\*+ END[ \t]*$"))) + (looking-at org-complex-heading-regexp))) + (match-beginning 4) + (>= (point) (match-beginning 4)) + (or (not (match-beginning 5)) + (< (point) (match-beginning 5)))))) + ;; White spaces after an object or blank lines after an element + ;; are OK. + ((>= (point) + (save-excursion (goto-char (org-element-property :end context)) + (skip-chars-backward " \r\t\n") + (if (memq type org-element-all-objects) (point) + (1+ (line-beginning-position 2)))))) + ;; Other elements are invalid. + ((memq type org-element-all-elements) nil) + ;; Just before object is fine. + ((= (point) (org-element-property :begin context))) + ;; Within recursive object too, but not in a link. + ((eq type 'link) nil) + ((let ((cbeg (org-element-property :contents-begin context)) + (cend (org-element-property :contents-end context))) + (and cbeg (>= (point) cbeg) (<= (point) cend)))))))) + +(defun org-footnote--clear-footnote-section () + "Remove all footnote sections in buffer and create a new one. +New section is created at the end of the buffer, before any file +local variable definition. Leave point within the new section." + (when org-footnote-section + (goto-char (point-min)) + (let ((regexp + (format "^\\*+ +%s[ \t]*$" + (regexp-quote org-footnote-section)))) + (while (re-search-forward regexp nil t) + (delete-region + (match-beginning 0) + (progn (org-end-of-subtree t t) + (if (not (eobp)) (point) + (org-footnote--goto-local-insertion-point) + (skip-chars-forward " \t\n") + (if (eobp) (point) (line-beginning-position))))))) + (goto-char (point-max)) + (org-footnote--goto-local-insertion-point) + (when (and (cdr (assq 'heading org-blank-before-new-entry)) + (zerop (save-excursion (org-back-over-empty-lines)))) + (insert "\n")) + (insert "* " org-footnote-section "\n"))) + +(defun org-footnote--set-label (label) + "Set label of footnote at point to string LABEL. +Assume point is at the beginning of the reference or definition +to rename." + (forward-char 4) + (cond ((eq (char-after) ?:) (insert label)) + ((looking-at "\\([-_[:word:]]+\\)") (replace-match label nil nil nil 1)) + (t nil))) + +(defun org-footnote--collect-references (&optional anonymous) + "Collect all labelled footnote references in current buffer. + +Return an alist where associations follow the pattern + + \(LABEL MARKER TOP-LEVEL? SIZE) + +with + + LABEL the label of the of the definition, + MARKER a marker pointing to its beginning, + TOP-LEVEL a boolean nil when the footnote is contained within + another one, + SIZE the length of the inline definition, in characters, + or nil for non-inline references. + +When optional ANONYMOUS is non-nil, also collect anonymous +references. In such cases, LABEL is nil. + +References are sorted according to a deep-reading order." + (org-with-wide-buffer + (goto-char (point-min)) + (let ((regexp (format ".\\[fn:[-_[:word:]]%s[]:]" (if anonymous "*" "+"))) + references nested) + (save-excursion + (while (re-search-forward regexp nil t) + (backward-char) + (let ((context (org-element-context))) + (when (eq (org-element-type context) 'footnote-reference) + (let* ((label (org-element-property :label context)) + (begin (org-element-property :begin context)) + (size + (and (eq (org-element-property :type context) 'inline) + (- (org-element-property :contents-end context) + (org-element-property :contents-begin context))))) + (let ((d (org-element-lineage context '(footnote-definition)))) + (push (list label (copy-marker begin) (not d) size) + references) + (when d + ;; Nested references are stored in alist NESTED. + ;; Associations there follow the pattern + ;; + ;; (DEFINITION-LABEL . REFERENCES) + (let* ((def-label (org-element-property :label d)) + (labels (assoc def-label nested))) + (if labels (push label (cdr labels)) + (push (list def-label label) nested)))))))))) + ;; Sort the list of references. Nested footnotes have priority + ;; over top-level ones. + (letrec ((ordered nil) + (add-reference + (lambda (ref allow-nested) + (when (or allow-nested (nth 2 ref)) + (push ref ordered) + (dolist (r (mapcar (lambda (l) (assoc l references)) + (reverse + (cdr (assoc (nth 0 ref) nested))))) + (funcall add-reference r t)))))) + (dolist (r (reverse references) (nreverse ordered)) + (funcall add-reference r nil)))))) + +(defun org-footnote--collect-definitions (&optional delete) + "Collect all footnote definitions in current buffer. + +Return an alist where associations follow the pattern + + \(LABEL . DEFINITION) + +with LABEL and DEFINITION being, respectively, the label and the +definition of the footnote, as strings. + +When optional argument DELETE is non-nil, delete the definition +while collecting them." + (org-with-wide-buffer + (goto-char (point-min)) + (let (definitions seen) + (while (re-search-forward org-footnote-definition-re nil t) + (backward-char) + (let ((element (org-element-at-point))) + (let ((label (org-element-property :label element))) + (when (and (eq (org-element-type element) 'footnote-definition) + (not (member label seen))) + (push label seen) + (let* ((beg (progn + (goto-char (org-element-property :begin element)) + (skip-chars-backward " \r\t\n") + (if (bobp) (point) (line-beginning-position 2)))) + (end (progn + (goto-char (org-element-property :end element)) + (skip-chars-backward " \r\t\n") + (line-beginning-position 2))) + (def (org-trim (buffer-substring-no-properties beg end)))) + (push (cons label def) definitions) + (when delete (delete-region beg end))))))) + definitions))) + +(defun org-footnote--goto-local-insertion-point () + "Find insertion point for footnote, just before next outline heading. +Assume insertion point is within currently accessible part of the buffer." + (org-with-limited-levels (outline-next-heading)) + ;; Skip file local variables. See `modify-file-local-variable'. + (when (eobp) + (let ((case-fold-search t)) + (re-search-backward "^[ \t]*# +Local Variables:" + (max (- (point-max) 3000) (point-min)) + t))) + (skip-chars-backward " \t\n") + (forward-line) + (unless (bolp) (insert "\n"))) + + +;;;; Navigation + (defun org-footnote-get-next-reference (&optional label backward limit) "Return complete reference of the next footnote. @@ -305,7 +490,7 @@ the buffer position bounding the search. Return value is a list like those provided by `org-footnote-at-reference-p'. If no footnote is found, return nil." (save-excursion - (let* ((label-fmt (if label (format "\\[%s[]:]" label) org-footnote-re))) + (let* ((label-fmt (if label (format "\\[fn:%s[]:]" label) org-footnote-re))) (catch 'exit (while t (unless (funcall (if backward #'re-search-backward #'re-search-forward) @@ -329,45 +514,19 @@ If no footnote is found, return nil." (unless (re-search-forward org-footnote-re limit t) (goto-char origin) (throw 'exit nil)) - ;; Beware: with [1]-like footnotes point will be just after + ;; Beware: with non-inline footnotes point will be just after ;; the closing square bracket. (backward-char) (cond ((setq ref (org-footnote-at-reference-p)) (throw 'exit ref)) - ;; Definition: also grab the last square bracket, only - ;; matched in `org-footnote-re' for [1]-like footnotes. + ;; Definition: also grab the last square bracket, matched in + ;; `org-footnote-re' for non-inline footnotes. ((save-match-data (org-footnote-at-definition-p)) (let ((end (match-end 0))) (throw 'exit (list nil (match-beginning 0) - (if (eq (char-before end) 93) end (1+ end))))))))))) - -(defun org-footnote-get-definition (label) - "Return label, boundaries and definition of the footnote LABEL." - (let* ((label (regexp-quote (org-footnote-normalize-label label))) - (re (format "^\\[%s\\]\\|.\\[%s:" label label))) - (org-with-wide-buffer - (goto-char (point-min)) - (catch 'found - (while (re-search-forward re nil t) - (let* ((datum (progn (backward-char) (org-element-context))) - (type (org-element-type datum))) - (when (memq type '(footnote-definition footnote-reference)) - (throw 'found - (list - label - (org-element-property :begin datum) - (org-element-property :end datum) - (let ((cbeg (org-element-property :contents-begin datum))) - (if (not cbeg) "" - (replace-regexp-in-string - "[ \t\n]*\\'" - "" - (buffer-substring-no-properties - cbeg - (org-element-property :contents-end datum)))))))))) - nil)))) + (if (eq (char-before end) ?\]) end (1+ end))))))))))) (defun org-footnote-goto-definition (label &optional location) "Move point to the definition of the footnote LABEL. @@ -379,7 +538,8 @@ Throw an error if there is no definition or if it cannot be reached from current narrowed part of buffer. Return a non-nil value if point was successfully moved." (interactive "sLabel: ") - (let ((def-start (or location (nth 1 (org-footnote-get-definition label))))) + (let* ((label (org-footnote-normalize-label label)) + (def-start (or location (nth 1 (org-footnote-get-definition label))))) (cond ((not def-start) (user-error "Cannot find definition of footnote %s" label)) @@ -387,7 +547,7 @@ value if point was successfully moved." (user-error "Definition is outside narrowed part of buffer"))) (org-mark-ring-push) (goto-char def-start) - (looking-at (format "\\[%s[]:] ?" label)) + (looking-at (format "\\[fn:%s[]:] ?" (regexp-quote label))) (goto-char (match-end 0)) (org-show-context 'link-search) (when (derived-mode-p 'org-mode) @@ -401,7 +561,8 @@ unique, with `\\[org-ctrl-c-ctrl-c]'."))) "Find the first closest (to point) reference of footnote with label LABEL." (interactive "sLabel: ") (org-mark-ring-push) - (let* ((label (org-footnote-normalize-label label)) ref) + (let ((label (org-footnote-normalize-label label)) + ref) (save-excursion (setq ref (or (org-footnote-get-next-reference label t) (org-footnote-get-next-reference label) @@ -415,111 +576,75 @@ unique, with `\\[org-ctrl-c-ctrl-c]'."))) (goto-char (nth 1 ref)) (org-show-context 'link-search)))) + +;;;; Getters + (defun org-footnote-normalize-label (label) - "Return LABEL as an appropriate string." - (cond - ((numberp label) (number-to-string label)) - ((equal "" label) nil) - ((not (string-match "^[0-9]+$\\|^fn:" label)) - (concat "fn:" label)) - (t label))) - -(defun org-footnote-all-labels (&optional with-defs) - "Return list with all defined foot labels used in the buffer. - -If WITH-DEFS is non-nil, also associate the definition to each -label. The function will then return an alist whose key is label -and value definition." - (let* (rtn - (push-to-rtn - (function - ;; Depending on WITH-DEFS, store label or (label . def) of - ;; footnote reference/definition given as argument in RTN. - (lambda (el) - (let ((lbl (car el))) - (push (if with-defs (cons lbl (nth 3 el)) lbl) rtn)))))) - (save-excursion - (save-restriction - (widen) - ;; Find all labels found in definitions. - (goto-char (point-min)) - (let (def) - (while (re-search-forward org-footnote-definition-re nil t) - (when (setq def (org-footnote-at-definition-p)) - (funcall push-to-rtn def)))) - ;; Find all labels found in references. - (goto-char (point-min)) - (let (ref) - (while (setq ref (org-footnote-get-next-reference)) - (goto-char (nth 2 ref)) - (and (car ref) ; ignore anonymous footnotes - (not (funcall (if with-defs #'assoc #'member) (car ref) rtn)) - (funcall push-to-rtn ref)))))) - rtn)) + "Return LABEL without \"fn:\" prefix. +If LABEL is the empty string or constituted of white spaces only, +return nil instead." + (let ((label (org-trim label))) + (cond + ((equal "" label) nil) + ((string-match "\\`fn:" label) (replace-match "" nil nil label)) + (t label)))) + +(defun org-footnote-get-definition (label) + "Return label, boundaries and definition of the footnote LABEL." + (let* ((label (regexp-quote (org-footnote-normalize-label label))) + (re (format "^\\[fn:%s\\]\\|.\\[fn:%s:" label label))) + (org-with-wide-buffer + (goto-char (point-min)) + (catch 'found + (while (re-search-forward re nil t) + (let* ((datum (progn (backward-char) (org-element-context))) + (type (org-element-type datum))) + (when (memq type '(footnote-definition footnote-reference)) + (throw 'found + (list + label + (org-element-property :begin datum) + (org-element-property :end datum) + (let ((cbeg (org-element-property :contents-begin datum))) + (if (not cbeg) "" + (replace-regexp-in-string + "[ \t\n]*\\'" + "" + (buffer-substring-no-properties + cbeg + (org-element-property :contents-end datum)))))))))) + nil)))) + +(defun org-footnote-all-labels () + "List all defined footnote labels used throughout the buffer. +This function ignores narrowing, if any." + (org-with-wide-buffer + (goto-char (point-min)) + (let (all) + (while (re-search-forward org-footnote-re nil t) + (backward-char) + (let ((context (org-element-context))) + (when (memq (org-element-type context) + '(footnote-definition footnote-reference)) + (let ((label (org-element-property :label context))) + (when label (cl-pushnew label all :test #'equal)))))) + all))) (defun org-footnote-unique-label (&optional current) "Return a new unique footnote label. -The function returns the first \"fn:N\" or \"N\" label that is -currently not used. +The function returns the first numeric label currently unused. Optional argument CURRENT is the list of labels active in the buffer." - (unless current (setq current (org-footnote-all-labels))) - (let ((fmt (if (eq org-footnote-auto-label 'plain) "%d" "fn:%d")) - (cnt 1)) - (while (member (format fmt cnt) current) - (incf cnt)) - (format fmt cnt))) + (let ((current (or current (org-footnote-all-labels)))) + (let ((count 1)) + (while (member (number-to-string count) current) + (incf count)) + (number-to-string count)))) -(defun org-footnote--allow-reference-p () - "Non-nil when a footnote reference can be inserted at point." - ;; XXX: This is similar to `org-footnote-in-valid-context-p' but - ;; more accurate and usually faster, except in some corner cases. - ;; It may replace it after doing proper benchmarks as it would be - ;; used in fontification. - (unless (bolp) - (let* ((context (org-element-context)) - (type (org-element-type context))) - (cond - ;; No footnote reference in attributes. - ((let ((post (org-element-property :post-affiliated context))) - (and post (< (point) post))) - nil) - ;; Paragraphs and blank lines at top of document are fine. - ((memq type '(nil paragraph))) - ;; So are contents of verse blocks. - ((eq type 'verse-block) - (and (>= (point) (org-element-property :contents-begin context)) - (< (point) (org-element-property :contents-end context)))) - ;; In an headline or inlinetask, point must be either on the - ;; heading itself or on the blank lines below. - ((memq type '(headline inlinetask)) - (or (not (org-at-heading-p)) - (and (save-excursion (beginning-of-line) - (and (let ((case-fold-search t)) - (not (looking-at "\\*+ END[ \t]*$"))) - (looking-at org-complex-heading-regexp))) - (match-beginning 4) - (>= (point) (match-beginning 4)) - (or (not (match-beginning 5)) - (< (point) (match-beginning 5)))))) - ;; White spaces after an object or blank lines after an element - ;; are OK. - ((>= (point) - (save-excursion (goto-char (org-element-property :end context)) - (skip-chars-backward " \r\t\n") - (if (memq type org-element-all-objects) (point) - (1+ (line-beginning-position 2)))))) - ;; Other elements are invalid. - ((memq type org-element-all-elements) nil) - ;; Just before object is fine. - ((= (point) (org-element-property :begin context))) - ;; Within recursive object too, but not in a link. - ((eq type 'link) nil) - ((let ((cbeg (org-element-property :contents-begin context)) - (cend (org-element-property :contents-end context))) - (and cbeg (>= (point) cbeg) (<= (point) cend)))))))) + +;;;; Adding, Deleting Footnotes (defun org-footnote-new () "Insert a new footnote. @@ -531,12 +656,12 @@ or new, let the user edit the definition of the footnote." (user-error "Cannot insert a footnote here")) (let* ((all (org-footnote-all-labels)) (label - (org-footnote-normalize-label - (if (eq org-footnote-auto-label 'random) - (format "fn:%x" (random most-positive-fixnum)) + (if (eq org-footnote-auto-label 'random) + (format "%x" (random most-positive-fixnum)) + (org-footnote-normalize-label (let ((propose (org-footnote-unique-label all))) - (if (memq org-footnote-auto-label '(t plain)) propose - (org-icompleting-read + (if (eq org-footnote-auto-label t) propose + (completing-read "Label (leave empty for anonymous): " (mapcar #'list all) nil nil (and (eq org-footnote-auto-label 'confirm) propose)))))))) @@ -544,14 +669,14 @@ or new, let the user edit the definition of the footnote." (insert "[fn::]") (backward-char 1)) ((member label all) - (insert "[" label "]") + (insert "[fn:" label "]") (message "New reference to existing note")) (org-footnote-define-inline - (insert "[" label ":]") + (insert "[fn:" label ":]") (backward-char 1) (org-footnote-auto-adjust-maybe)) (t - (insert "[" label "]") + (insert "[fn:" label "]") (let ((p (org-footnote-create-definition label))) ;; `org-footnote-goto-definition' needs to be called ;; after `org-footnote-auto-adjust-maybe'. Otherwise @@ -566,8 +691,6 @@ or new, let the user edit the definition of the footnote." (org-footnote-auto-adjust-maybe) (org-edit-footnote-reference))))))) -(defvar electric-indent-mode) -(defvar org-blank-before-new-entry) ; Silence byte-compiler. (defun org-footnote-create-definition (label) "Start the definition of a footnote with label LABEL. Return buffer position at the beginning of the definition. In an @@ -602,7 +725,7 @@ Org buffer, this function doesn't move point." (insert "\n")) (insert "* " org-footnote-section "\n"))) (when (zerop (org-back-over-empty-lines)) (insert "\n")) - (insert "[" label "] \n") + (insert "[fn:" label "] \n") (line-beginning-position 0))) (t ;; In a non-Org file. Search for footnote tag, or create it if @@ -640,252 +763,10 @@ Org buffer, this function doesn't move point." (unless (bolp) (newline)) (set-marker max nil)) (when (zerop (org-back-over-empty-lines)) (insert "\n")) - (insert "[" label "] \n") + (insert "[fn:" label "] \n") (backward-char) (line-beginning-position))))) -;;;###autoload -(defun org-footnote-action (&optional special) - "Do the right thing for footnotes. - -When at a footnote reference, jump to the definition. - -When at a definition, jump to the references if they exist, offer -to create them otherwise. - -When neither at definition or reference, create a new footnote, -interactively if possible. - -With prefix arg SPECIAL, or when no footnote can be created, -offer additional commands in a menu." - (interactive "P") - (let* ((context (and (not special) (org-element-context))) - (type (org-element-type context))) - (cond - ;; On white space after element, insert a new footnote. - ((and context - (> (point) - (save-excursion - (goto-char (org-element-property :end context)) - (skip-chars-backward " \t") - (point)))) - (org-footnote-new)) - ((eq type 'footnote-reference) - (let ((label (org-element-property :label context))) - (cond - ;; Anonymous footnote: move point at the beginning of its - ;; definition. - ((not label) - (goto-char (org-element-property :contents-begin context))) - ;; Check if a definition exists: then move to it. - ((let ((p (nth 1 (org-footnote-get-definition label)))) - (when p (org-footnote-goto-definition label p)))) - ;; No definition exists: offer to create it. - ((yes-or-no-p (format "No definition for %s. Create one? " label)) - (let ((p (org-footnote-create-definition label))) - (or (ignore-errors (org-footnote-goto-definition label p)) - ;; Since definition was created outside current scope, - ;; edit it remotely. - (org-edit-footnote-reference))))))) - ((eq type 'footnote-definition) - (org-footnote-goto-previous-reference - (org-element-property :label context))) - ((or special (not (org-footnote--allow-reference-p))) - (message "Footnotes: [s]ort | [r]enumber fn:N | [S]=r+s | \ -->[n]umeric | [d]elete") - (let ((c (read-char-exclusive))) - (cond - ((eq c ?s) (org-footnote-normalize 'sort)) - ((eq c ?r) (org-footnote-renumber-fn:N)) - ((eq c ?S) - (org-footnote-renumber-fn:N) - (org-footnote-normalize 'sort)) - ((eq c ?n) (org-footnote-normalize)) - ((eq c ?d) (org-footnote-delete)) - (t (error "No such footnote command %c" c))))) - (t (org-footnote-new))))) - -;;;###autoload -(defun org-footnote-normalize (&optional sort-only) - "Collect the footnotes in various formats and normalize them. - -This finds the different sorts of footnotes allowed in Org, and -normalizes them to the usual [N] format. - -When SORT-ONLY is set, only sort the footnote definitions into the -referenced sequence." - ;; This is based on Paul's function, but rewritten. - ;; - ;; Re-create `org-with-limited-levels', but not limited to Org - ;; buffers. - (let* ((limit-level - (and (boundp 'org-inlinetask-min-level) - org-inlinetask-min-level - (1- org-inlinetask-min-level))) - (nstars (and limit-level - (if org-odd-levels-only (1- (* limit-level 2)) - limit-level))) - (org-outline-regexp - (concat "\\*" (if nstars (format "\\{1,%d\\} " nstars) "+ "))) - (count 0) - ins-point ref ref-table) - (org-with-wide-buffer - ;; 1. Find every footnote reference, extract the definition, and - ;; collect that data in REF-TABLE. If SORT-ONLY is nil, also - ;; normalize references. - (goto-char (point-min)) - (while (setq ref (org-footnote-get-next-reference)) - (let* ((lbl (car ref)) - (pos (nth 1 ref)) - ;; When footnote isn't anonymous, check if it's label - ;; (REF) is already stored in REF-TABLE. In that case, - ;; extract number used to identify it (MARKER). If - ;; footnote is unknown, increment the global counter - ;; (COUNT) to create an unused identifier. - (a (and lbl (assoc lbl ref-table))) - (marker (or (nth 1 a) (incf count))) - ;; Is the reference inline or pointing to an inline - ;; footnote? - (inlinep (or (stringp (nth 3 ref)) (nth 3 a)))) - ;; Replace footnote reference with [MARKER]. Maybe fill - ;; paragraph once done. If SORT-ONLY is non-nil, only move - ;; to the end of reference found to avoid matching it twice. - (if sort-only (goto-char (nth 2 ref)) - (delete-region (nth 1 ref) (nth 2 ref)) - (goto-char (nth 1 ref)) - (insert (format "[%d]" marker)) - (and inlinep - org-footnote-fill-after-inline-note-extraction - (org-fill-paragraph))) - ;; Add label (REF), identifier (MARKER), definition (DEF) - ;; type (INLINEP) and position (POS) to REF-TABLE if data was - ;; unknown. - (unless a - (let ((def (or (nth 3 ref) ; Inline definition. - (nth 3 (org-footnote-get-definition lbl))))) - (push (list lbl marker def - ;; Reference beginning position is a marker - ;; to preserve it during further buffer - ;; modifications. - inlinep (copy-marker pos)) ref-table))))) - ;; 2. Find and remove the footnote section, if any. Also - ;; determine where footnotes shall be inserted (INS-POINT). - (cond - ((and org-footnote-section (derived-mode-p 'org-mode)) - (goto-char (point-min)) - (if (re-search-forward - (concat "^\\*[ \t]+" (regexp-quote org-footnote-section) - "[ \t]*$") nil t) - (delete-region (match-beginning 0) (org-end-of-subtree t t))) - ;; A new footnote section is inserted by default at the end of - ;; the buffer. - (goto-char (point-max)) - (skip-chars-backward " \r\t\n") - (forward-line) - (unless (bolp) (newline))) - ;; No footnote section set: Footnotes will be added at the end - ;; of the section containing their first reference. - ((derived-mode-p 'org-mode)) - (t - ;; Remove any left-over tag in the buffer, if one is set up. - (when org-footnote-tag-for-non-org-mode-files - (let ((tag (concat "^" (regexp-quote - org-footnote-tag-for-non-org-mode-files) - "[ \t]*$"))) - (goto-char (point-min)) - (while (re-search-forward tag nil t) - (replace-match "") - (delete-region (point) (progn (forward-line) (point)))))) - ;; In Message mode, ensure footnotes are inserted before the - ;; signature. - (if (and (derived-mode-p 'message-mode) - (goto-char (point-max)) - (re-search-backward message-signature-separator nil t)) - (beginning-of-line) - (goto-char (point-max))))) - (setq ins-point (point-marker)) - ;; 3. Clean-up REF-TABLE. - (setq ref-table - (delq nil - (mapcar - (lambda (x) - (cond - ;; When only sorting, ignore inline footnotes. - ;; Also clear position marker. - ((and sort-only (nth 3 x)) - (set-marker (nth 4 x) nil) nil) - ;; No definition available: provide one. - ((not (nth 2 x)) - (append - (list (car x) (nth 1 x) - (format "DEFINITION NOT FOUND: %s" (car x))) - (nthcdr 3 x))) - (t x))) - ref-table))) - (setq ref-table (nreverse ref-table)) - ;; 4. Remove left-over definitions in the buffer. - (dolist (x ref-table) - (unless (nth 3 x) (org-footnote-delete-definitions (car x)))) - ;; 5. Insert the footnotes again in the buffer, at the - ;; appropriate spot. - (goto-char ins-point) - (cond - ;; No footnote: exit. - ((not ref-table)) - ;; Cases when footnotes should be inserted in one place. - ((or (not (derived-mode-p 'org-mode)) org-footnote-section) - ;; Insert again the section title, if any. Ensure that title, - ;; or the subsequent footnotes, will be separated by a blank - ;; lines from the rest of the document. In an Org buffer, - ;; separate section with a blank line, unless explicitly stated - ;; in `org-blank-before-new-entry'. - (if (not (derived-mode-p 'org-mode)) - (progn (skip-chars-backward " \t\n\r") - (delete-region (point) ins-point) - (unless (bolp) (newline)) - (when org-footnote-tag-for-non-org-mode-files - (insert "\n" org-footnote-tag-for-non-org-mode-files "\n"))) - (when (and (cdr (assq 'heading org-blank-before-new-entry)) - (zerop (save-excursion (org-back-over-empty-lines)))) - (insert "\n")) - (insert "* " org-footnote-section "\n")) - (set-marker ins-point nil) - ;; Insert the footnotes, separated by a blank line. - (insert - (mapconcat - (lambda (x) - ;; Clean markers. - (set-marker (nth 4 x) nil) - (format "\n[%s] %s" (nth (if sort-only 0 1) x) (nth 2 x))) - ref-table "\n")) - (unless (eobp) (insert "\n\n"))) - ;; Each footnote definition has to be inserted at the end of the - ;; section where its first reference belongs. - (t - (dolist (x ref-table) - (let ((pos (nth 4 x))) - (goto-char pos) - ;; Clean marker. - (set-marker pos nil)) - (org-footnote--goto-local-insertion-point) - (insert (format "\n[%s] %s\n" - (nth (if sort-only 0 1) x) - (nth 2 x))))))))) - -(defun org-footnote--goto-local-insertion-point () - "Find insertion point for footnote, just before next outline heading. -Assume insertion point is within currently accessible part of the buffer." - (org-with-limited-levels (outline-next-heading)) - ;; Skip file local variables. See `modify-file-local-variable'. - (when (eobp) - (let ((case-fold-search t)) - (re-search-backward "^[ \t]*# +Local Variables:" - (max (- (point-max) 3000) (point-min)) - t))) - (skip-chars-backward " \t\n") - (forward-line) - (unless (bolp) (insert "\n"))) - (defun org-footnote-delete-references (label) "Delete every reference to footnote LABEL. Return the number of footnotes removed." @@ -903,7 +784,7 @@ Return the number of footnotes removed." Return the number of footnotes removed." (save-excursion (goto-char (point-min)) - (let ((def-re (concat "^\\[" (regexp-quote label) "\\]")) + (let ((def-re (format "^\\[fn:%s\\]" (regexp-quote label))) (ndef 0)) (while (re-search-forward def-re nil t) (let ((full-def (org-footnote-at-definition-p))) @@ -949,24 +830,149 @@ If LABEL is non-nil, delete that footnote instead." (message "%d definition(s) of and %d reference(s) of footnote %s removed" ndef nref label)))) + +;;;; Sorting, Renumbering, Normalizing + (defun org-footnote-renumber-fn:N () - "Renumber the simple footnotes like fn:17 into a sequence in the document." + "Order numbered footnotes into a sequence in the document." (interactive) - (let (map (n 0)) - (org-with-wide-buffer - (goto-char (point-min)) - (while (re-search-forward "\\[fn:\\([0-9]+\\)[]:]" nil t) - (save-excursion - (goto-char (match-beginning 0)) - ;; Ensure match is a footnote reference or definition. - (when (save-match-data (if (bolp) - (org-footnote-at-definition-p) - (org-footnote-at-reference-p))) - (let ((new-val (or (cdr (assoc (match-string 1) map)) - (number-to-string (incf n))))) - (unless (assoc (match-string 1) map) - (push (cons (match-string 1) new-val) map)) - (replace-match new-val nil nil nil 1)))))))) + (let ((references (org-footnote--collect-references))) + (unwind-protect + (let* ((c 0) + (references (cl-remove-if-not + (lambda (r) (string-match-p "\\`[0-9]+\\'" (car r))) + references)) + (alist (mapcar (lambda (l) (cons l (number-to-string (incf c)))) + (delete-dups (mapcar #'car references))))) + (org-with-wide-buffer + ;; Re-number references. + (dolist (ref references) + (goto-char (nth 1 ref)) + (org-footnote--set-label (cdr (assoc (nth 0 ref) alist)))) + ;; Re-number definitions. + (goto-char (point-min)) + (while (re-search-forward "^\\[fn:\\([0-9]+\\)\\]" nil t) + (replace-match (or (cdr (assoc (match-string 1) alist)) + ;; Un-referenced definitions get + ;; higher numbers. + (number-to-string (incf c))) + nil nil nil 1)))) + (dolist (r references) (set-marker (nth 1 r) nil))))) + +(defun org-footnote-sort () + "Rearrange footnote definitions in the current buffer. +Sort footnote definitions so they match order of footnote +references. Also relocate definitions at the end of their +relative section or within a single footnote section, according +to `org-footnote-section'. Inline definitions are ignored." + (let ((references (org-footnote--collect-references))) + (unwind-protect + (let ((definitions (org-footnote--collect-definitions 'delete))) + (org-with-wide-buffer + (org-footnote--clear-footnote-section) + ;; Insert footnote definitions at the appropriate location, + ;; separated by a blank line. Each definition is inserted + ;; only once throughout the buffer. + (let (inserted) + (dolist (cell references) + (let ((label (car cell)) + (nested (not (nth 2 cell))) + (inline (nth 3 cell))) + (unless (or (member label inserted) inline) + (push label inserted) + (unless (or org-footnote-section nested) + ;; If `org-footnote-section' is non-nil, or + ;; reference is nested, point is already at the + ;; correct position. Otherwise, move at the + ;; appropriate location within the section + ;; containing the reference. + (goto-char (nth 1 cell)) + (org-footnote--goto-local-insertion-point)) + (insert "\n" + (or (cdr (assoc label definitions)) + (format "[fn:%s] DEFINITION NOT FOUND." label)) + "\n"))))))) + ;; Clear dangling markers in the buffer. + (dolist (r references) (set-marker (nth 1 r) nil))))) + +(defun org-footnote-normalize () + "Turn every footnote in buffer into a numbered one." + (interactive) + (let ((references (org-footnote--collect-references 'anonymous))) + (unwind-protect + (let ((n 0) + (translations nil) + (definitions nil)) + (org-with-wide-buffer + ;; Update label for reference. We need to do this before + ;; clearing definitions in order to rename nested footnotes + ;; before they are deleted. + (dolist (cell references) + (let* ((label (car cell)) + (anonymous (not label)) + (new + (cond + ;; In order to differentiate anonymous + ;; references from regular ones, set their + ;; labels to integers, not strings. + (anonymous (setcar cell (incf n))) + ((cdr (assoc label translations))) + (t (let ((l (number-to-string (incf n)))) + (push (cons label l) translations) + l))))) + (goto-char (nth 1 cell)) ; Move to reference's start. + (org-footnote--set-label + (if anonymous (number-to-string new) new)) + (let ((size (nth 3 cell))) + ;; Transform inline footnotes into regular references + ;; and retain their definition for later insertion as + ;; a regular footnote definition. + (when size + (let ((def (concat + (format "[fn:%s] " new) + (org-trim + (substring + (delete-and-extract-region + (point) (+ (point) size 1)) + 1))))) + (push (cons (if anonymous new label) def) definitions) + (when org-footnote-fill-after-inline-note-extraction + (org-fill-paragraph))))))) + ;; Collect definitions. Update labels according to ALIST. + (let ((definitions + (nconc definitions + (org-footnote--collect-definitions 'delete))) + (inserted)) + (org-footnote--clear-footnote-section) + (dolist (cell references) + (let* ((label (car cell)) + (anonymous (integerp label)) + (pos (nth 1 cell))) + ;; Move to appropriate location, if required. When + ;; there is a footnote section or reference is + ;; nested, point is already at the expected location. + (unless (or org-footnote-section (not (nth 2 cell))) + (goto-char pos) + (org-footnote--goto-local-insertion-point)) + ;; Insert new definition once label is updated. + (unless (member label inserted) + (push label inserted) + (let ((stored (cdr (assoc label definitions))) + ;; Anonymous footnotes' label is already + ;; up-to-date. + (new (if anonymous label + (cdr (assoc label translations))))) + (insert "\n" + (cond + ((not stored) + (format "[fn:%s] DEFINITION NOT FOUND." new)) + (anonymous stored) + (t + (replace-regexp-in-string + "\\`\\[fn:\\(.*?\\)\\]" new stored nil nil 1))) + "\n")))))))) + ;; Clear dangling markers. + (dolist (r references) (set-marker (nth 1 r) nil))))) (defun org-footnote-auto-adjust-maybe () "Renumber and/or sort footnotes according to user settings." @@ -974,14 +980,77 @@ If LABEL is non-nil, delete that footnote instead." (org-footnote-renumber-fn:N)) (when (memq org-footnote-auto-adjust '(t sort)) (let ((label (car (org-footnote-at-definition-p)))) - (org-footnote-normalize 'sort) + (org-footnote-sort) (when label (goto-char (point-min)) - (and (re-search-forward (concat "^\\[" (regexp-quote label) "\\]") + (and (re-search-forward (format "^\\[fn:%s\\]" (regexp-quote label)) nil t) (progn (insert " ") (just-one-space))))))) + +;;;; End-user interface + +;;;###autoload +(defun org-footnote-action (&optional special) + "Do the right thing for footnotes. + +When at a footnote reference, jump to the definition. + +When at a definition, jump to the references if they exist, offer +to create them otherwise. + +When neither at definition or reference, create a new footnote, +interactively if possible. + +With prefix arg SPECIAL, or when no footnote can be created, +offer additional commands in a menu." + (interactive "P") + (let* ((context (and (not special) (org-element-context))) + (type (org-element-type context))) + (cond + ;; On white space after element, insert a new footnote. + ((and context + (> (point) + (save-excursion + (goto-char (org-element-property :end context)) + (skip-chars-backward " \t") + (point)))) + (org-footnote-new)) + ((eq type 'footnote-reference) + (let ((label (org-element-property :label context))) + (cond + ;; Anonymous footnote: move point at the beginning of its + ;; definition. + ((not label) + (goto-char (org-element-property :contents-begin context))) + ;; Check if a definition exists: then move to it. + ((let ((p (nth 1 (org-footnote-get-definition label)))) + (when p (org-footnote-goto-definition label p)))) + ;; No definition exists: offer to create it. + ((yes-or-no-p (format "No definition for %s. Create one? " label)) + (let ((p (org-footnote-create-definition label))) + (or (ignore-errors (org-footnote-goto-definition label p)) + ;; Since definition was created outside current scope, + ;; edit it remotely. + (org-edit-footnote-reference))))))) + ((eq type 'footnote-definition) + (org-footnote-goto-previous-reference + (org-element-property :label context))) + ((or special (not (org-footnote--allow-reference-p))) + (message "Footnotes: [s]ort | [r]enumber fn:N | [S]=r+s | [n]ormalize | \ +\[d]elete") + (pcase (read-char-exclusive) + (?s (org-footnote-sort)) + (?r (org-footnote-renumber-fn:N)) + (?S (org-footnote-renumber-fn:N) + (org-footnote-sort)) + (?n (org-footnote-normalize)) + (?d (org-footnote-delete)) + (char (error "No such footnote command %c" char)))) + (t (org-footnote-new))))) + + (provide 'org-footnote) ;; Local variables: diff --git a/testing/lisp/test-org-footnote.el b/testing/lisp/test-org-footnote.el index 4205d43..e08c7fe 100644 --- a/testing/lisp/test-org-footnote.el +++ b/testing/lisp/test-org-footnote.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2012-2015 Nicolas Goaziou -;; Author: Nicolas Goaziou <n.goaziou at gmail dot com> +;; Author: Nicolas Goaziou <mail at nicolasgoaziou dot fr> ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -30,15 +30,6 @@ (org-footnote-section nil)) (org-footnote-new)) (buffer-string)))) - ;; `org-footnote-auto-label' is `plain'. - (should - (string-match-p - "Test\\[1\\]\n+\\[1\\]" - (org-test-with-temp-text "Test<point>" - (let ((org-footnote-auto-label 'plain) - (org-footnote-section nil)) - (org-footnote-new)) - (buffer-string)))) ;; `org-footnote-auto-label' is `random'. (should (string-match-p @@ -128,334 +119,429 @@ ;; Regular test. (should (equal "Paragraph" - (org-test-with-temp-text "Paragraph[1]\n\n[1] Definition" - (search-forward "[") + (org-test-with-temp-text "Paragraph<point>[fn:1]\n\n[fn:1] Definition" (org-footnote-delete) (org-trim (buffer-string))))) ;; Remove multiple definitions and references. (should (equal "Paragraph and another" (org-test-with-temp-text - "Paragraph[1] and another[1]\n\n[1] def\n\n[1] def" - (search-forward "[") + "Paragraph<point>[fn:1] and another[fn:1] + +\[fn:1] def + +\[fn:1] def" (org-footnote-delete) (org-trim (buffer-string))))) ;; Delete inline footnotes and all references. (should (equal "Para and" - (org-test-with-temp-text "Para[fn:label:def] and[fn:label]" - (search-forward "[") + (org-test-with-temp-text "Para<point>[fn:label:def] and[fn:label]" (org-footnote-delete) (org-trim (buffer-string))))) ;; Delete anonymous footnotes. (should (equal "Para" - (org-test-with-temp-text "Para[fn::def]" - (search-forward "[") - (org-footnote-delete) - (org-trim (buffer-string))))) + (let ((org-footnote-section nil)) + (org-test-with-temp-text "Para<point>[fn::def]" + (org-footnote-delete) + (org-trim (buffer-string)))))) ;; With an argument, delete footnote with specified label. (should - (equal "Paragraph[1] and another\n\n[1] def" + (equal "Paragraph[fn:1] and another\n\n[fn:1] def" (let ((org-footnote-section nil)) (org-test-with-temp-text - "Paragraph[1] and another[2]\n\n[1] def\n\n[2] def2" + "Paragraph[fn:1] and another[fn:2]\n\n[fn:1] def\n\n[fn:2] def2" (org-footnote-delete "2") (org-trim (buffer-string)))))) ;; Error when no argument is specified at point is not at a footnote ;; reference. (should-error - (org-test-with-temp-text "Para[1]\n\n[1] Def" + (org-test-with-temp-text "Para[fn:1]\n\n[fn:1] Def" (org-footnote-delete))) ;; Correctly delete footnotes with multiple paragraphs. (should (equal "Para\n\n\nOutside footnote." - (org-test-with-temp-text - "Para[1]\n\n[1] para1\n\npara2\n\n\nOutside footnote." - (org-footnote-delete "1") - (org-trim (buffer-string)))))) + (let ((org-footnote-section nil)) + (org-test-with-temp-text + "Para[fn:1]\n\n[fn:1] para1\n\npara2\n\n\nOutside footnote." + (org-footnote-delete "1") + (org-trim (buffer-string))))))) (ert-deftest test-org-footnote/goto-definition () "Test `org-footnote-goto-definition' specifications." ;; Error on unknown definitions. (should-error (org-test-with-temp-text "No footnote definition" - (org-footnote-goto-definition "fn:1"))) + (org-footnote-goto-definition "1"))) ;; Error when trying to reach a definition outside narrowed part of ;; buffer. (should-error (org-test-with-temp-text "Some text<point>\n[fn:1] Definition." (narrow-to-region (point-min) (point)) - (org-footnote-goto-definition "fn:1"))) + (org-footnote-goto-definition "1"))) (should-error (org-test-with-temp-text "[fn:1] Definition.\n<point>Some text" (narrow-to-region (point) (point-max)) - (org-footnote-goto-definition "fn:1"))) + (org-footnote-goto-definition "1"))) ;; Otherwise, move at the beginning of the definition, including ;; anonymous footnotes. (should (equal "Definition." (org-test-with-temp-text "Some text\n[fn:1] Definition." - (org-footnote-goto-definition "fn:1") + (org-footnote-goto-definition "1") (buffer-substring (point) (point-max))))) (should (equal "definition]" (org-test-with-temp-text "Some text[fn:label:definition]" - (org-footnote-goto-definition "fn:label") + (org-footnote-goto-definition "label") (buffer-substring (point) (point-max)))))) -(ert-deftest test-org-footnote/normalize-in-org () - "Test specifications for `org-footnote-normalize' in an Org buffer." - ;; With a non-nil `org-footnote-section', normalize each type of - ;; footnote: standard, labelled, numbered, inline, anonymous. +(ert-deftest test-org-footnote/sort () + "Test `org-footnote-sort' specifications." + ;; Reorder definitions with a nil `org-footnote-section'. In this + ;; case each definition is written at the end of the section + ;; containing its first reference. (should - (equal "Paragraph[1][2][3][4][5] + (equal + " +Text[fn:1][fn:2] -* Footnotes +\[fn:1] Def 1 -\[1] Standard +\[fn:2] Def 2 +" + (org-test-with-temp-text " +Text[fn:1][fn:2] -\[2] Labelled +\[fn:2] Def 2 -\[3] Numbered +\[fn:1] Def 1" + (let ((org-footnote-section nil)) (org-footnote-sort)) + (buffer-string)))) + (should + (equal + " +* H1 +Text[fn:1] -\[4] Inline +\[fn:1] Def 1 +* H2 +Text[fn:2] -\[5] Anonymous +\[fn:2] Def 2 +" + (org-test-with-temp-text " +* H1 +Text[fn:1] +* H2 +Text[fn:2] +\[fn:1] Def 1 +\[fn:2] Def 2 " - (let ((org-footnote-section "Footnotes") - (org-blank-before-new-entry '((heading . auto)))) - (org-test-with-temp-text - "Paragraph[fn:1][fn:label][1][fn:inline:Inline][fn::Anonymous] + (let ((org-footnote-section nil)) (org-footnote-sort)) + (buffer-string)))) + ;; Reorder definitions with a non-nil `org-footnote-section'. + (should + (equal + " +Text[fn:1][fn:2] * Footnotes -\[fn:1] Standard +\[fn:1] Def 1 + +\[fn:2] Def 2 +" + (org-test-with-temp-text " +Text[fn:1][fn:2] -\[fn:label] Labelled +\[fn:2] Def 2 -\[1] Numbered" - (org-footnote-normalize) - (buffer-string))))) - ;; When no footnote section is present, create it. Follow - ;; `org-blank-before-new-entry' specifications when doing so. - (should - (equal "Paragraph[1]\n\n* Footnotes\n\n[1] Definition" - (let ((org-footnote-section "Footnotes") - (org-blank-before-new-entry '((heading . auto)))) - (org-test-with-temp-text "Paragraph[fn:1]\n\n[fn:1] Definition" - (org-footnote-normalize) - (buffer-string))))) - (should - (equal - "Paragraph[1]\n* Head1\n* Footnotes\n\n[1] Definition" - (let ((org-footnote-section "Footnotes") - (org-blank-before-new-entry '((heading)))) - (org-test-with-temp-text "Paragraph[fn:1]\n* Head1\n[fn:1] Definition" - (org-footnote-normalize) - (buffer-string))))) - ;; When the footnote section is misplaced, move it at the end of - ;; the buffer. +\[fn:1] Def 1" + (let ((org-footnote-section "Footnotes")) (org-footnote-sort)) + (buffer-string)))) + ;; When `org-footnote-section' is non-nil, clear previous footnote + ;; sections. (should (equal - "* Head1 -Body[1] -* Head2 + " +Text[fn:1] + +* Headline + +* Other headline * Footnotes -\[1] Definition 1" - (let ((org-footnote-section "Footnotes") - (org-blank-before-new-entry '((heading . auto)))) - (org-test-with-temp-text "* Head1 -Body[fn:1] +\[fn:1] Def 1 +" + (org-test-with-temp-text " +Text[fn:1] + * Footnotes -\[fn:1] Definition 1 -* Head2" - (org-footnote-normalize) - (buffer-string))))) - ;; With a nil `org-footnote-section', normalize each type of - ;; footnote: standard, labelled, numbered, inline, anonymous. - (should - (equal "Paragraph[1][2][3][4][5] -\[1] Standard +\[fn:1] Def 1 -\[2] Labelled +* Headline -\[3] Numbered +** Footnotes -\[4] Inline +* Other headline" + (let ((org-footnote-section "Footnotes")) (org-footnote-sort)) + (buffer-string)))) + ;; Ignore anonymous footnotes. + (should + (equal + " +Text[fn:1][fn::inline][fn:2] -\[5] Anonymous -" - (let ((org-footnote-section nil)) - (org-test-with-temp-text - "Paragraph[fn:1][fn:label][1][fn:inline:Inline][fn::Anonymous] +\[fn:1] Def 1 -\[fn:1] Standard +\[fn:2] Def 2 +" + (org-test-with-temp-text + " +Text[fn:1][fn::inline][fn:2] -\[fn:label] Labelled +\[fn:2] Def 2 -\[1] Numbered" - (org-footnote-normalize) - (buffer-string))))) - ;; Also put each footnote definition at the end of the section - ;; containing its first reference. +\[fn:1] Def 1" + (let ((org-footnote-section nil)) (org-footnote-sort)) + (buffer-string)))) + ;; Ignore inline footnotes. (should - (equal "* Head 1 -Text[1] + (equal + " +Text[fn:1][fn:label:inline][fn:2] -\[1] Def1 -* Head 2 -Text[1] -* Head 3 -Text[2] +\[fn:1] Def 1 -\[2] Def2 +\[fn:2] Def 2 " - (let ((org-footnote-section nil)) - (org-test-with-temp-text - "* Head 1 -Text[fn:1:Def1] -* Head 2 -Text[fn:1] -* Head 3 -Text[fn:2:Def2]" - (org-footnote-normalize) - (buffer-string)))))) + (org-test-with-temp-text + " +Text[fn:1][fn:label:inline][fn:2] + +\[fn:2] Def 2 -(ert-deftest test-org-footnote/normalize-outside-org () - "Test `org-footnote-normalize' specifications for buffers not in Org mode." - ;; 1. In a non-Org buffer, footnotes definitions are always put at - ;; its end. +\[fn:1] Def 1" + (let ((org-footnote-section nil)) (org-footnote-sort)) + (buffer-string)))) + ;; Handle (deeply) nested footnotes. (should (equal - "Paragraph[1][2][3][4][5] - + " +Text[fn:1][fn:3] -Some additional text. +\[fn:1] Def 1[fn:2] -\[1] Standard +\[fn:2] Def 2 -\[2] Labelled +\[fn:3] Def 3 +" + (org-test-with-temp-text " +Text[fn:1][fn:3] -\[3] Numbered +\[fn:1] Def 1[fn:2] -\[4] Inline +\[fn:3] Def 3 -\[5] Anonymous" - (let ((org-footnote-tag-for-non-org-mode-files nil)) - (with-temp-buffer - (insert "Paragraph[fn:1][fn:label][1][fn:inline:Inline][fn::Anonymous] +\[fn:2] Def 2 +" + (let ((org-footnote-section nil)) (org-footnote-sort)) + (buffer-string)))) + (should + (equal + " +Text[fn:1][fn:4] -\[fn:1] Standard +\[fn:1] Def 1[fn:2] -\[fn:label] Labelled +\[fn:2] Def 2[fn:3] -\[1] Numbered +\[fn:3] Def 3 +\[fn:4] Def 4 +" + (org-test-with-temp-text " +Text[fn:1][fn:4] -Some additional text.") - (org-footnote-normalize) - (buffer-string))))) - ;; 2. With a special tag. - (let ((org-footnote-tag-for-non-org-mode-files "Footnotes:")) - ;; 2.1. The tag must be inserted before the footnotes, separated - ;; from the rest of the text with a blank line. - (with-temp-buffer - (insert "Paragraph[fn:1][fn::Anonymous] +\[fn:1] Def 1[fn:2] -\[fn:1] Standard +\[fn:3] Def 3 +\[fn:2] Def 2[fn:3] -Some additional text.") - (org-footnote-normalize) - (should - (equal (buffer-string) - "Paragraph[1][2] +\[fn:4] Def 4 +" + (let ((org-footnote-section nil)) (org-footnote-sort)) + (buffer-string)))) + ;; When multiple (nested) references are used, make sure to insert + ;; definition only once. + (should + (equal + " +* Section 1 +Text[fn:1] -Some additional text. +\[fn:1] Def 1 -Footnotes: +* Section 2 -\[1] Standard +Text[fn:1]" + (org-test-with-temp-text + " +* Section 1 -\[2] Anonymous"))) - ;; 2.2. Any tag already inserted in the buffer should be removed - ;; prior to footnotes insertion. - (with-temp-buffer - (insert "Text[fn:1] -Footnotes: +Text[fn:1] -Additional text. +\[fn:1] Def 1 -Footnotes: +* Section 2 -\[fn:1] Definition") - (org-footnote-normalize) - (should - (equal (buffer-string) - "Text[1] +Text[fn:1]" + (let ((org-footnote-section nil)) (org-footnote-sort)) + (buffer-string)))) + (should + (equal + " +Text[fn:1][fn:4] -Additional text. +\[fn:1] Def 1[fn:2][fn:3] -Footnotes: +\[fn:2] Def 2[fn:3] -\[1] Definition")))) - ;; 3. As an exception, in `message-mode' buffer, if a signature is - ;; present, insert footnotes before it.n - (let ((org-footnote-tag-for-non-org-mode-files nil)) - (with-temp-buffer - (insert "Body[fn::def] --- -Fake signature --- -Signature") - ;; Mimic `message-mode'. - (let ((major-mode 'message-mode) - (message-cite-prefix-regexp "\\([ ]*[_.[:word:]]+>+\\|[ ]*[]>|]\\)+") - (message-signature-separator "^-- $")) - (flet ((message-point-in-header-p nil nil)) - (org-footnote-normalize))) - (should - (equal (buffer-string) - "Body[1] --- -Fake signature +\[fn:3] Def 3 -\[1] def +\[fn:4] Def 4 +" + (org-test-with-temp-text " +Text[fn:1][fn:4] --- -Signature"))))) +\[fn:1] Def 1[fn:2][fn:3] -(ert-deftest test-org-footnote/sort () - "Test footnotes definitions sorting." - (let ((org-footnote-section nil)) - (org-test-with-temp-text - "Text[fn:1][fn::inline][fn:2][fn:label] +\[fn:3] Def 3 -\[fn:label] C +\[fn:2] Def 2[fn:3] -\[fn:1] A +\[fn:4] Def 4 +" + (let ((org-footnote-section nil)) (org-footnote-sort)) + (buffer-string))))) -\[fn:2] B" - (org-footnote-normalize 'sort) - (should - (equal (buffer-string) - "Text[fn:1][fn::inline][fn:2][fn:label] +(ert-deftest test-org-footnote/renumber-fn:N () + "Test `org-footnote-renumber-fn:N' specifications." + ;; Renumber (inline) references and definitions. + (should + (equal + "Test[fn:1]" + (org-test-with-temp-text "Test[fn:99]" + (org-footnote-renumber-fn:N) + (buffer-string)))) + (should + (equal + "Test[fn:1]\n\n[fn:1] 99" + (org-test-with-temp-text "Test[fn:99]\n\n[fn:99] 99" + (org-footnote-renumber-fn:N) + (buffer-string)))) + (should + (equal + "Test[fn:1:99]" + (org-test-with-temp-text "Test[fn:99:99]" + (org-footnote-renumber-fn:N) + (buffer-string)))) + ;; No-op if there's no numbered footnote. + (should + (equal + "Test[fn:label]\n\n[fn:label] Def" + (org-test-with-temp-text "Test[fn:label]\n\n[fn:label] Def" + (org-footnote-renumber-fn:N) + (buffer-string)))) + ;; Definitions without a reference get the highest numbers. + (should + (equal + "Test[fn:1]\n[fn:1] 1\n[fn:2] 99" + (org-test-with-temp-text "Test[fn:1]\n[fn:1] 1\n[fn:99] 99" + (org-footnote-renumber-fn:N) + (buffer-string)))) + ;; Sort labels in sequence. Anonymous footnotes are ignored. + (should + (equal + "Test[fn:1][fn:2:def][fn:3]" + (org-test-with-temp-text "Test[fn:4][fn:3:def][fn:2]" + (org-footnote-renumber-fn:N) + (buffer-string)))) + (should + (equal + "Test[fn:1][fn::def][fn:2]" + (org-test-with-temp-text "Test[fn:4][fn::def][fn:2]" + (org-footnote-renumber-fn:N) + (buffer-string))))) + +(ert-deftest test-org-footnote/normalize () + "Test `org-footnote-normalize' specifications." + ;; Normalize regular, inline and anonymous references. + (should + (equal + "Test[fn:1]\n\n[fn:1] def\n" + (org-test-with-temp-text "Test[fn:label]\n[fn:label] def" + (let ((org-footnote-section nil)) (org-footnote-normalize)) + (buffer-string)))) + (should + (equal + "Test[fn:1]\n\n[fn:1] def\n" + (org-test-with-temp-text "Test[fn:label:def]" + (let ((org-footnote-section nil)) (org-footnote-normalize)) + (buffer-string)))) + (should + (equal + "Test[fn:1]\n\n[fn:1] def\n" + (org-test-with-temp-text "Test[fn::def]" + (let ((org-footnote-section nil)) (org-footnote-normalize)) + (buffer-string)))) + ;; Normalization includes sorting. + (should + (equal + "Test[fn:1][fn:2]\n\n[fn:1] def2\n\n[fn:2] def\n" + (org-test-with-temp-text "Test[fn:2][fn:1]\n\n[fn:2] def2\n[fn:1] def" + (let ((org-footnote-section nil)) (org-footnote-normalize)) + (buffer-string)))) + (should + (equal + "Test[fn:1][fn:2]\n\n[fn:1] def\n\n[fn:2] inline\n" + (org-test-with-temp-text "Test[fn:2][fn::inline]\n[fn:2] def\n" + (let ((org-footnote-section nil)) (org-footnote-normalize)) + (buffer-string)))) + (should + (equal + "Test[fn:1][fn:3] -\[fn:1] A +\[fn:1] def[fn:2] -\[fn:2] B +\[fn:2] inline -\[fn:label] C -"))))) +\[fn:3] last +" + (org-test-with-temp-text + "Test[fn:lab1][fn:lab2]\n[fn:lab1] def[fn::inline]\n[fn:lab2] last" + (let ((org-footnote-section nil)) (org-footnote-normalize)) + (buffer-string)))) + ;; When normalizing an inline reference, fill paragraph whenever the + ;; `org-footnote-fill-after-inline-note-extraction' is non-nil. + (should + (equal + "Test[fn:1] Next\n\n[fn:1] def\n" + (org-test-with-temp-text "Test[fn::def]\nNext" + (let ((org-footnote-section nil) + (org-footnote-fill-after-inline-note-extraction t)) + (org-footnote-normalize)) + (buffer-string))))) (provide 'test-org-footnote) |