Paul Sexton [Fri, 4 May 2012 20:09:22 +0000 (5 08:09 +1200)]
org-drill: prevent errors caused by attempting to display inline images on a non-graphical display.
Jason Dunsmore [Fri, 4 May 2012 19:57:34 +0000 (4 14:57 -0500)]
Fixed indentation in capture template doc.
Jason Dunsmore [Fri, 4 May 2012 19:47:40 +0000 (4 14:47 -0500)]
Clarified to capture template expansion doc.
Eric Schulte [Fri, 4 May 2012 13:17:13 +0000 (4 09:17 -0400)]
adding commented out code which should be activated once org-element has been merged
Used to clean up orphaned keywords of blocks removed by
org-export-blocks-preprocess.
Nicolas Goaziou [Fri, 4 May 2012 12:02:41 +0000 (4 14:02 +0200)]
org-e-ascii: Fix table export bug when ignoring sub/superscript
* contrib/lisp/org-e-ascii.el (org-e-ascii--table-cell-width):
Refactor code.
* contrib/lisp/org-export.el: Do not normalize contents when expanding
them, since it will be done at the end of the function, and only for
elements.
Bastien Guerry [Thu, 3 May 2012 14:44:17 +0000 (3 16:44 +0200)]
org-macs.el (orgstruct++-ignore-org-filling): Set `def-edebug-spec' correctly.
* org-macs.el (orgstruct++-ignore-org-filling): Set
`def-edebug-spec' correctly.
Nicolas Goaziou [Thu, 3 May 2012 12:29:30 +0000 (3 14:29 +0200)]
org-export: Fix table export bug with cells made of only one object
* contrib/lisp/org-export.el (org-export-table-row-is-special-p,
org-export-table-cell-width, org-export-table-cell-alignment):
Ensure cell only contains a string before trying to match width
cookie.
* testing/lisp/test-org-export.el: Modify tests accordingly.
Thanks to Eric Fraga for discovering and investigating about this.
Nicolas Goaziou [Wed, 2 May 2012 15:18:14 +0000 (2 17:18 +0200)]
org-element: Store fixed-with and comment contents without markers
* contrib/lisp/org-element.el (org-element-comment-parser): Store
comments without leading hash and maybe plus sign.
(org-element-fixed-width-parser): Store fixed-width contents without
leading colons.
(org-element-comment-interpreter,
org-element-fixed-width-interpreter): Apply changes.
* contrib/lisp/org-e-odt.el (org-e-odt-fixed-width): Apply changes to
fixed-width `:value' property.
* contrib/lisp/org-e-latex.el (org-e-latex-fixed-width): Apply changes
to fixed-width `:value' property.
* contrib/lisp/org-e-html.el (org-e-html-fixed-width): Apply changes
to fixed-width `:value' property.
* contrib/lisp/org-e-ascii.el (org-e-ascii-fixed-width): Apply changes
to fixed-width `:value' property.
* testing/lisp/test-org-element.el: Add tests.
Bastien Guerry [Tue, 1 May 2012 17:19:16 +0000 (1 19:19 +0200)]
Merge branch 'maint'
Bastien Guerry [Tue, 1 May 2012 17:19:06 +0000 (1 19:19 +0200)]
org-table.el: Fix bug about handling a negative duration value.
* org-table.el (org-table-time-seconds-to-string): Fix bug
about handling a negative duration value.
Bastien Guerry [Tue, 1 May 2012 16:43:41 +0000 (1 18:43 +0200)]
Merge branch 'maint'
Bastien Guerry [Tue, 1 May 2012 16:43:28 +0000 (1 18:43 +0200)]
org.texi (Durations and time values): Fix typo.
* org.texi (Durations and time values): Fix typo.
Bastien Guerry [Tue, 1 May 2012 15:47:13 +0000 (1 17:47 +0200)]
Fix bugs about computing durations in the column view.
* org-colview.el (org-columns-string-to-number): When
computing the values for the colview, match durations and
convert them to HH:MM values.
* org.el (org-duration-string-to-minutes): Match non-round
numbers. Add a new optional parameter to allow returning the
output as a string.
Thanks to Sébastien for reporting these bugs.
Bastien Guerry [Tue, 1 May 2012 13:57:27 +0000 (1 15:57 +0200)]
Merge branch 'master' of orgmode.org:org-mode
Bastien Guerry [Tue, 1 May 2012 13:56:12 +0000 (1 15:56 +0200)]
Merge branch 'fix-orgstruct'
Bastien Guerry [Tue, 1 May 2012 13:55:41 +0000 (1 15:55 +0200)]
Rework `orgstruct++-mode' so that you can turn if off safely.
* org.el (org-auto-fill-fallback-function)
(org-indent-line-fallback-function)
(org-fill-paragraph-fallback-function)
(org-auto-fill-fallback-function)
(org-indent-line-fallback-function)
(org-fill-paragraph-fallback-function): Remove.
(org-fb-vars): New buffer-local variable.
(orgstruct++-mode): Use the fallback variable `org-fb-vars' to
store, use and restore variables if needed.
(org-fill-paragraph): Ignore `orgstruct++-mode' filling
variables when needed.
(org-auto-fill-function, org-indent-line-function): Ditto.
* org-macs.el (orgstruct++-ignore-org-filling): New macro.
Nicolas Goaziou [Tue, 1 May 2012 13:08:08 +0000 (1 15:08 +0200)]
org-element: Apply `org-translate-link' when parsing a link
* contrib/lisp/org-element.el (org-element-link-parser): Apply
`org-translate-link' when parsing a link.
* testing/lisp/test-org-element.el: Add test.
Nicolas Goaziou [Tue, 1 May 2012 13:33:36 +0000 (1 15:33 +0200)]
Merge branch 'maint'
Nicolas Goaziou [Tue, 1 May 2012 13:32:46 +0000 (1 15:32 +0200)]
* lisp/org.el (org-link-expand-abbrev): Fix docstring
Nicolas Goaziou [Tue, 1 May 2012 13:31:53 +0000 (1 15:31 +0200)]
* lisp/org.el (org-translate-link): Fix bug
Nicolas Goaziou [Tue, 1 May 2012 12:10:12 +0000 (1 14:10 +0200)]
org-element: Internally store headline/inlinetask's tags as a list of strings
* contrib/lisp/org-element.el (org-element-headline-parser,
org-element-headline-interpreter, org-element-inlinetask-parser,
org-element-inlinetask-interpreter): Store headline/inlinetask's
tags as a list of strings.
* contrib/lisp/org-export.el (org-export--selected-trees,
org-export--skip-p): Use new tag representation.
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii-format-inlinetask-function, org-e-ascii-inlinetask): Use
new tag representation.
* contrib/lisp/org-e-html.el (org-e-html-format-headline-function,
org-e-html-format-inlinetask-function, org-e-html--tags): Use new
tag representation.
* contrib/lisp/org-e-latex.el (org-e-latex-format-headline-function,
org-e-latex-format-inlinetask-function, org-e-latex-headline,
org-e-latex-inlinetask): Use new tag representation.
* contrib/lisp/org-e-odt.el (org-e-odt-format-org-tags): Use new tag
representation.
* testing/lisp/test-org-element.el: Update test.
Bastien Guerry [Tue, 1 May 2012 11:03:56 +0000 (1 13:03 +0200)]
Merge branch 'master' of orgmode.org:org-mode
Feng Shu [Tue, 1 May 2012 10:51:17 +0000 (1 18:51 +0800)]
Using 'call-process to launch latex program
* org.el (org-create-formula-image-with-imagemagick): Use 'call-process
to launch latex so that no shell output buffer will be shown when previewing
formulas.
Feng Shu [Tue, 1 May 2012 10:48:50 +0000 (1 18:48 +0800)]
spelling fixes
* org.el (org-create-formula-image-with-imagemagick): Fix typo.
Nicolas Goaziou [Tue, 1 May 2012 10:20:06 +0000 (1 12:20 +0200)]
org-element: Interpret headlines without a `:pre-blank' property
* contrib/lisp/org-element.el (org-element-headline-interpreter):
Interpret headlines without a `:pre-blank' property.
Bastien Guerry [Sun, 29 Apr 2012 20:53:07 +0000 (29 22:53 +0200)]
Use compatibility function for XEmacs.
* lisp/org-exp-block.el: Use `org-find-library-name' instead of `find-library-name'.
Bastien Guerry [Sat, 28 Apr 2012 20:42:31 +0000 (28 22:42 +0200)]
Convert compatibility defun to a macro.
* lisp/org-compat.el (org-find-library-name): Convert into a macro to
avoid compilation of a function from XEmacs in Emacs and vice versa.
Based on a not fully working proposal by A. Gratz to the orgmode
mailing list:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-04/msg00009.html
Achim Gratz [Fri, 27 Apr 2012 19:04:57 +0000 (27 21:04 +0200)]
spelling fixes
Makefile: dito -> ditto
Bastien Guerry [Tue, 1 May 2012 08:04:46 +0000 (1 10:04 +0200)]
Merge branch 'maint'
Bastien Guerry [Tue, 1 May 2012 08:04:31 +0000 (1 10:04 +0200)]
org-agenda.el (org-agenda-bulk-mark-regexp): Fix bug.
* org-agenda.el (org-agenda-bulk-mark-regexp): Fix bug when
setting the number of marked entries.
Bastien Guerry [Tue, 1 May 2012 00:03:12 +0000 (1 02:03 +0200)]
org-table.el: Fix bug in ̀org-table-maybe-eval-formula'.
* org-table.el (org-table-store-formulas): Fix typo.
(org-table-maybe-eval-formula): Fix the regexp to only match
formulas, which never end with the `=' character. If the
field only contain this character, don't eval either.
Thanks to Thomas S. Dye for reporting this.
Bastien Guerry [Mon, 30 Apr 2012 23:42:17 +0000 (1 01:42 +0200)]
Merge branch 'maint'
Bastien Guerry [Mon, 30 Apr 2012 23:41:50 +0000 (1 01:41 +0200)]
org-table.el: Fix bug in a free variable name.
* org-table.el (org-tbl-calc-modes): Rename from
`org-table-modes'.
(org-set-calc-mode, org-table-eval-formula): Use it.
Thanks to Mikkel Kristiansen for reporting this and
to Nick Dokos for tracking down the bug and proposing
a fix.
Nicolas Goaziou [Mon, 30 Apr 2012 23:02:48 +0000 (1 01:02 +0200)]
org-element: code clean-up and some optimizations
* contrib/lisp/org-element.el (org-element-center-block-parser,
org-element-plain-list-parser, org-element-quote-block-parser,
org-element-special-block-parser, org-element-comment-parser,
org-element-comment-block-parser, org-element-example-block-parser,
org-element-export-block-parser, org-element-fixed-width-parser,
org-element-horizontal-rule-parser, org-element-keyword-parser,
org-element-latex-environment-parser, org-element-paragraph-parser,
org-element-property-drawer-parser, org-element-src-block-parser,
org-element-table-parser): Since parser will alway be called at the
beginning of the element, simplify code.
Nicolas Goaziou [Mon, 30 Apr 2012 21:44:30 +0000 (30 23:44 +0200)]
org-element: Interpret correctly switches in example blocks
* contrib/lisp/org-element.el (org-element-example-block-interpreter):
Interpret correctly switches in example blocks.
* testing/lisp/test-org-element.el: Add test.
Nicolas Goaziou [Mon, 30 Apr 2012 15:52:58 +0000 (30 17:52 +0200)]
org-element: Interpret secondary strings with `org-element-interpret-data'
* contrib/lisp/org-element.el (org-element-headline-interpreter,
org-element-inlinetask-interpreter, org-element-item-interpreter,
org-element-footnote-reference-interpreter,
org-element-interpret--affiliated-keywords): Use
`org-element-interpret-data' instead of
`org-element-interpret-secondary'.
(org-element-interpret-data): Handle secondary strings. Refactor
code.
(org-element-interpret-secondary): Remove function
* contrib/lisp/org-export.el (org-export-table-cell-alignment): Use
`org-element-interpret-data' instead of
`org-element-interpret-secondary'.
Nicolas Goaziou [Mon, 30 Apr 2012 00:04:03 +0000 (30 02:04 +0200)]
org-export: Secondary strings are transcoded with `org-export-data'
* contrib/lisp/org-export.el (org-export-transcoder): New function.
(org-export-data): Also export secondary strings. Refactored.
(org-export-secondary-string): Remove function.
(org-export-expand): Fix code indentation.
(org-export-expand-macro): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-link, org-e-ascii-quote-section,
org-e-ascii--table-cell-width): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-html.el (org-e-html-footnote-section,
org-e-html--caption/label-string, org-e-html-meta-info,
org-e-html-preamble, org-e-html-template,
org-e-html-format-headline--wrap, org-e-html-headline,
org-e-html-item, org-e-html-link): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-footnote-reference,
org-e-latex-headline, org-e-latex-inlinetask, org-e-latex-item,
org-e-latex-link, org-e-latex-src-block): Use `org-export-data'
instead of `org-export-secondary-string'.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-update-meta-file,
org-e-odt--caption/label-string, org-e-odt-footnote-def,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block):
Use `org-export-data' instead of `org-export-secondary-string'.
Bastien Guerry [Mon, 30 Apr 2012 16:30:31 +0000 (30 18:30 +0200)]
Merge branch 'master' of orgmode.org:org-mode
Bastien Guerry [Mon, 30 Apr 2012 16:30:13 +0000 (30 18:30 +0200)]
UTILITIES/mansplit.pl: mention http://orgmode.org
Thanks to Thierry Stoehr for suggesting this.
Bastien Guerry [Mon, 30 Apr 2012 16:28:31 +0000 (30 18:28 +0200)]
UTILITIES/manfull.pl: mention http://orgmode.org
Thanks to Thierry Stoehr for suggesting this.
Nicolas Goaziou [Mon, 30 Apr 2012 16:21:35 +0000 (30 18:21 +0200)]
org-element: Fix src-block switches parsing
* contrib/lisp/org-element.el (org-element-src-block-parser): Fix
switches parsing.
* testing/lisp/test-org-element.el: Add test.
Nicolas Goaziou [Mon, 30 Apr 2012 15:49:55 +0000 (30 17:49 +0200)]
org-element: Small fix to previous commit
* contrib/lisp/org-element.el (org-element-export-snippet-parser):
Small fix.
* testing/lisp/test-org-export.el: Fix test.
Nicolas Goaziou [Mon, 30 Apr 2012 15:20:57 +0000 (30 17:20 +0200)]
org-element: Change to export-snippet syntax
* contrib/lisp/org-element.el (org-element-export-snippet-parser):
Change syntax from @back-end{contents} to <back-end@contents>.
(org-element-export-snippet-successor): Use new syntax
* testing/lisp/test-org-element.el: Add test.
This change is required as curly braces conflict with LaTeX syntax
when trying to break a command in two parts. On the other hand, HTML
tags can be broken easily in two. More explicitely, both the
following constructs are possible now:
<latex@\textsc{>Name<latex@}> and <html@<b>>
Bastien Guerry [Sun, 29 Apr 2012 22:04:20 +0000 (30 00:04 +0200)]
org.el: Fix `org-diary' again by checking `org-agenda-buffer' correctly.
Nicolas Goaziou [Sun, 29 Apr 2012 20:55:37 +0000 (29 22:55 +0200)]
org-export: Add `active' and `inactive' alternatives to `org-export-with-timestamps'
* contrib/lisp/org-export.el (org-export-with-timestamps): Allow to
keep only active timestamps or inactive ones with respectively
`active' and `inactive' values.
(org-export--skip-p): Update tests to determine if a timestamp should
be ignored.
* testing/lisp/test-org-export.el: Add tests.
* contrib/lisp/org-element.el: Fix some comments.
Bastien Guerry [Sun, 29 Apr 2012 16:07:24 +0000 (29 18:07 +0200)]
org.el (org-set-property): Minor enhancement.
* org.el (org-set-property): Perform the correct check against
`org-properties-postprocess-alist'.
Thanks to Bill Wishon for spotting this.
Bastien Guerry [Sun, 29 Apr 2012 15:00:16 +0000 (29 17:00 +0200)]
org-bbdb.el: Enhance a customization type and suppress (defvar name).
* org-bbdb.el (org-bbdb-anniversary-format-alist): Update the
customization type.
(name): Suppress (defvar 'name) as name is not eval'ed when
setting `org-bbdb-anniversary-format-alist'.
Nicolas Goaziou [Sun, 29 Apr 2012 13:52:14 +0000 (29 15:52 +0200)]
org-export: Use (org-version) for creator string
* contrib/lisp/org-export.el (org-export-creator-string):
Use (org-version) for creator string.
Bastien Guerry [Sun, 29 Apr 2012 10:17:00 +0000 (29 12:17 +0200)]
Make (org-version) always returns a string, use it in exporters.
* org.el (org-version): When called non-interactively, insert
the short version string, otherwise send a message with the
complete version string.
* org-odt.el (org-odt-update-meta-file): Use (org-version) and
delegate checking whether `org-version' is known as a variable
there.
* org-html.el (org-export-as-html): Use (org-version).
* org-docbook.el (org-export-as-docbook): Ditto.
* org-latex.el (org-export-latex-make-header): Ditto.
Bastien Guerry [Sun, 29 Apr 2012 08:58:36 +0000 (29 10:58 +0200)]
org.texi: Document `C-0' as a prefix argument for `org-capture'.
* org.texi (Using capture): Document `C-0' as a prefix
argument for `org-capture'.
Thanks to Charles for this.
Nicolas Goaziou [Sun, 29 Apr 2012 00:23:09 +0000 (29 02:23 +0200)]
org-element: Rename `time-stamp' object type into `timestamp'
Nicolas Goaziou [Sun, 29 Apr 2012 00:11:22 +0000 (29 02:11 +0200)]
org-export: Export `clock' and `planning' elements
* contrib/lisp/org-export.el (org-export-option-alist): Add new
filters.
(org-export-with-clocks, org-export-with-planning,
org-export-filter-clock-functions,
org-export-filter-planning-functions): New variables.
(org-export--skip-p): Skip `clock' and `planning' types depending on
export options.
* contrib/lisp/org-e-ascii.el (org-e-ascii-clock,
org-e-ascii-planning): New functions.
(org-e-ascii-time-stamp): Update function. Use `org-translate-time'.
* contrib/lisp/org-e-html.el (org-e-html-clock, org-e-html-planning):
New functions.
(org-e-html-time-stamp): Update function.
* contrib/lisp/org-e-latex.el (org-e-latex-clock,
org-e-latex-planning): New functions.
(org-e-latex-time-stamp): Update function. Use `org-translate-time'.
* contrib/lisp/org-e-odt.el (org-e-odt-clock, org-e-odt-planning): New
functions.
(org-e-odt-time-stamp): Update function. Use `org-translate-time'.
* testing/lisp/test-org-export.el: Add tests.
Nicolas Goaziou [Sat, 28 Apr 2012 20:59:25 +0000 (28 22:59 +0200)]
org-element: Add `clock' and `planning' element types
* contrib/lisp/org-element.el (org-element-babel-call-parser): Fix
property name.
(org-element-babel-call-interpreter, org-element--element-block-re):
Fix docstring.
(org-element-clock-parser, org-element-clock-interpreter,
org-element-planning-parser, org-element-planning-interpreter): New
functions.
(org-element-time-stamp-parser): Move planning keywords out of the
object: no more `:appt-type' property
(org-element-time-stamp-interpreter,
org-element-time-stamp-successor): Apply changes to previous function.
(org-element-paragraph-separate): Time keywords also end paragraphs.
(org-element-all-elements): Register new elements types.
(org-element-current-element): Recognize new elements.
(org-element-parse-elements): Fix comments.
* testing/lisp/test-org-element.el: Add tests.
Eric Schulte [Sat, 28 Apr 2012 22:03:23 +0000 (28 18:03 -0400)]
Merge branch 'origin-maint'
Conflicts:
lisp/ob.el
Bastien Guerry [Sat, 28 Apr 2012 23:18:35 +0000 (29 01:18 +0200)]
org-clock.el: Fix bug in `org-clocktable-write-default'.
* org-clock.el (org-clocktable-write-default): Temporarily
disable `delete-active-region' so that we don't accidently
delete an active region when exporting a subtree/region.
Thanks to Mike McLean for the detailed bug report.
Eric Schulte [Sat, 28 Apr 2012 22:02:13 +0000 (28 18:02 -0400)]
fixes a bug finding empty named results
* lisp/ob.el (org-babel-find-named-result): Fix bug finding empty
named results.
Bastien Guerry [Sat, 28 Apr 2012 21:43:10 +0000 (28 23:43 +0200)]
org-clock.el: Use `executable-find' instead of `org-program-exists'.
* org-clock.el (org-program-exists): Remove.
(org-show-notification, org-clock-play-sound): Use
`executable-find' instead of `org-program-exists'.
Thanks to Sébastien Vauban for pointing this.
Bastien Guerry [Sat, 28 Apr 2012 21:35:01 +0000 (28 23:35 +0200)]
Merge branch 'master' of orgmode.org:org-mode
Bastien Guerry [Sat, 28 Apr 2012 21:34:51 +0000 (28 23:34 +0200)]
org-table.el: Fix `org-table-store-formulas'.
The bug was introduced by this commit:
http://orgmode.org/w/?p=org-mode.git;a=commit;h=1c203d
Thanks to Matt Lundin who reported this nasty/stupid bug.
Nicolas Goaziou [Sat, 28 Apr 2012 20:37:23 +0000 (28 22:37 +0200)]
Merge branch 'maint'
Nicolas Goaziou [Sat, 28 Apr 2012 20:34:36 +0000 (28 22:34 +0200)]
Fix `org-planning-or-clock-line-re' regexp
* lisp/org.el (org-set-regexps-and-options): Fix
`org-planning-or-clock-line-re' regexp. Indeed "\\>" will never
match since time keywords must end with colons, which are not word
constituent.
Bastien Guerry [Sat, 28 Apr 2012 20:24:32 +0000 (28 22:24 +0200)]
Merge branch 'master' of orgmode.org:org-mode
Bastien Guerry [Sat, 28 Apr 2012 20:23:40 +0000 (28 22:23 +0200)]
Merge branch 'fix-org-diary-bug' into fix-compiler-warnings
Bastien Guerry [Sat, 28 Apr 2012 20:23:08 +0000 (28 22:23 +0200)]
org-agenda.el: Prevent org-diary to fail.
* org-agenda.el (org-diary): Prevent failure from
`org-compile-prefix-format' when there is no agenda buffer.
Thanks to Rafael who reported this.
Bastien Guerry [Sat, 28 Apr 2012 19:36:58 +0000 (28 21:36 +0200)]
Replace obsolete variable `buffer-substring-filters'.
* org-agenda.el (org-agenda-mode): Replace obsolete variable
`buffer-substring-filters'.
* org-indent.el (org-indent-mode): Ditto.
Nicolas Goaziou [Sat, 28 Apr 2012 19:12:56 +0000 (28 21:12 +0200)]
org-element: Fix code typo
* contrib/lisp/org-element.el (org-element-object-successor-alist):
Fix code typo.
Nicolas Goaziou [Sat, 28 Apr 2012 19:12:30 +0000 (28 21:12 +0200)]
org-element: Fix block parsing
* contrib/lisp/org-element.el (org-element-current-element): Fix
regexp for block boundaries.
* testing/lisp/test-org-element.el (test-org-element/block-switches):
Fix test.
Bastien Guerry [Sat, 28 Apr 2012 17:16:59 +0000 (28 19:16 +0200)]
org-compat.el: Silent the byte-compiler about a warning related to XEmacs support.
* org-compat.el (org-find-library-name): Silent the
byte-compiler about a warning related to XEmacs support.
Bastien Guerry [Sat, 28 Apr 2012 17:08:42 +0000 (28 19:08 +0200)]
org-special-blocks.el: `org-line' instead of `line'.
* org-special-blocks.el
(org-special-blocks-convert-html-special-cookies): Use
`org-line' instead of `line'.
Bastien Guerry [Sat, 28 Apr 2012 17:06:52 +0000 (28 19:06 +0200)]
org-html.el: Use `org-line' instead of `line' as the free variable name.
* org-html.el (org-html-handle-links, org-export-as-html)
(org-format-org-table-html, org-format-table-table-html)
(org-html-export-list-line): Use `org-line' instead of `line'
as the free variable name.
Nicolas Goaziou [Sat, 28 Apr 2012 17:01:25 +0000 (28 19:01 +0200)]
org-element: Don't forget to register new objects
* contrib/lisp/org-element.el (org-element-all-objects): Register new objects.
Bastien Guerry [Sat, 28 Apr 2012 16:48:02 +0000 (28 18:48 +0200)]
org-latex.el (org-export-latex-tables): Let-bind `hfmt'.
* org-latex.el (org-export-latex-tables): Let-bind `hfmt'.
Silent byte-compiler.
Nicolas Goaziou [Sat, 28 Apr 2012 16:08:37 +0000 (28 18:08 +0200)]
org-export: Fix tests
* contrib/lisp/org-export.el (org-export-filters-alist): Remove
unexistant filters.
Nicolas Goaziou [Sat, 28 Apr 2012 16:00:50 +0000 (28 18:00 +0200)]
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
Nicolas Goaziou [Sat, 28 Apr 2012 09:33:16 +0000 (28 11:33 +0200)]
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
Nicolas Goaziou [Fri, 27 Apr 2012 22:57:38 +0000 (28 00:57 +0200)]
org-export: Run a hook before parsing
* contrib/lisp/org-export.el (org-export-before-parsing-hook): New
variable.
(org-export-as): Run `org-export-before-parsing-hook'.
* testing/lisp/test-org-export.el: Add test.
Bastien Guerry [Fri, 27 Apr 2012 21:26:05 +0000 (27 23:26 +0200)]
org.el: New face `org-list-dt' for definition terms in list.
* org-faces.el (org-list-dt): New face.
* org.el (org-set-font-lock-defaults): Use `org-list-dt' as
the face for definition terms in definition lists.
Thanks to Alex Lane for suggesting this.
Bastien Guerry [Fri, 27 Apr 2012 21:08:56 +0000 (27 23:08 +0200)]
org.el: Fix bug in `org-fill-paragraph'.
* org.el (org-fill-paragraph): Pass the `justify' argument to
`org-fill-paragraph-fallback-function'.
Thanks to Nick Dokos for spotting this.
Nicolas Goaziou [Fri, 27 Apr 2012 15:16:17 +0000 (27 17:16 +0200)]
org-element: Add tests
Nicolas Goaziou [Fri, 27 Apr 2012 15:27:08 +0000 (27 17:27 +0200)]
org-element: Fix comment block interpreter
* contrib/lisp/org-element.el (org-element-comment-block-interpreter):
Fix comment block interpreter.
Nicolas Goaziou [Fri, 27 Apr 2012 13:56:30 +0000 (27 15:56 +0200)]
org-element: Fix headline/inlinetask interpretation
* contrib/lisp/org-element.el (org-element-inlinetask-interpreter,
org-element-headline-interpreter): Fix headline/inlinetask
interpretation.
(org-element-inlinetask-interpreter): Prefer degenerate inlinetasks
when they have no contents.
Nicolas Goaziou [Fri, 27 Apr 2012 13:28:01 +0000 (27 15:28 +0200)]
org-element: Fix dynamic block parsing and interpretation
Nicolas Goaziou [Fri, 27 Apr 2012 13:02:22 +0000 (27 15:02 +0200)]
org-element: Fix docstrings
Bastien Guerry [Thu, 26 Apr 2012 20:43:36 +0000 (26 22:43 +0200)]
Merge branch 'maint'
Bastien Guerry [Thu, 26 Apr 2012 20:42:45 +0000 (26 22:42 +0200)]
org-ctags.el: Fix an option default value back again.
* org-ctags.el (org-ctags-new-topic-template): Fix the option
default value back again.
This option was "fixed" in Emacs emacs-24 branch:
http://git.savannah.gnu.org/cgit/emacs.git/diff/lisp/org/org-protocol.el?h=emacs-24&id=
0fc749f9
During an Emacs merge, I didn't check carefully and backported
this change into Org maint branch. This is now fixed in Org and
in emacs-24.
Eric Schulte [Thu, 26 Apr 2012 16:53:31 +0000 (26 12:53 -0400)]
Merge branch 'origin-maint'
Bastien Guerry [Thu, 26 Apr 2012 17:01:29 +0000 (26 19:01 +0200)]
etc/ORG-NEWS: add license and some more information.
Eric Schulte [Thu, 26 Apr 2012 16:51:36 +0000 (26 12:51 -0400)]
don't rely on kill-new to return a string
* lisp/org-bibtex.el (org-bibtex-export-to-kill-ring): Don't rely on
kill-new to return a string.
Eric Schulte [Thu, 26 Apr 2012 16:50:16 +0000 (26 12:50 -0400)]
remove call to bibtex-reformat which often hangs
* lisp/org-bibtex.el (org-bibtex-headline): Remove call to
bibtex-reformat which often hangs.
Bastien Guerry [Thu, 26 Apr 2012 16:48:56 +0000 (26 18:48 +0200)]
etc/ORG-NEWS: Major rewriting.
Bastien Guerry [Thu, 26 Apr 2012 13:41:09 +0000 (26 15:41 +0200)]
org.el (org-eval-in-calendar): Fix docstring to mention the KEEPDATE parameter.
* org.el (org-eval-in-calendar): Fix docstring to mention the
KEEPDATE parameter.
Thanks to Toby Cubitt for spotting this.
Bastien Guerry [Thu, 26 Apr 2012 13:16:05 +0000 (26 15:16 +0200)]
Merge branch 'master' of orgmode.org:org-mode
Bastien Guerry [Thu, 26 Apr 2012 12:56:31 +0000 (26 14:56 +0200)]
org.el (org-refresh-category-properties): Let-bind `inhibit-read-only' to t.
* org.el (org-refresh-category-properties): Let-bind
`inhibit-read-only' to t.
Nicolas Goaziou [Wed, 25 Apr 2012 20:15:29 +0000 (25 22:15 +0200)]
org-element: Verse blocks now contain objects
* contrib/lisp/org-element.el (org-element-verse-block-parser): Verse
blocks now contain objects.
(org-element-verse-block-interpreter, org-element-current-element):
Apply changes to verse blocks.
(org-element-secondary-value-alist): Remove verse blocks from elements
with a secondary string.
* contrib/lisp/org-e-odt.el (org-e-odt-verse-block): Apply changes to
verse blocks.
* contrib/lisp/org-e-latex.el (org-e-latex-verse-block): Apply changes
to verse blocks.
* contrib/lisp/org-e-html.el (org-e-html-verse-block): Apply changes
to verse blocks.
* contrib/lisp/org-e-ascii.el (org-e-ascii-verse-block): Apply changes
to verse blocks.
* testing/lisp/test-org-element.el: Add tests.
Nicolas Goaziou [Wed, 25 Apr 2012 20:07:37 +0000 (25 22:07 +0200)]
org-e-latex: Fix coderef display for links with no contents
* contrib/lisp/org-e-latex.el (org-e-latex-link): Fix coderef display
for links with no contents.
* contrib/lisp/org-e-odt.el (org-e-odt-link): Remove useless test.
* contrib/lisp/org-e-html.el (org-e-html-link): Remove useless test.
Nicolas Goaziou [Wed, 25 Apr 2012 18:40:13 +0000 (25 20:40 +0200)]
org-element: Ignore blank lines when removing element indentation
* contrib/lisp/org-element.el (org-element-normalize-contents): Ignore
blank and empty lines when removing element indentation.
* testing/lisp/test-org-element.el: Add tests.
Bastien Guerry [Thu, 26 Apr 2012 10:40:41 +0000 (26 12:40 +0200)]
org.el: Fix bug about (auto-)filling and indenting lines with orgstruct++-mode.
* org.el (org-auto-fill-fallback-function)
(org-indent-line-fallback-function)
(org-fill-paragraph-fallback-function): New variables to store
some fall-back functions when turning `orgstruct++-mode' on.
(orgstruct++-mode): Set the new variables.
(org-indent-line-function, org-fill-paragraph)
(org-auto-fill-function): Use them.
Thanks to Christopher Schmidt for reporting this and to Eric
S Fraga for insisting on it.
This commit creates these fall-back buffer-local variables:
(defvar org-auto-fill-fallback-function nil)
(defvar org-fill-paragraph-fallback-function nil)
(defvar org-indent-line-fallback-function nil)
When `org-auto-fill-function' cannot do anything useful in the
current mode and `org-auto-fill-fallback-function' is set (for
example to `message-do-auto-fill), use the fall-back function
before `do-auto-file'.
When `org-fill-paragraph-function' cannot do anything useful in the
current mode and `org-fill-paragraph-fallback-function' is set (for
example to `message-fill-paragraph'), use the fall-back function
before `fill-paragraph'.
When `org-indent-line-fallback-function' is set, always run it
instead of `org-indent-line-function'.
Bastien Guerry [Thu, 26 Apr 2012 08:59:16 +0000 (26 10:59 +0200)]
org.el (org-read-date): Bugfix.
* org.el (org-read-date): Bugfix: call `org-eval-in-calendar'
with the 'keepdate parameter set to t when setting the cursor
type.
Thanks to Matt Lundin for reporting this and for the solution.
Achim Gratz [Wed, 25 Apr 2012 17:04:29 +0000 (25 19:04 +0200)]
Improve compatibility with old Makefile
* targets.mk: change the "local.mk" template so that "oldorg" will be
the default target for maximum compatibility. Admonish info message
with a reminder to use "make help" for more information on targets
and that "oldorg" is the default target for now. Add new
convenience target "uncompiled" that will keep the lisp directory
free from *.elc files and the autoload files up-to-date.
* Makefile: make "targets" and "helpall" depend on "help" so that only
"help::" or "helpall::" needs to be written for adding more help
messages. Useful when users want to add their own messages to "make
help" et al.
Eric Schulte [Wed, 25 Apr 2012 19:34:15 +0000 (25 15:34 -0400)]
clean up the code implementing reads of irregular data into R
* lisp/ob-R.el (org-babel-R-assign-elisp): Clean up the code
implementing reads of irregular data into R.