Commit Graph

2374 Commits

Author SHA1 Message Date
Kyle Meyer 6b65af9e10 Merge branch 'maint' 2017-06-28 01:00:26 -04:00
Kyle Meyer a8d007db15 doc/Makefile: Auto-generate org-version.tex for orgcard
* doc/Makefile: Add rule to generate org-version.tex.
* doc/orgcard.tex: Include org-version.tex rather than explicitly
setting version and year.

This removes the only instance in the repo where the Org version is
hardcoded.
2017-06-28 00:54:32 -04:00
Bastien d9344b9ad6 Merge branch 'maint' 2017-06-25 10:53:06 +02:00
Kitamoto Tsuyoshi 08334effc1 doc/org.texi (HTML doctypes): Fix formatting
* doc/org.texi (HTML doctypes): Fix formatting.

TINYCHANGE
2017-06-25 10:38:46 +02:00
Kaushal Modi d94475d63c Merge branch 'maint' 2017-06-23 06:05:10 -04:00
Kaushal Modi 3c9ec81e18 Improve Noweb documentation
* doc/org.texi (noweb, noweb-ref, Noweb reference syntax): Add
examples and improve wording.  Clarify how to use Noweb style
references with code block arguments.  Replace occurrences of
``noweb'' and ``Noweb'' with Noweb for consistency.
2017-06-23 06:03:36 -04:00
Bastien 6bbc07f916 Merge branch 'maint' 2017-06-21 15:23:55 +02:00
Tsuyoshi Kitamoto 877377ebb3 doc/org.texi (External links): Tiny formatting fix
* doc/org.texi (External links): Tiny formatting fix.

TINYCHANGE
2017-06-21 15:23:23 +02:00
Nicolas Goaziou 3aa3add326 Merge branch 'maint' 2017-06-20 09:32:48 +02:00
Nicolas Goaziou bb25a04f86 org.texi: Fix menus
* doc/org.texi (Top):
(Texinfo export): Fix menus.
2017-06-20 09:32:10 +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
Kyle Meyer bed2c25fd3 Merge branch 'maint' 2017-06-19 23:37:06 -04:00
Kyle Meyer 2ab2a420a6 org.texi: Clean up spacing to pass Emacs's pre-commit check
Like c1822e556 (2017-01-25), this is in preparation for syncing with
the Emacs repo.
2017-06-19 23:23:07 -04:00
Nicolas Goaziou a615d399d9 org.texi: Update Texinfo section
* doc/org.texi (Plain lists in Texinfo export): Update according to
  latest changes.
2017-06-18 11:04:38 +02:00
Nicolas Goaziou 1a6bf9c5f9 Merge branch 'maint' 2017-06-18 11:03:43 +02:00
Nicolas Goaziou df62584820 org.texi: Small update
* doc/org.texi (A Texinfo example): Update according to latest
  ox-texinfo fixes.
2017-06-18 11:03:13 +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
Kaushal Modi d48cfdf68b Add hold 'action' to the "n" macro and ws-trim all "n" macro args
* lisp/org-macro.el (org-macro--counter-increment): Rename the
optional arg RESET to ACTION, as now that action can mean setting,
resetting or even holding the specified counter.  ACTION set to
"-" will hold the previous value of the counter.  White-space is
now trimmed from the NAME arg too.

* doc/org.texi (Macro replacement): Document the new hold action.

* testing/lisp/test-org-macro.el (test-org-macro/n): Add new tests for
the hold action.
2017-06-17 23:46:24 -04:00
Bastien 32676822de Merge branch 'maint' 2017-06-15 16:50:16 +02:00
Tsuyoshi Kitamoto 01ba5cafa5 doc/org.texi: Fix typos
* doc/org.texi (Include files)
(Special blocks in Texinfo export, Translator functions): Fix typos.

TINYCHANGE
2017-06-15 16:48:21 +02:00
Nicolas Goaziou c7be9d9ad5 org.texi: Add missing documentation about "n" macro
* doc/org.texi (Macro replacement): Add missing documentation.
2017-06-14 21:42:27 +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
Carsten Dominik feed16e1ed Merge branch 'master' of orgmode.org:org-mode 2017-06-14 05:46:17 +02:00
Carsten Dominik daff9c93f2 Implement new `U' mode switch for table formulas to omit seconds in durations
* lisp/org-table.el (org-table-duration-custom-format): Add new
	HH:MM format.
	(org-table-duration-hour-zero-padding): New option.
	(org-table-eval-formula): Select second-less format if
	requested.
	(org-table-time-seconds-to-string): Implement formats without
	seconds and without zero-padding for hours.

	* testing/lisp/test-org-table.el (test-org-table/duration):
	New test for second-less durations.

	* doc/org.texi (Formula syntax for Calc)
	(Durations and time values): Document the U mode switch.
2017-06-14 05:43:12 +02:00
Kaushal Modi 1e92f5ed39 Allow org-file-contents to fetch file contents from a URL
* lisp/org.el (org--file-cache): New variable.
(org-reset-file-cache):
(org-file-url-p): New function.
(org-mode-restart): Use new function.

* lisp/org.el (org-file-contents): Allow the FILE argument to be a
URL.  If the URL contents are already cached, return the cache
contents, else download the file and return contents of that.  The
file is automatically cached each time it is downloaded.  Add a new
optional argument NOCACHE.  If this is non-nil, the URL is always
downloaded afresh.  Use `org--file-cache' and `org-file-url-p'.

* lisp/org.el (org-edit-special): Do not allow editing the "file" if a
URL is specified for the "#+SETUPFILE".

* lisp/ox.el (org-export--list-bound-variables)
(org-export--prepare-file-contents):
* lisp/org-macro.el (org-macro--collect-macros) : Adapt to the
possibility that the input to `org-file-contents' can be a URL too.

* doc/org.texi (Export settings, In-buffer settings)
(The very busy C-c C-c key): Mention that #+SETUPFILE keyword can now
take a URL as a value, and that C-c C-c on the #+SETUPFILE line will
clear the org file cache.

* testing/lisp/test-org.el (test-org/org-file-contents-url)
(test-org/org-file-contents-file): Add tests for org-file-contents.

* testing/lisp/test-ox.el (test-org-export/get-inbuffer-options): Add
test for reading setupfile specified via a URL.
2017-06-13 11:41:58 -04:00
Kaushal Modi a933b34992 Merge branch 'maint' 2017-06-09 16:18:24 -04:00
Kaushal Modi 7cd7b90dcb Update remote file syntax for Tramp
* testing/lisp/test-ox.el (test-org-export/file-uri):
* doc/org.texi (External links): The method part of remote file names
is mandatory now in the emacs master (26+).  A valid remote file name
starts with "/method:host:" or "/method:user@host:".  ssh is used as
an example method here.

This change in the examples is backward compatible with emacs 25, 24, ..

Suggested by: Michael Albinus <michael.albinus@gmx.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00151.html>

Relevant commit in emacs master causing this change:
<http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=ed33337c3e0d0b1a8b140e23168421ea43d79324>
2017-06-09 16:15:15 -04:00
Kaushal Modi 4c24ecc073 Merge branch 'maint' 2017-06-07 18:40:56 -04:00
Kaushal Modi 51b743fc29 Mention org-speed-command-help in Speed Keys info node
* doc/org.texi (Speed keys): Mention org-speed-command-help.
2017-06-07 18:37:23 -04:00
Nicolas Goaziou 8dc31ed680 ox-texinfo: Implement the :sep attribute in plain lists
* lisp/ox-texinfo.el (org-texinfo-item):
* doc/org.texi (Plain lists in Texinfo export):
2017-06-07 22:17:08 +02:00
Nicolas Goaziou 82066d1a0c Merge branch 'maint' 2017-05-15 14:05:19 +02:00
Nicolas Goaziou 3c7ef9f8e8 org.texi: Silence Texinfo
* doc/org.texi (HTML Specific export settings): Silence Texinfo.
2017-05-15 14:04:38 +02:00
Nicolas Goaziou da68c2cc35 Merge branch 'maint' 2017-05-15 08:41:31 +02:00
Nicolas Goaziou 44a81a11a6 org.texi: Fix typo
* doc/org.texi (Tables in @LaTeX{} export): Fix typo.

Reported-by: Robert Klein <roklein@roklein.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/113490>
2017-05-15 08:41:12 +02:00
Nicolas Goaziou 8fba95ea8a Merge branch 'maint' 2017-05-15 00:20:03 +02:00
Nicolas Goaziou 134500e7c1 org.texi: Fix Texinfo compilation 2017-05-15 00:19:41 +02:00
Nicolas Goaziou 42f3daf6cf Merge branch 'maint' 2017-05-14 23:54:39 +02:00
Lambda Coder 6ce21caac5 Editorial revisions to the manual
* doc/org.texi: Exporting chapter
2017-05-14 23:43:33 +02:00
Nicolas Goaziou be90287802 Merge branch 'maint' 2017-04-16 09:00:04 +02:00
aviv 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
Kyle Meyer e9018fbd0e Merge branch 'maint' 2017-03-26 21:52:15 -04:00
Paul Eggert 18d9b2181b Backport commit 14d8b6858 from Emacs
* doc/org.texi (noweb-ref): Simplify shell script example and don’t
use ‘tail -1’, which is not portable.

Port and simplify example sh script
14d8b6858a49e97f9b69593df5a8a7886430d43f
Paul Eggert
Tue Mar 21 09:19:42 2017 -0700
2017-03-26 21:50:06 -04:00
Kyle Meyer 48cd9729a5 Merge branch 'maint' 2017-03-19 13:32:19 -04:00
Michael Albinus 10bd44db7b Backport commit 265a5d979 from Emacs
* doc/org.texi (dir): Change example to use a method.

Document remote file name syntax change
265a5d9791bf42da0bab7bdbef4352e8d734ef31
Michael Albinus
Thu Mar 16 16:23:07 2017 +0100
2017-03-19 13:31:49 -04:00
Nicolas Goaziou e1cd71532f Merge branch 'maint' 2017-03-16 13:01:24 +01:00
Nicolas Goaziou 6039ece3f3 org.texi: Fix link
* doc/org.texi (Hooks): Fix link.
2017-03-16 13:00:39 +01:00
Carsten Dominik 0f1b5ec496 Consolidate capture targets and allow outline path in datetree targets
* doc/org.texi: Document the new capture templates target.
* lisp/org-capture.el (org-capture-upgrade-templates): New function.
(org-capture-templates): Implement the new file+olp+datetree target.
(org-capture): Document the C-1 prefix.
(org-capture-sanitize-olp): New function.
(org-capture-select-template): Make sure upgraded version of templates
variable is used.
* lisp/org-datetree.el (org-datetree-find-date-create): Accept
`subtree-at-point' as a value for the KEEP-RESTRICTION argument.
(org-datetree-find-iso-week-create): Accept `subtree-at-point'
as a value for the KEEP-RESTRICTION argument.
* lisp/org.el (org-find-olp): Throw an error when called in a
buffer that is not in Org mode.
* lisp/org-capture.el (org-capture-fill-template): Use overriding time
also in `?<>' escapes.
2017-03-16 08:18:55 +01:00
Wojciech Gac 2d1f73ebf8 org-attach.el: Add functionality to attach from URL
* lisp/org-attach.el (org-attach): Create a binding under 'u' to
  attach a file from URL
  (org-attach-url): Prompt user for URL
  (org-attach-attach): Update method list

* doc/org.texi (Attachments): Document attaching from URL

TINYCHANGE
2017-03-11 13:41:18 +01:00
Eduardo Bellani 78bddaca1f org-clock.el: Add nullary function evaluation as a clocktable scope parameter
* lisp/org-clock.el (org-dblock-write:clocktable): Funcall the scope
  argument if it is a function.

* doc/org.texi: Document the feature of using a nullary function as the
  scope for the clocktable.

* testing/lisp/test-org-clock.el: Adds a test for the above
  feature.  Also, fix the number of hours of a test that seemed to be
  broken.

TINYCHANGE
2017-03-06 18:00:19 +01:00