summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-05-27 22:03:42 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-05-27 22:03:42 +0200
commite43c7a3575cf024420feab63acbe148165faeeb9 (patch)
tree115f12f80433c02b28a678e97d8a370c77436ad1
parent2086ea42cfb3f895c576ed4e27da4f6a502ce86c (diff)
downloadorg-mode-e43c7a3575cf024420feab63acbe148165faeeb9.tar.gz
org-manual: Auto-adjust footnotes upon insertion
* doc/org-manual.org: Re-order footnotes. * .dir-locals.el (org-mode): Auto-adjust footnotes.
-rw-r--r--.dir-locals.el1
-rw-r--r--doc/org-manual.org84
2 files changed, 43 insertions, 42 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 0254670..f003bcc 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -10,6 +10,7 @@
(indent-tabs-mode)
(org-adapt-indentation)
(org-edit-src-content-indentation . 0)
+ (org-footnote-auto-adjust . t)
(org-footnote-auto-label . t)
(org-footnote-define-inline . nil)
(org-footnote-section . "Footnotes")
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 667adbb..fd38ad3 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -17175,7 +17175,7 @@ default behavior is to automatically determine the result type.
If =file= is missing, Org generates the base name of the output
file from the name of the code block, and its extension from the
=file-ext= header argument. In that case, both the name and the
- extension are mandatory[fn:150].
+ extension are mandatory[fn:134].
#+begin_example
,#+name: circle
@@ -17755,7 +17755,7 @@ for Python and Emacs Lisp languages.
#+cindex: syntax, Noweb
#+cindex: source code, Noweb reference
-Org supports named blocks in Noweb[fn:134] style syntax:
+Org supports named blocks in Noweb[fn:135] style syntax:
: <<CODE-BLOCK-ID>>
@@ -18255,7 +18255,7 @@ Org Tempo expands snippets to structures defined in
~org-structure-template-alist~ and ~org-tempo-keywords-alist~. For
example, {{{kbd(< s TAB)}}} creates a code block. Enable it by
customizing ~org-modules~ or add ~(require 'org-tempo)~ to your Emacs
-init file[fn:135].
+init file[fn:136].
#+attr_texinfo: :columns 0.1 0.9
@@ -18511,7 +18511,7 @@ changes.
#+vindex: org-startup-indented
Dynamic virtual indentation is controlled by the variable
- ~org-startup-indented~.[fn:136]
+ ~org-startup-indented~.[fn:137]
- =indent= ::
@@ -18843,7 +18843,7 @@ uses only one star and indents text to line with the heading:
#+findex: org-indent-mode
To turn this mode on, use the minor mode, ~org-indent-mode~. Text
lines that are not headlines are prefixed with spaces to vertically
-align with the headline text[fn:137].
+align with the headline text[fn:138].
#+vindex: org-indent-indentation-per-level
To make more horizontal space, the headlines are shifted by two stars.
@@ -18878,7 +18878,7 @@ headings as shown in examples below.
#+vindex: org-adapt-indentation
Org supports this with paragraph filling, line wrapping, and
structure editing, preserving or adapting the indentation as
- appropriate[fn:138].
+ appropriate[fn:139].
- /Hiding leading stars/ ::
@@ -18912,7 +18912,7 @@ headings as shown in examples below.
#+vindex: org-odd-levels-only
Using stars for only odd levels, 1, 3, 5, ..., can also clean up
- the clutter. This removes two stars from each level[fn:139].
+ the clutter. This removes two stars from each level[fn:140].
For Org to properly handle this cleaner structure during edits
and exports, configure the variable ~org-odd-levels-only~. To
set this per-file, use either one of the following lines:
@@ -19490,9 +19490,9 @@ of these strategies:
#+cindex: @LaTeX{}, and Orgtbl mode
To wrap a source table in LaTeX, use the =comment= environment
-provided by =comment.sty=[fn:140]. To activate it, put
+provided by =comment.sty=[fn:141]. To activate it, put
~\usepackage{comment}~ in the document header. Orgtbl mode inserts
-a radio table skeleton[fn:139] with the command {{{kbd(M-x
+a radio table skeleton[fn:140] with the command {{{kbd(M-x
orgtbl-insert-radio-table)}}}, which prompts for a table name. For
example, if =salesfigures= is the name, the template inserts:
@@ -19511,7 +19511,7 @@ The line =#+ORGTBL: SEND= tells Orgtbl mode to use the function
~orgtbl-to-latex~ to convert the table to LaTeX format, then insert
the table at the target (receive) location named =salesfigures=. Now
the table is ready for data entry. It can even use spreadsheet
-features[fn:141]:
+features[fn:142]:
#+begin_example
% BEGIN RECEIVE ORGTBL salesfigures
@@ -19726,7 +19726,7 @@ Dynamic blocks, like any other block, can be narrowed with
#+vindex: org-agenda-skip-function
#+vindex: org-agenda-skip-function-global
Org provides a special hook to further limit items in agenda views:
-~agenda~, ~agenda*~[fn:142], ~todo~, ~alltodo~, ~tags~, ~tags-todo~,
+~agenda~, ~agenda*~[fn:143], ~todo~, ~alltodo~, ~tags~, ~tags-todo~,
~tags-tree~. Specify a custom function that tests inclusion of every
matched item in the view. This function can also skip as much as is
needed.
@@ -19769,7 +19769,7 @@ meaningful string suitable for the agenda view.
#+vindex: org-agenda-skip-function
Search for entries with a limit set on levels for the custom search.
This is a general approach to creating custom searches in Org. To
-include all levels, use =LEVEL>0=[fn:143]. Then to selectively pick
+include all levels, use =LEVEL>0=[fn:144]. Then to selectively pick
the matched entries, use ~org-agenda-skip-function~, which also
accepts Lisp forms, such as ~org-agenda-skip-entry-if~ and
~org-agenda-skip-subtree-if~. For example:
@@ -20264,13 +20264,13 @@ with Emacs. With a public server, consider encrypting the files.
MobileOrg version 1.5 supports encryption for the iPhone. Org also
requires =openssl= installed on the local computer. To turn on
encryption, set the same password in MobileOrg and in Emacs. Set the
-password in the variable ~org-mobile-use-encryption~[fn:144]. Note
+password in the variable ~org-mobile-use-encryption~[fn:145]. Note
that even after MobileOrg encrypts the file contents, the file name
remains visible on the file systems of the local computer, the server,
and the mobile device.
For a server to host files, consider options like [[http://dropbox.com][Dropbox.com]]
-account[fn:145]. On first connection, MobileOrg creates a directory
+account[fn:146]. On first connection, MobileOrg creates a directory
=MobileOrg= on Dropbox. Pass its location to Emacs through an
initialisation file variable as follows:
@@ -20292,15 +20292,15 @@ Org pushes files listed in ~org-mobile-files~ to
~org-mobile-directory~. Files include agenda files (as listed in
~org-agenda-files~). Customize ~org-mobile-files~ to add other files.
File names are staged with paths relative to ~org-directory~, so all
-files should be inside this directory[fn:146].
+files should be inside this directory[fn:147].
Push creates a special Org file =agendas.org= with custom agenda views
-defined by the user[fn:147].
+defined by the user[fn:148].
Finally, Org writes the file =index.org=, containing links to other
files. MobileOrg reads this file first from the server to determine
what other files to download for agendas. For faster downloads,
-MobileOrg only reads files whose checksums[fn:148] have changed.
+MobileOrg only reads files whose checksums[fn:149] have changed.
** Pulling from MobileOrg
:PROPERTIES:
@@ -20314,7 +20314,7 @@ Org integrates its data in an inbox file format.
1.
#+vindex: org-mobile-inbox-for-pull
- Org moves all entries found in =mobileorg.org=[fn:149] and appends
+ Org moves all entries found in =mobileorg.org=[fn:150] and appends
them to the file pointed to by the variable
~org-mobile-inbox-for-pull~. Each captured entry and each editing
event is a top-level entry in the inbox file.
@@ -21324,29 +21324,37 @@ to remove code evaluation from the {{{kbd(C-c C-c)}}} key binding.
are not evaluated when they appear in a keyword line---i.e. lines
starting with =#+KEYWORD:=, see [[*Summary of In-Buffer Settings]].
-[fn:134] For Noweb literate programming details, see
+[fn:134] Due to the way this header argument is implemented, it
+implies ":results file". Therefore if it is set for multiple blocks
+at once (by a subtree or buffer property for example), all blocks are
+forced to produce file results. This is seldom desired behavior, so
+it is recommended to set this header only on a per-block basis. It is
+possible that this aspect of the implementation might change in the
+future.
+
+[fn:135] For Noweb literate programming details, see
http://www.cs.tufts.edu/~nr/noweb/.
-[fn:135] For more information, please refer to the commentary section
+[fn:136] For more information, please refer to the commentary section
in =org-tempo.el=.
-[fn:136] Note that ~org-indent-mode~ also sets the ~wrap-prefix~
+[fn:137] Note that ~org-indent-mode~ also sets the ~wrap-prefix~
property, such that ~visual-line-mode~ (or purely setting ~word-wrap~)
wraps long lines (including headlines) correctly indented.
-[fn:137] The ~org-indent-mode~ also sets the ~wrap-prefix~ correctly
+[fn:138] The ~org-indent-mode~ also sets the ~wrap-prefix~ correctly
for indenting and wrapping long lines of headlines or text. This
minor mode handles ~visual-line-mode~ and directly applied settings
through ~word-wrap~.
-[fn:138] Also see the variable ~org-adapt-indentation~.
+[fn:139] Also see the variable ~org-adapt-indentation~.
-[fn:139] Because =LEVEL=2= has 3 stars, =LEVEL=3= has 4 stars, and so
+[fn:140] Because =LEVEL=2= has 3 stars, =LEVEL=3= has 4 stars, and so
on.
-[fn:140] https://ctan.org/tex-archive/macros/latex/contrib/comment?lang=en
+[fn:141] https://ctan.org/tex-archive/macros/latex/contrib/comment?lang=en
-[fn:141] If the =TBLFM= keyword contains an odd number of dollar
+[fn:142] If the =TBLFM= keyword contains an odd number of dollar
characters, this may cause problems with Font Lock in LaTeX mode. As
shown in the example you can fix this by adding an extra line inside
the =comment= environment that is used to balance the dollar
@@ -21354,40 +21362,32 @@ expressions. If you are using AUCTeX with the font-latex library,
a much better solution is to add the =comment= environment to the
variable ~LaTeX-verbatim-environments~.
-[fn:142] The ~agenda*~ view is the same as ~agenda~ except that it
+[fn:143] The ~agenda*~ view is the same as ~agenda~ except that it
only considers /appointments/, i.e., scheduled and deadline items that
have a time specification =[h]h:mm= in their time-stamps.
-[fn:143] Note that, for ~org-odd-levels-only~, a level number
+[fn:144] Note that, for ~org-odd-levels-only~, a level number
corresponds to order in the hierarchy, not to the number of stars.
-[fn:144] If Emacs is configured for safe storing of passwords, then
+[fn:145] If Emacs is configured for safe storing of passwords, then
configure the variable, ~org-mobile-encryption-password~; please read
the docstring of that variable.
-[fn:145] An alternative is to use a WebDAV server. MobileOrg
+[fn:146] An alternative is to use a WebDAV server. MobileOrg
documentation has details of WebDAV server configuration. Additional
help is at this [[https://orgmode.org/worg/org-faq.html#mobileorg_webdav][FAQ entry]].
-[fn:146] Symbolic links in ~org-directory~ need to have the same name
+[fn:147] Symbolic links in ~org-directory~ need to have the same name
as their targets.
-[fn:147] While creating the agendas, Org mode forces ID properties on
+[fn:148] While creating the agendas, Org mode forces ID properties on
all referenced entries, so that these entries can be uniquely
identified if MobileOrg flags them for further action. To avoid
setting properties configure the variable
~org-mobile-force-id-on-agenda-items~ to ~nil~. Org mode then relies
on outline paths, assuming they are unique.
-[fn:148] Checksums are stored automatically in the file
+[fn:149] Checksums are stored automatically in the file
=checksums.dat=.
-[fn:149] The file will be empty after this operation.
-
-[fn:150] Due to the way this header argument is implemented, it
-implies ":results file". Therefore if it is set for multiple blocks
-at once (by a subtree or buffer property for example), all blocks are
-forced to produce file results. This is seldom desired behavior, so
-it is recommended to set this header only on a per-block basis. It is
-possible that this aspect of the implementation might change in the
-future.
+[fn:150] The file will be empty after this operation.