Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
153ae947
Commit
153ae947
authored
Apr 01, 2012
by
Bastien Guerry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to Org version 7.8.07 (commit da0e6f in Org's repo)
parent
42ee526b
Changes
51
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
51 changed files
with
3471 additions
and
1279 deletions
+3471
-1279
doc/misc/ChangeLog
doc/misc/ChangeLog
+112
-0
doc/misc/org.texi
doc/misc/org.texi
+369
-228
etc/ChangeLog
etc/ChangeLog
+8
-0
etc/org/OrgOdtContentTemplate.xml
etc/org/OrgOdtContentTemplate.xml
+54
-1
etc/org/OrgOdtStyles.xml
etc/org/OrgOdtStyles.xml
+63
-3
etc/org/README
etc/org/README
+1
-1
etc/refcards/orgcard.pdf
etc/refcards/orgcard.pdf
+0
-0
etc/refcards/orgcard.tex
etc/refcards/orgcard.tex
+3
-3
lisp/org/ChangeLog
lisp/org/ChangeLog
+1439
-0
lisp/org/ob-C.el
lisp/org/ob-C.el
+3
-1
lisp/org/ob-R.el
lisp/org/ob-R.el
+2
-1
lisp/org/ob-clojure.el
lisp/org/ob-clojure.el
+2
-3
lisp/org/ob-ditaa.el
lisp/org/ob-ditaa.el
+3
-15
lisp/org/ob-emacs-lisp.el
lisp/org/ob-emacs-lisp.el
+7
-7
lisp/org/ob-exp.el
lisp/org/ob-exp.el
+68
-66
lisp/org/ob-fortran.el
lisp/org/ob-fortran.el
+11
-14
lisp/org/ob-lilypond.el
lisp/org/ob-lilypond.el
+3
-13
lisp/org/ob-lob.el
lisp/org/ob-lob.el
+6
-6
lisp/org/ob-maxima.el
lisp/org/ob-maxima.el
+7
-2
lisp/org/ob-sql.el
lisp/org/ob-sql.el
+1
-0
lisp/org/ob-sqlite.el
lisp/org/ob-sqlite.el
+8
-1
lisp/org/ob-table.el
lisp/org/ob-table.el
+3
-4
lisp/org/ob-tangle.el
lisp/org/ob-tangle.el
+6
-4
lisp/org/ob.el
lisp/org/ob.el
+169
-30
lisp/org/org-agenda.el
lisp/org/org-agenda.el
+40
-28
lisp/org/org-ascii.el
lisp/org/org-ascii.el
+3
-1
lisp/org/org-attach.el
lisp/org/org-attach.el
+1
-1
lisp/org/org-bbdb.el
lisp/org/org-bbdb.el
+10
-16
lisp/org/org-beamer.el
lisp/org/org-beamer.el
+24
-24
lisp/org/org-bibtex.el
lisp/org/org-bibtex.el
+3
-3
lisp/org/org-capture.el
lisp/org/org-capture.el
+23
-23
lisp/org/org-clock.el
lisp/org/org-clock.el
+4
-14
lisp/org/org-colview.el
lisp/org/org-colview.el
+18
-7
lisp/org/org-crypt.el
lisp/org/org-crypt.el
+10
-6
lisp/org/org-eshell.el
lisp/org/org-eshell.el
+0
-1
lisp/org/org-exp-blocks.el
lisp/org/org-exp-blocks.el
+10
-7
lisp/org/org-exp.el
lisp/org/org-exp.el
+12
-22
lisp/org/org-footnote.el
lisp/org/org-footnote.el
+92
-75
lisp/org/org-habit.el
lisp/org/org-habit.el
+17
-9
lisp/org/org-html.el
lisp/org/org-html.el
+3
-3
lisp/org/org-indent.el
lisp/org/org-indent.el
+1
-0
lisp/org/org-latex.el
lisp/org/org-latex.el
+50
-16
lisp/org/org-list.el
lisp/org/org-list.el
+18
-68
lisp/org/org-lparse.el
lisp/org/org-lparse.el
+84
-131
lisp/org/org-mouse.el
lisp/org/org-mouse.el
+4
-4
lisp/org/org-odt.el
lisp/org/org-odt.el
+412
-238
lisp/org/org-protocol.el
lisp/org/org-protocol.el
+7
-6
lisp/org/org-special-blocks.el
lisp/org/org-special-blocks.el
+6
-6
lisp/org/org-src.el
lisp/org/org-src.el
+30
-16
lisp/org/org-table.el
lisp/org/org-table.el
+8
-8
lisp/org/org.el
lisp/org/org.el
+233
-143
No files found.
doc/misc/ChangeLog
View file @
153ae947
2012-04-01 Jambunathan K <kjambunathan@gmail.com>
* org.texi (Customizing tables in ODT export): Correct few errors.
2012-04-01 Jambunathan K <kjambunathan@gmail.com>
* org.texi (Links in ODT export): Update.
(Labels and captions in ODT export): New node.
2012-04-01 Jambunathan K <kjambunathan@gmail.com>
* org.texi (Literal examples in ODT export): htmlfontify.el in
Emacs-24.1 now supports fontification. So ODT source blocks will
be fontified by default.
2012-04-01 Julian Gehring <julian.gehring@googlemail.com> (tiny change)
* org.texi (Refiling notes): Remove duplicated keybinding.
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
* org.texi (noweb): Documentation of this new option to the :noweb
header argument.
2012-04-01 Suvayu Ali <fatkasuvayu+linux@gmail.com>
* org.texi (Header and sectioning): Add example demonstrating how
to use "LaTeX_CLASS_OPTIONS".
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
* org.texi (Noweb reference syntax): Describe the ability to
execute noweb references in the manual.
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
* org.texi (cache): Improve cache documentation when session
evaluation is used.
2012-04-01 Nicolas Goaziou <n.goaziou@gmail.com>
* org.texi (Plain lists): Document removal.
2012-04-01 Michael Brand <michael.ch.brand@gmail.com>
* org.texi: Decapitalize file name in references to Calc manual.
2012-04-01 Nicolas Goaziou <n.goaziou@gmail.com>
* org.texi (Plain lists): Document removal.
2012-04-01 Jambunathan K <kjambunathan@gmail.com>
* org.texi (Top, OpenDocument Text export)
(ODT export commands, Extending ODT export)
(Images in ODT export, Tables in ODT export)
(Configuring a document converter): Add or Update.
2012-04-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (MobileOrg): Change the wording to reflect that the
Android Version is no longer just the little brother of the iOS
version.
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
* org.texi (Key bindings and useful functions): Updated babel key
binding documentation in manual.
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
* org.texi (noweb): Document new noweb header value.
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
* org.texi (noweb-sep): Document new header argument.
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
* org.texi (noweb-ref): Documentation of this new custom variable.
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
* org.texi (wrap): Update the new :wrap documentation to match the
current implementation.
2012-04-01 Thomas Dye <dk@poto.myhome.westell.com>
* org.texi: Added documentation for :wrap.
2012-04-01 Thomas Dye <dk@poto.myhome.westell.com>
* org.texi: #+RESULTS now user-configurable.
2012-04-01 Thomas Dye <dk@poto.myhome.westell.com>
* org.texi: Documented :noweb no-export.
2012-04-01 Thomas Dye <dk@poto.local>
* org.texi: Edit :noweb no header argument for correctness.
2012-04-01 Bastien Guerry <bzg@altern.org>
* org.texi (Customization): Update the approximate number of Org
variables.
2012-04-01 Thomas Dye <dk@poto.local>
* org.texi: The :results wrap produces a drawer instead of a
begin_results block.
2012-03-22 Peder O. Klingenberg <peder@klingenberg.no> (tiny change)
* gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
...
...
doc/misc/org.texi
View file @
153ae947
This diff is collapsed.
Click to expand it.
etc/ChangeLog
View file @
153ae947
2012-04-01 Jambunathan K <kjambunathan@gmail.com>
* org/OrgOdtContentTemplate.xml (OrgIndentedSection-Level-*):
New section styles. These sections are indented to the same
level as the corresponding list entries. These sections hold
tables that occur within a list. (OrgTable): Increased
relative width from 90% to 96% for aesthetic reasons.
2012-03-16 Glenn Morris <rgm@gnu.org>
* HELLO: Say that this is not a comprehensive list.
...
...
etc/org/OrgOdtContentTemplate.xml
View file @
153ae947
...
...
@@ -46,8 +46,61 @@
<!-- automatic styles -->
<office:automatic-styles>
<!-- Section styles -->
<style:style
style:name=
"OrgIndentedSection-Level-1"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"1.281cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-2"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"1.905cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-3"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"2.54cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-4"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"3.175cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-5"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"3.81cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-6"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"4.445cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-7"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"5.08cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-8"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"5.715cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-9"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"6.35cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<style:style
style:name=
"OrgIndentedSection-Level-10"
style:family=
"section"
>
<style:section-properties
text:dont-balance-text-columns=
"false"
fo:margin-left=
"6.985cm"
fo:margin-right=
"0cm"
style:editable=
"false"
>
<style:columns
fo:column-count=
"1"
fo:column-gap=
"0cm"
/>
</style:section-properties>
</style:style>
<!-- Table styles -->
<style:style
style:name=
"OrgTable"
style:family=
"table"
>
<style:table-properties
style:rel-width=
"9
0
%"
fo:margin-top=
"0cm"
fo:margin-bottom=
"0.20cm"
table:align=
"center"
/>
<style:table-properties
style:rel-width=
"9
6
%"
fo:margin-top=
"0cm"
fo:margin-bottom=
"0.20cm"
table:align=
"center"
/>
</style:style>
<style:style
style:name=
"OrgTableColumn"
style:family=
"table-column"
>
...
...
etc/org/OrgOdtStyles.xml
View file @
153ae947
...
...
@@ -718,15 +718,75 @@
<text:linenumbering-configuration
text:number-lines=
"false"
text:offset=
"0.499cm"
style:num-format=
"1"
text:number-position=
"left"
text:increment=
"5"
/>
</office:styles>
<office:automatic-styles>
<style:page-layout
style:name=
"Mpm1"
>
<style:style
style:name=
"MP1"
style:family=
"paragraph"
style:parent-style-name=
"Footer"
>
<style:paragraph-properties
fo:text-align=
"center"
style:justify-single-word=
"false"
/>
</style:style>
<style:page-layout
style:name=
"Mpm1"
style:page-usage=
"mirrored"
>
<style:page-layout-properties
fo:page-width=
"21.001cm"
fo:page-height=
"29.7cm"
style:num-format=
"1"
style:print-orientation=
"portrait"
fo:margin-top=
"2cm"
fo:margin-bottom=
"2cm"
fo:margin-left=
"2cm"
fo:margin-right=
"2cm"
style:writing-mode=
"lr-tb"
style:footnote-max-height=
"0cm"
>
<style:footnote-sep
style:width=
"0.018cm"
style:distance-before-sep=
"0.101cm"
style:distance-after-sep=
"0.101cm"
style:adjustment=
"left"
style:rel-width=
"25%"
style:color=
"#000000"
/>
<style:footnote-sep
style:width=
"0.018cm"
style:distance-before-sep=
"0.101cm"
style:distance-after-sep=
"0.101cm"
style:line-style=
"none"
style:adjustment=
"left"
style:rel-width=
"25%"
style:color=
"#000000"
/>
</style:page-layout-properties>
<style:header-style/>
<style:footer-style>
<style:header-footer-properties
fo:min-height=
"0.6cm"
fo:margin-left=
"0cm"
fo:margin-right=
"0cm"
fo:margin-top=
"0.499cm"
style:dynamic-spacing=
"false"
/>
</style:footer-style>
</style:page-layout>
<style:page-layout
style:name=
"Mpm2"
>
<style:page-layout-properties
fo:page-width=
"21.001cm"
fo:page-height=
"29.7cm"
style:num-format=
"1"
style:print-orientation=
"portrait"
fo:margin-top=
"2cm"
fo:margin-bottom=
"2cm"
fo:margin-left=
"2cm"
fo:margin-right=
"2cm"
style:writing-mode=
"lr-tb"
style:footnote-max-height=
"0cm"
>
<style:footnote-sep
style:width=
"0.018cm"
style:distance-before-sep=
"0.101cm"
style:distance-after-sep=
"0.101cm"
style:line-style=
"solid"
style:adjustment=
"left"
style:rel-width=
"25%"
style:color=
"#000000"
/>
</style:page-layout-properties>
<style:header-style/>
<style:footer-style/>
</style:page-layout>
<style:page-layout
style:name=
"Mpm3"
style:page-usage=
"mirrored"
>
<style:page-layout-properties
fo:page-width=
"21.001cm"
fo:page-height=
"29.7cm"
style:num-format=
"i"
style:print-orientation=
"portrait"
fo:margin-top=
"2cm"
fo:margin-bottom=
"2cm"
fo:margin-left=
"2cm"
fo:margin-right=
"2cm"
style:writing-mode=
"lr-tb"
style:footnote-max-height=
"0cm"
>
<style:footnote-sep
style:width=
"0.018cm"
style:distance-before-sep=
"0.101cm"
style:distance-after-sep=
"0.101cm"
style:line-style=
"solid"
style:adjustment=
"left"
style:rel-width=
"25%"
style:color=
"#000000"
/>
</style:page-layout-properties>
<style:header-style/>
<style:footer-style>
<style:header-footer-properties
fo:min-height=
"0cm"
fo:margin-left=
"0cm"
fo:margin-right=
"0cm"
fo:margin-top=
"0.499cm"
/>
</style:footer-style>
</style:page-layout>
<style:page-layout
style:name=
"Mpm4"
style:page-usage=
"right"
>
<style:page-layout-properties
fo:page-width=
"21.001cm"
fo:page-height=
"29.7cm"
style:num-format=
"1"
style:print-orientation=
"portrait"
fo:margin-top=
"2cm"
fo:margin-bottom=
"2cm"
fo:margin-left=
"2cm"
fo:margin-right=
"2cm"
fo:background-color=
"transparent"
style:writing-mode=
"lr-tb"
style:footnote-max-height=
"0cm"
>
<style:background-image/>
<style:footnote-sep
style:width=
"0.018cm"
style:distance-before-sep=
"0.101cm"
style:distance-after-sep=
"0.101cm"
style:line-style=
"solid"
style:adjustment=
"left"
style:rel-width=
"25%"
style:color=
"#000000"
/>
</style:page-layout-properties>
<style:header-style/>
<style:footer-style>
<style:header-footer-properties
fo:min-height=
"0.6cm"
fo:margin-left=
"0cm"
fo:margin-right=
"0cm"
fo:margin-top=
"0.499cm"
style:dynamic-spacing=
"false"
/>
</style:footer-style>
</style:page-layout>
<style:page-layout
style:name=
"Mpm5"
style:page-usage=
"mirrored"
>
<style:page-layout-properties
fo:page-width=
"21.001cm"
fo:page-height=
"29.7cm"
style:num-format=
"1"
style:print-orientation=
"portrait"
fo:margin-top=
"2cm"
fo:margin-bottom=
"2cm"
fo:margin-left=
"2cm"
fo:margin-right=
"2cm"
style:writing-mode=
"lr-tb"
style:footnote-max-height=
"0cm"
>
<style:footnote-sep
style:width=
"0.018cm"
style:distance-before-sep=
"0.101cm"
style:distance-after-sep=
"0.101cm"
style:line-style=
"solid"
style:adjustment=
"left"
style:rel-width=
"25%"
style:color=
"#000000"
/>
</style:page-layout-properties>
<style:header-style/>
<style:footer-style>
<style:header-footer-properties
fo:min-height=
"0.6cm"
fo:margin-left=
"0cm"
fo:margin-right=
"0cm"
fo:margin-top=
"0.499cm"
style:dynamic-spacing=
"false"
/>
</style:footer-style>
</style:page-layout>
</office:automatic-styles>
<office:master-styles>
<style:master-page
style:name=
"Standard"
style:page-layout-name=
"Mpm1"
/>
<style:master-page
style:name=
"Standard"
style:page-layout-name=
"Mpm1"
>
<style:footer>
<text:p
text:style-name=
"MP1"
><text:page-number
text:select-page=
"current"
></text:page-number></text:p>
</style:footer>
</style:master-page>
<style:master-page
style:name=
"OrgTitlePage"
style:page-layout-name=
"Mpm2"
style:next-style-name=
"OrgFrontMatterPage"
/>
<style:master-page
style:name=
"OrgFrontMatterPage"
style:page-layout-name=
"Mpm3"
>
<style:footer>
<text:p
text:style-name=
"MP1"
><text:page-number
text:select-page=
"current"
/></text:p>
</style:footer>
</style:master-page>
<style:master-page
style:name=
"OrgFirstPage"
style:page-layout-name=
"Mpm4"
style:next-style-name=
"OrgPage"
>
<style:footer>
<text:p
text:style-name=
"MP1"
><text:page-number
text:select-page=
"current"
/></text:p>
</style:footer>
</style:master-page>
<style:master-page
style:name=
"OrgPage"
style:page-layout-name=
"Mpm5"
>
<style:footer>
<text:p
text:style-name=
"MP1"
><text:page-number
text:select-page=
"current"
/></text:p>
</style:footer>
</style:master-page>
</office:master-styles>
</office:document-styles>
etc/org/README
View file @
153ae947
The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
following copyright information:
Copyright (C) 2010-201
2
Free Software Foundation, Inc.
Copyright (C) 2010-201
1
Free Software Foundation, Inc.
These files are part of GNU Emacs.
...
...
etc/refcards/orgcard.pdf
View file @
153ae947
This diff was suppressed by a .gitattributes entry.
etc/refcards/orgcard.tex
View file @
153ae947
% Reference Card for Org Mode
\def\orgversionnumber
{
7.8.0
2
}
\def\versionyear
{
201
1
}
% latest update
\def\orgversionnumber
{
7.8.0
7
}
\def\versionyear
{
201
2
}
% latest update
\def\year
{
2012
}
% latest copyright year
%**start of header
...
...
@@ -17,7 +17,7 @@
\pdflayout
=(0l)
% Nothing else needs to be changed below this line.
% Copyright (C) 1987, 1993, 1996-1997, 2001-201
2
% Copyright (C) 1987, 1993, 1996-1997, 2001-201
1
% Free Software Foundation, Inc.
% This file is part of GNU Emacs.
...
...
lisp/org/ChangeLog
View file @
153ae947
This diff is collapsed.
Click to expand it.
lisp/org/ob-C.el
View file @
153ae947
...
...
@@ -88,7 +88,9 @@ or `org-babel-execute:C++'."
(
cond
((
equal
org-babel-c-variant
'c
)
".c"
)
((
equal
org-babel-c-variant
'cpp
)
".cpp"
))))
(
tmp-bin-file
(
org-babel-temp-file
"C-bin-"
))
(
tmp-bin-file
(
org-babel-temp-file
"C-bin-"
(
if
(
equal
system-type
'windows-nt
)
".exe"
""
)))
(
cmdline
(
cdr
(
assoc
:cmdline
params
)))
(
flags
(
cdr
(
assoc
:flags
params
)))
(
full-body
(
org-babel-C-expand
body
params
))
...
...
lisp/org/ob-R.el
View file @
153ae947
...
...
@@ -279,7 +279,8 @@ last statement in BODY, as elisp."
(
with-temp-buffer
(
insert
(
org-babel-chomp
body
))
(
let
((
ess-local-process-name
(
process-name
(
get-buffer-process
session
))))
(
process-name
(
get-buffer-process
session
)))
(
ess-eval-visibly-p
nil
))
(
ess-eval-buffer
nil
)))
(
let
((
tmp-file
(
org-babel-temp-file
"R-"
)))
(
org-babel-comint-eval-invisibly-and-wait-for-file
...
...
lisp/org/ob-clojure.el
View file @
153ae947
...
...
@@ -31,7 +31,6 @@
;;; - clojure (at least 1.2.0)
;;; - clojure-mode
;;; - slime
;;; - swank-clojure
;;; By far, the best way to install these components is by following
;;; the directions as set out by Phil Hagelberg (Technomancy) on the
...
...
@@ -75,7 +74,7 @@
(
defun
org-babel-execute:clojure
(
body
params
)
"Execute a block of Clojure code with Babel."
(
require
'slime
)
(
require
'swank-clojure
)
(
require
'slime
)
(
with-temp-buffer
(
insert
(
org-babel-expand-body:clojure
body
params
))
((
lambda
(
result
)
...
...
@@ -86,7 +85,7 @@
(
condition-case
nil
(
org-babel-script-escape
result
)
(
error
result
)))))
(
slime-eval
`
(
swank:
interactive-eval-region
`
(
swank:
eval-and-grab-output
,
(
buffer-substring-no-properties
(
point-min
)
(
point-max
)))
(
cdr
(
assoc
:package
params
))))))
...
...
lisp/org/ob-ditaa.el
View file @
153ae947
...
...
@@ -39,22 +39,10 @@
(
require
'ob
)
(
defvar
org-babel-default-header-args:ditaa
'
((
:results
.
"file"
)
(
:exports
.
"results"
)
(
:java
.
"-Dfile.encoding=UTF-8"
))
'
((
:results
.
"file"
)
(
:exports
.
"results"
)
(
:java
.
"-Dfile.encoding=UTF-8"
))
"Default arguments for evaluating a ditaa source block."
)
(
defcustom
org-ditaa-jar-path
nil
"Path for the ditaa jar file."
:group
'org-babel
:type
'string
)
(
defcustom
org-ditaa-jar-option
"-jar"
"Option for the ditaa jar file.
Do not leave leading or trailing spaces in this string."
:group
'org-babel
:type
'string
)
(
defvar
org-ditaa-jar-path
)
(
defun
org-babel-execute:ditaa
(
body
params
)
"Execute a block of Ditaa code with org-babel.
This function is called by `org-babel-execute-src-block'."
...
...
@@ -67,7 +55,7 @@ This function is called by `org-babel-execute-src-block'."
(
cmdline
(
cdr
(
assoc
:cmdline
params
)))
(
java
(
cdr
(
assoc
:java
params
)))
(
in-file
(
org-babel-temp-file
"ditaa-"
))
(
cmd
(
concat
"java "
java
"
"
org-ditaa-jar-option
"
"
(
cmd
(
concat
"java "
java
"
-jar
"
(
shell-quote-argument
(
expand-file-name
org-ditaa-jar-path
))
" "
cmdline
...
...
lisp/org/ob-emacs-lisp.el
View file @
153ae947
...
...
@@ -41,13 +41,13 @@
(
result-params
(
cdr
(
assoc
:result-params
params
)))
(
print-level
nil
)
(
print-length
nil
)
(
body
(
if
(
>
(
length
vars
)
0
)
(
concat
"(let ("
(
mapconcat
(
lambda
(
var
)
(
format
"%S"
(
print
`
(
,
(
car
var
)
',
(
cdr
var
)))))
vars
"\n "
)
")\n"
body
")"
)
body
)))
(
concat
"(let ("
(
mapconcat
(
lambda
(
var
)
(
format
"%S"
(
print
`
(
,
(
car
var
)
',
(
cdr
var
)))))
vars
"\n "
)
")\n"
body
"
\n
)"
)
(
concat
body
"\n"
)
)))
(
if
(
or
(
member
"code"
result-params
)
(
member
"pp"
result-params
))
(
concat
"(pp "
body
")"
)
body
)))
...
...
lisp/org/ob-exp.el
View file @
153ae947
...
...
@@ -34,8 +34,7 @@
(
defvar
org-babel-ref-split-regexp
)
(
declare-function
org-babel-lob-get-info
"ob-lob"
())
(
declare-function
org-babel-eval-wipe-error-buffer
"ob-eval"
())
(
add-to-list
'org-export-interblocks
'
(
src
org-babel-exp-inline-src-blocks
))
(
add-to-list
'org-export-interblocks
'
(
lob
org-babel-exp-lob-one-liners
))
(
add-to-list
'org-export-interblocks
'
(
src
org-babel-exp-non-block-elements
))
(
org-export-blocks-add-block
'
(
src
org-babel-exp-src-block
nil
))
...
...
@@ -117,33 +116,74 @@ none ----- do not display either code or results upon export"
(
nth
1
info
)))
(
org-babel-exp-do-export
info
'block
hash
)))))
(
defun
org-babel-exp-inline-src-blocks
(
start
end
)
"Process inline source blocks between START and END for export.
See `org-babel-exp-src-block' for export options, currently the
options and are taken from `org-babel-default-inline-header-args'."
(
defvar
org-babel-default-lob-header-args
)
(
defun
org-babel-exp-non-block-elements
(
start
end
)
"Process inline source and call lines between START and END for export."
(
interactive
)
(
save-excursion
(
goto-char
start
)
(
while
(
and
(
<
(
point
)
end
)
(
re-search-forward
org-babel-inline-src-block-regexp
end
t
))
(
let*
((
info
(
save-match-data
(
org-babel-parse-inline-src-block-match
)))
(
params
(
nth
2
info
)))
(
save-match-data
(
goto-char
(
match-beginning
2
))
(
unless
(
markerp
end
)
(
let
((
m
(
make-marker
)))
(
set-marker
m
end
(
current-buffer
))
(
setq
end
m
)))
(
let
((
rx
(
concat
"\\("
org-babel-inline-src-block-regexp
"\\|"
org-babel-lob-one-liner-regexp
"\\)"
)))
(
while
(
and
(
<
(
point
)
(
marker-position
end
))
(
re-search-forward
rx
end
t
))
(
if
(
save-excursion
(
goto-char
(
match-beginning
0
))
(
looking-at
org-babel-inline-src-block-regexp
))
(
progn
(
forward-char
1
)
(
let*
((
info
(
save-match-data
(
org-babel-parse-inline-src-block-match
)))
(
params
(
nth
2
info
)))
(
save-match-data
(
goto-char
(
match-beginning
2
))
(
unless
(
org-babel-in-example-or-verbatim
)
;; expand noweb references in the original file
(
setf
(
nth
1
info
)
(
if
(
and
(
cdr
(
assoc
:noweb
params
))
(
string=
"yes"
(
cdr
(
assoc
:noweb
params
))))
(
org-babel-expand-noweb-references
info
(
get-file-buffer
org-current-export-file
))
(
nth
1
info
)))
(
let
((
code-replacement
(
save-match-data
(
org-babel-exp-do-export
info
'inline
))))
(
if
code-replacement
(
progn
(
replace-match
code-replacement
nil
nil
nil
1
)
(
delete-char
1
))
(
org-babel-examplize-region
(
match-beginning
1
)
(
match-end
1
))
(
forward-char
2
)))))))
(
unless
(
org-babel-in-example-or-verbatim
)
;; expand noweb references in the original file
(
setf
(
nth
1
info
)
(
if
(
and
(
cdr
(
assoc
:noweb
params
))
(
string=
"yes"
(
cdr
(
assoc
:noweb
params
))))
(
org-babel-expand-noweb-references
info
(
get-file-buffer
org-current-export-file
))
(
nth
1
info
)))
(
let
((
code-replacement
(
save-match-data
(
org-babel-exp-do-export
info
'inline
))))
(
if
code-replacement
(
replace-match
code-replacement
nil
nil
nil
1
)
(
org-babel-examplize-region
(
match-beginning
1
)
(
match-end
1
))
(
forward-char
2
)))))))))
(
let*
((
lob-info
(
org-babel-lob-get-info
))
(
inlinep
(
match-string
11
))
(
inline-start
(
match-end
11
))
(
inline-end
(
match-end
0
))
(
rep
(
let
((
lob-info
(
org-babel-lob-get-info
)))
(
save-match-data
(
org-babel-exp-do-export
(
list
"emacs-lisp"
"results"
(
org-babel-merge-params
org-babel-default-header-args
org-babel-default-lob-header-args
(
org-babel-params-from-properties
)
(
org-babel-parse-header-arguments
(
org-babel-clean-text-properties
(
concat
":var results="
(
mapconcat
#'
identity
(
butlast
lob-info
)
" "
)))))
""
nil
(
car
(
last
lob-info
)))
'lob
)))))
(
if
inlinep
(
save-excursion
(
goto-char
inline-start
)
(
delete-region
inline-start
inline-end
)
(
insert
rep
))
(
replace-match
rep
t
t
)))))))))
(
defun
org-babel-in-example-or-verbatim
()
"Return true if point is in example or verbatim code.
...
...
@@ -158,46 +198,6 @@ org-mode text."
(
org-in-block-p
org-list-forbidden-blocks
)
(
org-between-regexps-p
"^[ \t]*#\\+begin_src"
"^[ \t]*#\\+end_src"
)))
(
defvar
org-babel-default-lob-header-args
)
(
defun
org-babel-exp-lob-one-liners
(
start
end
)
"Process Library of Babel calls between START and END for export.
See `org-babel-exp-src-block' for export options. Currently the
options are taken from `org-babel-default-header-args'."
(
interactive
)
(
save-excursion
(
goto-char
start
)
(
while
(
and
(
<
(
point
)
end
)
(
re-search-forward
org-babel-lob-one-liner-regexp
end
t
))
(
unless
(
org-babel-in-example-or-verbatim
)
(
let*
((
lob-info
(
org-babel-lob-get-info
))
(
inlinep
(
match-string
11
))
(
inline-start
(
match-end
11
))
(
inline-end
(
match-end
0
))
(
rep
(
let
((
lob-info
(
org-babel-lob-get-info
)))
(
save-match-data
(
org-babel-exp-do-export
(
list
"emacs-lisp"
"results"
(
org-babel-merge-params
org-babel-default-header-args
org-babel-default-lob-header-args
(
org-babel-params-from-properties
)
(
org-babel-parse-header-arguments
(
org-babel-clean-text-properties
(
concat
":var results="
(
mapconcat
#'
identity
(
butlast
lob-info
)
" "
)))))
""
nil
(
car
(
last
lob-info
)))
'lob
)))))
(
setq
end
(
+
end
(
-
(
length
rep
)
(
-
(
length
(
match-string
0
))
(
length
(
or
(
match-string
11
)
""
))))))
(
if
inlinep
(
save-excursion
(
goto-char
inline-start
)
(
delete-region
inline-start
inline-end
)
(
insert
rep
))
(
replace-match
rep
t
t
)))))))
(
defun
org-babel-exp-do-export
(
info
type
&optional
hash
)
"Return a string with the exported content of a code block.
The function respects the value of the :exports header argument."
...
...
@@ -218,7 +218,9 @@ The function respects the value of the :exports header argument."
"#+BEGIN_SRC %lang%flags\n%body\n#+END_SRC"
`
((
"lang"
.
,
(
nth
0
info
))
(
"flags"
.
,
((
lambda
(
f
)
(
when
f
(
concat
" "
f
)))
(
nth
3
info
)))
(
"body"
.
,
(
nth
1
info
)))))
(
"body"
.
,
(
if
(
string=
(
nth
0
info
)
"org"
)
(
replace-regexp-in-string
"^"
","
(
nth
1
info
))
(
nth
1
info
))))))
(
defun
org-babel-exp-results
(
info
type
&optional
silent
hash
)
"Evaluate and return the results of the current code block for export.
...
...
lisp/org/ob-fortran.el
View file @
153ae947
;;; ob-fortran.el --- org-babel functions for fortran
;; Copyright (C) 2011-2012
Free Software Foundation, Inc.
;; Copyright (C) 2011-2012
Sergey Litvinov, Eric Schulte
;; Authors: Sergey Litvinov
;; Eric Schulte
;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
;; Keywords: literate programming, reproducible research, fortran
;; Homepage: http://orgmode.org
;; Version: 7.8.02
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation
,
either version 3 o
f the License, or
;;
(at your option)
any later version.
;;
GNU Emacs
is distributed in the hope that it will be useful,
;; the Free Software Foundation
;
either version 3
,
o
r (at your option)
;; any later version.
;;
;;
This program
is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.