2 years agoNew vars: org-habit-today-glyph, org-habit-completed-glyph
John Wiegley [Wed, 21 Sep 2011 09:09:49 +0000]
New vars: org-habit-today-glyph, org-habit-completed-glyph

2 years agoconfigurable property name for bibtex entry types
Eric Schulte [Tue, 20 Sep 2011 15:20:53 +0000]
configurable property name for bibtex entry types

* lisp/org-bibtex.el (org-bibtex-type-property-name): Configurable
  property name for bibtex entry types.
  (org-bibtex-headline): Use new configurable property name.
  (org-bibtex-check): Use new configurable property name.
  (org-bibtex-create): Use new configurable property name.
  (org-bibtex-write): Use new configurable property name.

2 years agoModifications to enable test script to run with emacs-23 and emacs-22 * testing/org...
Martyn Jago [Tue, 20 Sep 2011 07:44:24 +0000]
Modifications to enable test script to run with emacs-23 and emacs-22 * testing/org-test.el: enable test script to run with emacs-23 and emacs-22 * testing/lisp/test-org-exp.el: added org-ascii requirement

2 years agoorg-test-with-temp-text allows variable inputs holding strings
Eric Schulte [Tue, 20 Sep 2011 15:01:11 +0000]
org-test-with-temp-text allows variable inputs holding strings

* testing/org-test.el (org-test-with-temp-text): Allow variable inputs
  holding strings.

2 years agoMerge branch 'master' of
Carsten Dominik [Tue, 20 Sep 2011 13:41:19 +0000]
Merge branch 'master' of

2 years agoRemove unnecessary `concat'
Carsten Dominik [Tue, 20 Sep 2011 08:32:41 +0000]
Remove unnecessary `concat'

* lisp/org.el (org-paste-subtree): Remove unnecessary `concat'.

2 years agoorg.el (org-paste-subtree): Remove useless (concat ...).
Bastien Guerry [Tue, 20 Sep 2011 06:37:23 +0000]
org.el (org-paste-subtree): Remove useless (concat ...).

* org.el (org-paste-subtree): Remove useless (concat ...).

See change from Stefan Monnier here:

2 years agoConvenience macro for testing.
Eric Schulte [Mon, 19 Sep 2011 16:01:32 +0000]
Convenience macro for testing.

* testing/org-test.el (org-test-with-temp-text): Convenience macro for

2 years agoExplicitely set coding system for unescaped string
David Maus [Sun, 18 Sep 2011 14:40:01 +0000]
Explicitely set coding system for unescaped string

* test-org.el (test-org/org-link-unescape-ascii-extended-char):
Explicitely set coding system for unescaped string.

Needed for Emacs22 to pass these tests. The input string is extended
ASCII which is covered by latin-1 coding system.

2 years agoConditionally define `special-mode' for Emacs22
David Maus [Sun, 18 Sep 2011 08:35:50 +0000]
Conditionally define `special-mode' for Emacs22

* org-test.el: Conditionally define `special-mode' for Emacs22.

Copied definition from Emacs23's simple.el.

2 years agoreplacing usage of characterp with integerp (which should work w/Emacs22)
Eric Schulte [Sat, 17 Sep 2011 20:52:19 +0000]
replacing usage of characterp with integerp (which should work w/Emacs22)

* contrib/babel/langs/ob-fortran.el (org-babel-fortran-var-to-fortran):
  Replacing usage of characterp with integerp (which should work w/Emacs22).
* lisp/ob-C.el (org-babel-C-var-to-C): Replacing usage of characterp
  with integerp (which should work w/Emacs22).

2 years agoorg-odt.el: Typeset display equations using tables
Jambunathan K [Sat, 17 Sep 2011 18:39:06 +0000]
org-odt.el: Typeset display equations using tables

* contrib/odt/styles/OrgOdtContentTemplate.xml: Add bottom
margin to "OrgTable".  Modify border properties of
"OrgTblCell*"s.  Add "OrgEquation" table styles for
typesetting of display equations.

* contrib/odt/styles/OrgOdtStyles.xml: Added various "graphic"
styles for formatting of inline and display equations.
Modified names of some "graphic" styles for images for reasons
of consistency.

* contrib/lisp/org-odt.el (org-export-odt-do-format-image):
Removed.  This is now folded in to
`org-export-odt-format-image'.  A part of this is extracted in
to `org-odt-format-entity'.
(org-odt-entity-frame-styles): New variable.
(org-odt-format-entity): New function.  See previous entries.
(org-export-odt-format-image): Modified.  See previous
(org-export-odt-do-format-formula): Removed.  These functions
are now folded within `org-export-odt-format-formula'.
(org-export-odt-format-formula): Modified as noted above.
Also use `org-odt-format-entity'.
(org-odt-format-frame, org-odt-format-textbox): Modified
signature to facilitate elegant introduction of
(org-odt-format-inlinetask): Honor change in signature.
(org-odt-label-def-ref-spec): Added an entry for "Equation".

Only MathML equations are typeset using tables.  Dvipng equations are still
typeset as regular images.

2 years agoorg-footnote: check context around definition at a proper place
Nicolas Goaziou [Sat, 17 Sep 2011 10:01:54 +0000]
org-footnote: check context around definition at a proper place

* lisp/org-footnote.el (org-footnote-at-definition-p): Context must be
  valid at the beginning of line, not at point.

2 years agoorg-odt.el: Improve how labels are applied and generated.
Jambunathan K [Fri, 16 Sep 2011 18:42:02 +0000]
org-odt.el: Improve how labels are applied and generated.

* contrib/lisp/org-odt.el
(org-odt-entity-labels-alist, org-odt-entity-counts-plist)
(org-odt-label-def-ref-spec): New variables.
(org-odt-init-outfile): Reset above variables.
(org-odt-add-label-definition, org-odt-get-label-definition)
(org-odt-fixup-label-references): New functions.
(org-export-odt-preprocess-label-references): Modified.
(org-odt-end-export): Call `org-odt-fixup-label-references'.
(org-odt-parse-label): Removed
(org-odt-default-entity): Removed.
(org-odt-format-entity-caption): Fixed signature so that
category param is no longer optional.  Use
(org-export-odt-do-format-image): Pass the mandatory category
param to `org-odt-format-entity-caption'.

* contrib/odt/styles/OrgOdtContentTemplate.xml: Add Figure and
Equation as sequence declarations.

Most of these changes can be pushed to org-exp.el.  For now park the
changes locally to org-odt.el.

2 years agobetter delimiting of Org-mode text preceding a code block
Eric Schulte [Fri, 16 Sep 2011 15:52:09 +0000]
better delimiting of Org-mode text preceding a code block

  Thanks to Christopher Genovese for this change

* lisp/ob-tangle.el (org-babel-tangle-collect-blocks): Better
  delimiting of Org-mode text preceding a code block.

2 years agoisolating dangerous testing examples
Eric Schulte [Fri, 16 Sep 2011 15:23:29 +0000]
isolating dangerous testing examples

* testing/examples/ To house the dangerous.
* testing/examples/ (an): Removed a trouble maker.

2 years agoAdd test checking that any variable declared with no default value will generate...
Sebastien Vauban [Fri, 16 Sep 2011 10:07:19 +0000]
Add test checking that any variable declared with no default value will generate a proper error message.

2 years agoAdd test checking that any variable declared with no default value will generate...
Sebastien Vauban [Fri, 16 Sep 2011 10:06:21 +0000]
Add test checking that any variable declared with no default value will generate a proper error message.

2 years agoDon't delete variable values when checking for assignment.
Eric Schulte [Fri, 16 Sep 2011 13:43:07 +0000]
Don't delete variable values when checking for assignment.

* lisp/ob.el (org-babel-get-src-block-info): Fixing bug, accidentally
  deleted variable values.

2 years agocustomizable processing of Org-mode text used as comments in tangled source-code...
Eric Schulte [Thu, 15 Sep 2011 22:00:10 +0000]
customizable processing of Org-mode text used as comments in tangled source-code files

* lisp/ob-tangle.el (org-babel-process-comment-text): Customizable
  function to process comment text.
  (org-babel-tangle-collect-blocks): Make use of new customizable
  processing function.
  (org-babel-spec-to-string): Call customizable function rather than

2 years agoFix check for feature Org mode
David Maus [Fri, 16 Sep 2011 04:48:16 +0000]
Fix check for feature Org mode

* org-test.el: Fix check for feature Org mode.

2 years agoob-R: don't process output when "scalar" or "verbatim"
Eric Schulte [Thu, 15 Sep 2011 21:43:35 +0000]
ob-R: don't process output when "scalar" or "verbatim"

* lisp/ob-R.el (org-babel-execute:R): Collect and pass along the
  (org-babel-R-evaluate): Accept result-params and if "scalar" or
  "verbatim" don't process output.
  (org-babel-R-evaluate-session): Accept result-params and if "scalar"
  or "verbatim" don't process output.

2 years agotest the combination of code block results wrapper and type
Eric Schulte [Thu, 15 Sep 2011 21:29:10 +0000]
test the combination of code block results wrapper and type

* testing/examples/ (an): Test the combination of code block
  results wrapper and type.
* testing/lisp/test-ob.el (test-org-babel/combining-scalar-and-raw-result-types):
  Test the combination of code block results wrapper and type.

2 years agodifferentiate between result types and wrappers
Eric Schulte [Thu, 15 Sep 2011 21:22:14 +0000]
differentiate between result types and wrappers

* lisp/ob.el (org-babel-merge-params): Differentiate between result
  types and wrappers.

2 years agoCheck that functional-syntax variables are initialized.
Eric Schulte [Thu, 15 Sep 2011 15:24:29 +0000]
Check that functional-syntax variables are initialized.

* lisp/ob.el (org-babel-get-src-block-info): Check that
  functional-syntax variables are initialized.

2 years agoAdding a note for a future enhancement.
Eric Schulte [Thu, 15 Sep 2011 15:11:12 +0000]
Adding a note for a future enhancement.

* lisp/ob.el (org-babel-check-src-block): Adding a note for a future

2 years agoorg-odt.el: Support for styling of tables using table templates
Jambunathan K [Tue, 13 Sep 2011 14:07:13 +0000]
org-odt.el: Support for styling of tables using table templates

* contrib/lisp/org-odt.el (org-odt-table-style)
(org-odt-table-style-spec): New variables.
(org-export-odt-table-styles): New user-customizable variable.
(org-odt-begin-table): Init `org-odt-table-style' from the
(org-odt-get-table-cell-styles): New function.
(org-odt-end-table): Use the above function.
(org-odt-get-style-name-for-table-cell): Removed.  Now folded
in to `org-odt-get-table-cell-styles'.
(org-odt-get-style-name-cookie-for-table-cell): Modified to
accommodate new user-defined styles.

Users now have the option of choosing Org's own way of styling or
using custom styling.

2 years agoMerge branch 'master' of
Carsten Dominik [Wed, 14 Sep 2011 06:54:53 +0000]
Merge branch 'master' of

2 years agoRestore point when exporting a subtree
Carsten Dominik [Wed, 14 Sep 2011 05:48:49 +0000]
Restore point when exporting a subtree

* lisp/org-exp.el (org-export): Restore point when exporting a subtree.

2 years agomore robust to code blocks with empty bodies
Eric Schulte [Tue, 13 Sep 2011 15:36:03 +0000]
more robust to code blocks with empty bodies
* lisp/ob.el (org-babel-parse-src-block-match): More robust to code
  blocks with empty bodies.

2 years agoDon't error on empty code block body.
Eric Schulte [Tue, 13 Sep 2011 14:57:29 +0000]
Don't error on empty code block body.

* lisp/ob.el (org-babel-parse-src-block-match): Don't error on empty
  code block body.

2 years agofixed author information
Eric Schulte [Mon, 12 Sep 2011 16:42:22 +0000]
fixed author information

* testing/lisp/test-ob-awk.el: Fixed author information.
* testing/lisp/test-ob-fortran.el: Fixed author information.

2 years agoAdd missing FSF / author headers and org-test dependency to some test files * testing...
Martyn Jago [Mon, 12 Sep 2011 16:07:21 +0000]
Add missing FSF / author headers and org-test dependency to some test files * testing/lisp/test-ob-awk.el: * testing/lisp/test-ob-fortran.el: * testing/lisp/test-ob-lilypond.el: * testing/lisp/test-ob.el: * testing/lisp/test-org-exp.el: Add missing FSF / author headers and org-test dependency to some test files.

2 years agoRemove jump.el dependency from test execution * testing/org-test.el: Remove jump...
Martyn Jago [Mon, 12 Sep 2011 15:50:28 +0000]
Remove jump.el dependency from test execution * testing/org-test.el: Remove jump.el dependency from test execution removing the need for a user to install git submodules

2 years agoFix previous commit
Jambunathan K [Mon, 12 Sep 2011 11:56:59 +0000]
Fix previous commit

2 years agoReplace OrgOdtAutomaticStyles.xml with OrgOdtContentTemplate.xml
Jambunathan K [Mon, 12 Sep 2011 11:49:14 +0000]
Replace OrgOdtAutomaticStyles.xml with OrgOdtContentTemplate.xml

* contrib/odt/styles/OrgOdtAutomaticStyles.xml: Removed

* contrib/odt/styles/OrgOdtContentTemplate.xml: Added. This
file is now a fully-formed "content.xml" file but with "empty"
content. Note that the original "OrgOdtAutomaticStyles.xml"
was just an xml fragment.

* contrib/lisp/org-odt.el
(org-odt-document-content-header): Removed.
(org-export-odt-automatic-styles-file): Removed.
(org-export-odt-content-template-file): Renamed from
(org-odt-data-dir): Update docstring.
(org-odt-begin-office-body, org-odt-begin-document-content):
Modified to accomodate changes introduced by the new
"OrgOdtContentTemplate.xml" file.

2 years agore-wrapped test to prevent failure during batch execution
Eric Schulte [Sun, 11 Sep 2011 20:35:13 +0000]
re-wrapped test to prevent failure during batch execution

* testing/lisp/test-ob.el (test-org-babel/inline-src-blocks):
  Re-wrapped test to prevent failure during batch execution.

2 years agoall tests should now pass on Emacs23
Eric Schulte [Sun, 11 Sep 2011 20:19:02 +0000]
all tests should now pass on Emacs23

* testing/lisp/test-ob.el (test-org-babel/org-babel-get-inline-src-block-matches):
  All tests should now pass on Emacs23.

2 years agoUnescape plain link before open
David Maus [Sun, 11 Sep 2011 14:50:22 +0000]
Unescape plain link before open

* org.el (org-open-at-point): Unescape plain link.

This should fix a problem with open plain links reported by
Sebastien Vauban.

2 years agoRemove unnecessary link unescape
David Maus [Sun, 11 Sep 2011 14:01:59 +0000]
Remove unnecessary link unescape

* org-html.el (org-html-handle-links): Remove unnecessary link

PATH is already unescaped and should never be escaped twice. Big
thanks to Jambunathan K for analyzing the problem.

2 years agoBetter Org-mode initialization for batch tests.
Eric Schulte [Fri, 9 Sep 2011 20:21:06 +0000]
Better Org-mode initialization for batch tests.

  Thanks to Martyn Jago for this patch.

* testing/org-test.el (org-test-dir): Better Org-mode initialization
  for batch tests.

2 years ago* testing/lisp/test-ob.el: Fixed typo
Martyn Jago [Thu, 8 Sep 2011 21:34:38 +0000]
* testing/lisp/test-ob.el: Fixed typo

2 years ago* testing/lisp/test-ob.el: More tests for inline source blocks execution via org...
Martyn Jago [Thu, 8 Sep 2011 15:50:26 +0000]
* testing/lisp/test-ob.el: More tests for inline source blocks execution via org-ctrl-c-ctrl-c

2 years agoRevert "org.el (org-fixup-indentation): Correctly indent meta lines."
Bastien Guerry [Fri, 9 Sep 2011 17:47:41 +0000]
Revert "org.el (org-fixup-indentation): Correctly indent meta lines."

This reverts commit 6b04befa48f2aed0a44d25bced54adeda4658bf0.

2 years agoorg-lparse.el: Rename table routines
Jambunathan K [Thu, 8 Sep 2011 19:08:31 +0000]
org-lparse.el: Rename table routines

* contrib/lisp/org-lparse.el (org-lparse-insert-org-table):
Renamed from `org-lparse-do-format-org-table'.
(org-lparse-insert-list-table): Renamed from
(org-lparse-insert-table-table): Renamed from
(org-lparse-insert-org-table, org-lparse-format-org-table)
(org-lparse-format-list-table, org-lparse-format-table-table):
Propagate above renamings.

* contrib/lisp/org-odt.el
(org-export-odt-do-format-numbered-formula): Propagate above

Maintain a clear distinction between format and insert behaviours.

2 years agoorg-odt.el: Set mathml option
Jambunathan K [Thu, 8 Sep 2011 18:52:19 +0000]
org-odt.el: Set mathml option

* contrib/lisp/org-odt.el
(org-export-odt-do-preprocess-latex-fragments): Pass 'mathml
option to `org-format-latex'.

2 years agobetter error message for unassigned variables
Eric Schulte [Thu, 8 Sep 2011 17:33:04 +0000]
better error message for unassigned variables

* lisp/ob.el (org-babel-merge-params): Better error message for
  unassigned variables.

2 years agoorg-odt.el: Embed links to mathml files as ODF formula
Jambunathan K [Thu, 8 Sep 2011 15:11:27 +0000]
org-odt.el: Embed links to mathml files as ODF formula

* contrib/lisp/org-odt.el
(org-odt-embedded-formulas-count):New variable.
(org-odt-init-outfile): Reset above variable.
(org-odt-is-formula-link-p, org-odt-format-inline-formula)
(org-odt-copy-formula-file, org-export-odt-format-formula)
(org-export-odt-do-format-numbered-formula): New functions for
formatting mathml file links as embedded ODF formulae.
(org-odt-format-org-link): Add check for links to mathml files
and call `org-odt-format-inline-formula'.
(org-export-odt-format-image): Update function signature.  Use
`org-latex-src' property to identify latex dvipng images.  Use
the (to be committed) `org-latex-src-embed-type' to identify
whether the equation image should be inlined or displayed.
(org-odt-format-textbox): Modified to accomodate correct
formatting of captioned formula.
(org-odt-format-inlinetask): Modified to accomodate changes to
the previous function.
(org-export-odt-do-format-image): Minor change.
(org-export-odt-do-preprocess-latex-fragments): When LaTeX
fragment option is set to `t' or `mathjax' check for
availability of latex to mathml converter using (to be
committed) `org-format-latex-mathml-available-p'.  If such a
converter is available and configured, use it.  Otherwise
default to the earlier behaviour.

Refer the following post for more information:

2 years agoadding function for batch test evaluation
Eric Schulte [Thu, 8 Sep 2011 15:11:26 +0000]
adding function for batch test evaluation

* testing/org-test.el (org-test-run-batch-tests): Allows for batch
  evaluation of the Org-mode test suite.

2 years agoorg-odt.el: Sanitize formatting of Images
Jambunathan K [Wed, 7 Sep 2011 17:12:33 +0000]
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.

2 years agoMerge branch 'master' of
Christian Egli [Wed, 7 Sep 2011 13:45:40 +0000]
Merge branch 'master' of

2 years agotaskjuggler export: take buffer local variables into account
Christian Egli [Wed, 7 Sep 2011 13:45:14 +0000]
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.

2 years agotest of comma stripping behavior
Eric Schulte [Wed, 7 Sep 2011 03:58:51 +0000]
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.

2 years agoorg-exp: only remove commas on the front line of a code block
Eric Schulte [Wed, 7 Sep 2011 03:52:04 +0000]
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.

2 years agoorg-odt.el: Format date strings in meta.xml using portable means
Jambunathan K [Tue, 6 Sep 2011 18:15:25 +0000]
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

2 years agoorg-odt.el: Rework embedding of images
Jambunathan K [Tue, 6 Sep 2011 12:16:11 +0000]
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.

2 years agocorrectly resolving load-path in testing files
Eric Schulte [Tue, 6 Sep 2011 17:11:12 +0000]
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.

2 years agoUse `string=' to compare strings
David Maus [Thu, 1 Sep 2011 04:49:29 +0000]
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

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

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

2 years agoensure all tests have unique names
Eric Schulte [Tue, 6 Sep 2011 15:07:00 +0000]
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.

2 years agoremoving test: shouldn't test a variables value, should test its functionality
Eric Schulte [Tue, 6 Sep 2011 14:57:10 +0000]
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

2 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]
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

2 years agoBug fixes to inline source block execution triggering. * lisp/ob.el: Created org...
Martyn Jago [Mon, 5 Sep 2011 21:53:07 +0000]
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

2 years agoorg-odt.el: Create and update manifest.xml towards end of export
Jambunathan K [Mon, 5 Sep 2011 18:00:14 +0000]
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.

2 years agoorg-odt.el: Trivial cleanup
Jambunathan K [Mon, 5 Sep 2011 06:23:00 +0000]
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.

2 years agoorg-odt.el: Create mimetype file towards the end of export
Jambunathan K [Mon, 5 Sep 2011 06:03:20 +0000]
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.

2 years agoorg-odt.el: Create and update meta.xml towards end of the export
Jambunathan K [Mon, 5 Sep 2011 05:47:10 +0000]
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.

2 years agobetter code block demarcation
Eric Schulte [Sun, 4 Sep 2011 23:06:07 +0000]
better code block demarcation

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

2 years agocorrected file insertion for inline results
Eric Schulte [Sun, 4 Sep 2011 16:50:37 +0000]
corrected file insertion for inline results

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

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

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

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

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

2 years agoorg-compat.el: Remove LABEL argument from pop-to-buffer-same-window call.
Martin Rudalics [Fri, 2 Sep 2011 16:18:56 +0000]
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.

2 years agoorg-lparse.el: Abort export if list-tables are malformed
Jambunathan K [Fri, 2 Sep 2011 08:57:31 +0000]
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.

2 years agoorg-xhtml.el: Fix a crash during export of list-tables
Jambunathan K [Thu, 1 Sep 2011 18:48:43 +0000]
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.

2 years agoorg-lparse.el: Support for list-tables (first cut)
Jambunathan K [Thu, 1 Sep 2011 18:11:26 +0000]
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.

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

This reverts commit e887881e1302a9bba8fda296ec8b4723269b2a76.  Keep things
simple for now.

2 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]
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.

2 years agoIntroduce org-odt-begin-table-cell and org-odt-end-table-cell
Jambunathan K [Thu, 1 Sep 2011 14:06:34 +0000]
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

2 years agoRefactor org-odt-format-table-cell
Jambunathan K [Thu, 1 Sep 2011 13:02:13 +0000]
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.

2 years agoIntroduced org-lparse-begin-collect and org-lparse-end-collect
Jambunathan K [Thu, 1 Sep 2011 11:02:06 +0000]
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'.

2 years agoorg-lparse.el: Recognize #+begin_list-table...#+end_list-table blocks
Jambunathan K [Thu, 1 Sep 2011 09:33:52 +0000]
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.

2 years agoorg-inlinetask: Small refactoring
Nicolas Goaziou [Thu, 1 Sep 2011 06:49:28 +0000]
org-inlinetask: Small refactoring

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

2 years agoorg-lparse.el: Fix earlier checkin
Jambunathan K [Wed, 31 Aug 2011 19:42:15 +0000]
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.

2 years agoIntroduced org-lparse-do-format-list-table
Jambunathan K [Wed, 31 Aug 2011 18:05:29 +0000]
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.

2 years agoIntroduced org-lparse-org-table-to-list-table
Jambunathan K [Wed, 31 Aug 2011 17:53:03 +0000]
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

2 years agoIntroduce org-lparse-begin/end-list-item
Jambunathan K [Wed, 31 Aug 2011 16:53:46 +0000]
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.

2 years agoob-asymptote: simplify table to array conversion process
Nicolas Goaziou [Wed, 31 Aug 2011 09:26:29 +0000]
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.

2 years agoob-asymptote: full support for uni-dimensional lists
Nicolas Goaziou [Wed, 31 Aug 2011 09:11:31 +0000]
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.

2 years agobabel: don't check for header arguments in properties with leading ":"s
Eric Schulte [Tue, 30 Aug 2011 20:50:26 +0000]
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.

2 years agoorg-inlinetask: fix `org-inlinetask-goto-end' with one line long tasks
Nicolas Goaziou [Tue, 30 Aug 2011 12:28:36 +0000]
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.

2 years agotest inline src blocks
Eric Schulte [Mon, 29 Aug 2011 22:13:46 +0000]
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.

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

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

2 years agoob-asymptote: small fix
Nicolas Goaziou [Mon, 29 Aug 2011 21:06:35 +0000]
ob-asymptote: small fix

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

2 years agonew lob function to convert every element of a table to a string
Eric Schulte [Mon, 29 Aug 2011 18:01:38 +0000]
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.

2 years agoob-asymptote: mixed-types tables default to string arrays
Nicolas Goaziou [Mon, 29 Aug 2011 15:24:07 +0000]
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.

2 years agoorg-footnote: fix xhtml export
Nicolas Goaziou [Mon, 29 Aug 2011 11:05:57 +0000]
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.

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

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

2 years agoob-awk: safer variable expansion
Eric Schulte [Sun, 28 Aug 2011 15:03:07 +0000]
ob-awk: safer variable expansion

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

2 years agoorg-xhtml.el: Support for captioning and labelling of equation images
Jambunathan K [Sat, 27 Aug 2011 21:21:38 +0000]
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.

2 years agoFix some issues with org-xhtml export
Jambunathan K [Sat, 27 Aug 2011 20:31:40 +0000]
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.