4f8e1e85b2
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.
2012-05-01 12:20:06 +02:00
bf5b4012e9
Use compatibility function for XEmacs.
...
* lisp/org-exp-block.el: Use `org-find-library-name' instead of `find-library-name'.
2012-05-01 10:40:19 +02:00
b3f60f791e
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
2012-05-01 10:40:15 +02:00
a965630293
spelling fixes
...
Makefile: dito -> ditto
2012-05-01 10:07:29 +02:00
e5c8780e5c
Merge branch 'maint'
2012-05-01 10:04:46 +02:00
adb10d1543
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.
2012-05-01 10:04:31 +02:00
8342fdb70a
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.
2012-05-01 02:03:12 +02:00
1f663e7ab3
Merge branch 'maint'
2012-05-01 01:42:17 +02:00
3053c13d2c
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.
2012-05-01 01:41:50 +02:00
49228181ee
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.
2012-05-01 01:02:48 +02:00
2ab6367daf
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.
2012-04-30 23:44:30 +02:00
537ab2ada3
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'.
2012-04-30 20:10:54 +02:00
03813d9bc4
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'.
2012-04-30 20:10:54 +02:00
330257949d
Merge branch 'master' of orgmode.org:org-mode
2012-04-30 18:30:31 +02:00
96dd842ee1
UTILITIES/mansplit.pl: mention http://orgmode.org
...
Thanks to Thierry Stoehr for suggesting this.
2012-04-30 18:30:13 +02:00
ad812d8cd1
UTILITIES/manfull.pl: mention http://orgmode.org
...
Thanks to Thierry Stoehr for suggesting this.
2012-04-30 18:28:31 +02:00
15315c5cc6
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.
2012-04-30 18:21:35 +02:00
99a5d6bea8
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.
2012-04-30 17:49:55 +02:00
803d76825a
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>>
2012-04-30 17:34:01 +02:00
237c65b1f7
org.el: Fix `org-diary' again by checking `org-agenda-buffer' correctly.
2012-04-30 00:04:20 +02:00
bea597be96
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.
2012-04-29 22:55:37 +02:00
491ce5491d
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.
2012-04-29 18:07:24 +02:00
9604f522fc
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'.
2012-04-29 17:00:16 +02:00
e3dfe717c8
org-export: Use (org-version) for creator string
...
* contrib/lisp/org-export.el (org-export-creator-string):
Use (org-version) for creator string.
2012-04-29 15:52:14 +02:00
6732d633af
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.
2012-04-29 12:17:00 +02:00
d6e56bce71
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.
2012-04-29 10:58:36 +02:00
b5f4b526ca
org-element: Rename `time-stamp' object type into `timestamp'
2012-04-29 02:26:57 +02:00
941f90a649
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.
2012-04-29 02:26:33 +02:00
5cd9c01757
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.
2012-04-29 02:26:33 +02:00
4eb4010a97
Merge branch 'origin-maint'
...
Conflicts:
lisp/ob.el
2012-04-28 18:03:23 -04:00
c306dbe388
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.
2012-04-29 01:18:35 +02:00
604a55edd6
fixes a bug finding empty named results
...
* lisp/ob.el (org-babel-find-named-result): Fix bug finding empty
named results.
2012-04-28 18:02:13 -04:00
008689cc79
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.
2012-04-28 23:43:10 +02:00
0678e0e359
Merge branch 'master' of orgmode.org:org-mode
2012-04-28 23:35:01 +02:00
d7dfe9fd69
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.
2012-04-28 23:34:51 +02:00
f9d4069033
Merge branch 'maint'
2012-04-28 22:37:23 +02:00
7f2e22339c
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.
2012-04-28 22:34:36 +02:00
7e155ecfbc
Merge branch 'master' of orgmode.org:org-mode
2012-04-28 22:24:32 +02:00
982b7b972f
Merge branch 'fix-org-diary-bug' into fix-compiler-warnings
2012-04-28 22:23:40 +02:00
4b8359a395
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.
2012-04-28 22:23:08 +02:00
c5f73635d0
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.
2012-04-28 21:36:58 +02:00
3621634861
org-element: Fix code typo
...
* contrib/lisp/org-element.el (org-element-object-successor-alist):
Fix code typo.
2012-04-28 21:12:56 +02:00
fd5f561a3e
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.
2012-04-28 21:12:30 +02:00
69d2d4e130
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.
2012-04-28 19:16:59 +02:00
3d3ad17d74
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'.
2012-04-28 19:08:42 +02:00
b69eeee54d
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.
2012-04-28 19:06:52 +02:00
676846cd85
org-element: Don't forget to register new objects
...
* contrib/lisp/org-element.el (org-element-all-objects): Register new objects.
2012-04-28 19:01:25 +02:00
019bd93ced
org-latex.el (org-export-latex-tables): Let-bind `hfmt'.
...
* org-latex.el (org-export-latex-tables): Let-bind `hfmt'.
Silent byte-compiler.
2012-04-28 18:48:02 +02:00
f70afc42ef
org-export: Fix tests
...
* contrib/lisp/org-export.el (org-export-filters-alist): Remove
unexistant filters.
2012-04-28 18:08:37 +02:00
b21b6ead24
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.
2012-04-28 18:00:50 +02:00
Nicolas Goaziou
Bastien Guerry
Achim Gratz
Eric Schulte