Kyle Meyer
47908228e7
Merge branch 'maint'
2018-02-18 16:33:04 -05:00
Glenn Morris
4ddfc6bd69
Backport commit 66a4e651f from Emacs
...
; Fix doc typos related to indefinite articles
66a4e651f3cf38c320d1a9d5ae6f88dcc641792b
Glenn Morris
Fri Feb 16 15:16:15 2018 -0500
2018-02-18 16:32:41 -05:00
Kyle Meyer
d94f7024bc
Merge branch 'maint'
2018-01-07 00:28:35 -05:00
Kyle Meyer
3e1641ef0a
Update copyright years
2018-01-07 00:27:54 -05:00
Nicolas Goaziou
8d43a0c49f
ox-texinfo: Gracefully handle node collision in the same hierarchy
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Ensure the upper element
get the shorter node.
Considering the following document:
* Headline
** Headline
the level 1 headlines get "Headline" node and the other one
"Headline (1)".
2017-11-05 12:22:18 +01:00
Nicolas Goaziou
04f35fc473
ox-texinfo: Preserve target name as node.
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Use target's value as
base for the node name, instead of using `org-export-get-reference'.
2017-11-05 10:32:13 +01:00
Nicolas Goaziou
7ba058963e
Merge branch 'maint'
2017-11-04 21:51:40 +01:00
Nicolas Goaziou
db16370c0b
ox-texinfo: Fix @ref without description
...
* lisp/ox-texinfo.el (org-texinfo--@ref): Prefer @ref{} with a single
argument when no description is provided.
2017-11-04 21:50:00 +01:00
Nicolas Goaziou
902bfe1892
Merge branch 'maint'
2017-11-03 12:22:33 +01:00
Nicolas Goaziou
b5f075aa05
ox-texinfo: Fix spurious blank lines in detailed menu.
...
* lisp/ox-texinfo.el (org-texinfo--build-menu): Prevent spurious blank
lines in detailed menu.
2017-11-03 12:21:56 +01:00
Nicolas Goaziou
c470edba77
ox-texinfo: Prettify adjunct for indentical nodes.
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Nicer adjunct for
identical nodes.
2017-11-03 11:35:53 +01:00
Nicolas Goaziou
f9c09b194f
ox-texinfo: Allow cross-references to headlines excluded from TOC
...
* lisp/ox-texinfo.el (org-texinfo-headline): Use @anchor instead of
@node for headlines outside TOC.
2017-11-03 11:34:21 +01:00
Nicolas Goaziou
bebfd341af
Merge branch 'maint'
2017-10-24 13:56:56 +02:00
Nicolas Goaziou
5c91976b49
ox-texinfo: Remove TABs from output
...
* lisp/ox-texinfo.el (org-texinfo--untabify): New function.
(texinfo): Use new function as a final output filter.
See (info "(texinfo) Conventions").
2017-10-24 13:55:38 +02:00
Nicolas Goaziou
73a15d1bfb
ox-texinfo: Small refactoring
...
* lisp/ox-texinfo.el (org-texinfo--sanitize-title):
(org-texinfo--wrap-float): Use new `org-export-toc-entry-backend'
function.
2017-10-24 10:07:50 +02:00
Nicolas Goaziou
e59199e3a8
ox-texinfo: Fix missing contents in headings out of TOC
...
* lisp/ox-texinfo.el (org-texinfo-section): Include contents even in
headings out of TOC.
2017-10-23 14:55:05 +02:00
Nicolas Goaziou
5b2b8f3175
ox-texinfo: Handle "notoc" value
...
* lisp/ox-texinfo.el (org-texinfo-classes): Introduce @chapheading and
al. in default value.
(org-texinfo--structuring-command): Remove function.
(org-texinfo-headline): Handle unnumbered out of TOC headlines.
(org-texinfo-section): Do not add menu in unnumbered headings.
2017-10-15 16:51:13 +02:00
Nicolas Goaziou
7df5d21f79
Merge branch 'maint'
2017-10-14 12:30:59 +02:00
Nicolas Goaziou
827af59873
Fix links without contents in table of contents' entries
...
* lisp/ox.el (org-export-toc-entry-backend): New function.
* lisp/ox-html.el (org-html--format-toc-headline):
* lisp/ox-md.el (org-md--build-toc):
* lisp/ox-odt.el (org-odt-toc): Use new function.
* lisp/ox-texinfo.el (org-texinfo--sanitize-title):
(org-texinfo--wrap-float): Handle links without contents.
* testing/lisp/test-ox.el (test-org-export/toc-entry-backend): New
test.
Reported-by: ConcreteVitamin <concretevitamin@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00235.html >
2017-10-14 12:29:52 +02:00
Nicolas Goaziou
ad0662bbe7
Revert "Table of contents ignore unnumbered headlines"
...
This reverts commit bd2378161e
.
2017-09-21 21:14:41 +02:00
Kyle Meyer
297acd7517
Merge branch 'maint'
2017-09-17 01:17:10 -04:00
Paul Eggert
ff0dcf52a5
Backport commit bc511a64f from Emacs
...
Prefer HTTPS to FTP and HTTP in documentation
bc511a64f6da9ab51acc7c8865e80c4a4cb655c2
Paul Eggert
Wed Sep 13 15:54:37 2017 -0700
2017-09-17 00:28:38 -04:00
Nicolas Goaziou
9f863a695b
ox-texinfo: Add missing autoload cookies
...
* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo):
(org-texinfo-export-to-info): Add autoload cookie.
2017-09-15 21:11:55 +02:00
Nicolas Goaziou
9c4ee81a8b
ox-texinfo: Add missing autoload cookies
...
* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo):
(org-texinfo-export-to-info): Add autoload cookie.
2017-09-15 21:10:29 +02:00
Nicolas Goaziou
c6e5639b7e
ox-texinfo: Do not add @node for unnumbered headings
...
* lisp/ox-texinfo.el (org-texinfo-headline): Do not add @node for
unnumbered headings.
2017-09-10 19:17:44 +02:00
Nicolas Goaziou
bd2378161e
Table of contents ignore unnumbered headlines
...
* doc/org.texi (Table of contents): Document behavior.
* lisp/ox-texinfo.el (org-texinfo-classes): Use @heading commands and
alike for unnumbered sections.
* lisp/ox.el (org-export-collect-headlines): Ignore unnumbered
headlines.
* testing/lisp/test-ox.el (test-org-export/collect-headlines): Add
test.
2017-09-10 15:53:20 +02:00
Nicolas Goaziou
720b213a35
ox-texinfo: Default process includes "--no-split" option
...
* lisp/ox-texinfo.el (org-texinfo-info-process): Add "--no-split"
option.
Reported-by: Jonas Bernoulli <jonas@bernoul.li>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-07/msg00458.html >
2017-07-27 13:52:12 +02:00
Nicolas Goaziou
ed6849d18d
ox-texinfo: Insert blank line between sectioning command and contents
...
* lisp/ox-texinfo.el (org-texinfo-headline): Insert blank line between
sectioning command and contents.
2017-07-25 20:44:35 +02:00
Nicolas Goaziou
8112629d37
ox-texinfo: Fix code typo
...
* lisp/ox-texinfo.el (org-texinfo--menu-entries): Only collect direct
children.
The regression was introduced in
1b415735ea
.
2017-07-25 19:24:47 +02:00
Nicolas Goaziou
379a22c9c6
Revert "ox-texinfo: Move menu handling from sections to headlines"
...
This reverts commit 988e8802a6
.
2017-06-28 22:51:26 +02:00
Nicolas Goaziou
1b415735ea
ox-texinfo: Small menu refactoring
...
* lisp/ox-texinfo.el (org-texinfo--menu-entries): Use
`org-export-collect-headlines'.
2017-06-22 19:01:28 +02:00
Nicolas Goaziou
988e8802a6
ox-texinfo: Move menu handling from sections to headlines
...
* lisp/ox-texinfo.el (org-texinfo-headline): Move menu handling from
sections to headlines.
2017-06-22 19:01:23 +02:00
Nicolas Goaziou
20795aae27
ox-texinfo: Change Texinfo class definition
...
* lisp/ox-texinfo.el (org-texinfo-classes): Change default value and
structure.
(org-texinfo--structuring-command): New function.
(org-texinfo-headline): Use new function.
The new structure handles properly appendices at sub-levels.
2017-06-22 18:46:44 +02:00
Nicolas Goaziou
03d43ee6c6
Merge branch 'maint'
2017-06-20 09:30:25 +02:00
Nicolas Goaziou
5d6325ffa3
ox-texinfo: Remove spurious "@insertcopying"
...
* lisp/ox-texinfo.el (org-texinfo-template): Remove "@insertcopying"
command outside title page.
See (info "(texinfo) Copyright") for details.
2017-06-20 09:28:40 +02:00
Nicolas Goaziou
5e439d41f8
Merge branch 'maint'
2017-06-20 09:25:05 +02:00
Nicolas Goaziou
fa6b7bf25c
ox-texinfo: Fix location of text before first headline
...
* doc/org.texi (Info directory file): Fix node name.
(Headings and sectioning structure): Document location of text before
first headline.
(A Texinfo example): Update example.
* lisp/ox-texinfo.el (org-texinfo-template): Handle contents of very
first section.
(org-texinfo-section): Ignore very first section.
According to Texinfo specifications, Top node contents should not
appear in printed output. Move it near "@top" command, within
"@ifnottex".
2017-06-20 09:24:34 +02:00
Nicolas Goaziou
1a6bf9c5f9
Merge branch 'maint'
2017-06-18 11:03:43 +02:00
Nicolas Goaziou
8769cfc91c
Revert "ox-texinfo: Escape @ { } in index"
...
* lisp/ox-texinfo.el (org-texinfo-keyword): Index keywords are
specific to Texinfo back-end, so they expect regular Texinfo code.
* doc/org.texi (Indices): Update documentation.
2017-06-18 11:00:56 +02:00
Nicolas Goaziou
4295d1b949
Merge branch 'maint'
2017-06-17 12:07:09 +02:00
Nicolas Goaziou
39351d0d14
ox-texinfo: Add missing entities
...
* lisp/ox-texinfo.el (org-texinfo-entity): Add "@textdegree{}" and
"@registeredsymbol".
2017-06-17 12:04:36 +02:00
Nicolas Goaziou
ad0312cde2
Merge branch 'maint'
2017-06-14 23:07:44 +02:00
Nicolas Goaziou
17382722db
ox-texinfo: Fix last commit
...
* lisp/ox-texinfo.el (org-texinfo-keyword): Fix last commit.
Do not escape raw #+TEXINFO value.
2017-06-14 23:07:04 +02:00
Nicolas Goaziou
e5396c189a
Merge branch 'maint'
2017-06-14 21:27:37 +02:00
Nicolas Goaziou
a621289953
ox-texinfo: Escape @ { } in index
...
* lisp/ox-texinfo.el (org-texinfo-keyword): Escape @ { } in index.
2017-06-14 21:27:02 +02:00
Nicolas Goaziou
be30c8b126
ox-texinfo: Change default table markup
...
* lisp/ox-texinfo.el (org-texinfo-table-default-markup): Rename from
`org-texinfo-def-table-markup'. Set default value to the neutral
"@asis".
(org-texinfo-plain-list): Use new name.
* lisp/org-compat.el (org-texinfo-def-table-markup): Mark as obsolete.
* doc/org.texi (Publishing options): Document change.
2017-06-14 19:11:33 +02:00
Nicolas Goaziou
5e35bc1807
Merge branch 'maint'
2017-06-11 11:39:37 +02:00
Nicolas Goaziou
62dc27dc75
ox-texinfo: Fix spurious "nil" in "special block export
...
* lisp/ox-texinfo.el (org-texinfo-special-block): Remove spurious
"nil" when no option is defined.
2017-06-11 11:38:45 +02:00
Nicolas Goaziou
cf505d2ebb
ox-texinfo: Export example blocks as @example
...
* lisp/ox-texinfo.el (org-texinfo-example-block): Export as @example.
Escape @, {, }, however, so as to get proper verbatim contents.
2017-06-09 22:03:08 +02:00
Nicolas Goaziou
c24c07c810
Merge branch 'maint'
2017-06-08 23:28:03 +02:00