6 years agoorg-odt.el: Sanitize formatting of Images
Jambunathan K [Wed, 7 Sep 2011 17:12:33 +0000 (22:42 +0530)]
org-odt.el: Sanitize formatting of Images

* contrib/lisp/org-odt.el (org-odt-format-frame): New.
(org-odt-format-textbox): Use the above function.
(org-export-odt-do-format-image): Use the above two functions.
Use the new custom styles for the Frame and Graphics elements.
(org-odt-image-attrs-from-size): Remove this.

* contrib/odt/styles/OrgOdtAutomaticStyles.xml: Removed all
Frame and Graphics entries.

* contrib/odt/styles/OrgOdtStyles.xml: Added following custom
styles - OrgSimpleGraphics, OrgCaptionedGraphics,
OrgCaptionFrame, OrgInlineGraphics and OrgInlineFormula.

6 years agoMerge branch 'master' of
Christian Egli [Wed, 7 Sep 2011 13:45:40 +0000 (15:45 +0200)]
Merge branch 'master' of

6 years agotaskjuggler export: take buffer local variables into account
Christian Egli [Wed, 7 Sep 2011 13:45:14 +0000 (15:45 +0200)]
taskjuggler export: take buffer local variables into account

* org-taskjuggler.el (org-export-as-taskjuggler): Clone the
buffer local variables to the temporary buffer before

The taskjuggler exporter handles properties. When defining buffer
local priorities the export fails however, as buffer local variables
are not taken into account since the export happens in a new temporary
buffer. This commit fixes that by cloning the relevant buffer local
variables into the temporary buffer before exporting.

6 years agotest of comma stripping behavior
Eric Schulte [Wed, 7 Sep 2011 03:58:51 +0000 (21:58 -0600)]
test of comma stripping behavior

* testing/examples/ Example file for export tests.
* testing/lisp/test-org-exp.el (test-org-exp/stripping-commas): List
  file for export tests.

6 years agoorg-exp: only remove commas on the front line of a code block
Eric Schulte [Wed, 7 Sep 2011 03:52:04 +0000 (21:52 -0600)]
org-exp: only remove commas on the front line of a code block

* lisp/org-exp.el (org-export-select-backend-specific-text): Only
  remove commas on the front line of a code block.

6 years agoorg-odt.el: Format date strings in meta.xml using portable means
Jambunathan K [Tue, 6 Sep 2011 18:15:25 +0000 (23:45 +0530)]
org-odt.el: Format date strings in meta.xml using portable means

* contrib/lisp/org-odt.el (org-odt-format-date): %:z format
specifier of `format-time-string' is not portable.  Replace it
with an equivalent implementation using %z specifier.

Thanks to Anton Tarasenko for reporting this bug and verifying
this fix.  See

6 years agoorg-odt.el: Rework embedding of images
Jambunathan K [Tue, 6 Sep 2011 12:16:11 +0000 (17:46 +0530)]
org-odt.el: Rework embedding of images

* contrib/lisp/org-odt.el (org-odt-embedded-images-count): New
(org-odt-copy-image-file): Use the above variable to name the
embedded image files. Remove some cruft as well.
(org-export-odt-file-list, org-export-odt-save-list): Removed.
(org-odt-init-outfile, org-odt-save-as-outfile): Related changes.

6 years agocorrectly resolving load-path in testing files
Eric Schulte [Tue, 6 Sep 2011 17:11:12 +0000 (11:11 -0600)]
correctly resolving load-path in testing files

* testing/lisp/test-org.el (testing-lisp-dir): Require all files with
  load-path set.
* testing/lisp/test-ob-lob.el (expand-file-name): Relative load path.
* testing/lisp/test-ob-fortran.el (load-path): Relative load path.

6 years agoUse `string=' to compare strings
David Maus [Thu, 1 Sep 2011 04:49:29 +0000 (06:49 +0200)]
Use `string=' to compare strings

* org-elisp-symbol.el (org-elisp-symbol-store-link): Use `string=' to
compare strings.

(let ((foo "foo"))
  (eq foo "foo")) => nil

6 years agocommenting out single failing test
Eric Schulte [Tue, 6 Sep 2011 15:09:09 +0000 (09:09 -0600)]
commenting out single failing test

* testing/lisp/test-ob-fortran.el: Commenting out single failing test.

6 years agoensure all tests have unique names
Eric Schulte [Tue, 6 Sep 2011 15:07:00 +0000 (09:07 -0600)]
ensure all tests have unique names

* testing/lisp/test-ob-exp.el (test-ob-exp/org-babel-exp-src-blocks/w-no-headers2):
  Renamed to be unique.

6 years agoremoving test: shouldn't test a variables value, should test its functionality
Eric Schulte [Tue, 6 Sep 2011 14:57:10 +0000 (08:57 -0600)]
removing test: shouldn't test a variables value, should test its functionality

* testing/lisp/test-ob.el (test-org-babel/get-header): Removing a
  test, shouldn't test a variables value, should test its

6 years agoInline source block and test fixes * lisp/ob.el: Fixed late night refactoring error...
Martyn Jago [Tue, 6 Sep 2011 08:00:24 +0000 (09:00 +0100)]
Inline source block and test fixes * lisp/ob.el: Fixed late night refactoring error * testing/examples/ whitespace * testing/lisp/test-ob.el: Fixed test-org-babel/inline-src-block-regexp (regression error) Renamed test-org-babel/parse-header-args2 since duplicate test heading Made test-org-babel/parse-header-args less brittle

6 years agoBug fixes to inline source block execution triggering. * lisp/ob.el: Created org...
Martyn Jago [Mon, 5 Sep 2011 21:53:07 +0000 (22:53 +0100)]
Bug fixes to inline source block execution triggering. * lisp/ob.el: Created org-babel-get-inline-src-block-matches() to fix problems with org-ctrl-c-ctrl-c not triggering inline src block execution when point is on or after a space within the inline src block body. Also fixed execution problems where inline src block is on buffer line 1. * testing/examples/ Test data for org-babel-get-inline-src-block-matches()

* testing/lisp/test-ob.el: Tests for

6 years agoorg-odt.el: Create and update manifest.xml towards end of export
Jambunathan K [Mon, 5 Sep 2011 18:00:14 +0000 (23:30 +0530)]
org-odt.el: Create and update manifest.xml towards end of export

* contrib/lisp/org-odt.el (org-export-odt-manifest-lines):
(org-odt-update-manifest-file): Removed.
(org-odt-write-manifest-file): New function.
(org-odt-manifest-file-entries): New variable.
(org-odt-manifest-file-entry-tag): Updated.
(org-odt-init-outfile): Don't create manifest.xml here.  Don't
create Pictures directory so early in the export.  Reset
(org-odt-save-as-outfile): Modified.  Use
`org-odt-create-manifest-file-entry' and
(org-odt-copy-image-file, org-odt-update-meta-file)
(org-odt-copy-styles-file): Use

Rationalized creation of Manifest file entries.  New entries are
created right at the point where new files are added to the odt file.

6 years agoorg-odt.el: Trivial cleanup
Jambunathan K [Mon, 5 Sep 2011 06:23:00 +0000 (11:53 +0530)]
org-odt.el: Trivial cleanup

* contrib/lisp/org-odt.el (org-export-odt-nosave-list): Remove
a useless variable.
(org-odt-init-outfile): Propagate above change.

6 years agoorg-odt.el: Create mimetype file towards the end of export
Jambunathan K [Mon, 5 Sep 2011 06:03:20 +0000 (11:33 +0530)]
org-odt.el: Create mimetype file towards the end of export

* contrib/lisp/org-odt.el (org-odt-init-outfile): Don't create
mimetype file here.
(org-odt-save-as-outfile): Create mimetype file here.  Note
that this routine gets called towards the end of the export
just before files are zipped.

6 years agoorg-odt.el: Create and update meta.xml towards end of the export
Jambunathan K [Mon, 5 Sep 2011 05:47:10 +0000 (11:17 +0530)]
org-odt.el: Create and update meta.xml towards end of the export

* contrib/lisp/org-odt.el
(org-odt-init-outfile): Don't create meta.xml here.
(org-odt-update-meta-file): Create and update meta.xml here
instead.  Note that this routine gets called just before the
component files are zipped.
(org-export-odt-meta-lines): Remove it. Not needed any longer.
(org-odt-save-as-outfile): No need to create backup files
while saving xml buffers.

6 years agobetter code block demarcation
Eric Schulte [Sun, 4 Sep 2011 23:06:07 +0000 (17:06 -0600)]
better code block demarcation

* lisp/ob.el (org-babel-demarcate-block): Copy headers and indent to
  column of point when a block is split.

6 years agocorrected file insertion for inline results
Eric Schulte [Sun, 4 Sep 2011 16:50:37 +0000 (10:50 -0600)]
corrected file insertion for inline results

* lisp/ob.el (org-babel-insert-result): Corrected file insertion for
  inline results.

6 years agoorg-footnote: no footnote in latex fragments
Nicolas Goaziou [Sun, 4 Sep 2011 14:45:39 +0000 (16:45 +0200)]
org-footnote: no footnote in latex fragments

* lisp/org-footnote.el (org-footnote-in-valid-context-p): No footnote
  in latex fragments.

6 years agoProvide edebug spec for with-org-lparse-preserve-paragraph-state
David Maus [Sun, 28 Aug 2011 14:03:38 +0000 (16:03 +0200)]
Provide edebug spec for with-org-lparse-preserve-paragraph-state

* contrib/lisp/org-lparse.el (with-org-lparse-preserve-paragraph-state):
Provide edebug spec.

6 years agoorg-compat.el: Remove LABEL argument from pop-to-buffer-same-window call.
Martin Rudalics [Fri, 2 Sep 2011 16:18:56 +0000 (18:18 +0200)]
org-compat.el: Remove LABEL argument from pop-to-buffer-same-window call.

* org-compat.el (org-pop-to-buffer-same-window): Remove LABEL
argument from pop-to-buffer-same-window call.

6 years agoorg-lparse.el: Abort export if list-tables are malformed
Jambunathan K [Fri, 2 Sep 2011 08:57:31 +0000 (14:27 +0530)]
org-lparse.el: Abort export if list-tables are malformed

* contrib/lisp/org-lparse.el (org-lparse-format-table-row): In
list-tables, require that the header row be a row with max
number of columns. Abort export if this condition is not met.

6 years agoorg-xhtml.el: Fix a crash during export of list-tables
Jambunathan K [Thu, 1 Sep 2011 18:48:43 +0000 (00:18 +0530)]
org-xhtml.el: Fix a crash during export of list-tables

* contrib/lisp/org-xhtml.el (org-xhtml-end-table): During
export of list-tables, `org-xhtml-format-table-no-css' is not
bound.  In such cases pretend that it's value is nil.

6 years agoorg-lparse.el: Support for list-tables (first cut)
Jambunathan K [Thu, 1 Sep 2011 18:11:26 +0000 (23:41 +0530)]
org-lparse.el: Support for list-tables (first cut)

* contrib/lisp/org-lparse.el
(org-lparse-list-table:table-cell-open): New variable.
(org-lparse-end-list-table:table-cell): New routines.  Use
`org-lparse-begin-collect' and `org-lparse-end-collect' to get
a string representation of a multi-line table cell.
(org-lparse-list-table-p, org-lparse-list-level)
(org-lparse-list-item-count, org-lparse-list-stack)
(org-lparse-list-table:lines): New variables to keep track of
the state of the list at a point in time during export.
(org-do-lparse): Init above variables.
(org-lparse-begin-list, org-lparse-end-list)
(org-lparse-begin-list-item, org-lparse-end-list-item):
Modified so that list marked as list-table are exported as a
table.  Refer notes in the file for more information.
(org-lparse-do-format-list-table): Make sure that `org-table'
is loaded.

* contrib/lisp/org-odt.el (org-odt-format-table-cell): Table
cells are list-tables are already paragraphs.  No need to
enclose them in paragraphs again.

6 years agoRevert "Introduce org-odt-begin-table-cell and org-odt-end-table-cell"
Jambunathan K [Thu, 1 Sep 2011 16:56:17 +0000 (22:26 +0530)]
Revert "Introduce org-odt-begin-table-cell and org-odt-end-table-cell"

This reverts commit e887881e1302a9bba8fda296ec8b4723269b2a76.  Keep things
simple for now.

6 years agoob-R: improve prompt detection regexp. Thanks to the users of ess-tracebug for this...
Eric Schulte [Thu, 1 Sep 2011 18:03:33 +0000 (12:03 -0600)]
ob-R: improve prompt detection regexp.  Thanks to the users of ess-tracebug for this new regexp

* lisp/ob-R.el (org-babel-R-evaluate-session): Improve prompt
  detection regexp.

6 years agoIntroduce org-odt-begin-table-cell and org-odt-end-table-cell
Jambunathan K [Thu, 1 Sep 2011 14:06:34 +0000 (19:36 +0530)]
Introduce org-odt-begin-table-cell and org-odt-end-table-cell

* contrib/lisp/org-odt.el
(org-odt-entity-control-callbacks-alist): Added an entry for
(org-odt-begin-paragraph, org-odt-format-stylized-paragraph):
Honour `org-lparse-current-paragraph-style'.
(org-odt-begin-table-cell, org-odt-end-table-cell): Factored
out from the earlier `org-odt-format-table-cell'. Note that
these functions set and reset
(org-odt-format-table-cell): Use the above functions.
* contrib/lisp/org-lparse.el
(org-lparse-current-paragraph-style): New variable.
(org-do-lparse): Init the above variable at the beginning of

6 years agoRefactor org-odt-format-table-cell
Jambunathan K [Thu, 1 Sep 2011 13:02:13 +0000 (18:32 +0530)]
Refactor org-odt-format-table-cell

* contrib/lisp/org-odt.el
(org-odt-get-style-name-cookie-for-table-cell): Factored out
from `org-odt-format-table-cell'.
(org-odt-format-table-cell): Simplified using above functions.

6 years agoIntroduced org-lparse-begin-collect and org-lparse-end-collect
Jambunathan K [Thu, 1 Sep 2011 11:02:06 +0000 (16:32 +0530)]
Introduced org-lparse-begin-collect and org-lparse-end-collect

* contrib/lisp/org-lparse.el (org-lparse-footnote-buffer):
Deleted.  Genericized as `org-lparse-collect-buffer'.
(org-lparse-output-buffer): Added docstring.
(org-lparse-collect-buffer): New variable.  Was
`org-lparse-footnote-buffer' till now.
(org-lparse-collect-count): New variable to aid in asserting
implicit assumptions made by the export engine.
(org-lparse-begin-collect): New function.  Factored out from
(org-lparse-end-collect): New function.  Factored out from
(org-lparse-end-footnote-definition): Use above functions.
(org-do-lparse): Reset `org-lparse-collect-buffer' and
`org-lparse-collect-count' at the beginning of export.
Cleanup `org-lparse-collect-buffer'.

* contrib/lisp/org-xhtml.el (org-xhtml-end-export): Removed
references to `org-lparse-footnote-buffer'.

6 years agoorg-lparse.el: Recognize #+begin_list-table...#+end_list-table blocks
Jambunathan K [Thu, 1 Sep 2011 09:33:52 +0000 (15:03 +0530)]
org-lparse.el: Recognize #+begin_list-table...#+end_list-table blocks

* contrib/lisp/org-lparse.el (org-lparse-list-table-enable):
New customizable variable.
(org-lparse-preprocess-after-blockquote-hook): New hook to
treat #+begin_list-table...#+end_list-table blocks specially.
Add this hook to
(org-lparse-list-table-p): New variable. Bound during
(org-lparse-begin-environment, org-lparse-end-environment):
Set `org-lparse-list-table-p' as the engine moves in and out
of list-table blocks.
(org-do-lparse): Bind `org-lparse-list-table-p' to nil on
start of export.  Honor

Actual export of list as table is not implemented yet.

6 years agoorg-inlinetask: Small refactoring
Nicolas Goaziou [Thu, 1 Sep 2011 06:49:28 +0000 (08:49 +0200)]
org-inlinetask: Small refactoring

* lisp/org-inlinetask.el (org-inlinetask-goto-end): Small refactoring.

6 years agoorg-lparse.el: Fix earlier checkin
Jambunathan K [Wed, 31 Aug 2011 19:42:15 +0000 (01:12 +0530)]
org-lparse.el: Fix earlier checkin

* contrib/lisp/org-lparse.el (org-lparse-do-format-org-table):
Modified.  Delete some local variables and move it to
(org-lparse-do-format-list-table): Modified as above.

6 years agoIntroduced org-lparse-do-format-list-table
Jambunathan K [Wed, 31 Aug 2011 18:05:29 +0000 (23:35 +0530)]
Introduced org-lparse-do-format-list-table

* contrib/lisp/org-lparse.el
(org-lparse-do-format-list-table): New. Factored out from
(org-lparse-do-format-org-table): Use above function.
(org-lparse-format-list-table): New.  Wrapper for
`org-lparse-do-format-list-table'. For future use.

6 years agoIntroduced org-lparse-org-table-to-list-table
Jambunathan K [Wed, 31 Aug 2011 17:53:03 +0000 (23:23 +0530)]
Introduced org-lparse-org-table-to-list-table

* contrib/lisp/org-lparse.el
(org-lparse-org-table-to-list-table): New. Factored out from
(org-lparse-do-format-org-table): Use

6 years agoIntroduce org-lparse-begin/end-list-item
Jambunathan K [Wed, 31 Aug 2011 16:53:46 +0000 (22:23 +0530)]
Introduce org-lparse-begin/end-list-item

* contrib/lisp/org-lparse.el (org-lparse-end-list-item):
Renamed to `org-lparse-end-list-item-1'.
(org-lparse-begin-list-item, org-lparse-end-list-item): New
functions.  Use these instead of doing (org-lparse-begin
'LIST-ITEM ...) or (org-lparse-end 'LIST-ITEM ...).
(org-lparse-export-list-line, org-lparse-begin-level)
(org-lparse-end-level): Propagate above changes.
* contrib/lisp/org-odt.el
(org-odt-begin-list-item, org-odt-end-list-item): ditto.
* contrib/lisp/org-xhtml.el (org-xhtml-format-toc-item)
(org-xhtml-begin-toc, org-xhtml-end-toc): ditto.

6 years agoob-asymptote: simplify table to array conversion process
Nicolas Goaziou [Wed, 31 Aug 2011 09:26:29 +0000 (11:26 +0200)]
ob-asymptote: simplify table to array conversion process

* lisp/ob-asymptote.el (org-babel-asymptote-var-to-asymptote):
  refactor code.
(org-babel-asymptote-table-to-array): removed function.

6 years agoob-asymptote: full support for uni-dimensional lists
Nicolas Goaziou [Wed, 31 Aug 2011 09:11:31 +0000 (11:11 +0200)]
ob-asymptote: full support for uni-dimensional lists

* lisp/ob-asymptote.el (org-babel-asymptote-var-to-asymptote):
  recognize non-nested lists as uni-dimensional arrays.

6 years agobabel: don't check for header arguments in properties with leading ":"s
Eric Schulte [Tue, 30 Aug 2011 20:50:26 +0000 (14:50 -0600)]
babel: don't check for header arguments in properties with leading ":"s

* lisp/ob.el (org-babel-params-from-properties): Don't check for
  header arguments in properties with leading ":"s.

6 years agoorg-inlinetask: fix `org-inlinetask-goto-end' with one line long tasks
Nicolas Goaziou [Tue, 30 Aug 2011 12:28:36 +0000 (14:28 +0200)]
org-inlinetask: fix `org-inlinetask-goto-end' with one line long tasks

* lisp/org-inlinetask.el (org-inlinetask-goto-end): Correctly detect
  the end of an inlinetask when the next one starts immediately after
  the current one.  Also, return position of point.

6 years agotest inline src blocks
Eric Schulte [Mon, 29 Aug 2011 22:13:46 +0000 (16:13 -0600)]
test inline src blocks

* testing/examples/ (an): Adding example inline code blocks.
* testing/lisp/test-ob.el (test-org-babel/inline-src-blocks): Test
  inline code blocks.

6 years agoob: allow inline src blocks to start at bol
Nicolas Goaziou [Mon, 29 Aug 2011 21:13:40 +0000 (23:13 +0200)]
ob: allow inline src blocks to start at bol

* lisp/ob.el (org-babel-inline-src-block-regexp): Allow regexp to
  start at bol.

6 years agoob-asymptote: small fix
Nicolas Goaziou [Mon, 29 Aug 2011 21:06:35 +0000 (23:06 +0200)]
ob-asymptote: small fix

* lisp/ob-asymptote.el (org-babel-asymptote-define-type): elisp floats
  are asymptote reals.

6 years agonew lob function to convert every element of a table to a string
Eric Schulte [Mon, 29 Aug 2011 18:01:38 +0000 (12:01 -0600)]
new lob function to convert every element of a table to a string

* contrib/babel/ (Write): Convert every element of
  a table to a string.

6 years agoob-asymptote: mixed-types tables default to string arrays
Nicolas Goaziou [Mon, 29 Aug 2011 15:24:07 +0000 (17:24 +0200)]
ob-asymptote: mixed-types tables default to string arrays

* lisp/ob-asymptote.el (org-babel-asymptote-table-to-array): Require a
new argument TYPE specifying the detected type of array.  If it's a
string array, make sure every element is returned as a string. Also
improve doc-string.
(org-babel-asymptote-var-to-asymptote): Fill new argument.  Small
(org-babel-asymptote-define-type): Rewrite to avoid stopping search at
first float found, as strings have precedence over floats.

6 years agoorg-footnote: fix xhtml export
Nicolas Goaziou [Mon, 29 Aug 2011 11:05:57 +0000 (13:05 +0200)]
org-footnote: fix xhtml export

* lisp/org-footnote.el (org-footnote-normalize): be sure to separate
  the last footnote definition from the rest of the buffer.

Thanks to Jambunathan K for reporting this.

6 years ago* contrib/babel/ 2011-08-28 Thomas Dye <>
Tom Dye [Sun, 28 Aug 2011 17:00:32 +0000 (07:00 -1000)]
* contrib/babel/ 2011-08-28 Thomas Dye <>

* Add booktabs-notes source block to the Library of Babel.  Minor
edits to booktabs documentation.

6 years agoob-awk: safer variable expansion
Eric Schulte [Sun, 28 Aug 2011 15:03:07 +0000 (09:03 -0600)]
ob-awk: safer variable expansion

* lisp/ob-awk.el (org-babel-expand-body:awk): Allow for symbolic
  variable names.

6 years agoorg-xhtml.el: Support for captioning and labelling of equation images
Jambunathan K [Sat, 27 Aug 2011 21:21:38 +0000 (02:51 +0530)]
org-xhtml.el: Support for captioning and labelling of equation images

* contrib/lisp/org-xhtml.el
(org-export-xhtml-do-preprocess-latex-fragments): Factored out
from the earlier org-export-xhtml-preprocess.
(org-export-xhtml-preprocess-latex-fragments): Check if
backend is xhtml. If yes, delegate to
org-export-xhtml-do-preprocess-latex-fragments. This is hooked
to org-export-preprocess-after-blockquote-hook.
(org-export-xhtml-preprocess-label-references): Factored out
from the earlier org-export-xhtml-preprocess.
(org-export-xhtml-preprocess): Call
org-export-xhtml-preprocess-label-references. Note that
processing of latex fragments is no longer done here.
(org-xhtml-format-image): Honor captions, label and attributes
even for images that are created by latex fragment processing.
(org-xhtml-unload-function): Unhook from

Thanks to Myles English for registering this requirement.

6 years agoFix some issues with org-xhtml export
Jambunathan K [Sat, 27 Aug 2011 20:31:40 +0000 (02:01 +0530)]
Fix some issues with org-xhtml export

* contrib/lisp/org-xhtml.el: require html (temporarily). This
makes sure that variables such as org-export-html-extension
etc referenced in org-exp.el and made available through
opt-plist are properly inited. Can be removed once the
org-export-xhtml namespace is annihilated.

* contrib/lisp/org-lparse.el (org-lparse-format-table): Export
of table.el tables were broken. Fix it. Can be removed once
the xhtml backend is annihilated.

6 years agoRun org-export-odt-preprocess-latex-fragments only if backend is odt
Jambunathan K [Sat, 27 Aug 2011 20:18:25 +0000 (01:48 +0530)]
Run org-export-odt-preprocess-latex-fragments only if backend is odt

* contrib/lisp/org-odt.el
(org-export-odt-do-preprocess-latex-fragments): Renamed from
(org-export-odt-preprocess-latex-fragments): Check that
backend is odt. If yes, delegate to

6 years agoorg-odt.el: Support for captioning and labelling of equation images
Jambunathan K [Sat, 27 Aug 2011 14:57:16 +0000 (20:27 +0530)]
org-odt.el: Support for captioning and labelling of equation images

* contrib/lisp/org-lparse.el (org-do-lparse): let-bind
org-lparse-opt-plist to current export options.
* contrib/lisp/org-odt.el
(org-odt-begin-office-body): Add a directive so that Equations
can be sequentially numbered.
(org-export-odt-preprocess): Removed call to
(org-export-odt-preprocess-latex-fragments): Fix signature and
hook it to org-export-preprocess-after-blockquote-hook. Use
(org-odt-unload-function): Leave no trace in

Thanks to Myles English for registering this requirement.

6 years agoorg-odt.el: Honor caption, label and attributes for latex png images
Jambunathan K [Sat, 27 Aug 2011 09:45:11 +0000 (15:15 +0530)]
org-odt.el: Honor caption, label and attributes for latex png images

* contrib/lisp/org-odt.el (org-export-odt-format-image): Honor
captions, label and attributes for all images including those
generated from latex fragments.

6 years agoRefactor org-export-odt-preprocess
Jambunathan K [Sat, 27 Aug 2011 08:56:41 +0000 (14:26 +0530)]
Refactor org-export-odt-preprocess

* contrib/lisp/org-odt.el
(org-export-odt-preprocess-label-references): New
routines. Factored out of the earlier
(org-export-odt-preprocess): Use above functions.

Preparing for enabling of captions and labels for latex fragments
embedded as images.

6 years agoorg-odt.el: Fix byte-compiler warnings
Jambunathan K [Sat, 27 Aug 2011 08:50:47 +0000 (14:20 +0530)]
org-odt.el: Fix byte-compiler warnings

6 years agoAllow $...$ and $x$ latex fragment types at beginning of line
Nicolas Goaziou [Sat, 27 Aug 2011 13:04:51 +0000 (15:04 +0200)]
Allow $...$ and $x$ latex fragment types at beginning of line

* lisp/org.el (org-latex-regexps): Allow matching latex fragments of
  type "$" and "$1" at beginning of line.

6 years agoorg-odt: Force columns of tables to have the same width
Jambunathan K [Thu, 25 Aug 2011 21:02:08 +0000 (02:32 +0530)]
org-odt: Force columns of tables to have the same width

* contrib/lisp/org-odt.el (org-odt-end-table): Associate table
columns with `OrgTableColumn' style.
(org-odt-format-source-code-or-example): Delete trailing

* contrib/odt/styles/OrgOdtAutomaticStyles.xml: Modify
`OrgTable' style to use a relative width of 90%. Effective
table width is now increased so that tables are not
congested. There could be a reverse problem of they being too
big. This is OK. Introduced `OrgTableColumn' style and force
the columns to use the same width.

Fixes the following symptoms - congested table and uneven
columns - seen with the below report..

Table cookies can specify default column width. These could be
used for finer control of column widths on per-table
basis. However this introduces the need to create automatic
column styles for each and every column that is explicitly
sized. The exporter has so far avoided creating of automatic
styles `on the go' and instead relied on a custom styles for
formatting. If column-widths are made user-controllable then
this has to change and the exporter could become a bit
inelegant. Is the overhead worth it?

6 years agoMerge branch 'master' of
Bastien Guerry [Thu, 25 Aug 2011 21:42:43 +0000 (23:42 +0200)]
Merge branch 'master' of

6 years agoorg-agenda.el: Add `category-pos' in let construct.
Bastien Guerry [Thu, 25 Aug 2011 21:42:07 +0000 (23:42 +0200)]
org-agenda.el: Add `category-pos' in let construct.

* org-agenda.el (org-search-view, org-agenda-get-todos)
(org-agenda-get-deadlines, org-agenda-get-scheduled): Add
`category-pos' in let construct.

Thanks to Achim Gratz for spotting this.

6 years agoorg-footnote: preserve narrowing when searching a definition
Nicolas Goaziou [Thu, 25 Aug 2011 19:12:07 +0000 (21:12 +0200)]
org-footnote: preserve narrowing when searching a definition

* lisp/org-footnote.el (org-footnote-get-definition): the function has
  to widen buffer if definition has not been found in the current
  narrowed part. Be sure to restore that restriction once the
  definition is found.

6 years agoicalendar: Make alarm duration RFC5545 compliant
Michal Sojka [Thu, 25 Aug 2011 19:34:27 +0000 (19:34 +0000)]
icalendar: Make alarm duration RFC5545 compliant

* org-icalendar.el (org-print-icalendar-entries): Make alarm duration
RFC5545 compliant.

The format of alarm trigger was incorrect because "T" letter from
dur-time element was missing (see This caused some
software (such as KOrganizer) to not interpret the alarms correctly.


6 years agoorg-agenda.el: Correctly set the `org-category-pos' property.
Bastien Guerry [Thu, 25 Aug 2011 13:20:10 +0000 (15:20 +0200)]
org-agenda.el: Correctly set the `org-category-pos' property.

* org-agenda.el (org-agenda-get-timestamps)
(org-agenda-get-sexps, org-agenda-get-progress): Correctly set
the `org-category-pos' property.

Thanks to Michael Brand for signaling this problem, and to Nick
Dokos and Erik Iverson for confirming it.

6 years agoorg-html.el (org-export-html-divs): Improve docstring.
Bastien Guerry [Thu, 25 Aug 2011 13:09:44 +0000 (15:09 +0200)]
org-html.el (org-export-html-divs): Improve docstring.

* org-html.el (org-export-html-divs): Improve docstring.

6 years agoMerge branch 'master' of
Bastien Guerry [Thu, 25 Aug 2011 07:39:38 +0000 (09:39 +0200)]
Merge branch 'master' of

6 years agoMerge branch 'master' of
Carsten Dominik [Thu, 25 Aug 2011 06:48:16 +0000 (08:48 +0200)]
Merge branch 'master' of

6 years agoKeep table row/column removal from creating invalid formulas
Carsten Dominik [Thu, 25 Aug 2011 06:16:00 +0000 (08:16 +0200)]
Keep table row/column removal from creating invalid formulas

* lisp/org-table.el (org-table-fix-formulas): Throw error when changing
formula leads to an invalid formula.

This fix catches at least one case, the one described by Nicolas:

> | 1 | 2 | 3 |
> | 1 | 2 | 3 |
> #+TBLFM: @2$1..@2$3=@1
> If I remove the second column (M-S-Left), the formula is correctly
> updated. But when I remove the last column, the formula gets partly
> deleted and becomes:
>                            #+TBLFM: @2$1..

6 years ago* org.el (org-archive-location): Minor docstring fix.
Bastien Guerry [Wed, 24 Aug 2011 22:33:13 +0000 (00:33 +0200)]
* org.el (org-archive-location): Minor docstring fix.

Thanks to John Hendy for pointing this out.

6 years agoMerge branch 'master' of
Bastien Guerry [Wed, 24 Aug 2011 20:32:55 +0000 (22:32 +0200)]
Merge branch 'master' of

6 years agobackport copyright and license headers from Emacs trunk
Achim Gratz [Wed, 24 Aug 2011 18:55:11 +0000 (20:55 +0200)]
backport copyright and license headers from Emacs trunk

6 years agoorg-agenda: refactor code in `org-agenda-dim-blocked-tasks'
Nicolas Goaziou [Wed, 24 Aug 2011 14:35:36 +0000 (16:35 +0200)]
org-agenda: refactor code in `org-agenda-dim-blocked-tasks'

6 years agoCorrectly find unchecked boxes in a section
Nicolas Goaziou [Wed, 24 Aug 2011 14:34:05 +0000 (16:34 +0200)]
Correctly find unchecked boxes in a section

* lisp/org.el (org-block-todo-from-checkboxes):
  `org-list-search-forward' should be used when looking for an item,
  as it filters out contexts where match couldn't be in
  a list (i.e. example blocks). Also use a correct item regexp, taking
  into account alphabetical ordered lists and counters.

6 years agoorg-html.el (org-html-make-link): Minor fix to the docstring.
Bastien Guerry [Wed, 24 Aug 2011 14:13:14 +0000 (16:13 +0200)]
org-html.el (org-html-make-link): Minor fix to the docstring.

* org-html.el (org-html-make-link): Minor fix to the docstring.

6 years agoDefine org-inlinetask face
Suvayu Ali [Mon, 1 Aug 2011 22:24:50 +0000 (00:24 +0200)]
Define org-inlinetask face

* org-inlinetask.el (org-inlinetask): New customisable face
  for inlinetasks


6 years ago* org-agenda.el (org-agenda-get-todos): Properly set `category-pos'.
Bastien Guerry [Wed, 24 Aug 2011 08:17:09 +0000 (10:17 +0200)]
* org-agenda.el (org-agenda-get-todos): Properly set `category-pos'.

* org-agenda.el (org-agenda-get-todos): Properly set

Thanks to Noorul Islam for this patch.

6 years agoorg-list: fix code typo
Nicolas Goaziou [Wed, 24 Aug 2011 00:11:36 +0000 (02:11 +0200)]
org-list: fix code typo

6 years agoorg-odt.el: Fix a bug in outline numbering
Jambunathan K [Tue, 23 Aug 2011 23:11:43 +0000 (04:41 +0530)]
org-odt.el: Fix a bug in outline numbering

* contrib/lisp/org-odt.el
(org-odt-configure-outline-numbering): Fixed a bug with
outline numbering. Also removed the check for
org-export-odt-factory-settings (for now).

6 years agoRevert "Revert "make the "FILE" property non-special when resolving bibtex values""
Eric Schulte [Tue, 23 Aug 2011 20:44:09 +0000 (14:44 -0600)]
Revert "Revert "make the "FILE" property non-special when resolving bibtex values""

This reverts commit 4b423ac3cb6ae06e5be649e8a4b6c75bfb9f5c12.

6 years agoorg-list: tiny code change
Nicolas Goaziou [Tue, 23 Aug 2011 20:20:55 +0000 (22:20 +0200)]
org-list: tiny code change

* lisp/org-list.el (org-list-struct-apply-struct): don't
  use (copy-marker (point)) instead of (point-marker).

6 years agoorg-list: forgot a double space
Nicolas Goaziou [Tue, 23 Aug 2011 20:19:14 +0000 (22:19 +0200)]
org-list: forgot a double space

6 years agoorg-list: corrections to commentary section and add linefeed
Nicolas Goaziou [Tue, 23 Aug 2011 20:17:20 +0000 (22:17 +0200)]
org-list: corrections to commentary section and add linefeed

6 years agoMake some files pass checkdoc test
Nicolas Goaziou [Tue, 23 Aug 2011 19:26:51 +0000 (21:26 +0200)]
Make some files pass checkdoc test

6 years agoMerge branch 'master' of
Bastien Guerry [Tue, 23 Aug 2011 15:52:53 +0000 (17:52 +0200)]
Merge branch 'master' of

6 years agoDon't require full variable resolution when finding results
Eric Schulte [Tue, 23 Aug 2011 15:46:32 +0000 (09:46 -0600)]
Don't require full variable resolution when finding results

* lisp/ob.el (org-babel-where-is-src-block-result): Don't try to
  resolve variables when simply checking if we're inside of a code

6 years agoNew 'org-category-position text property in agendas.
Bastien Guerry [Tue, 23 Aug 2011 15:34:15 +0000 (17:34 +0200)]
New 'org-category-position text property in agendas.

* org.el (org-refresh-category-properties): New text property
'org-category-position to point at the beginning of the
headline from which the category is set.

* org-agenda.el (org-search-view, org-agenda-get-todos)
(org-agenda-get-timestamps, org-agenda-get-sexps)
(org-agenda-get-progress, org-agenda-get-deadlines)
(org-agenda-get-scheduled, org-agenda-get-blocks)
(org-agenda-filter-by-tag-refine): Add the
'org-category-position text property.

This commit prepares for a future `org-agenda-set-category'
function allowing to set the category of the headline at point.

6 years agoNo need to call org-back-to-heading with goto argument.
Matt Lundin [Mon, 22 Aug 2011 14:26:57 +0000 (09:26 -0500)]
No need to call org-back-to-heading with goto argument.

* lisp/org.el: (org-refile) Don't call org-back-to-heading with goto

This fixes an error that results when calling org-refile with the
GOTO argument in a non-org buffer.

6 years agoorg.el: Remove `org-link-display-descriptive' and use `org-descriptive-links'.
Bastien Guerry [Tue, 23 Aug 2011 14:55:48 +0000 (16:55 +0200)]
org.el: Remove `org-link-display-descriptive' and use `org-descriptive-links'.

* org.el (org-link-display-descriptive): Remove this option
and rely on the existing `org-descriptive-links' instead.
(org-toggle-link-display): Use `org-descriptive-links'.

Without this change, both options are redundant.  This also
fixes a bug about using `org-descriptive-links' in the `org-mode'
function, that initialize the display using `org-descriptive-links'
instead of `org-link-display-descriptive'.

Thanks to Thomas S. Dye for spotting this.

6 years agomore robust test execution with `org-test-run-all-tests'
Eric Schulte [Tue, 23 Aug 2011 14:36:45 +0000 (08:36 -0600)]
more robust test execution with `org-test-run-all-tests'

* testing/org-test.el (org-test-touch-all-examples): Open all example
  files -- seems to help resolution of org ids.
  (org-test-run-all-tests): Open all example files before running

6 years agoAllow matching of results with tags after the result name.
Eric Schulte [Tue, 23 Aug 2011 14:26:52 +0000 (08:26 -0600)]
Allow matching of results with tags after the result name.

* lisp/ob-ref.el (org-babel-ref-resolve): Allow matching of results
  with tags after the result name.

6 years agoorg.texi: Document the restriction about field and column names.
Bastien Guerry [Tue, 23 Aug 2011 14:34:35 +0000 (16:34 +0200)]
org.texi: Document the restriction about field and column names.

6 years agoorg-table.el: Allow underscore in field and column names.
Bastien Guerry [Tue, 23 Aug 2011 14:27:56 +0000 (16:27 +0200)]
org-table.el: Allow underscore in field and column names.

* org-table.el (org-table-get-specials): Allow the use of the
underscore character in column names.
(org-table-get-specials): Allow the use of the underscore
character in field names.

Thanks to AndrĂ¡s Major for bringing this up and to Nick Dokos
for a suggested fix.

6 years agoorg.texi: Explicitely mention the default values for select/exclude tags.
Bastien Guerry [Tue, 23 Aug 2011 14:17:56 +0000 (16:17 +0200)]
org.texi: Explicitely mention the default values for select/exclude tags.

* org.texi (Selective export): Explicitely mention the default
values for `org-export-select-tags', `org-export-exclude-tags'.


6 years agocleaning up markers in org-exp-blocks -- Thanks again to Nicolas Goaziou for advice
Eric Schulte [Mon, 22 Aug 2011 14:31:09 +0000 (08:31 -0600)]
cleaning up markers in org-exp-blocks -- Thanks again to Nicolas Goaziou for advice

* lisp/org-exp-blocks.el (org-export-blocks-preprocess): Explicitly
  cleaning up markers.

6 years agoimprove export of inline code blocks
Eric Schulte [Mon, 22 Aug 2011 14:09:28 +0000 (08:09 -0600)]
improve export of inline code blocks

* lisp/ob-exp.el (org-babel-exp-inline-src-blocks): Save match data
  around `org-babel-exp-do-export' which now searches in this case.
  (org-babel-exp-results): Position the point in the inline source
  block during export evaluation.
* lisp/ob.el (org-babel-insert-result): More readable code.

6 years agoremove duplicate function, Thanks to Nicolas Goaziou for pointing this out.
Eric Schulte [Mon, 22 Aug 2011 13:39:46 +0000 (07:39 -0600)]
remove duplicate function, Thanks to Nicolas Goaziou for pointing this out.

* lisp/org-exp-blocks.el (org-export-blocks-preprocess): Use the built
  in function rather than the superfluous (and now removed)
  org-specific function.

6 years agoob-exp: don't examplize inline code blocks which are already escaped
Eric Schulte [Sun, 21 Aug 2011 20:23:27 +0000 (14:23 -0600)]
ob-exp: don't examplize inline code blocks which are already escaped

* lisp/ob-exp.el (org-babel-exp-inline-src-blocks): Don't examplize
  inline code blocks which are already escaped.

6 years agoorg-exp-blocks: use markers instead of points to remember code block locations
Eric Schulte [Sun, 21 Aug 2011 20:14:14 +0000 (14:14 -0600)]
org-exp-blocks: use markers instead of points to remember code block locations

* lisp/org-exp-blocks.el (org-marker-from-point): Helper function to
  create markers at specific points in source buffers.
  (org-export-blocks-preprocess): Use markers instead of points to
  delimit code blocks.

6 years agoorg-list: remove dependency on `org-back-over-empty-lines'
Nicolas Goaziou [Sun, 21 Aug 2011 19:31:58 +0000 (21:31 +0200)]
org-list: remove dependency on `org-back-over-empty-lines'

* lisp/org-list.el (org-list-separating-blank-lines-number): the
  behaviour of `org-back-over-empty-lines' depends on the associated
  value of `headline' in `org-blank-before-new-entry', which is out of
  context in a list.

6 years ago* doc/org.texi: Added a line to specify that header arguments are lowercase.
Tom Dye [Sat, 20 Aug 2011 16:48:35 +0000 (06:48 -1000)]
* doc/org.texi: Added a line to specify that header arguments are lowercase.

6 years agoGet rid of gratuitous newline after listing/minted environment.
Nick Dokos [Fri, 19 Aug 2011 22:36:50 +0000 (18:36 -0400)]
Get rid of gratuitous newline after listing/minted environment.

Signed-off-by: Nick Dokos <>