47908228e7
Merge branch 'maint'
2018-02-18 16:33:04 -05:00
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
0155441358
Merge branch 'maint'
2018-01-19 18:22:00 +01:00
b289a65be7
Use https for links to orgmode.org
...
TINYCHANGE
2018-01-19 18:14:58 +01:00
ba6c0f1ea9
ox-html: Add label and number to equations in HTML export
...
* lisp/ox-html.el (org-html--wrap-latex-environment): New function.
(org-html--math-environment-p): New function.
(org-html-latex-environment): Use `org-html--wrap-latex-environment' to
wrap equation in HTML container (non-MathJax modes). Make latex
environment unnumbered when compiling equations to images. Insert latex
label in environment in MathJax mode.
(org-html-link): Calculate equation number limiting counter to equation
environments. Use eqref for link when using MathJax
(org-html--make-unlabelled-latex-environment): New function.
2018-01-17 22:24:31 +01:00
ebb67cebe5
Merge branch 'maint'
2018-01-15 16:39:11 +01:00
ad390e895a
ox-html.el (org-html-head): Fix docstring
...
* ox-html.el (org-html-head): Fix docstring.
Thanks to Adam Porter for reporting this.
2018-01-15 16:38:33 +01:00
d94f7024bc
Merge branch 'maint'
2018-01-07 00:28:35 -05:00
3e1641ef0a
Update copyright years
2018-01-07 00:27:54 -05:00
0c691737aa
Merge branch 'maint'
2017-12-04 08:24:19 +01:00
e22ee8b8a3
Fix bug in HTML export of code blocks with starting blank lines
...
* lisp/ox-html.el (org-html-do-format-code): Preverse starting blank
lines when splitting code lines (use `split-string' instead of
`org-split-string').
(org-html-fontify-code): Preserve starting blank lines in returned
code string.
2017-12-04 08:24:02 +01:00
579fa12f50
Merge branch 'maint'
2017-11-26 11:02:14 +01:00
18f6610b32
ox-html: Fix last commit
...
* lisp/ox-html.el (org-html-link): Fix last commit.
2017-11-26 10:57:02 +01:00
b0ab7008df
Merge branch 'maint'
2017-11-26 10:47:55 +01:00
6aac798f25
Fix publishing links to absolute file names belonging to project
...
* lisp/ox-publish.el (org-publish-file-relative-name): New function.
* lisp/ox-html.el (org-html-link): Use new function.
* testing/lisp/test-ox-publish.el (test-org-publish/file-relative-name):
New test.
2017-11-26 10:46:53 +01:00
9cac9d7bc7
Merge branch 'maint'
2017-11-12 23:29:38 +01:00
3f8d67c490
ox-html: Allow disabling htmlize
...
* lisp/ox-html.el (org-html-fontify-code): Do it.
Disable htmlize by setting org-html-htmlize-output-type to nil.
TINYCHANGE
2017-11-12 23:28:57 +01:00
7df5d21f79
Merge branch 'maint'
2017-10-14 12:30:59 +02: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
cf35109ad8
Merge branch 'maint'
2017-09-19 22:01:07 +02:00
db1dab8abe
ox-html.el: Partially revert d5bbf36553
...
* lisp/ox-html.el (org-html-src-block): Unless klipse is used, export
source code blocks as content of `pre' elements, and not as content of
`code' children of `pre' elements. Restores the previous way of
exporting source code blocks, and fixes the display of language
indicators while hovering over the blocks in the exported HTML file,
when klipse is not used.
(org-html-keep-old-src): Remove it. Not needed because it is now the
default, unless klipse is used.
2017-09-19 22:00:32 +02:00
297acd7517
Merge branch 'maint'
2017-09-17 01:17:10 -04:00
d4d7cda57f
Backport commit 5da53a019 from Emacs
...
* lisp/org-info.el (org-info-other-documents)
(org-info-map-html-url):
* lisp/ox-html.el (org-html-creator-string): Use HTTPS instead of
HTTP.
Prefer HTTPS to HTTP for gnu.org
5da53a01912c2f5d46f5df4ef8cc13a34b5017d4
Paul Eggert
Wed Sep 13 15:54:25 2017 -0700
2017-09-17 00:09:11 -04:00
3944547bf2
Merge branch 'maint'
2017-09-14 14:47:15 +02:00
7584268314
ox-html: Fix missing Mathjax config with maths elements in captions
...
* lisp/ox-html.el (org-html--build-mathjax-config): Fix missing
Mathjax config with maths elements in captions.
Reported-by: Lawrence Bottorff <borgauf@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00302.html >
2017-09-14 14:40:33 +02:00
007bbddbcc
ox-html: Prevent spurious target below headlines
...
* lisp/ox-html.el (org-html-headline):
(org-html-link): Do not insert an additional target.
* lisp/ox-publish.el (org-publish-resolve-external-link): Add an
optional argument.
* lisp/ox.el (org-export-get-reference): Improve docstring.
* testing/examples/pub/a.org:
* testing/examples/pub/b.org: New files.
* testing/lisp/test-ox-publish.el (test-org-publish/resolve-external-link):
New test.
2017-09-10 00:23:42 +02:00
d0ced98943
Delete htmlize.el from Org’s contrib directory
...
* lisp/ox-org.el (org-org-publish-to-org):
* lisp/ox-html.el (org-html-htmlize-generate-css):
(org-html-fontify-code):
* lisp/org-agenda.el (org-agenda-write): Throw an error
requesting the user to install htmlize.el.
* doc/org.texi (Exporting agenda views, Literal examples):
Don’t assume htmlize.el is available.
You need to install it from https://github.com/hniksic/emacs-htmlize
See https://github.com/hniksic/emacs-htmlize/issues/7 for this issue.
2017-08-18 09:54:19 +02:00
c8ade76ca2
Fix blank titles resulting in export of invalid HTML
...
* lisp/ox-html.el (org-html--build-meta-info): Use an invisible
character "‎" (left-to-right mark) in the HTML title tags
instead of removing the title altogether (invalid HTML) or setting
the content of title tag to nothing (invalid HTML).
Discussion:
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00021.html >
2017-08-14 16:11:32 -04:00
8ab9a82be2
ox-html: Respect the "title" option
...
* lisp/ox-html.el (org-html-template): Respect :with-title.
Reported-by: lists@wilkesley.net
<http://permalink.gmane.org/gmane.emacs.orgmode/114942 >
2017-08-09 11:39:56 +02:00
d39ccc17d4
Merge branch 'maint'
2017-07-09 11:28:54 -04:00
ef742df8b5
Backport commit 26a308ea1 from Emacs
...
* lisp/ox-html.el (org-html-infojs-template): Update copyright.
26a308ea112637911fd3870139ba0e2d98e58aa0
Glenn Morris
Wed Jul 5 14:07:14 2017 -0400
2017-07-09 11:27:10 -04:00
acabacaa56
ox-html: Use correct "br" tag for subtitle
...
* lisp/ox-html.el (org-html-template): Use correct "br" tag depending
on :html-doctype.
Reported-by: Olivier Berger <olivier.berger@telecom-sudparis.eu>
<http://permalink.gmane.org/gmane.emacs.orgmode/114546 >
2017-07-04 18:50:39 +02:00
865ac0952b
Merge branch 'maint'
2017-05-15 18:29:23 +02:00
2c9f6fcef9
Fontify inline source blocks when exporting to HTML
...
* lisp/ox-html.el (org-html-inline-src-block): Fontify inline source
blocks.
2017-05-15 18:28:34 +02:00
be90287802
Merge branch 'maint'
2017-04-16 09:00:04 +02:00
842a75828f
Updating MathJax CDN links
...
* doc/org.texi : Change reference to "cdn.mathjax.org" to "cdnjs.com",
removing comment about no longer relevant terms of service.
* lisp/ox-html.el (org-html-mathjax-options) : Change link to
appropriate cdnjs.com link to load MathJax.
Updating MathJax CDN links to reflect cdnjs.com as cdn.mathjax.org
will be disconitnued as of 30 April 2017.
TINYCHANGE
2017-04-16 08:59:05 +02:00
8a7fe3c219
Merge branch 'maint'
2017-03-23 23:49:11 +01:00
e3ed81c98d
ox-html.el (org-html-scripts): Fix copyright years
...
* lisp/ox-html.el (org-html-scripts): Fix copyright years.
2017-03-23 23:46:13 +01:00
d5bbf36553
ox-html: Allow displaying source code block using klipse
...
* lisp/ox-html.el (html, org-html-template)
(org-html-src-block): Allow to display source code block using
the klipse javascript plugin.
Thanks to Nicolas Goaziou for reviewing the patch.
2017-03-23 23:22:30 +01:00
09ee728c64
Babel support for hledger accounting tool
...
* lisp/ob-hledger.el: New file.
* lisp/org.el (org-babel-load-languages):
* lisp/ox-html.el (org-html-style-default): Allow calling hledger from
Babel.
2017-03-14 18:19:26 +01:00
2f48603d71
Merge branch 'maint'
2017-03-08 00:15:26 +01:00
64a5f9a596
ox-html: Fix verse blocks
...
* lisp/ox-html.el (org-html-verse-block): Add missing line break at
the end of each line in verse environments.
Reported-by: Skip Collins <skip.collins@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112537 >
2017-03-08 00:12:55 +01:00
4caad0555f
ox-html: Fix last commit (part 2)
...
* lisp/ox-html.el (org-html-plain-list): Fix typo.
2017-02-14 17:27:26 +01:00
0890cc7b6c
ox-html: Fix last commit
...
* lisp/ox-html.el (org-html-plain-list): Fix last commit.
2017-02-14 16:34:17 +01:00
54734bd69d
ox-html: Silence byte-compiler
...
* lisp/ox-html.el (org-html-plain-list): Silence byte-compiler. Small
refactoring.
2017-02-14 16:32:44 +01:00
ea16d4ca8f
ox-html: More newlines around lists
...
* lisp/ox-html.el (org-html-headline):
(org-html-format-list-item):
(org-html-section): Insert more newlines.
2017-02-14 15:15:28 +01:00
8855c23c68
ox-html: Plain list supports arbitrary attributes
...
* lisp/ox-html.el (org-html-begin-plain-list):
(org-html-end-plain-list): Remove.
(org-html-plain-list):
(org-html-headline): Remove dependency on org-html-begin-plain-list
and org-html-end-plain-list.
2017-02-14 12:14:14 +01: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
dcad3499af
Merge branch 'maint'
2017-01-25 17:58:54 +01:00
Kyle Meyer
Glenn Morris
Nicolas Goaziou
Tim Landscheidt
thibault
Bastien
Chunyang Xu
N. Raghavendra
Paul Eggert
Kaushal Modi
Rasmus
Nicolas Berthier
aviv
Matt Price
Simon Michael