89b0d485b1
Merge branch 'maint'
2020-05-05 00:16:53 -04:00
0f783cbca8
ox-odt: Do not ignore org-odt-styles-file
...
* lisp/ox-odt.el (odt): Delete a repeated entry for :odt-styles-file
and absorb its org-odt-styles-file, which had no effect due to the
repeated entries, into the first definition.
TINYCHANGE
2020-05-05 00:15:57 -04:00
42ec2462a0
Do not leak "attachment" links
...
* lisp/ol.el (org-link-open): Remove "attachment" for special cases.
* lisp/org-attach.el (org-attach-expand-links):
(org-attach-follow): New functions.
(org-attach-link-expand): Remove function.
* lisp/org-element.el (org-element-link-parser):
* lisp/ox-ascii.el (org-ascii-link):
* lisp/ox-html.el (org-html-link):
* lisp/ox-latex.el (org-latex--inline-image):
(org-latex-link):
* lisp/ox-man.el (org-man-link):
* lisp/ox-md.el (org-md-link):
* lisp/ox-odt.el (org-odt-inline-image-rules):
(org-odt-link):
* lisp/ox-texinfo.el (org-texinfo-inline-image-rules):
(org-texinfo-link): Remove "attachment" from special cases.
2020-02-22 14:22:49 +01:00
ab9166ad29
Extend export tooling in link parameters
...
* lisp/ol.el (org-link-parameters): Allow a fourth "info" argument for
`:export' property. Expound docstring.
* lisp/ox.el (org-export-custom-protocol-maybe): Accept a fourth
optional argument.
* lisp/ox-ascii.el (org-ascii--describe-links):
(org-ascii-link):
* lisp/ox-beamer.el (org-beamer-link):
* lisp/ox-html.el (org-html-link):
* lisp/ox-latex.el (org-latex-link):
* lisp/ox-man.el (org-man-link):
* lisp/ox-md.el (org-md-link):
* lisp/ox-odt.el (org-odt-link):
* lisp/ox-org.el (org-org-link):
* lisp/ox-texinfo.el (org-texinfo-link):
* contrib/lisp/ox-groff.el (org-groff-link): Provide expected fourth
argument.
* lisp/ox.el (org-export-link-as-file): New function.
* lisp/ol.el (org-link-parameters): Add reference to new function in docstring.
* testing/lisp/test-ox.el (test-org-export/link-as-file): Add tests.
(test-org-export/custom-protocol-maybe): Update tests.
2020-02-19 18:41:37 +01:00
a24c8c481f
Refactor attachment path expansion
...
* lisp/org-attach.el (org-attach-link-expand): New function for link
element expansion.
* lisp/org-element.el (org-element-link-parser): Remove info about
expanded attachment paths from link elements.
* lisp/ol.el (org-link-open)
* lisp/ox-texinfo.el (org-texinfo-link)
* lisp/ox-odt.el (org-odt-link)
* lisp/ox-md.el (org-md-link)
* lisp/ox-man.el (org-man-link)
* lisp/ox-latex.el (org-latex--inline-image, org-latex-link)
* lisp/ox-html.el (org-html-link)
* lisp/ox-ascii.el (org-ascii-link): Refactor to use new link
expansion function from org-attach.el instead of (now removed)
custom link property from org-element.el.
2020-02-06 22:09:18 +01:00
499cff10ef
Merge branch 'maint'
2020-01-31 17:22:01 +01:00
04bd110b2b
Small fixes
...
* lisp/ox-odt.el (org-odt--format-timestamp): Fix timestamp
display.
* lisp/org-agenda.el (org-agenda-show-and-scroll-up): Remove
useless code.
2020-01-31 17:21:43 +01:00
52fafd3005
Fix backtick in org-odt-inline-image-rules
...
* lisp/ox-odt.el (org-odt-inline-image-rules): Fix error to make the
list evaluate inline code at definition.
2020-01-18 01:41:16 +01:00
20d293b4aa
Give link parser knowledge of attachment link expanded path
...
* lisp/org-element.el (org-element-link-parser): Add info about
expanded attachment paths to the link parse tree export.
* lisp/org-attach.el Remove org-attach-open-link. Let attachment
links use the built in code that already is developed for file
links.
* lisp/ol.el (org-link-open): Add knowledge about attachment links to
the function opening links, so they can be opened exactly as file
links are opened.
* lisp/ox-texinfo.el (org-texinfo-link)
* lisp/ox-odt.el (org-odt-link)
* lisp/ox-md.el (org-md-link)
* lisp/ox-man.el (org-man-link)
* lisp/ox-latex.el (org-latex--inline-image, org-latex-link)
* lisp/ox-html.el (org-html-link)
* lisp/ox-ascii.el (org-ascii-link): Refactor to use property from
link parser instead of invoking attachment expansion in the
exporter.
2020-01-18 01:41:01 +01:00
f93020d5e6
Expand attachment links with point in correct place
...
* lisp/ox-texinfo.el (org-texinfo-link)
* lisp/ox-odt.el (org-odt-link)
* lisp/ox-md.el (org-md-link)
* lisp/ox-man.el (org-man-link)
* lisp/ox-latex.el (org-latex--inline-image, org-latex-link)
* lisp/ox-html.el (org-html-link)
* lisp/ox-ascii.el (org-ascii-link): Move point to the link for
org-attach-expand to know from which headline to expand the link.
2020-01-15 20:40:24 +01:00
0ac6a9e1fc
Further fix of exporting attachment links in export backends
...
* lisp/ox-html.el (org-html-link, org-html-inline-image-rules)
* lisp/ox-odt.el (org-odt-inline-image-rules)
* lisp/ox-texinfo.el (org-texinfo-link)
(org-texinfo-inline-image-rules): Make attachment links consistently
expand as relative to file and add attachment link type to
image rules for consistency among export backends.
2020-01-14 21:45:31 +01:00
d70db54dbc
Improve attachment link export functionality
...
Make attachment links export just as file links.
* lisp/ox-ascii.el
* lisp/ox-html.el
* lisp/ox-latex.el
* lisp/ox-man.el
* lisp/ox-md.el
* lisp/ox-texinfo.el
* lisp/org-attach.el: Move export functionality for attachment links
into the respective export backend, for feature parity with file
links.
2020-01-14 04:15:38 +01:00
ff5fc050d3
Update copyright year to 2020
2020-01-01 13:38:46 -05:00
6315e1e760
ox-odt: Get write permissions on styles.xml
...
* lisp/ox-odt.el (org-odt-template): The file `styles.xml' might be
copied from a location where it is read-only. Since we need to modify
it (and its copied under /tmp, so we can modify it), we need to ensure
we have write persmissions on it. Set mode to 600.
This is especially needed for projects like Guix, where all system
files are stored in a read-only location.
TINYCHANGE
2019-12-22 10:07:29 +01:00
5117d8a159
Fix typos
2019-11-16 17:17:36 -05:00
d215c3a8c0
Merge branch 'maint'
2019-09-29 15:49:08 -04:00
001306c1c0
Backport commit 79a01866a from Emacs
...
* lisp/org-agenda.el (org-agenda-change-all-lines)
(org-agenda-today-p):
* lisp/org-id.el (org-id-get):
* lisp/org.el (org-highlight-latex-and-related)
(org--valid-property-p):
* lisp/ox-beamer.el (org-beamer--get-label):
* lisp/ox-latex.el (org-latex--caption-above-p):
* lisp/ox-odt.el (org-odt--copy-image-file)
(org-odt--copy-formula-file):
* lisp/ox.el (org-export-with-timestamps): Fix typos in docstrings.
lisp/*.el, src/*.c: Fix typos in docstrings
79a01866a01754b9f566af76ef96e80cd90d094b
Juanma Barranquero
Thu Sep 19 04:32:25 2019 +0200
2019-09-29 15:47:57 -04:00
a41e9950ae
Add :target option for the TOC keyword
...
* doc/org-manual.org, etc/ORG_NEWS: Document :target option
for the TOC keyword.
* lisp/ox.el (org-export-resolve-link): New function.
* lisp/ox-ascii.el (org-ascii-keyword): Added :target to the TOC
keyword.
(org-ascii--build-toc): Changed LOCAL argument to SCOPE.
* lisp/ox-html.el (org-html-keyword): Added :target to the TOC keyword.
* lisp/ox-md.el (org-md-keyword): Added :target to the TOC keyword.
(org-md--build-toc): Changed LOCAL argument to SCOPE.
* lisp/ox-odt.el (org-odt-keyword): Added :target to the TOC keyword.
* testing/lisp/test-ox.el (test-org-export/collect-headlines): Added
tests for specifying scope by CUSTOM_ID or by fuzzy matching.
(test-org-export/resolve-link): New test.
2019-05-30 15:25:46 +02:00
de54bbd759
reproducibility: Remove absolute file names in ox-odt.elc
...
* lisp/ox-odt.el (org-odt-schema-dir-list):
(org-odt-styles-dir-list): Remove `eval-when-compile'.
* mk/org-fixup.el (org-make-org-version): Change signature. Do not
hard-code ODT style directory at build time.
Fixes: bug#34323
2019-02-09 12:31:37 +01:00
ba321d0e44
Merge branch 'maint'
2019-01-13 15:14:37 -05:00
16c8187db1
Backport commit d5f6ff99c from Emacs
...
* lisp/org.el (image-refresh):
* lisp/ox-odt.el (clear-image-cache, image-size): Declare.
Quieten without-x org compilation
d5f6ff99c2b594919931b277a2d94d3a289ca764
Glenn Morris
Wed Feb 28 16:55:41 2018 -0500
2019-01-13 12:43:04 -05:00
7a22b8f93b
Merge branch 'maint'
2019-01-01 11:54:01 +01:00
f584d37a67
Update copyright year
2019-01-01 11:50:56 +01:00
683199e6e1
Merge branch 'master' into next
2018-11-10 22:00:34 +01:00
5dfbe46b1e
ox-odt: Fix typo
...
* lisp/ox-odt.el (org-odt-template): Fix typo.
2018-11-10 21:59:52 +01:00
a97903944b
Merge branch 'master' into next
2018-11-10 21:57:29 +01:00
9056d2b706
ox-odt: Fix last commit
...
* lisp/ox-odt.el (org-odt-template): Add missing `org-strip-quote'
call.
2018-11-10 21:56:10 +01:00
cd12a9eefe
Merge branch 'master' into next
2018-11-10 20:00:31 +01:00
bea916d9f6
ox-odt: Improve styles file handling
...
* lisp/ox-odt.el (org-odt-template): Allow double quotes around file
name. Better error handling. Small refactoring.
2018-11-10 20:00:02 +01:00
1e063b401a
Merge branch 'master' into next
2018-11-04 23:40:27 +01:00
bfb946c7da
ox-odt: Read list values in ODT_STYLES_FILE
...
* lisp/ox-odt.el (org-odt-template): Read value for ODT_STYLES_FILE
when it is enclosed in round brackets.
Reported-by: Christian Moe <mail@christianmoe.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-10/msg00418.html >
2018-11-04 23:00:01 +01:00
eb806aa503
ox-odt: Add support for text:start-value
...
* lisp/ox-odt.el (org-odt-item): Support starting lists at a set
number via "text:start-value". Without this, ODF files just restart
numbering when they should continue with the specified number.
2018-10-19 21:49:54 +02:00
17edaf8c14
"src block" -> "source block" in documentation and comments
...
* etc/ORG-NEWS (Maxima: new headers ~:prologue~ and ~:epilogue~):
(Texinfo exports inline source blocks as ~@code{}~):
(Default lexical evaluation of emacs-lisp source blocks):
* lisp/ob-clojure.el (org-babel-clojure-default-ns):
* lisp/ob-core.el (org-babel-named-src-block-regexp-for-name):
(org-babel-current-src-block-location):
(org-babel-mark-block):
(org-babel-insert-result):
* lisp/ob-emacs-lisp.el (org-babel-default-header-args:emacs-lisp):
* lisp/ob-exp.el (org-babel-exp-process-buffer):
* lisp/ob-lob.el (org-babel-lob-ingest):
* lisp/ob-ref.el:
* lisp/org-element.el (org-element-object-restrictions):
(org-element-src-block-parser):
(org-element-inline-src-block-parser):
* lisp/org-lint.el:
(org-lint--checkers):
* lisp/org-pcomplete.el (pcomplete/org-mode/block-option/src):
* lisp/org-src.el (org-edit-inline-src-code):
* lisp/org.el (org-ctrl-c-ctrl-c):
(org-in-src-block-p):
(org-fill-element):
* lisp/ox-html.el (org-html--textarea-block):
(org-html-format-code):
* lisp/ox-latex.el (org-latex-minted-options):
(org-latex-custom-lang-environments):
* lisp/ox-md.el:
* lisp/ox-odt.el (org-odt-format-code):
* lisp/ox.el (org-export-collect-listings):
* testing/lisp/test-ob-exp.el (ob-exp/src-block-with-affiliated-keyword):
* testing/lisp/test-ob.el (test-ob/preserve-results-indentation):
Correct "src block" occurrences when they do not specifically refer
to the element type `src-block'.
2018-09-20 11:23:49 +02:00
30498ef932
ox-odt: Fix `org-odt-template' styles file retrieval
...
* lisp/ox-odt.el (org-odt-template): Fix `org-odt-template' styles
file retrieval.
TINYCHANGE
Signed-off-by: Charles Celerier <chckyn@gmail.com>
2018-08-05 08:02:00 +02:00
ec8590d5e2
Backport commit 69107f347 from Emacs
...
; Fix doc typos related to indefinite articles
69107f347b3ac7f51cd22333f57393fd735915f2
Glenn Morris
Fri Feb 16 17:33:57 2018 -0500
2018-02-18 16:32:41 -05:00
b289a65be7
Use https for links to orgmode.org
...
TINYCHANGE
2018-01-19 18:14:58 +01:00
3e1641ef0a
Update copyright years
2018-01-07 00:27:54 -05:00
08fa2ae056
Fix some defcustoms types
...
* lisp/ob-stan.el (org-babel-stan-cmdstan-directory):
* lisp/org.el (org-latex-default-packages-alist):
* lisp/ox-odt.el (org-odt-with-latex): Fix type mismatch.
Fixes: 29695
2017-12-13 23:51:10 +01:00
adfbfd42b2
Backport commit a89f0b6f3 from Emacs
...
maint: shorten https://lists.gnu.org/archive/html/ ... links
a89f0b6f33f9eb8910a1fceda9028d76ef50b05d
Paul Eggert
Sat Nov 25 22:48:12 2017 -0800
2017-11-26 20:35:46 -05:00
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
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
6496d0ca95
Correct defcustom version information
...
* lisp/ob-lilypond.el (org-babel-lilypond-commands):
* lisp/ob-lua.el (org-babel-lua-command):
(org-babel-lua-mode):
(org-babel-lua-hline-to):
(org-babel-lua-None-to):
* lisp/org-agenda.el (org-agenda-search-view-max-outline-level):
* lisp/org.el (org-mouse-1-follows-link):
(org-src-fontify-natively):
(orgstruct-heading-prefix-regexp):
* lisp/ox-ascii.el (org-ascii-format-inlinetask-function):
* lisp/ox-latex.el (org-latex-format-drawer-function):
(org-latex-listings-langs):
* lisp/ox-odt.el (org-odt-format-drawer-function):
* lisp/ox.el (org-export-with-properties): Correct ":version" value.
* lisp/org-attach.el (org-attach-annex-auto-get): Correct
":package-version" value.
2017-09-07 16:56:11 -04:00
845138473e
Merge branch 'maint'
2017-09-05 22:34:38 +02:00
0a77f042ea
ox-odt: Small fix
...
* lisp/ox-odt.el (org-odt--translate-latex-fragments): Ignore blank
lines before link to parse.
Reported-by: Alastair Burt <alastair.burt@gmail.com>
2017-09-05 22:33:29 +02:00
c01b62305e
Merge branch 'maint'
2017-08-30 08:12:29 +02:00
18a48b5861
Fix ODT priority styling
...
* lisp/ox-odt.el (org-odt-format-headline-default-function): Fix style
name for priority cookie.
Reported-by: Henry Todd <hjst@me.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00648.html >
2017-08-30 08:04:25 +02:00
09e61233ed
Merge branch 'maint'
2017-06-25 23:09:41 +02:00
7b065b1d0a
ox-odt: Include #+latex_header when converting LaTeX to PNG
...
* lisp/ox-odt.el (org-odt--translate-latex-fragments): Include
#+latex_header when converting LaTeX to PNG.
Reported-by: edgar@openmail.cc
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00480.html >
2017-06-25 23:09:21 +02:00
7278899697
Merge branch 'maint'
2017-01-26 00:05:29 -05:00
7c710f6f57
Change :version in defcustoms from "25.2" to "26.1"
...
* lisp/ob-J.el (org-babel-J-command):
* lisp/ob-core.el (org-babel-hash-show-time):
* lisp/ob-exp.el (org-babel-exp-inline-code-template):
* lisp/ob-lisp.el (org-babel-lisp-eval-fn):
* lisp/org-agenda.el (org-agenda-view-columns-initially):
* lisp/org-attach.el (org-attach-commit):
(org-attach-archive-delete):
(org-attach-annex-auto-get):
* lisp/org-bibtex.el (org-bibtex-inherit-tags):
* lisp/org-clock.el (org-clock-into-drawer):
* lisp/org-colview.el (org-columns-summary-types):
* lisp/org-faces.el (org-block):
* lisp/org-src.el (org-src-block-faces):
* lisp/org-table.el (org-table-copy-increment):
(org-table-formula-create-columns):
(org-table-convert-region-max-lines):
* lisp/org-timer.el (org-timer-default-timer):
* lisp/org.el (org-export-backends):
(org-show-context-detail):
(org-cycle-hook):
(org-occur-case-fold-search):
(org-preview-latex-default-process):
(org-preview-latex-process-alist):
(org-preview-latex-image-directory):
(org-latex-default-packages-alist):
(org-sparse-tree-default-date-type):
(org-structure-template-alist):
(org-effort-durations):
(org-agenda-ignore-properties): Change :version from "25.2" to "26.1".
(customize-package-emacs-version-alist): Fix associations between Org
and Emacs releases.
* lisp/ox-ascii.el (org-ascii-list-margin):
* lisp/ox-beamer.el (org-beamer-subtitle-format):
* lisp/ox-html.el (org-html-format-headline-function):
(org-html-format-inlinetask-function):
(org-html-viewport):
* lisp/ox-latex.el (org-latex-caption-above):
(org-latex-prefer-user-labels):
(org-latex-subtitle-format):
(org-latex-hyperref-template):
(org-latex-footnote-defined-format):
(org-latex-images-centered):
(org-latex-default-figure-position):
(org-latex-text-markup-alist):
(org-latex-format-inlinetask-function):
(org-latex-custom-lang-environments):
(org-latex-compiler-file-string):
(org-latex-compiler):
(org-latex-bib-compiler):
(org-latex-logfiles-extensions):
(org-latex-known-warnings):
* lisp/ox-md.el (org-md-footnotes-section):
(org-md-footnote-format):
* lisp/ox-odt.el (org-odt-format-headline-function):
(org-odt-format-inlinetask-function):
(org-odt-inline-image-rules):
* lisp/ox-texinfo.el (org-texinfo-format-headline-function):
* lisp/ox.el (org-export-with-creator):
(org-export-with-title):
(org-export-with-broken-links):
(org-export-copy-to-kill-ring): Change :version from "25.2" to "26.1".
It looks like the goal is to sync Org 9.0.* (maint) with the Emacs
master branch (what will be version 26.1):
https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00558.html
2017-01-26 00:02:03 -05:00
Kyle Meyer
Eric Timmons
Nicolas Goaziou
Gustav Wikström
Bastien
nixo
Jonas Bernoulli
Juanma Barranquero
Sacha Chua
Glenn Morris
Mark A. Hershberger
Charles Celerier
Tim Landscheidt
Paul Eggert