* org-html.el (org-export-html-preamble-format)
(org-export-html-postamble-format): Improve the docstring.
* org.texi (HTML preamble and postamble): Small doc improvement.
Thanks to Zachary Jones who asked for this.
This will no longer insert the value of the :file header argument as
the description if the description is left blank (as this changes
the meaning of the :file header argument).
The desc handling logic is moved to the `org-babel-result-to-file'
function.
* lisp/ob.el (org-babel-result-to-file): New optional description
argument.
(org-babel-insert-result): Moved description logic to another
function.
* lisp/ob.el (org-babel-insert-result): Change name of filelinkdescr
to file-desc.
(org-babel-common-header-args-w-values): Change name of
filelinkdescr to file-desc.
Thanks to Richard Stanton for pointing out this problem and
suggesting the fix.
* lisp/ob-C.el (org-babel-C-execute): Add .exe to the end of compiled
C files on windows.
Thanks to Richard Stanton for pointing out this problem and
suggesting the fix.
* lisp/ob-C.el (org-babel-C-execute): Add .exe to the end of compiled
C files on windows.
* lisp/ob-exp.el (org-babel-exp-code): Escape all lines when exporting
Org-mode blocks.
* lisp/ob.el (org-babel-parse-src-block-match): Make use of the new
language argument to org-babel-strip-protective-commas.
(org-babel-parse-inline-src-block-match): Make use of the new
language argument to org-babel-strip-protective-commas.
(org-babel-strip-protective-commas): Now accepts a language
argument.
Conflicts:
lisp/ob-exp.el
* lisp/ob-exp.el (org-babel-exp-code): Escape all lines when exporting
Org-mode blocks.
* lisp/ob.el (org-babel-parse-src-block-match): Make use of the new
language argument to org-babel-strip-protective-commas.
(org-babel-parse-inline-src-block-match): Make use of the new
language argument to org-babel-strip-protective-commas.
(org-babel-strip-protective-commas): Now accepts a language
argument.
This reverts commit 4202665f5b.
The buffer file name is not always available (e.g., during export), so
it should not be relied upon, rather a header argument should be used.
* lisp/ob-exp.el (org-babel-exp-src-block): Remove noweb handling from
the top level.
(org-babel-exp-code): Noweb handling for code export.
(org-babel-exp-results): Noweb handling for results export.
* lisp/org-lparse.el (org-lparse-insert-org-table): Consider
short caption as plain text and not as org text.
* lisp/org-odt.el (org-export-odt-format-formula)
(org-export-odt-format-image): ditto.
Fixes earlier checkin. See
http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg01212.html
Handling of short captions is only a convenience feature.
From within LibreOffice one can always create an "unprotected"
editable index and later manually delete unwanted index entries (for
example, delete uncaptioned entries which are given automatic names)
or modify existing entries (for example, fix long captions to their
short versions).
* lisp/org-odt.el (org-odt-begin-table)
(org-export-odt-format-formula, org-export-odt-format-image)
(org-odt-format-entity): Handle short caption.
* lisp/org-lparse.el (org-lparse-insert-org-table)
(org-lparse-insert-list-table, org-lparse-insert-table-table):
Ditto.
Handle short caption for tables, figures and formulae.
#+CAPTION: [Caption for index entry]{Regular caption.}
Fix for bug
http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg01169.html
* org.el (org-mode): Use `buffer-face-mode' to remap the
'default face to 'org-default.
Thanks to Du Yanning for raising an issue that this patch circumvents.
* org.el: Prevent a bug while defining the menu by requiring
`org-beamer' when necessary.
* org-beamer.el (org-insert-beamer-options-template): Make the
parameter optional since the interactive call defines it.
* org-table.el (orgtbl-self-insert-command): Use
`backward-delete-char' instead of `delete-backward-char' as
this last command gets caught by the compiler which says to
not use it in programs. `backward-delete-char' is just an
alias for `delete-backward-char' which is internally remapped
to `org-delete-backward-char' for optimization purpose.
* org.el (org-self-insert-command): Ditto.
* org-latex.el (org-export-latex-subcontent): Bugfix: when
`org-export-latex-low-levels' is nil, do not export low levels.
Thanks to Nick Dokos for spotting this.
* org.el (org-set-tags): Include `org-tag-alist' in the list
of possible completions, even when there are tags defined in
the buffer.
Thanks to Mike McLean for reporting this.
* org.el (org-fast-tag-selection): Include tags from
`org-tag-alist' when completing with the TAB key.
Thanks to Mike McLean for reporting this problem.
* org-latex.el (org-export-latex-subcontent): Don't insert a
linebreak when itemizing a subtree that is just a headline.
Thanks to Richard Stanton for spotting this.
* lisp/ob-maxima.el (org-babel-maxima-command): The maxima command
used should be configurable (defaults to maxima-command if defined).
(org-babel-execute:maxima): The maxima command used should be
configurable (defaults to maxima-command if defined).
* lisp/ob-C.el (org-babel-C-execute): Add the local directory to the
library search path for C/C++ block compilation.
This patch was submitted to the list by Daimrod.
* lisp/org-colview.el (org-columns-cleanup-item): Handle case of empty
headline
* lisp/org-colview-xemacs.el (org-columns-cleanup-item): Handle case of empty
headline
TINYCHANGE
* org.el (org-read-date): Don't mention `parse-time-weekdays'
and `parse-time-months' in the docstring.
This problem has been reported by Michael Heerdegen -- see
Emacs bug#11042 against 24.0.94.
* org-colview.el (org-columns-compute): Also consider inline
tasks when computing the sum.
TINYCHANGE
Thanks to Myles English for spotting this and for his patch,
this one is a slightly modified version of his.
* org-latex.el (org-export-as-latex): Fix bug in setting the
export directory according to the LaTeX options.
Thanks to A. Major for reporting this and to Christian Moe for suggesting a
fix.
lisp/org.el (org-scan-tags): Require todo-only argument, and document
that it should be the same one set by make-org-tags-matcher.
Fix documentation to explain that todo-only is really
not-done-todo-only.
(org-make-tags-matcher): If todo part of matcher starts with /!,
matcher now always checks that the TODO keyword is present and
is a not-done state. This matters e.g. for org-map-entries
which unlike org-scan-tags does not do its own separate todo-only
filtering. Added docs to explain matcher dependencies.
(org-map-entries): Make sure todo-only is correctly passed from
org-make-tags-matcher to org-scan-tags.
* lisp/org-clock.el: (org-clock-get-table-data): Make sure todo-only
does not leak when it is set by make-org-tags-macher.
* lisp/org-crypt.el: (org-encrypt-entries, org-decrypt-entries): Make
sure todo-only is correctly passed from org-make-tags-matcher to
org-scan-tags.
* contrib/lisp/contacts.el: (org-contacts-filter) : Make sure todo-only
is correctly passed from org-make-tags-matcher to org-scan-tags.
is redisplayed, it was losing the 'extra property on redisplay
* lisp/org-agenda.el (org-agenda-change-all-lines): move accessing of
'extra text property outside of with-current-buffer for original
buffer
* org.el (org-cycle-internal-local): Don't try to hide drawers
within subtrees in this function, it slows cycling down.
This comments the change made in commit
bb28480169
Thanks to Marcel Van der Boom for reporting this.
* org-agenda.el (org-agenda-custom-commands-local-options):
Fix incorrect custom option definition.
Thanks to Joe Vornehm Jr. for this patch.
See http://patchwork.newartisans.com/patch/1231/
* org-colview.el (org-columns-display-here): Bugfix: use the date as the
value for the ITEM column when displaying a summary.
Thanks to Rasmus Rempling for reporting this and to Nick Dokos for digging
further.
* lisp/org-odt.el (org-odt-format-entity-caption): Enumerate
entities that have either a caption or a label.
(org-odt-label-styles, org-odt-category-map-alist): Add a
separator between sequence number and caption. Introduced two
new label styles for handling of math formula and math label.
(org-odt-format-label-definition)
(org-export-odt-format-formula): Propagate above changes.
* lisp/org-odt.el (org-export-odt-category-strings): New
custom variable.
(org-odt-category-map-alist): Modify interpretation. Don't
use the same field to double up as both a OpenDocument
variable and a category string. Entries in this list now
specify only the OpenDocument variable. Category strings are
obtained through an indirect lookup of
`org-export-odt-category-strings'. Use same OpenDocument
variables as what LibreOffice uses for various entities. Fix
docstring.
(org-odt-add-label-definition)
(org-odt-format-label-definition)
(org-odt-format-label-reference): Propagate above changes.
Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg00628.html
* lisp/org-lparse.el (org-do-lparse): Make effective setting
of `org-export-headline-levels' available to the ODT exporter.
Also remove some stale comments.
* lisp/org-odt.el (org-odt-format-link): Add support for
generating cross-references to chapter numbers.
(org-odt-format-org-link): Resolve links to outline headings
as section numbers. This special case resolution kicks in
only if the Org link has no description and the target outline
is not listified i.e., it is at a level within
`org-export-headline-levels'.
Fix for the following request:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg01035.html
The above change is in conformity with the way links to
headlines will be treated in new ODT exporter that will be
built on top of Nicolas' org-element/org-export
infrastructure.
* org-src.el (org-edit-src-code): Change let bind to let*,
e.g. if case-fold-search is bound to nil globally, the
(case-fold-search t) doesn't work until we get to the body.
The fix and analysis was provided by Nick Dokos on this
email message thread:
<http://thread.gmane.org/gmane.emacs.orgmode/53335/focus=53342>
TINY CHANGE
I started from the 78ec8e commit then cherry-picked and squashed
commits that have been done in master since then, except the bad
commits that overwrote the tree (in master) with the tree in maint.
This commit also bumps the version number to 7.8.06.
The only "fix" that was made between 78ec8e and the previous commit
is e0072f which has been reported to break stuff.
* org-exp.el (org-export-language-setup): Add japanese translation.
Translation by Hideki SAITO
<CAAaRP5umR8kDfZoZw6y2XJgyL70YdiJqLtpBvX++0ff+mU=fhA@mail.gmail.com>,
converted to numeric character entities.
TINYCHANGE
* org.el (org-scan-tags): Require one or more spaces (+) between
keyword and headline.
Otherwise the re will match a line like:
* TODO@ Foobar
And assumes the @ to be part of the headline.
This fixes a glitch reported by Simon Thum in
<4F53DEF7.8080604@gmx.de>.
> Hi all,
>
> I have found some irritating behaviour, potentially a bug. I have a
> block agenda which goes like:
>
> tags-todo "@home&TODO=\"TODO\"
>
> and it displays a certain org line that reads
>
> **** TODO_ state triggers
>
> Which is just a heading for dealing with TODO state triggers, and I
> appended the _ as I don't want it to be a TODO.
>
> For example, the global TODO list and syntax highlighting does not
> consider it a todo, but C-c a m TODO="TODO" does. TODO="T" does not,
> so it's not very grave.
>
> Most likely, it's simply an inconsistency arising from not having a
> real parser. I just wanted to report it here so it may get fixed.
* org-agenda.el (org-prepare-agenda): Don't reset
`org-done-keywords-for-agenda' when org-agenda-multi.
Fixes a bug with DONE keywords in org-todo face reported by Hans-Peter
Deifel in <87r4xwypxh.fsf@hpdeifel.de>.
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.
This commit reverts back the maint branch to its state before
merging the master branch. From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
* org-src.el (org-src-edit-buffer-p): New function.
* org.el (org-store-link): Use the new function to correctly
match source code buffer.
TINYCHANGE
Thanks to Ilya Shlyakhter for this patch.
* org-agenda.el (org-agenda-skip-if): Fix the order conditions
are being checked. Also enhance the docstring a bit.
TINYCHANGE
Thanks to Toby Cubitt for a patch to this effect.
* org-agenda.el (org-agenda-tree-to-indirect-buffer): Fix the
display of indirect agenda window.
TINYCHANGE
Thanks to Dave Abrahams for a patch to this effect.
* lisp/org-clock.el (org-clock-get-table-data): Bind org-scanner-tags
to tags-list and org-trust-scanner-tags to t while evaluating the
matcher, since the matcher is always evaluated at the current entry.
TINYCHANGE
On 3/16/2012 2:10 AM, Nick Dokos wrote:
> One more thing that you'll need to do is put your patches in attachments
> of a type that will allow patchwork to snag the patch:
Thanks, I was wondering why they're not showing up.
Here is another try (attached) for the org.el patch.
ilya
>From 95c38b06803aec0787bc2eaab3d0062221390292 Mon Sep 17 00:00:00 2001
From: Ilya Shlyakhter <ilya_shl@alum.mit.edu>
Date: Fri, 16 Mar 2012 00:10:25 -0400
Subject: [PATCH 2/2] Tags/properties matcher: faster matching by trusting
org-scanner-tags
* lisp/org.el (org-scan-tags): Bind org-trust-scanner-tags to t
while evaluating the matcher, since the matcher is always evaluated
at the current entry.
TINYCHANGE
* lisp/ob-lilypond.el (ly-compile-lilyfile): Fixed misplaced comma in a
quoting expression.
* lisp/org-pcomplete.el: added missing defvar definitions for org vars
* lisp/org-src.el: added declare-function line for org-babel-tangle
* lisp/ob.el (org-scan-tags): protected the variable tags-list with a let
(other) added missing defvar declarations.
TINYCHANGE
* lisp/ob.el (org-babel-merge-params): Add "eval" as acceptable noweb
argument.
(org-babel-noweb-p): The "eval" argument only expands during
evaluation.
* org-attach.el (org-attach-store-link-p): Remove spurious quote in
customization form choice.
Glitch discovered and fix suggested by Henning Weiss in
<CAKq33udFSsBP0egVrgfjcBnou+PhKtyYaGBn0SfMicp42h0=kw@mail.gmail.com>>.
* lisp/ob-lilypond.el: Make auditioning of midi and pdf asynchronous,
and add easy pdf generation in the form of `ly-gen-pdf' variable.
* testing/lisp/test-ob-lilypond.el: Tests for above.
* lisp/org-agenda.el (org-agenda-local-vars): Clean up the variable list.
(org-agenda-get-restriction-and-command): Add a key for toggling
sticky agenda views.
* doc/org.texi (Agenda dispatcher): Document sticky agenda views
and the new key for them.
This is just an intermediate commit, to make sure that the comments
are all visible in the git history.
* lisp/org-agenda.el (org-agenda-local-vars): Final decisions about global/local
* lisp/org-agenda.el (org-agenda-force-single-file): Variable removed.
(org-prepare-agenda-window): Store pre-agenda window config locally.
(org-timeline): Introduce a scoped version of `org-agenda-show-log'.
(org-agenda-list): Introduce a scoped version of
`org-agenda-show-log'.
(org-agenda-get-progress): Use the scoped version of
`org-agenda-show-log'.
(org-agenda-local-vars): Write the analysis result as a comment - to
be cleaned up in the next iteration.
* lisp/org-agenda.el (org-toggle-sticky-agenda): Kill all agenda buffers
when toggling sticky-agendas.
(org-agenda-get-restriction-and-command): Add `C-c a C-k' as a key to
explicitly kill all agenda buffers.
(org-agenda-run-series): Remove any old agenda markers in the buffer
that is going to take the new block agenda.
(org-prepare-agenda): Reset markers before erasing the buffer anc
running `org-agenda-mode', because after that hte local variable
`org-agenda-markers' will have gone away.
(org-agenda-Quit):
(org-finalize-agenda): Install the marker resetter into
the `kill-buffer-hook'.
(org-agenda-save-markers-for-cut-and-paste): Look for markers in all
agenda buffers.
(org-agenda-kill-all-agenda-buffers): New function.
* lisp/ob-tangle.el (org-babel-tangle): Don't prompt for a file name
if :tangle is specified.
* lisp/ob.el (org-babel-expand-noweb-references): Widen buffer when
expanding noweb references.
* org.el (org-clone-subtree-with-time-shift): Fix task cloning for
repeating tasks using .+n and ++n syntax
Tasks with repeaters using .+n and ++n syntax retain the repeater in
all of the clones causing duplicate tasks. These tasks are now
handled the same as the regular repeating task using +n syntax.
* lisp/org-footnote.el (org-footnote-normalize): Remove an useless
part of the function.
(org-insert-footnote-reference-near-definition): Remove function.
* lisp/org-footnote.el (org-footnote-normalize): Fix normalization of
inline footnotes with no footnote section.
* testing/lisp/test-org-footnote.el: New test file.
Thanks to Samuel Wales for reporting this.
* org-bbdb.el (org-bbdb-old): Replace `defvar' after loading 'bbdb to
check for old or new version by a check for the required function in
`org-bbdb-open' and `org-bbdb-store-link'.
(org-bbdb-store-link, org-bbdb-open): Check which version of bbdb is
to be used.
This is a follow up of ddf4f1e7a9.
Instead of depending on the loading of bbdb we do a check for the
required function in `org-bbdb-open' and `org-bbdb-store-link'.
* lisp/org.el (org-link-search): Search for #+name affiliated keywords
and invisible targets.
* contrib/lisp/org-element.el (org-element-link-parser): Remove "ref"
links relative part.
(org-element-target-parser): Move property name from `:raw-value' to
`:value'.
(org-element-recursive-objects): Remove targets from tables. Cells
are not parsed unless explicitely asked by back-end developer, too
late. A target wouldn't be noticed in time. One solution could be to
parse every table, but that's time consumming.
(org-element-object-restrictions): Target are not recursive anymore.
* contrib/lisp/org-export.el (org-export-resolve-fuzzy-link): Find
elements with a matching "#+name: path" affiliated keyword.
(org-export-get-ordinal): Make special cases for headlines, items,
footnotes definitions and references.
(org-export-resolve-ref-link): Removed function.
* EXPERIMENTAL/org-e-latex.el (org-e-latex-link): Handle
cross-reference numbers.
(org-e-latex-target): Targets have no contents.
* EXPERIMENTAL/org-e-ascii.el (org-e-ascii--describe-links): Ignore
fuzzy links in link description at the end of the section.
(org-e-ascii-link): Handle cross-reference numbers.
* testing/contrib/lisp/test-org-export.el: Add tests.
* testing/lisp/test-org.el: Add tests.
* org-lparse.el (org-lparse-end-footnote-definition): Cleanup
newlines in a transcoded footnote definition. This ensures
that the line that is currently being processed by
`org-do-lparse' loop doesn't get broken up into multiple
lines. Fix for the following bug -
* lisp/org-footnote.el (org-footnote-normalize): Force a paragraph
break after the last footnote definition. This is an an
implicit assumption made by the org-lparse.el library. With
this change, footnote definitions can reliably be exported
with ODT backend. See
http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg01013.html.
* lisp/ob-ditaa.el (org-ditaa-jar-path): Already defined in
org-exp-blocks.el.
* lisp/org-exp-blocks.el (org-ditaa-jar-path): Declare appropriately
for the fact that this is really now a Babel thing -- even if it is
used here and the definition should remain here for reasons of load
dependencies.
* org-bbdb.el (org-bbdb-old): Wrap `defvar' so the variable gets
defined after bbdb was loaded.
Thanks to Nick Dokos for reporting this glitch in
<8273.1330161610@alphaville>.
* lisp/org-odt.el (org-odt-insert-toc): Remove this stray,
dysfunctional routine. This possibly has crept in because of the
broken merges between "maint" and "origin" branches.
(org-odt-begin-table): Don't emit an empty paragraph when a table is
neither labelled or captioned.
(org-odt-init-outfile): Remove reference to an unused variable.
* lisp/ob-sql.el(org-babel-execute:sql): Add support for MonetDB to
SQL code blocks.
Hi,
the attached patch adds support for evaluating SQL blocks on MonetDB.
The MonetDB client normally requires the password to be inputted on the
console. To get around this, you have to use a dotfile ~/.monetdb with
authentification data. Note that this file is ignored if you specify a
user on the cmdline. See
http://www.monetdb.org/Documentation/mclient-man-page for details.
A usage example follows.
Setup MonetDB test database and authentification data
#+BEGIN_SRC sh :results output verbatim
MONETDB_DIR=$HOME/unix/var/monetdb/demodb
monetdbd create $MONETDB_DIR
monetdbd start $MONETDB_DIR
monetdb create demodb
monetdb release demodb
cat > ~/.monetdb <<EOF
user=monetdb
password=monetdb
EOF
#+END_SRC
#+RESULTS:
: created database in maintenance mode: demodb
: taken database out of maintenance mode: demodb
Data is returned without column names (the default return format
cannot be parsed by Babel).
#+BEGIN_SRC sql :engine monetdb :cmdline demodb
CREATE TABLE foo ( bar INTEGER );
SELECT 'Table count', count(*) FROM foo;
#+END_SRC
#+RESULTS:
| Table count | 0 |
The parameter "-i" is required on the command line in order to use
special client commands. Also note that a newline is required at the
end if the last line contains a special client command.
#+BEGIN_SRC sql :engine monetdb :cmdline demodb -i :results output
verbatim
\d
\?
#+END_SRC
#+RESULTS:
#+begin_example
TABLE sys.foo
\? - show this message
\<file - read input from file
\>file - save response in file, or stdout if no file is given
\|cmd - pipe result to process, or stop when no command is given
\h - show the readline history
\D table- dumps the table, or the complete database if none given.
\d[Stvsfn]+ [obj] - list database objects, or describe if obj given
\A - enable auto commit
\a - disable auto commit
\e - echo the query in sql formatting mode
\f - format using a built-in renderer {csv,tab,raw,sql,xml}
\w# - set maximal page width (-1=unlimited, 0=terminal width,
>0=limit to num)
\r# - set maximum rows per page (-1=raw)
\L file - save client/server interaction
\X - trace mclient code
\q - terminate session
#+end_example
Have fun!
> attached is a patch that enhances org-babel-goto-named-src-block (bound
> to C-c C-v g by default). Included are two enhancements:
>
> 1. the point is pushed to the org-mark-ring, such that returning with
> C-c & becomes possible
> 2. the target src block is guessed from
> a) noweb-reference
> b) #+call:
> c) #+results:
> d) symbol-at-point
> if one of these is found (in that order)
* lisp/ob.el (org-babel-goto-named-src-block): Pushing the point to
the org-mark-ring and guessing at the code block name to jump to.
* org-agenda.el (org-agenda-tree-to-indirect-buffer): Fix handling of
indirect buffer and window.
Check if the window of last indirect buffer is still live and properly
handle the case of `org-last-indirect-buffer' being nil.
Changes suggested by Dave Abrahams in <m2boow1q9e.fsf@boostpro.com>.
Bastien Guerry
Yury Bulka
Eric Schulte
Andreas Leha
Ilya Shlyakhter
Jambunathan K
Shoji Nishimura
Nicolas Goaziou
Thomas Morgan
K.Nagashima
Max Mikhanosha
Martyn Jago
FengShu
Henning Weiss
Carsten Dominik
Shaun Johnson
Suvayu Ali
David Maus
Bastien Guerry
Sebastien Vauban
Deech
Adam Spiers
Bernt Hansen
Karl Fogel
Andrzej Lichnerowicz
Viktor Rosenfeld
Andreas Leha