Bastien Guerry
1144903cfa
ox-odt.el (org-odt-link): Fix bug: convert & to & in links
...
* ox-odt.el (org-odt-link): Fix bug: convert & to & in
links.
2013-04-08 21:25:09 +02:00
Nicolas Goaziou
1af215bb46
ox-html: Tiny fix and outdated comments removal
...
* lisp/ox-html.el (org-html-doctype): Make value fit on a single line
so `org-export-insert-default-template' can handle it.
2013-04-08 00:17:10 +02:00
Bastien Guerry
bf8c341f4e
ox-html.el (org-html-table-row-tags): Update
...
* ox-html.el (org-html-table-row): Dynamically bind
`rowgroup-number', `start-rowgroup-p', `end-rowgroup-p',
`top-row-p', `bottom-row-p'.
(org-html-table-row-tags): Update docstring: tell what
variables are dynamically bound.
Thanks to Stefan Vollmar for raising this problem.
2013-04-07 23:19:07 +02:00
Bastien Guerry
8c7e46b6a9
org-src.el (org-edit-src-code): Don't set `buffer-auto-save-file-name' unless `auto-save-default' is non-nil
...
* org-src.el (org-edit-src-code): Don't set
`buffer-auto-save-file-name' unless `auto-save-default' is
non-nil.
Thanks to Charles Berry for reporting this.
2013-04-07 22:43:02 +02:00
Nicolas Goaziou
d6d7bc55b8
ox/ox-html: Use a language agnostic and more neutral default creator
...
* lisp/ox-html.el (org-html-creator-string): Change default value.
* lisp/ox.el (org-export-creator-string): Change default value.
2013-04-07 20:21:58 +02:00
Rick Frankel
bf1f08cd41
Break out description of results parameter into four section instead
...
of three, matching the actual code.
* doc/org.texi (results): Add Format section (broken out of Type
section to match code.
(hlines): Remove (incorrect) Emacs Lisp exception.
(colnames): Remove (incorrect) Emacs Lisp exception. Note that the
actual default handling (at least for python and emacs-lisp) does not
seem to match the description.
2013-04-07 13:45:18 -04:00
Rick Frankel
b162dd43db
Fix typo in doc string.
...
* lisp/ox-html.el (org-html-divs): Extra character in doc string.
2013-04-07 13:02:11 -04:00
Eric Schulte
3cdd81e820
Merge branch 'master' of orgmode.org:org-mode
2013-04-07 07:26:40 -06:00
Eric Schulte
58d601979c
include default elisp header args in call lines
...
Because in actuality the call line expands to an Emacs Lisp code
block.
* lisp/ob-lob.el (org-babel-lob-execute): Include default elisp header
args in call lines.
2013-04-07 07:16:08 -06:00
Nicolas Goaziou
bd61cb2bf0
ox-html: Allow to add last modification time in preamble/postamble
...
* lisp/ox-html.el (org-html-postamble-format,
org-html-preamble-format): Allow last modification time of source in
template.
(org-html-format-spec): Produce last modification time when the source
is a file.
2013-04-07 14:59:27 +02:00
Nicolas Goaziou
c1d716f703
ox-html: Fix docstrings
...
* lisp/ox-html.el (org-html-postamble-format,
org-html-preamble-format): Fix docstrings.
2013-04-07 14:53:11 +02:00
Eric Schulte
385ef25c6e
don't over-evaluate result-params in macro
...
* lisp/ob-core.el (org-babel-result-cond): Don't over-evaluate
result-params in macro.
2013-04-07 06:49:54 -06:00
Nicolas Goaziou
2d6a90229d
ox/ox-html: Fix defcustoms
...
* lisp/ox.el (org-export-with-archived-trees, org-export-with-author,
org-export-with-clocks, org-export-with-date,
org-export-creator-string, org-export-with-drawers,
org-export-with-email, org-export-with-emphasize,
org-export-exclude-tags, org-export-with-fixed-width,
org-export-with-footnotes, org-export-with-latex,
org-export-headline-levels, org-export-default-language,
org-export-preserve-breaks, org-export-with-entities,
org-export-with-inlinetasks, org-export-with-planning,
org-export-with-priority, org-export-with-section-numbers,
org-export-select-tags, org-export-with-smart-quotes,
org-export-with-special-strings,
org-export-with-statistics-cookies,
org-export-with-sub-superscripts, org-export-with-toc,
org-export-with-tables, org-export-with-tags,
org-export-with-tasks, org-export-time-stamp-file,
org-export-with-timestamps, org-export-with-todo-keywords): Fix
docstrings.
* lisp/ox-html.el (org-html-postamble-format): Slightly change default
value so "Generated by" string doesn't get duplicated.
(org-html-creator-string): Fix docstring.
2013-04-07 14:36:48 +02:00
Achim Gratz
220b083091
test-ob-fortran: fix typo
...
* testing/lisp/test-ob-fortran.el (ob-fortran/preprocessor-var): Fix
typo, write `preprocessor´ instead of `preprosessor´.
2013-04-07 11:49:37 +02:00
Achim Gratz
02137f0d6f
test-ob-fortran: re-enable formerly failing test
...
* testing/lisp/test-ob-fortran.el (ob-fortran/character-var):
Uncomment test that formerly failed.
This test seems to be working correctly on Linux and Cygwin.
Re-enable to see if it may not work on other systems and then check
why.
2013-04-07 11:47:48 +02:00
Achim Gratz
3aa78cf4bd
test-ob-perl: improve test coverage
...
testing/lisp/test-ob-perl.el (test-ob-perl/table-passthrough-colnames-nil),
(test-ob-perl/table-passthrough-colnames-no):
Make some table entries numbers for better test coverage.
2013-04-07 11:28:57 +02:00
Achim Gratz
8ea4967643
ob-perl: use TAB as separator for table results
...
* lisp/ob-perl.el (org-babel-perl-wrapper-method): Use TAB as
separator for table results as expected by
`org-babel-import-elisp-from-file´.
2013-04-07 11:21:14 +02:00
Achim Gratz
af6f32af1a
fix commit df0c8a3bc4
...
* lisp/ob-core.el (org-babel-number-p): String match for any number
moved first so that the match data for the length check does not
become corrupted.
2013-04-07 11:16:45 +02:00
Nicolas Goaziou
4c804d2720
Small changes to documentation for embedded LaTeX
...
* doc/org.texi: Small changes to documentation for embedded LaTeX.
* doc/orgguide.texi: Small changes to documentation for embedded
LaTeX.
2013-04-07 10:46:21 +02:00
Bastien Guerry
bb54616b0e
Merge branch 'master' of orgmode.org:org-mode
2013-04-07 10:23:11 +02:00
Nicolas Goaziou
86815fc4e5
orgguide.texi: Update documentation wrt captions
2013-04-07 10:08:09 +02:00
Bastien Guerry
5e8f30f61e
org-table.el (orgtbl-apply-fmt): Enhance docstring
...
* ox.el (org-export-table-row-group): Fix typo in docstring.
2013-04-07 10:05:13 +02:00
Bastien Guerry
3f4028312e
ox.el: Fix typos
...
* org-table.el (orgtbl-apply-fmt): Enhance docstring.
2013-04-07 10:03:37 +02:00
Nicolas Goaziou
e1a9b5fb32
org.texi: Fix typo in commit d419f00f5a
2013-04-07 10:00:16 +02:00
Nicolas Goaziou
d419f00f5a
org.texi: Update documentation wrt to captions
2013-04-07 09:56:40 +02:00
Rémi Vanicat
1f8822101b
Correctly format orgtbl line when there is a :lfmt argument.
...
* org-table.el (orgtbl-format-line): Fix bug when formatting
line.
TINYCHANGE
2013-04-07 09:41:00 +02:00
Bastien Guerry
0625b53a07
org-table.el (orgtbl-apply-fmt): Enhance docstring
...
* org-table.el (orgtbl-apply-fmt): Enhance docstring.
2013-04-07 09:36:52 +02:00
Feng Shu
ef8e4b57ed
org-contacts.el , fix bugs about 'tel and 'note properties
...
* contrib/lisp/org-contacts.el (org-contacts-vcard-format): Fix bug by
taking the "tel" and "note" properties into account.
2013-04-07 08:07:23 +02:00
Nicolas Goaziou
40f390574c
org.texi: Update internal links documentation
...
* doc/org.texi (Internal links): Document #+NAME keyword and
cross-referencing during export.
* doc/orgguide.texi (Internal links): Add a note about
cross-referencing.
2013-04-07 01:21:43 +02:00
Nicolas Goaziou
0ed17115a1
org.texi: Update documentation about included files
...
* doc/org.texi (Include files): Remove reference to :prefix1
and :prefix. Give more details for :minlevel.
2013-04-07 00:14:55 +02:00
Bastien Guerry
227bc3b702
Merge branch 'master' of orgmode.org:org-mode
2013-04-06 23:17:41 +02:00
Bastien Guerry
46cca57cb9
org-contacts.el (org-contacts-matcher): Better matcher
...
* contrib/lisp/org-contacts.el (org-contacts-matcher): Better matcher.
Thanks to Simon Thum for suggesting this.
2013-04-06 22:58:03 +02:00
Bastien Guerry
4a8f81153a
org-contacts.el (org-contacts-export-as-vcard): Don't use non-existent function `org-install-letbind'
...
* contrib/lisp/org-contacts.el (org-contacts-export-as-vcard): Don't use
non-existent function `org-install-letbind'.
Thanks to Simon Thum for reporting this.
2013-04-06 22:51:17 +02:00
Bastien Guerry
591d377e78
org.el (org-file-contents): Make the message more prominent
...
* org.el (org-file-contents): Make the message more prominent.
2013-04-06 22:31:13 +02:00
Eric Schulte
09cb6d3f21
use org-babel-result-cond in Ruby code blocks
...
* lisp/ob-ruby.el (org-babel-execute:ruby): Use org-babel-result-cond in
Ruby code blocks.
(org-babel-ruby-evaluate): Delay table processing.
2013-04-06 12:59:04 -06:00
Eric Schulte
fe93daa72a
use org-babel-result-cond in JavaScript code blocks
...
* lisp/ob-js.el (org-babel-execute:js): Use org-babel-result-cond in
JavaScript code blocks.
2013-04-06 11:39:23 -06:00
Eric Schulte
92e32755fd
use org-babel-result-cond in scheme code blocks
...
* lisp/ob-scheme.el (org-babel-execute:scheme): Use
org-babel-result-cond in scheme code blocks.
2013-04-06 11:39:23 -06:00
Eric Schulte
f58889f0c1
use org-babel-result-cond in OCaml code blocks
...
* lisp/ob-ocaml.el (org-babel-execute:ocaml): Use org-babel-result-cond
in OCaml code blocks.
2013-04-06 11:39:23 -06:00
Eric Schulte
4b51984fe7
use org-babel-result-cond in Haskell code blocks
...
* lisp/ob-haskell.el (org-babel-execute:haskell): Use
org-babel-result-cond in Haskell code blocks.
2013-04-06 11:39:23 -06:00
Eric Schulte
7117ad4f92
raw org and drawer imply verbatim results
...
This unifies the results handling across a number of different
languages. It is still possible to force tabular output by adding the
":results table" argument.
The following example demonstrates the results in shell python and perl.
** drawer and table
#+begin_src sh :results drawer table
echo -e "1\n2\n3"
#+end_src
#+RESULTS:
:RESULTS:
| 1 |
| 2 |
| 3 |
:END:
#+begin_src perl :results drawer table
"1\n2\n3"
#+end_src
#+RESULTS:
:RESULTS:
| 1 |
| 2 |
| 3 |
:END:
#+begin_src python :results drawer table
return "1\n2\n3"
#+end_src
#+RESULTS:
:RESULTS:
| 1\n2\n3 |
:END:
** drawer
#+begin_src sh :results drawer
echo -e "1\n2\n3"
#+end_src
#+RESULTS:
:RESULTS:
1
2
3
:END:
#+begin_src perl :results drawer
"1\n2\n3"
#+end_src
#+RESULTS:
:RESULTS:
1
2
3
:END:
#+begin_src python :results drawer
return "1\n2\n3"
#+end_src
#+RESULTS:
:RESULTS:
1
2
3
:END:
** raw
#+begin_src sh :results raw
echo -e "1\n2\n3"
#+end_src
#+RESULTS:
1
2
3
#+begin_src perl :results raw
"1\n2\n3"
#+end_src
#+RESULTS:
1
2
3
#+begin_src python :results raw
return "1\n2\n3"
#+end_src
#+RESULTS:
1
2
3
* lisp/ob-core.el (org-babel-result-cond): The "raw", "org" and "drawer"
:results header argument values preclude table processing unless the
"table" argument is given as well.
2013-04-06 11:39:23 -06:00
Bastien Guerry
52ba37b8c8
Merge branch 'master' of orgmode.org:org-mode
2013-04-06 19:11:57 +02:00
Bastien Guerry
1e496cc8f9
ox.el (org-export-replace-region-by): New function
...
* ox.el (org-export-replace-region-by): New function.
* ox-texinfo.el (org-texinfo-convert-region-to-texinfo):
* ox-md.el (org-md-convert-region-to-md):
* ox-latex.el (org-latex-convert-region-to-latex):
* ox-html.el (org-html-convert-region-to-html): New functions
to replace the active region by its export into various
backends.
2013-04-06 19:09:38 +02:00
Nicolas Goaziou
f2fd185175
ox: Inhibit startup process when calling `org-mode'
...
* lisp/ox.el (org-export--get-inbuffer-options,
org-export--list-bound-variables, org-export--generate-copy-script,
org-export-string-as, org-export-expand-include-keyword,
org-export--prepare-file-contents): Inhibit startup process when
calling `org-mode'.
2013-04-06 17:31:56 +02:00
Bastien Guerry
133afe8915
Cosmetic change in messages.
2013-04-06 16:49:10 +02:00
Ippei FURUHASHI
67a55acb39
org-table.el: Fix a bug of leaving the inserted TBLFM line
...
* org-table.el (org-calc-current-TBLFM): Ensure to remove the
currently inserted TBLFM line, when calling `org-table-recalculate'
returns an error and the processing stops.
* testing/lisp/test-org-table.el: Add test.
When you hit =C-c C-c= at the line of "#+TBLFM: $2=$1*2::$2=$1**2" in
| 1 | |
| 2 | |
#+TBLFM: $2=$1*1
#+TBLFM: $2=$1*2::$2=$1**2
you got:
| 1 | |
| 2 | |
#+TBLFM: $2=$1*2::$2=$1**2
#+TBLFM: $2=$1*1
#+TBLFM: $2=$1*2::$2=$1**2
with the error message of:
user-error: Double definition `$2=' in TBLFM line, please fix by hand
In this case, you expected:
| 1 | |
| 2 | |
#+TBLFM: $2=$1*1
#+TBLFM: $2=$1*2::$2=$1**2
2013-04-06 15:15:44 +02:00
Nicolas Goaziou
e01daa00be
ox-publish: Fix "bad timestamp" error with some DATE values
...
* lisp/ox-publish.el (org-publish-find-date): Fix "bad timestamp"
error with some DATE values: :date property in communication channel
is no longer a string.
2013-04-06 14:17:26 +02:00
Nicolas Goaziou
67cf80ae9a
ox: Add a command to insert a default export template
...
* lisp/ox.el (org-export-insert-default-template): New function.
(org-export--dispatch-ui, org-export--dispatch-action): Access to the
function through the dispatcher.
From the dispatcher, if subtree export is selected, options will be
installed as node properties in current subtree.
2013-04-06 13:34:41 +02:00
Carsten Dominik
d1c940fe5c
org.el (org-show-siblings): By default, also show siblings from a bookmark jump
...
* org.el (org-show-siblings): By default, also show siblings
from a bookmark jump.
2013-04-06 03:02:31 +02:00
Nicolas Richard
61f8870eb4
contrib/lisp/ob-maxima.el (org-babel-execute:maxima): Ignore lines with ";;; Loading #P"
...
* contrib/lisp/ob-maxima.el (org-babel-execute:maxima): Ignore
lines with ";;; Loading #P".
TINYCHANGE
2013-04-06 02:23:59 +02:00
Bastien Guerry
bcc7a9cadf
Merge branch 'master' of orgmode.org:org-mode
2013-04-06 01:52:02 +02:00