Eric Schulte
1dd3180480
Merge branch 'origin-maint'
2012-03-14 09:22:59 -04:00
Sebastien Vauban
0dcd83d3b2
Add autoload instruction before org-version
...
* org.el (org-version): Add autoload cookie.
TINYCHANGE
2012-03-14 09:17:43 -04:00
Jambunathan K
416acea371
org-e-html: Use new source code handling API
2012-03-14 15:26:28 +05:30
David Maus
837b58ee28
Merge branch 'maint'
2012-03-14 06:43:19 +01:00
David Maus
a829737e46
Remove spurious quote in customization form choice
...
* 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>>.
2012-03-14 06:17:25 +01:00
David Maus
21391e2f84
Merge branch 'maint'
2012-03-14 06:00:49 +01:00
Tassilo Horn
429cf28ebe
Add missing word to org-contacts y-or-n-p question
...
* org-contacts.el (org-contacts-check-mail-address): Add missing word
to y-or-n-p question.
2012-03-14 05:46:04 +01:00
Eric Schulte
5cb80c7e5b
apply :shebang and :padline to shell script execution
...
* lisp/ob-sh.el (org-babel-execute:sh): Pass all params to subroutine.
(org-babel-sh-evaluate): Apply :shebang and :padline to shell script
execution.
2012-03-12 13:23:53 -04:00
Eric Schulte
de09874a27
Merge branch 'origin-maint'
2012-03-12 08:41:38 -04:00
Eric Schulte
d5e21f43fc
Ensure correct order for empty result wrapping blocks.
...
* lisp/ob.el (org-babel-insert-result): Ensure correct order for empty
result wrapping blocks.
2012-03-12 08:40:43 -04:00
Eric Schulte
6cbcb80cce
fix whitespace errors
2012-03-11 22:52:06 -06:00
Martyn Jago
2c623a0558
Make auditioning of midi and pdf generations asynchronous, and add easy pdf generation.
...
* 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.
2012-03-11 22:51:21 -06:00
Nicolas Goaziou
beb024687b
org-export: Remove useless INFO argument from `org-export-unravel-code'
...
* contrib/lisp/org-export.el (org-export-unravel-code): Remove INFO
argument. Fix a bug preventing code references to be properly
recognized.
(org-export-format-code-default): Apply signature change.
(org-export-resolve-coderef): Fix a bug preventing code references to
be properly recognized.
* EXPERIMENTAL/org-e-latex.el (org-e-latex-src-block): Apply signature
change.
* testing/lisp/test-org-export.el: Add tests.
2012-03-10 20:25:32 +01:00
Nicolas Goaziou
06a1b8615d
test-org-element: Fix a test about block switches
2012-03-10 13:46:35 +01:00
Nicolas Goaziou
c7203b4142
org-export: Change source code handling API
...
* contrib/lisp/org-element.el (org-element-example-block-parser,
org-element-src-block-parser): Add `:number-lines',
`:preserve-indent, `:retain-labels', `:use-labels' and
`:label-fmt' properties.
* contrib/lisp/org-export.el (org-export-resolve-coderef,
org-export-get-loc): Apply changes to src-block and example-block
elements' properties.
(org-export-unravel-code, org-export-format-code,
org-export-format-code-default): New functions.
(org-export-handle-code): Removed function.
* EXPERIMENTAL/org-e-latex.el (org-e-latex-example-block): Use new
function.
(org-e-latex-src-block): Use new API. Better handling of numbered
lines with special packages.
* EXPERIMENTAL/org-e-ascii.el (org-e-ascii-example-block,
org-e-ascii-src-block): Use new functions.
* testing/lisp/test-org-element.el: Add tests.
* testing/lisp/test-org-export.el: Add tests.
2012-03-10 13:42:46 +01:00
Nicolas Goaziou
86131a8b50
org-element: New `org-element-down' function
...
* contrib/lisp/org-element.el (org-element-down): New function.
* testing/lisp/test-org-element.el: Add test.
2012-03-09 19:47:50 +01:00
Eric Schulte
1a42967061
Merge branch 'origin-maint'
2012-03-09 06:54:36 -07:00
Deech
26e817ac20
The link generated by org-store-link is escaped twice when tangling with ":comments yes" flag.
...
* ob-tangle.el (org-babel-spec-to-string): The link generated by
org-store-link is escaped twice when tangling with ":comments yes"
flag.
2012-03-09 06:54:22 -07:00
Bastien Guerry
9cf435800b
org-html.el (org-export-as-html): Remove another useless space before tag.
...
* org-html.el (org-export-as-html): Remove another useless
space before tag.
Thanks to Mathias Bauer for spotting this.
2012-03-09 03:09:15 +01:00
Bastien Guerry
d0570f9592
org-html.el (org-export-as-html): Remove another useless space before tag.
...
* org-html.el (org-export-as-html): Remove another useless
space before tag.
Thanks to Mathias Bauer for spotting this.
2012-03-09 03:08:43 +01:00
Bastien Guerry
e77daf8391
Merge branch 'maint'
2012-03-09 02:55:03 +01:00
Bastien Guerry
1b4480e15f
org-html.el (org-export-as-html): Remove useless space before tag.
...
* org-html.el (org-export-as-html): Remove useless space
before tag.
Thanks to Mathias Bauer for spotting this.
2012-03-09 02:54:34 +01:00
Sebastien Vauban
f8efc63236
Add autoload instruction before org-version
...
* org.el (org-version): Add autoload cookie.
TINYCHANGE
2012-03-08 14:22:42 +01:00
Bastien Guerry
dfa317b6f3
Merge branch 'maint'
2012-03-08 14:08:38 +01:00
Bastien Guerry
e78cb895ca
org.el (org-get-category): Save match data.
...
* org.el (org-get-category): Save match data.
Thanks to Adam Spiers for spotting this issue.
2012-03-08 14:08:15 +01:00
Bastien Guerry
b879590f3b
Merge branch 'maint'
2012-03-08 13:50:51 +01:00
Adam Spiers
11e441e85f
Fix typos
2012-03-08 13:50:19 +01:00
Suvayu Ali
e896ca6707
Add example demonstrating LaTeX_CLASS_OPTIONS
...
* org.texi (Header and sectioning): Add example demonstrating how to use
"LaTeX_CLASS_OPTIONS".
TINY CHANGE
2012-03-08 13:44:49 +01:00
Bastien Guerry
c889f209fb
Merge branch 'master' of orgmode.org:org-mode
2012-03-08 09:50:34 +01:00
Jambunathan K
94fe07a5f5
org-e-html: Improve handling of images, headlines and inlinetasks
...
1. Handle inlining of remote images
2. Proper handling of "alt" attribute for regular imgages and dvipnged
fragments.
3. Support for Inlinetasks
4. Headlines are "transcoded" in three places:
- org-e-html-headline (`org-e-html-format-headline')
- org-e-html-inlinetask
- org-e-html-toc (`org-e-html-format-toc-headline')
These are now conveniently wrapped and cleared through
'org-e-html-format-headline--wrap'. The regular and toc headlines
formatters mentioned afore take a superset of arguments allowed by
`org-e-html-format-headline-function'. Augmenting the signature of
the `org-e-html-format-headline-function' is worth considering.
2012-03-08 13:28:44 +05:30
Bastien Guerry
f9d864435d
Merge branch 'master' of orgmode.org:org-mode
2012-03-07 18:24:21 +01:00
Nicolas Goaziou
62a631e236
org-export: Small fix
...
* contrib/lisp/org-export.el (org-export-get-ordinal): Change signature.
* EXPERIMENTAL/org-e-ascii.el (org-e-ascii--build-caption): Apply
changes to previous function
2012-03-07 18:02:57 +01:00
Nicolas Goaziou
bbbdff9f81
org-export: Predicate in `org-export-get-ordinal' accepts two arguments
...
* contrib/lisp/org-export.el (org-export-get-ordinal): Predicate in
`org-export-get-ordinal' accepts two arguments.
2012-03-07 17:18:20 +01:00
Bastien Guerry
0f799373b2
Merge branch 'master' of orgmode.org:org-mode
2012-03-07 09:05:44 +01:00
Jambunathan K
d2bcc61001
org-e-html: Support for enumerating inline images
2012-03-06 23:31:59 +05:30
Bastien Guerry
32947c0eed
Merge branch 'master' of orgmode.org:org-mode
2012-03-06 09:40:22 +01:00
Eric Schulte
dad33a6b3d
Merge branch 'origin-maint'
2012-03-05 14:55:05 -07:00
Eric Schulte
9371465aab
describe the ability to execute noweb references in the manual
...
* doc/org.texi (Noweb reference syntax): Describe the ability to
execute noweb references in the manual.
2012-03-05 14:54:56 -07:00
Bastien Guerry
40bd216119
Merge branches 'maint' and 'master' of orgmode.org:org-mode
2012-03-05 21:10:22 +01:00
Bastien Guerry
0630d89a0c
Merge branch 'maint' of orgmode.org:org-mode
2012-03-05 21:10:22 +01:00
Eric Schulte
93ad1e4c9a
Merge branch 'origin-maint'
2012-03-05 10:46:01 -07:00
Eric Schulte
9480a2210c
improved sbe documentation
2012-03-05 10:45:25 -07:00
Eric Schulte
f6ea7c581c
Merge branch 'origin-maint'
2012-03-05 08:22:55 -07:00
Eric Schulte
efe039db93
fix two bugs related to calling tangle with a prefix argument
...
* 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.
2012-03-05 08:22:35 -07:00
Eric Schulte
2cff2cb159
Merge branch 'origin-maint'
2012-03-05 07:32:19 -07:00
Eric Schulte
aceddafc06
fixed bug in `sbe' when variables are force interpreted as strings
...
* lisp/ob-table.el (sbe): Don't accidentally leave a `t' value when
variables are force interpreted as strings.
2012-03-05 07:32:03 -07:00
David Maus
dfeac71699
Merge branch 'master' of orgmode.org:org-mode
2012-03-04 20:57:19 +01:00
David Maus
21c7ad67cf
Merge branch 'maint'
...
org-bbdb in master already contained declare-function for external
bbdb-functions.
Conflicts:
lisp/org-bbdb.el
2012-03-04 20:53:05 +01:00
Jambunathan K
a49193da37
org-e-odt: Bring it to the same level as org-e-html
2012-03-05 01:22:20 +05:30
David Maus
c9482d61a8
org-bbdb: Pass variable to avoid dynamic scoping.
...
* org-bbdb.el (org-bbdb-open, org-bbdb-open-old)
(org-bbdb-open-new): Pass record name to avoid dynamic scoping.
2012-03-04 20:37:46 +01:00