eeb08e5c6e
Merge remote-tracking branch 'origin/hotfix-7.8.06'
2012-03-21 15:39:17 +05:30
34ab9a0eb2
org-odt.el: Enumerate labeled/captioned entities correctly
...
* lisp/org-odt.el (org-odt-format-entity-caption): Enumerate
entities that have either a caption or a label.
(org-odt-label-styles, org-odt-category-map-alist): Add a
separator between sequence number and caption. Introduced two
new label styles for handling of math formula and math label.
(org-odt-format-label-definition)
(org-export-odt-format-formula): Propagate above changes.
2012-03-21 15:21:10 +05:30
eb84020a9f
org-exp.el: Add traditional Chinese translation.
2012-03-21 10:23:31 +01:00
ba51d8e9c8
Merge branch 'hotfix-7.8.06'
2012-03-21 08:27:30 +01:00
d83284b728
org.el (org-enforce-todo-dependencies): Fix docstring.
...
* org.el (org-enforce-todo-dependencies): Fix docstring.
Thanks to Bernt Hansen for spotting this.
2012-03-21 08:27:17 +01:00
c4978d6210
Merge branch 'hotfix-7.8.06'
2012-03-21 01:14:31 +01:00
431407cc27
Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06
2012-03-21 01:12:08 +01:00
e2f490826c
Merge remote-tracking branch 'origin/hotfix-7.8.06'
2012-03-21 02:51:09 +05:30
aa20053803
org.texi (Customizing tables in ODT export): Fix errors
...
* doc/org.texi (Customizing tables in ODT export): Correct few
errors.
2012-03-21 02:47:55 +05:30
acec9db838
Merge remote-tracking branch 'origin/hotfix-7.8.06'
2012-03-21 02:15:24 +05:30
1cc2af2f25
org.texi: Udpate ODT section
...
* doc/org.texi (Links in ODT export): Update.
(Labels and captions in ODT export): New node.
2012-03-21 02:13:55 +05:30
135a74e4cb
Merge remote-tracking branch 'origin/hotfix-7.8.06'
2012-03-20 23:53:46 +05:30
fee7de7c56
org-odt.el: Make category component of captions configurable
...
* lisp/org-odt.el (org-export-odt-category-strings): New
custom variable.
(org-odt-category-map-alist): Modify interpretation. Don't
use the same field to double up as both a OpenDocument
variable and a category string. Entries in this list now
specify only the OpenDocument variable. Category strings are
obtained through an indirect lookup of
`org-export-odt-category-strings'. Use same OpenDocument
variables as what LibreOffice uses for various entities. Fix
docstring.
(org-odt-add-label-definition)
(org-odt-format-label-definition)
(org-odt-format-label-reference): Propagate above changes.
Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg00628.html
2012-03-20 23:26:12 +05:30
1d0fa25bda
Merge branch 'hotfix-7.8.06'
2012-03-20 17:21:57 +01:00
3007ddd1cc
org-latex.el (org-export-as-latex): Check TeX-master correctly.
...
* org-latex.el (org-export-as-latex): Check TeX-master correctly.
TINYCHANGE
2012-03-20 17:21:42 +01:00
ce7579e1f7
contrib/lisp/org-export-generic.el: Added variables for exporting tables and a mediawiki exporter.
2012-03-20 17:01:21 +01:00
aa05c14fe9
org-odt.el: Remove stale code
...
* lisp/org-odt.el (org-odt-category-map-alist): Update
docstring.
(org-export-odt-user-categories)
(org-export-odt-get-category-from-label)
(org-odt-get-label-category-and-style): Remove.
(org-odt-add-label-definition): Propagate above changes.
2012-03-20 21:11:21 +05:30
d22ffc23d0
Merge branch 'master' of orgmode.org:org-mode
2012-03-20 16:29:31 +01:00
c6442dac9c
org-mobile.el (org-mobile-sumo-agenda-command): Use a shorter title.
...
* org-mobile.el (org-mobile-sumo-agenda-command): Use a
shorter title.
TINYCHANGE
2012-03-20 16:28:45 +01:00
c7be54d3cb
Merge branch 'hotfix-7.8.06'
2012-03-20 16:25:44 +01:00
d1fd77819e
org-mobile.el: Whitespace cleanup.
2012-03-20 16:25:39 +01:00
b137bc4eae
Merge remote-tracking branch 'origin/hotfix-7.8.06'
2012-03-20 20:31:04 +05:30
f2fc168a73
org.texi (Literal examples in ODT export): Update
...
* doc/org.texi (Literal examples in ODT export):
htmlfontify.el in Emacs-24.1 now supports fontification. So
ODT source blocks will be fontified by default.
(Evaluating code blocks, Evaluating code blocks):
Whitespace-only change.
2012-03-20 20:23:47 +05:30
b8cd4a0973
Merge branch 'hotfix-7.8.06'
2012-03-20 15:50:46 +01:00
c73f32c14a
org.el: Don't allow creation of parents when using refile as goto.
...
* org.el (org-refile): Don't allow creation of parents when
using the refile command to go to a headline.
TINYCHANGE
2012-03-20 15:44:44 +01:00
d3cd3720d5
org-odt.el: Resolve headline links as sec nos only if num:t
...
* lisp/org-odt.el (org-odt-format-org-link): Resolve links to
headlines as section numbers only if section numbering is on.
2012-03-20 19:58:40 +05:30
309bd4c263
Merge branch 'hotfix-7.8.06'
2012-03-20 13:15:44 +01:00
1987412be6
org.el (format-spec): Require 'format-spec.
...
* org.el (format-spec): Require 'format-spec.
2012-03-20 13:15:27 +01:00
2cc3fd7b0d
org.el: Don't declare function `format-spec' as it is already required.
2012-03-20 13:14:34 +01:00
44bf4de900
Merge branch 'hotfix-7.8.06'
...
Conflicts:
lisp/org-agenda.el
2012-03-20 13:06:26 +01:00
fc717f3eb7
Fix compiler warnings.
2012-03-20 13:04:55 +01:00
05ca3731f2
Merge branch 'hotfix-7.8.06'
2012-03-20 12:37:37 +01:00
4ef3304ac2
doc/org.texi: Small doc fix.
...
TINYCHANGE
2012-03-20 12:31:26 +01:00
cc46c9627b
Merge branch 'hotfix-7.8.06'
2012-03-20 12:26:16 +01:00
04c9e0e64c
doc/org.texi: Remove duplicated keybinding for 'org-refile-cache-clear'.
...
* org.texi (Refiling notes): Remove duplicated keybinding.
TINYCHANGE
2012-03-20 12:25:51 +01:00
e2444eab93
doc/org.texi: Tiny stylistic improvements.
...
TINYCHANGE
2012-03-20 12:23:05 +01:00
b05e7cdf3b
org-html.el: New option `org-export-html-date-format-string'.
...
* org-html.el (org-export-html-date-format-string): Make a
defcustom.
TINYCHANGE
Thanks to Sébastian Vauban for this patch.
2012-03-20 12:12:35 +01:00
a0554234ef
* org-html.el (org-export-as-html): New option: a format string
...
for the HTML export of date and time.
2012-03-20 12:11:25 +01:00
c8f9972a41
org-latex.el: Fix TeX-master declaration.
...
* org-latex.el (org-export-as-latex): Fix TeX-master declaration.
TINYCHANGE
2012-03-20 12:11:25 +01:00
18ba67bf57
org-latex.el: Fix TeX-master declaration.
...
* org-latex.el (org-export-as-latex): Fix TeX-master declaration.
TINYCHANGE
2012-03-20 12:01:25 +01:00
fcc7aa5cc9
Merge branch 'hotfix-7.8.06'
2012-03-20 11:50:55 +01:00
ca41982ad4
imenu: Added a check that looking-at succeeds before using the match results.
...
* lisp/org.el (org-imenu-get-tree): Check that looking-at succeeds before using match results.
TINYCHANGE
2012-03-20 11:50:42 +01:00
98b8cdd333
Merge branch 'hotfix-7.8.06'
2012-03-20 11:12:04 +01:00
9c8cc41ae1
Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06
2012-03-20 11:11:40 +01:00
fffd14fc3a
Merge branch 'hotfix-7.8.06'
...
Conflicts:
lisp/org-exp-blocks.el
2012-03-20 11:07:00 +01:00
042950a892
org-exp-blocks.el: Make a defcustom.
...
* org-exp-blocks.el (org-ditaa-jar-path): Make a defcustom.
2012-03-20 09:51:53 +01:00
4120d6fcf7
org-odt.el: Render links to outline headings as section nos
...
* lisp/org-lparse.el (org-do-lparse): Make effective setting
of `org-export-headline-levels' available to the ODT exporter.
Also remove some stale comments.
* lisp/org-odt.el (org-odt-format-link): Add support for
generating cross-references to chapter numbers.
(org-odt-format-org-link): Resolve links to outline headings
as section numbers. This special case resolution kicks in
only if the Org link has no description and the target outline
is not listified i.e., it is at a level within
`org-export-headline-levels'.
Fix for the following request:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg01035.html
The above change is in conformity with the way links to
headlines will be treated in new ODT exporter that will be
built on top of Nicolas' org-element/org-export
infrastructure.
2012-03-20 13:32:23 +05:30
c983bc2400
Fix ODT validation failures with French and other languages
...
* lisp/org-odt.el (org-odt-begin-toc): Handle named HTML
entities in per-language string for "Table Of Contents".
Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2011-07/msg00486.html
2012-03-20 13:02:02 +05:30
c7a26931f0
Merge branch 'fix-ts-regexp0'
2012-03-20 06:53:20 +01:00
7d84b300f4
Allow date stamps to have no dame of day, in one more place
...
* lisp/org.el (org-ts-regexp0): Allow time stamps without name of day.
2012-03-20 06:52:53 +01:00
Jambunathan K
FengShu
Bastien Guerry
Tom Alexander
Henning Weiss
Rustom Mody
Julian Gehring
Ilya Shlyakhter
Carsten Dominik