mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity
org-mode/testing/lisp/test-org-footnote.el

762 lines
19 KiB
EmacsLisp
Raw Normal View History

testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
;;; test-org-footnote.el --- Tests for org-footnote.el -*- lexical-binding: t; -*-
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
Update copyright year
2019-01-01 10:50:56 +00:00
;; Copyright (C) 2012-2015, 2019 Nicolas Goaziou
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
;; Author: Nicolas Goaziou <mail at nicolasgoaziou dot fr>
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
;; 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
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
Prefer HTTPS to HTTP for links to gnu.org
2021-03-20 07:27:57 +00:00
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
;;; Code:
testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
(require 'org-footnote)
org-footnote-new: Add an option to create new anonymous labels * lisp/org-footnote.el (org-footnote-new, org-footnote-auto-label): Add symbol `anonymous' to `org-footnote-auto-label'. With this, anonymous footnotes will be created. This is sometimes useful in long texts. Mimics \footnote{} in LaTeX. Modify `org-footnote-new' to generate anonymous footnotes directly. * lisp/org.el (org-startup-options): Add `fnanon' to startup options. * testing/lisp/test-org-footnote.el (test-org-footnote/new-anon): Add a test for creation of anonymous footnotes. * etc/ORG-NEWS: (~org-footnote-new~ can be configured to create anonymous footnotes): Announce new anonymous footnote support. * doc/org-manual.org (Summary of In-Buffer Settings): Document "fnanon" startup option.
2024-02-05 06:30:00 +00:00
(ert-deftest test-org-footnote/new-anon ()
"Test `org-footnote-new' specifications."
;; `org-footnote-auto-label' is `anonymous'.
(should
(string-match-p
"Test\\[fn::\\]"
(org-test-with-temp-text "Test<point>"
(let ((org-footnote-auto-label 'anonymous)
(org-footnote-section nil))
(org-footnote-new))
(buffer-string)))))
org-footnote: Be more strict about location for new footnotes * lisp/org-footnote.el (org-footnote--allow-reference-p): New function. (org-footnote-new): Use new function. * testing/lisp/test-org-footnote.el (test-org-footnote/new): New test. In particular, Org now refuses to add a footnote reference in a keyword, e.g., TITLE.
2015-02-15 20:30:29 +00:00
(ert-deftest test-org-footnote/new ()
"Test `org-footnote-new' specifications."
;; `org-footnote-auto-label' is t.
(should
(string-match-p
"Test\\[fn:1\\]\n+\\[fn:1\\]"
(org-test-with-temp-text "Test<point>"
(let ((org-footnote-auto-label t)
(org-footnote-section nil))
(org-footnote-new))
(buffer-string))))
;; `org-footnote-auto-label' is `random'.
(should
(string-match-p
"Test\\[fn:\\(.+?\\)\\]\n+\\[fn:\\1\\]"
(org-test-with-temp-text "Test<point>"
(let ((org-footnote-auto-label 'random)
(org-footnote-section nil))
(org-footnote-new))
(buffer-string))))
;; Error at beginning of line.
(should-error
(org-test-with-temp-text "<point>Test"
(org-footnote-new)))
;; Error at keywords.
(should-error
(org-test-with-temp-text "#+TIT<point>LE: value"
(org-footnote-new)))
(should-error
(org-test-with-temp-text "#+CAPTION: <point>\nParagraph"
(org-footnote-new)))
;; Allow new footnotes in blank lines at the beginning of the
;; document.
(should
(string-match-p
" \\[fn:1\\]"
(org-test-with-temp-text " <point>"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
org-footnote: Allow new footnotes in headlines * lisp/org-footnote.el (org-footnote--allow-reference-p): Allow new footnotes in headlines. * testing/lisp/test-org-footnote.el (test-org-footnote/new): Add test. Reported-by: Thomas S. Dye <tsd@tsdye.com> <http://permalink.gmane.org/gmane.emacs.orgmode/96843>
2015-04-11 22:25:33 +00:00
;; In an headline or inlinetask, point must be either on the
;; heading itself or on the blank lines below.
(should (org-test-with-temp-text "* H<point>" (org-footnote-new) t))
(should
(org-test-with-temp-text "* H\n <point>\nParagraph" (org-footnote-new) t))
(should-error (org-test-with-temp-text "*<point> H" (org-footnote-new) t))
(should-error
(org-test-with-temp-text "* H <point>:tag:" (org-footnote-new) t))
org-footnote: Be more strict about location for new footnotes * lisp/org-footnote.el (org-footnote--allow-reference-p): New function. (org-footnote-new): Use new function. * testing/lisp/test-org-footnote.el (test-org-footnote/new): New test. In particular, Org now refuses to add a footnote reference in a keyword, e.g., TITLE.
2015-02-15 20:30:29 +00:00
;; Allow new footnotes within recursive objects, but not in links.
(should
(string-match-p
" \\*bold\\[fn:1\\]\\*"
(org-test-with-temp-text " *bold<point>*"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
(should-error
Update URLs in source code or tests TINYCHANGE
2018-01-16 18:42:57 +00:00
(org-test-with-temp-text " [[https://orgmode.org][Org mode<point>]]"
org-footnote: Be more strict about location for new footnotes * lisp/org-footnote.el (org-footnote--allow-reference-p): New function. (org-footnote-new): Use new function. * testing/lisp/test-org-footnote.el (test-org-footnote/new): New test. In particular, Org now refuses to add a footnote reference in a keyword, e.g., TITLE.
2015-02-15 20:30:29 +00:00
(org-footnote-new)))
;; Allow new footnotes in blank lines after an element or white
;; spaces after an object.
(should
(string-match-p
" \\[fn:1\\]"
(org-test-with-temp-text "#+BEGIN_EXAMPLE\nA\n#+END_EXAMPLE\n <point>"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
(should
(string-match-p
" \\*bold\\*\\[fn:1\\]"
(org-test-with-temp-text " *bold*<point>"
(let ((org-footnote-auto-label t)) (org-footnote-new))
org-footnote: Fix f8c4102cc6e65d48e0b9502cc568843a86f92f1c * lisp/org-footnote.el (org-footnote-new): Fix f8c4102cc6e65d48e0b9502cc568843a86f92f1c. * testing/lisp/test-org-footnote.el (test-org-footnote/new): Add test.
2015-08-14 14:17:18 +00:00
(buffer-string))))
footnote: Allow footnotes at footnote definition start * lisp/org-footnote.el (org-footnote--allow-reference-p): Allow footnotes at footnote definition start, right after label. * testing/lisp/test-org-footnote.el (test-org-footnote/new): Add tests.
2021-10-06 12:34:14 +00:00
;; Allow new footnotes at the start of a footnote definition.
(should
(string-match-p
"\\[fn:1\\]\\[fn:2\\]"
(org-test-with-temp-text "[fn:1]<point>"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
(should
(string-match-p
"\\[fn:1\\] \\[fn:2\\]"
(org-test-with-temp-text "[fn:1] <point>"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
(should
(string-match-p
"\\[fn:1\\]\\[fn:2\\]"
(org-test-with-temp-text "[fn:1]<point> \nParagraph"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
(should-error
(org-test-with-temp-text "[fn:<point>1]"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string)))
(should-error
(org-test-with-temp-text "<point>[fn:1]"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string)))
;; Allow new footnotes in table cells.
footnote: Allow new footnotes in empty cells * lisp/org-footnote.el (org-footnote--allow-reference-p): allow inserting new footnotes in empty cells. * testing/lisp/test-org-footnote.el (test-org-footnote/new): Add tests. Reported-by: Uwe Brauer <oub@mat.ucm.es> <http://lists.gnu.org/r/emacs-orgmode/2021-05/msg00940.html>
2021-05-20 13:44:27 +00:00
(should
(string-match-p
" \\[fn:1\\]"
(org-test-with-temp-text "| <point> |"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
(should
(string-match-p
"|\\[fn:1\\]"
(org-test-with-temp-text "|<point> |"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
(should
(string-match-p
" \\[fn:1\\]"
(org-test-with-temp-text "| <point>|"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
footnote: Allow inserting footnotes at the end of table cells * lisp/org-footnote.el (org-footnote--allow-reference-p): Allow inserting footnotes at the end of table cells. * testing/lisp/test-org-footnote.el (test-org-footnote/new): Add test.
2021-07-29 19:15:11 +00:00
(should
(string-match-p
" \\[fn:1\\]"
(org-test-with-temp-text "| contents <point>|"
(let ((org-footnote-auto-label t)) (org-footnote-new))
(buffer-string))))
org-footnote: Fix f8c4102cc6e65d48e0b9502cc568843a86f92f1c * lisp/org-footnote.el (org-footnote-new): Fix f8c4102cc6e65d48e0b9502cc568843a86f92f1c. * testing/lisp/test-org-footnote.el (test-org-footnote/new): Add test.
2015-08-14 14:17:18 +00:00
;; When creating a new footnote, move to its definition.
(should
(string=
org-footnote: Fix failing test * testing/lisp/test-org-footnote.el (test-org-footnote/new): Fix failing test.
2018-09-05 17:04:34 +00:00
"[fn:1]"
org-footnote: Fix f8c4102cc6e65d48e0b9502cc568843a86f92f1c * lisp/org-footnote.el (org-footnote-new): Fix f8c4102cc6e65d48e0b9502cc568843a86f92f1c. * testing/lisp/test-org-footnote.el (test-org-footnote/new): Add test.
2015-08-14 14:17:18 +00:00
(org-test-with-temp-text "Text<point>"
(let ((org-footnote-auto-label t)
(org-footnote-auto-adjust nil))
(org-footnote-new))
(buffer-substring-no-properties (line-beginning-position) (point)))))
;; Re-order and re-label footnotes properly when
;; `org-footnote-auto-adjust' is non-nil.
(should
(string=
"[fn:1] 1\n\n[fn:2] \n\n[fn:3] 2\n"
(org-test-with-temp-text
"Text[fn:1]Text<point>Text[fn:2]\n\n[fn:1] 1\n\n[fn:2] 2"
(let ((org-footnote-auto-label t)
(org-footnote-auto-adjust t)
(org-footnote-section nil))
(org-footnote-new))
(buffer-substring-no-properties
(line-beginning-position -1)
Preserve file local variables during some operations * lisp/org-macs.el (org-preserve-local-variables): New macro. * lisp/org-footnote.el (org-footnote--clear-footnote-section): (org-footnote--goto-local-insertion-point): (org-footnote-create-definition): (org-footnote-delete): (org-footnote-renumber-fn:N): (org-footnote-sort): (org-footnote-normalize): * lisp/org.el (org-move-subtree-down): (org-copy-subtree): (org-sort-entries): (org-refile): Use new macro. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize): (test-org-footnote/delete): (test-org-footnote/sort): (test-org-footnote/normalize): * testing/lisp/test-org.el (test-org/sort-entries): Add tests. Operations affected include copying, killing, refiling, archiving and moving subtrees. It also affects sorting, creating and deleting footnotes.
2017-12-18 14:50:51 +00:00
(line-beginning-position 4)))))
;; Do not alter file local variables when inserting new definition
;; label.
(should
(equal "Paragraph[fn:1]
\[fn:1]
# Local Variables:
# foo: t
# End:"
(org-test-with-temp-text
"Paragraph<point>\n# Local Variables:\n# foo: t\n# End:"
(let ((org-footnote-section nil)) (org-footnote-new))
(buffer-string))))
(should
(equal "Paragraph[fn:1]
* Footnotes
\[fn:1]
# Local Variables:
# foo: t
# End:"
(org-test-with-temp-text
"Paragraph<point>\n# Local Variables:\n# foo: t\n# End:"
(let ((org-footnote-section "Footnotes")) (org-footnote-new))
org-footnote: Fix inserting new footnote mangling drawers * org-footnote.el (org-footnote-create-definition): Replace `forward-line' with `org-end-of-meta-data' to skip over any properties and/or drawers that may be present on the `org-footnote-section' heading (default "Footnotes"). TINYCHANGE
2021-01-09 16:50:50 +00:00
(buffer-string))))
(should
(equal "Para[fn:1]
* Footnotes
:properties:
:custom_id: id
:end:
\[fn:1]"
(org-test-with-temp-text
"Para<point>\n* Footnotes\n:properties:\n:custom_id: id\n:end:"
(let ((org-footnote-section "Footnotes"))
(org-footnote-new))
(org-trim (buffer-string))))))
org-footnote: Be more strict about location for new footnotes * lisp/org-footnote.el (org-footnote--allow-reference-p): New function. (org-footnote-new): Use new function. * testing/lisp/test-org-footnote.el (test-org-footnote/new): New test. In particular, Org now refuses to add a footnote reference in a keyword, e.g., TITLE.
2015-02-15 20:30:29 +00:00
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
(ert-deftest test-org-footnote/delete ()
"Test `org-footnote-delete' specifications."
;; Regular test.
(should
(equal "Paragraph"
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.
2015-12-16 17:38:53 +00:00
(org-test-with-temp-text "Paragraph<point>[fn:1]\n\n[fn:1] Definition"
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
(org-footnote-delete)
(org-trim (buffer-string)))))
;; Remove multiple definitions and references.
(should
(equal "Paragraph and another"
(org-test-with-temp-text
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.
2015-12-16 17:38:53 +00:00
"Paragraph<point>[fn:1] and another[fn:1]
\[fn:1] def
\[fn:1] def"
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
(org-footnote-delete)
(org-trim (buffer-string)))))
;; Delete inline footnotes and all references.
(should
(equal "Para and"
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.
2015-12-16 17:38:53 +00:00
(org-test-with-temp-text "Para<point>[fn:label:def] and[fn:label]"
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
(org-footnote-delete)
(org-trim (buffer-string)))))
;; Delete anonymous footnotes.
(should
(equal "Para"
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.
2015-12-16 17:38:53 +00:00
(let ((org-footnote-section nil))
(org-test-with-temp-text "Para<point>[fn::def]"
(org-footnote-delete)
(org-trim (buffer-string))))))
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
;; With an argument, delete footnote with specified label.
(should
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.
2015-12-16 17:38:53 +00:00
(equal "Paragraph[fn:1] and another\n\n[fn:1] def"
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
(let ((org-footnote-section nil))
(org-test-with-temp-text
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.
2015-12-16 17:38:53 +00:00
"Paragraph[fn:1] and another[fn:2]\n\n[fn:1] def\n\n[fn:2] def2"
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
(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-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.
2015-12-16 17:38:53 +00:00
(org-test-with-temp-text "Para[fn:1]\n\n[fn:1] Def"
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
(org-footnote-delete)))
;; Correctly delete footnotes with multiple paragraphs.
(should
(equal "Para\n\n\nOutside footnote."
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.
2015-12-16 17:38:53 +00:00
(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-footnote: Fix footnote deletion * lisp/org-footnote.el (org-footnote-delete-definitions): Preserve blank lines after the definition. * testing/lisp/test-org-footnote.el (test-org-footnote/delete): Add test.
2017-06-09 07:43:49 +00:00
(org-trim (buffer-string))))))
;; Remove blank lines above the footnote but preserve those after
;; it.
(should
(equal "Text\n\n\nOther text."
(let ((org-footnote-section nil))
(org-test-with-temp-text
"Text[fn:1]\n\n[fn:1] Definition.\n\n\nOther text."
(org-footnote-delete "1")
Preserve file local variables during some operations * lisp/org-macs.el (org-preserve-local-variables): New macro. * lisp/org-footnote.el (org-footnote--clear-footnote-section): (org-footnote--goto-local-insertion-point): (org-footnote-create-definition): (org-footnote-delete): (org-footnote-renumber-fn:N): (org-footnote-sort): (org-footnote-normalize): * lisp/org.el (org-move-subtree-down): (org-copy-subtree): (org-sort-entries): (org-refile): Use new macro. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize): (test-org-footnote/delete): (test-org-footnote/sort): (test-org-footnote/normalize): * testing/lisp/test-org.el (test-org/sort-entries): Add tests. Operations affected include copying, killing, refiling, archiving and moving subtrees. It also affects sorting, creating and deleting footnotes.
2017-12-18 14:50:51 +00:00
(buffer-string)))))
;; Preserve file local variables when deleting a footnote.
(should
(equal
"Paragraph\n# Local Variables:\n# foo: t\n# End:"
(org-test-with-temp-text
"Paragraph[fn:1]\n[fn:1] Def 1\n# Local Variables:\n# foo: t\n# End:"
(let ((org-footnote-section nil)) (org-footnote-delete "1"))
(buffer-string)))))
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
org-footnote: Do not move point if definition is unreachable * lisp/org-footnote.el (org-footnote-goto-definition): Throw an error when definition is outside narrowed part of buffer. Do not move point either. * testing/lisp/test-org-footnote.el (test-org-footnote/goto-definition): New test. Reported-by: Rasmus <rasmus@gmx.us> <http://permalink.gmane.org/gmane.emacs.orgmode/97158>
2015-04-25 08:36:35 +00:00
(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: 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.
2015-12-16 17:38:53 +00:00
(org-footnote-goto-definition "1")))
org-footnote: Do not move point if definition is unreachable * lisp/org-footnote.el (org-footnote-goto-definition): Throw an error when definition is outside narrowed part of buffer. Do not move point either. * testing/lisp/test-org-footnote.el (test-org-footnote/goto-definition): New test. Reported-by: Rasmus <rasmus@gmx.us> <http://permalink.gmane.org/gmane.emacs.orgmode/97158>
2015-04-25 08:36:35 +00:00
;; 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: 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.
2015-12-16 17:38:53 +00:00
(org-footnote-goto-definition "1")))
org-footnote: Fix 5954f6aa25b51a3a9a8f258fb0f15ef51be31366 * lisp/org-footnote.el (org-footnote-goto-definition): Better check for narrowed scope. * testing/lisp/test-org-footnote.el (test-org-footnote/goto-definition): Add test.
2015-04-25 09:09:05 +00:00
(should-error
(org-test-with-temp-text "[fn:1] Definition.\n<point>Some text"
(narrow-to-region (point) (point-max))
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.
2015-12-16 17:38:53 +00:00
(org-footnote-goto-definition "1")))
org-footnote: Do not move point if definition is unreachable * lisp/org-footnote.el (org-footnote-goto-definition): Throw an error when definition is outside narrowed part of buffer. Do not move point either. * testing/lisp/test-org-footnote.el (test-org-footnote/goto-definition): New test. Reported-by: Rasmus <rasmus@gmx.us> <http://permalink.gmane.org/gmane.emacs.orgmode/97158>
2015-04-25 08:36:35 +00:00
;; Otherwise, move at the beginning of the definition, including
;; anonymous footnotes.
(should
(equal
Revert "org-footnote: Fix location after moving to definition" This reverts commit 8500501984b6b0e283722d6e96c4e359f818f7cb.
2018-08-30 21:59:01 +00:00
" Definition."
org-footnote: Do not move point if definition is unreachable * lisp/org-footnote.el (org-footnote-goto-definition): Throw an error when definition is outside narrowed part of buffer. Do not move point either. * testing/lisp/test-org-footnote.el (test-org-footnote/goto-definition): New test. Reported-by: Rasmus <rasmus@gmx.us> <http://permalink.gmane.org/gmane.emacs.orgmode/97158>
2015-04-25 08:36:35 +00:00
(org-test-with-temp-text "Some text\n[fn:1] Definition."
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.
2015-12-16 17:38:53 +00:00
(org-footnote-goto-definition "1")
org-footnote: Do not move point if definition is unreachable * lisp/org-footnote.el (org-footnote-goto-definition): Throw an error when definition is outside narrowed part of buffer. Do not move point either. * testing/lisp/test-org-footnote.el (test-org-footnote/goto-definition): New test. Reported-by: Rasmus <rasmus@gmx.us> <http://permalink.gmane.org/gmane.emacs.orgmode/97158>
2015-04-25 08:36:35 +00:00
(buffer-substring (point) (point-max)))))
(should
(equal
"definition]"
(org-test-with-temp-text "Some text[fn:label:definition]"
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.
2015-12-16 17:38:53 +00:00
(org-footnote-goto-definition "label")
org-footnote: Do not move point if definition is unreachable * lisp/org-footnote.el (org-footnote-goto-definition): Throw an error when definition is outside narrowed part of buffer. Do not move point either. * testing/lisp/test-org-footnote.el (test-org-footnote/goto-definition): New test. Reported-by: Rasmus <rasmus@gmx.us> <http://permalink.gmane.org/gmane.emacs.orgmode/97158>
2015-04-25 08:36:35 +00:00
(buffer-substring (point) (point-max))))))
org-footnote: Fix `org-footnote-goto-previous-reference' * lisp/org-footnote.el (org-footnote-goto-previous-reference): Only add to mark ring on a successful match. Improve error message when reference is outside visible part of buffer. (org-footnote-get-next-reference): Avoid using `org-footnote-at-reference-p', which is inaccurate, due to `org-footnote-in-valid-context-p'. * testing/lisp/test-org-footnote.el (test-org-footnote/goto-previous-reference): New test.
2018-06-24 09:10:06 +00:00
(ert-deftest test-org-footnote/goto-previous-reference ()
"Test `org-footnote-goto-previous-reference' specifications."
;; Error on unknown reference.
(should-error
(org-test-with-temp-text "No footnote reference"
(org-footnote-goto-previous-reference "1")))
;; Error when trying to reach a reference outside narrowed part of
;; buffer.
(should-error
(org-test-with-temp-text "Some text<point>\nReference[fn:1]."
(narrow-to-region (point-min) (point))
(org-footnote-goto-previous-reference "1")))
;; Otherwise, move to closest reference from point.
(should
(org-test-with-temp-text "First reference[fn:1]\nReference[fn:1].<point>"
(org-footnote-goto-previous-reference "1")
(= (line-end-position) (point-max))))
(should
(org-test-with-temp-text "First reference[fn:1]\nReference[fn:1]."
(org-footnote-goto-previous-reference "1")
(= (line-beginning-position) (point-min)))))
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.
2015-12-16 17:38:53 +00:00
(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.
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
(should
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.
2015-12-16 17:38:53 +00:00
(equal
"
Text[fn:1][fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
"
(org-test-with-temp-text "
Text[fn:1][fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1"
(let ((org-footnote-section nil)) (org-footnote-sort))
(buffer-string))))
(should
(equal
"
* H1
Text[fn:1]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
* H2
Text[fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
"
(org-test-with-temp-text "
* H1
Text[fn:1]
* H2
Text[fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
"
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.
2015-12-16 17:38:53 +00:00
(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]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
* Footnotes
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
\[fn:2] Def 2
"
(org-test-with-temp-text "
Text[fn:1][fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[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.
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
(should
(equal
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.
2015-12-16 17:38:53 +00:00
"
Text[fn:1]
* Headline
* Other headline
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
* Footnotes
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
"
(org-test-with-temp-text "
Text[fn:1]
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
* Footnotes
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
* Headline
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
** Footnotes
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
* Other headline"
(let ((org-footnote-section "Footnotes")) (org-footnote-sort))
(buffer-string))))
;; Ignore anonymous footnotes.
(should
(equal
"
Text[fn:1][fn::inline][fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
"
(org-test-with-temp-text
"
Text[fn:1][fn::inline][fn:2]
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1"
(let ((org-footnote-section nil)) (org-footnote-sort))
(buffer-string))))
;; Ignore inline footnotes.
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
(should
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.
2015-12-16 17:38:53 +00:00
(equal
"
Text[fn:1][fn:label:inline][fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
org-footnote: Rename `org-footnote-goto-local-insertion-point' * lisp/org-footnote.el (org-footnote--goto-local-insertion-point): Renamed from `org-footnote-goto-local-insertion-point'. (org-footnote-normalize): Use function above. Small refactoring. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize-in-org): Small refactoring.
2015-05-06 21:21:10 +00:00
"
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.
2015-12-16 17:38:53 +00:00
(org-test-with-temp-text
"
Text[fn:1][fn:label:inline][fn:2]
\[fn:2] Def 2
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1"
(let ((org-footnote-section nil)) (org-footnote-sort))
(buffer-string))))
;; Handle (deeply) nested footnotes.
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
(should
(equal
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.
2015-12-16 17:38:53 +00:00
"
Text[fn:1][fn:3]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1[fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:3] Def 3
"
(org-test-with-temp-text "
Text[fn:1][fn:3]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1[fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:3] Def 3
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2
"
(let ((org-footnote-section nil)) (org-footnote-sort))
(buffer-string))))
(should
(equal
"
Text[fn:1][fn:4]
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1[fn:2]
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2[fn:3]
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:3] Def 3
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:4] Def 4
"
(org-test-with-temp-text "
Text[fn:1][fn:4]
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1[fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:3] Def 3
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2[fn:3]
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
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.
2015-12-16 17:38:53 +00:00
\[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
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
Text[fn:1]
Require 2 blank lines to separate footnote definition * lisp/org-element.el (org-element-footnote-definition-parser): Require 2 blank lines to separate footnote definition. * lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank lines to separate footnote definition. * doc/org.texi: Update documentation for footnotes. * testing/lisp/test-org-element.el: Update tests. * testing/lisp/test-org-footnote.el: Add tests. Footnote definitions can still be separated with other footnote definitions and headlines. This change allows to have multiple paragraphs in a footnote definition without resorting to the "\par" trick.
2013-02-21 14:30:16 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
* Section 2
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
Text[fn:1]"
(org-test-with-temp-text
"
* Section 1
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
Text[fn:1]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
* Section 2
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
Text[fn:1]"
(let ((org-footnote-section nil)) (org-footnote-sort))
(buffer-string))))
(should
(equal
"
Text[fn:1][fn:4]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1[fn:2][fn:3]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2[fn:3]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:3] Def 3
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:4] Def 4
"
(org-test-with-temp-text "
Text[fn:1][fn:4]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] Def 1[fn:2][fn:3]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:3] Def 3
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] Def 2[fn:3]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:4] Def 4
"
org-footnote: Handle un-referenced definitions * lisp/org-footnote.el (org-footnote-sort): (org-footnote-normalize): Insert un-referenced definitions upon sorting. * testing/lisp/test-org-footnote.el (test-org-footnote/sort): (test-org-footnote/normalize): Add tests.
2016-02-27 15:05:35 +00:00
(let ((org-footnote-section nil)) (org-footnote-sort))
(buffer-string))))
;; Insert un-referenced definitions at the end.
(should
(equal
"Text[fn:9]
\[fn:9] B
\[fn:1] A
"
(org-test-with-temp-text "Text[fn:9]\n\n[fn:1] A\n[fn:9] B"
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.
2015-12-16 17:38:53 +00:00
(let ((org-footnote-section nil)) (org-footnote-sort))
Preserve file local variables during some operations * lisp/org-macs.el (org-preserve-local-variables): New macro. * lisp/org-footnote.el (org-footnote--clear-footnote-section): (org-footnote--goto-local-insertion-point): (org-footnote-create-definition): (org-footnote-delete): (org-footnote-renumber-fn:N): (org-footnote-sort): (org-footnote-normalize): * lisp/org.el (org-move-subtree-down): (org-copy-subtree): (org-sort-entries): (org-refile): Use new macro. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize): (test-org-footnote/delete): (test-org-footnote/sort): (test-org-footnote/normalize): * testing/lisp/test-org.el (test-org/sort-entries): Add tests. Operations affected include copying, killing, refiling, archiving and moving subtrees. It also affects sorting, creating and deleting footnotes.
2017-12-18 14:50:51 +00:00
(buffer-string))))
;; When sorting, preserve file local variables.
(should
(equal "
Paragraph[fn:1][fn:2]
\[fn:1] Def 1
\[fn:2] Def 2
# Local Variables:
# foo: t
# End:"
(org-test-with-temp-text
"
Paragraph[fn:1][fn:2]
\[fn:2] Def 2
\[fn:1] Def 1
# Local Variables:
# foo: t
# End:"
(let ((org-footnote-section nil)) (org-footnote-sort))
(buffer-string)))))
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
(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]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:1] def[fn:2]
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[fn:2] inline
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
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.
2015-12-16 17:38:53 +00:00
\[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))
org-footnote: Handle un-referenced definitions * lisp/org-footnote.el (org-footnote-sort): (org-footnote-normalize): Insert un-referenced definitions upon sorting. * testing/lisp/test-org-footnote.el (test-org-footnote/sort): (test-org-footnote/normalize): Add tests.
2016-02-27 15:05:35 +00:00
(buffer-string))))
;; Insert un-referenced definitions at the end.
(should
(equal
"Test[fn:1]\nNext\n\n[fn:1] def\n\n[fn:2] A\n"
(org-test-with-temp-text "Test[fn::def]\nNext\n[fn:unref] A"
(let ((org-footnote-section nil)) (org-footnote-normalize))
Preserve file local variables during some operations * lisp/org-macs.el (org-preserve-local-variables): New macro. * lisp/org-footnote.el (org-footnote--clear-footnote-section): (org-footnote--goto-local-insertion-point): (org-footnote-create-definition): (org-footnote-delete): (org-footnote-renumber-fn:N): (org-footnote-sort): (org-footnote-normalize): * lisp/org.el (org-move-subtree-down): (org-copy-subtree): (org-sort-entries): (org-refile): Use new macro. * testing/lisp/test-org-footnote.el (test-org-footnote/normalize): (test-org-footnote/delete): (test-org-footnote/sort): (test-org-footnote/normalize): * testing/lisp/test-org.el (test-org/sort-entries): Add tests. Operations affected include copying, killing, refiling, archiving and moving subtrees. It also affects sorting, creating and deleting footnotes.
2017-12-18 14:50:51 +00:00
(buffer-string))))
;; Preserve file local variables when normalizing.
(should
(equal "
Paragraph[fn:1][fn:2]
\[fn:1] Def 1
\[fn:2] Def 2
# Local Variables:
# foo: t
# End:"
(org-test-with-temp-text
"
Paragraph[fn:foo][fn:bar]
\[fn:bar] Def 2
\[fn:foo] Def 1
# Local Variables:
# foo: t
# End:"
(let ((org-footnote-section nil)) (org-footnote-normalize))
(buffer-string)))))
org-footnote: Fix normalization of inline footnotes with no footnote section * lisp/org-footnote.el (org-footnote-normalize): Fix normalization of inline footnotes with no footnote section. * testing/lisp/test-org-footnote.el: New test file. Thanks to Samuel Wales for reporting this.
2012-03-02 21:37:12 +00:00
(provide 'test-org-footnote)
;;; test-org-footnote.el ends here