Commit Graph

10501 Commits

Author SHA1 Message Date
Nicolas Goaziou 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
Bastien Guerry 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
Nicolas Goaziou 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
Nicolas Goaziou 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 312e225685 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.
2012-04-28 11:41:15 +02:00
Nicolas Goaziou b3e8a8d437 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.
2012-04-28 09:35:12 +02:00
Bastien Guerry 21e24f8f24 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.
2012-04-27 23:26:05 +02:00
Bastien Guerry 30986cd7c5 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.
2012-04-27 23:08:56 +02:00
Nicolas Goaziou 41b2a2e766 org-element: Add tests 2012-04-27 19:02:02 +02:00
Nicolas Goaziou 8e52d1d7f0 org-element: Fix comment block interpreter
* contrib/lisp/org-element.el (org-element-comment-block-interpreter):
  Fix comment block interpreter.
2012-04-27 17:27:28 +02:00
Nicolas Goaziou 7cdd0db287 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.
2012-04-27 17:16:32 +02:00
Nicolas Goaziou e4852f7ee9 org-element: Fix dynamic block parsing and interpretation 2012-04-27 17:16:32 +02:00
Nicolas Goaziou 18aef0875a org-element: Fix docstrings 2012-04-27 17:16:32 +02:00
Bastien Guerry 0233eb989b Merge branch 'maint' 2012-04-26 22:43:36 +02:00
Bastien Guerry 0945fea562 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.
2012-04-26 22:42:45 +02:00
Eric Schulte 8c18495597 Merge branch 'origin-maint' 2012-04-26 12:53:31 -04:00
Bastien Guerry b2fa4cbbbf etc/ORG-NEWS: add license and some more information. 2012-04-26 19:01:29 +02:00
Eric Schulte 5d5ce5d7b0 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.
2012-04-26 12:51:36 -04:00
Eric Schulte fa7c989a3f remove call to bibtex-reformat which often hangs
* lisp/org-bibtex.el (org-bibtex-headline): Remove call to
  bibtex-reformat which often hangs.
2012-04-26 12:50:16 -04:00
Bastien Guerry a1a5c15e7e etc/ORG-NEWS: Major rewriting. 2012-04-26 18:48:56 +02:00
Bastien Guerry 580add2f41 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.
2012-04-26 15:41:09 +02:00
Bastien Guerry dd6ee0e1b5 Merge branch 'master' of orgmode.org:org-mode 2012-04-26 15:16:05 +02:00
Bastien Guerry fe0515e5bf 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.
2012-04-26 14:56:31 +02:00
Nicolas Goaziou c6dc6e3d32 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.
2012-04-26 14:49:29 +02:00
Nicolas Goaziou c3d7d21108 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.
2012-04-26 14:49:29 +02:00
Nicolas Goaziou 206ce6e0b5 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.
2012-04-26 14:49:29 +02:00
Bastien Guerry 84a358e381 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'.
2012-04-26 12:40:41 +02:00
Bastien Guerry e02226bfc2 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.
2012-04-26 10:59:16 +02:00
Achim Gratz 357fd63a14 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.
2012-04-26 08:55:32 +02:00
Eric Schulte fb7ebd2dae 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.
2012-04-25 15:40:13 -04:00
Thomas Dye 870b4e3c9d R-based solution to variable-row-length tables 2012-04-25 15:40:13 -04:00
Jambunathan K 4908ea99ed org-odt.el: Provide for non-availability of `org-version'
* lisp/org-odt.el (org-odt-update-meta-file): Check for
`org-version' is bound before accessing it.
2012-04-26 01:22:04 +05:30
Brian van den Broek a178bc9d84 Small grammar tweaks in export sections of org.texi
* org.texi The sections in the Exporting section of the manual left
out articles in the description of the org-export-as-* commands, among
other places. This patch adds them, adds a few missing prepositions,
and switches instances of "an HTML" to "a html" for internal
consistency.

TINYCHANGE
2012-04-24 23:27:59 +02:00
Bastien Guerry 5add9cdef0 org-agenda.el: Implement `org-agenda-persistent-marks' for bulk actions.
* org-agenda.el (org-agenda-persistent-marks): New option to
keep marks after a bulk action.  The option defaults to nil.
(org-agenda-bulk-action): Use the new option.

* org.texi (Agenda commands): Document persistent marks.
2012-04-24 18:10:55 +02:00
Bastien Guerry 1666b910fe org-capture.el: Use %\n instead of %n.
* org-capture.el (org-capture-fill-template): Use %\n instead of %n as a
template element to be replaced with the nth prompted string.
(org-capture-templates): Update docstring.

* org.texi (Template expansion): Update doc to reflect change.

Using %n triggers errors when the template contains escaped strings,
which happens a lot with links.
2012-04-24 11:54:16 +02:00
Bastien Guerry fdace895fa Fix bug in `org-insert-link'. 2012-04-23 22:29:54 +02:00
Bastien Guerry 312dbb63cb Merge branch 'master' of orgmode.org:org-mode 2012-04-23 21:42:23 +02:00
Achim Gratz 687766c922 Introduce compatibility and convenience targets, local.mk template, add "helpall"
* Makefile: new target "helpall" to document all targets, while "help"
  continues to show a brief subset.

* default.mk: add cutlines for sed to produce local.mk with.

* targets.mk: add target "local.mk" to produce an (empty) local.mk
  configuration template when it isn't already present.  Ignore any
  error when making this target since sed might not be present on all
  systems.  Redefine target "update" to not include testing, similarly
  add target "update2" to additionally install without test.  Add
  targets "up0" to stop after git pull and "up1" to stop after test,
  while "up2" continues to do everything and then installs.  Complete
  .PHONY target list.  Add "refcard" target for compatibility with old
  make.  Clean contrib in "cleanall", too.
2012-04-23 21:42:08 +02:00
Nicolas Goaziou 9743a2ca3d Merge branch 'maint' 2012-04-23 20:54:40 +02:00
Nicolas Goaziou 374c56bad3 org-table: Fix typo in a docstring
* lisp/org-table.el (org-table-number-fraction): Fix typo.
2012-04-23 20:53:51 +02:00
Eric Schulte b47bccf81c Merge branch 'origin-maint' 2012-04-23 11:39:50 -04:00
Bastien Guerry e9d34dcd72 org.texi: Fix insertion of {} chars.
Thanks to Richard Stanton for spotting this.
2012-04-23 19:24:04 +02:00
Bastien Guerry 374d1b93c3 org.el (org-goto): Fix docstring and document what C-u does.
* org.el (org-goto): Fix docstring and document what C-u does.

Thanks to John Hendy for pointing this.
2012-04-23 19:08:15 +02:00
Eric Schulte cd080b025a ensure newline precedes automatically-added returns for Python code blocks
* lisp/ob-python.el (org-babel-execute:python): Ensure newline
  precedes automatically-added returns.
2012-04-23 11:39:28 -04:00
Toby S. Cubitt b7982a0024 org-capture.el: Fixed bug in org-capture-templates %<n> expandos
* lisp/org-capture.el (org-capture-fill-template): Fixed regexp for
  %<n> expandos to match any positive integer.
  (org-capture-templates): Updated docstring accordingly.

* doc/org.texi: Updated documentation accordingly.
2012-04-23 17:34:15 +02:00
Daniel Dehennin 077af66a6f org-exp.el: Handle new parameter :addlevel when including a file.
* org-exp.el (org-export-handle-include-files)
(org-get-file-contents): Handle new parameter :addlevel.

TINYCHANGE
2012-04-23 14:46:24 +02:00
Bastien Guerry d592b07d51 org-publish.el: Use (case-fold-search t) when looking for #+INCLUDE:.
* org-publish.el (org-publish-cache-file-needs-publishing):
Use (case-fold-search t) when looking for #+INCLUDE:.
2012-04-23 14:19:21 +02:00
Christophe Rhodes c627a22e29 org-latex.el: Support setting the :hfmt parameter from #+ATTR_LaTeX.
* org-latex.el (org-export-latex-tables): Support setting
the :hfmt parameter from #+ATTR_LaTeX.

TINYCHANGE
2012-04-23 13:41:27 +02:00
niels giesen 549c498bb6 org-table.el: Add defcustoms for LaTeX export of table rules :tstart, :hline and :tend
* org-table.el (orgtbl-to-generic): Add check for :skipheadrule.
When present, the :hline following the head will be skipped.  This is
necessary to avoid doubling of horizontal rules in LaTeX longtable
environments and consequent width problems.

* org-latex.el (org-export-latex-tables-tstart)
(org-export-latex-tables-hline)
(org-export-latex-tables-tend): New options.
(org-export-latex-tables): Use the new options.
2012-04-23 13:23:36 +02:00
Bastien Guerry b1618e2d69 Fix missing } in org.texi. 2012-04-23 12:59:32 +02:00