5fc740a230
Merge branch 'maint'
2013-01-08 15:04:40 +01:00
72bc144c15
Update Copyright lines to match Emacs format.
2013-01-08 15:04:32 +01:00
60b23bdeac
Merge branch 'maint'
...
Conflicts:
contrib/lisp/htmlize.el
etc/schema/od-manifest-schema-v1.2-os.rnc
etc/schema/od-schema-v1.2-os.rnc
lisp/org-exp-blocks.el
2013-01-01 16:06:17 +01:00
98cd4687a2
Update copyright years.
...
Happy new year!
2013-01-01 16:04:24 +01:00
ff0081847c
requiring ob now pulls in all of Babel
2012-12-12 10:48:56 -07:00
09743f48d6
Fix many small typos.
2012-08-13 05:59:44 +02:00
793485b07a
adding a :java header argument to plantuml
...
* lisp/ob-plantuml.el (org-babel-execute:plantuml): Adding a :java
header argument to plantuml.
2012-05-19 20:37:54 -04:00
a0d59ff6a3
Add :version to ob-plantuml.el option.
2012-04-03 13:43:36 +02:00
de42649f7b
Manually revert maint to e85080.
...
e85080 is the last correct commit in the maint branch
before releasing 7.8.04. The 7.8.05 release should be
done from this commit.
2012-03-17 16:28:46 +01:00
73bb18ba37
Manually revert to the Release 7.8.04 tag.
2012-03-17 15:52:24 +01:00
6e534f9c61
Manually revert back to commit e85080.
...
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.
2012-03-17 14:34:01 +01:00
04971de4b9
Add version tag "24.1" for options introduced since Emacs 23.4 (and <= 24.1)
...
* org-exp.el (org-export-kill-product-buffer-when-displayed)
(org-export-initial-scope, org-export-date-timestamp-format)
(org-export-with-tasks, org-export-email-info)
(org-export-table-remove-empty-lines): Add version tag.
* org-mobile.el (org-mobile-files-exclude-regexp)
(org-mobile-use-encryption, org-mobile-encryption-tempfile)
(org-mobile-encryption-password, org-mobile-agendas): Add
version tag.
* ob-plantuml.el (org-plantuml-jar-path): Add version tag.
* org.el (org-babel-load-languages, org-clone-delete-id)
(org-log-buffer-setup-hook)
(org-loop-over-headlines-in-active-region)
(org-use-sub-superscripts, org-startup-with-beamer-mode)
(org-startup-with-inline-images, org-ctrl-k-protect-subtree)
(org-catch-invisible-edits)
(org-link-search-must-match-exact-headline)
(org-confirm-shell-link-not-regexp)
(org-confirm-elisp-link-not-regexp, org-log-refile)
(org-refile-use-cache)
(org-refile-active-region-within-subtree)
(org-todo-repeat-to-state, org-get-priority-function)
(org-agenda-jump-prefer-future)
(org-read-date-force-compatible-dates)
(org-use-effective-time)
(org-complete-tags-always-offer-all-agenda-tags)
(org-properties-postprocess-alist)
(org-format-latex-signal-error)
(org-latex-to-mathml-jar-file)
(org-latex-to-mathml-convert-command)
(org-export-latex-default-packages-alist)
(org-hidden-keywords, org-pretty-entities)
(org-pretty-entities-include-sub-superscripts)
(org-src-fontify-natively, org-effort-durations)
(org-speed-command-hook): Add version tag.
* org-html.el (org-export-html-footnote-separator)
(org-export-html-mathjax-options)
(org-export-html-mathjax-template)
(org-export-html-headline-anchor-format)
(org-export-html-preamble-format)
(org-export-html-postamble-format)
(org-export-html-table-align-individual-fields)
(org-export-html-protect-char-alist, org-export-html-divs):
Add version tag.
* org-ctags.el (org-ctags-path-to-ctags)
(org-ctags-open-link-functions)
(org-ctags-new-topic-template): Add version tag.
* ob-exp.el (org-export-babel-evaluate): Add version tag.
* org-beamer.el (org-beamer-use-parts)
(org-beamer-frame-level, org-beamer-frame-default-options)
(org-beamer-column-view-format, org-beamer-themes)
(org-beamer-environments-extra, org-beamer-fragile-re)
(org-beamer-outline-frame-title)
(org-beamer-outline-frame-options): Add version tag.
* org-wl.el (org-wl-link-remove-filter)
(org-wl-shimbun-prefer-web-links)
(org-wl-nntp-prefer-web-links, org-wl-disable-folder-check)
(org-wl-namazu-default-index): Add version tag.
* org-clock.el (org-task-overrun-text)
(org-clocktable-defaults, org-clock-clocktable-formatter)
(org-clock-clocktable-language-setup)
(org-clock-report-include-clocking-task)
(org-clock-resolve-expert): Add version tag.
* ob-lob.el (org-babel-lob-files): Add version tag.
* org-freemind.el (org-freemind-node-css-style): Add version
tag.
* org-archive.el (org-archive-reversed-order)
(org-archive-subtree-add-inherited-tags): Add version tag.
* org-bibtex.el (org-bibtex-autogen-keys, org-bibtex-prefix)
(org-bibtex-treat-headline-as-title)
(org-bibtex-export-arbitrary-fields)
(org-bibtex-key-property, org-bibtex-tags)
(org-bibtex-tags-are-keywords, org-bibtex-no-export-tags)
(org-bibtex-type-property-name): Add version tag.
* org-timer.el (org-timer-default-timer): Add version tag.
* org-taskjuggler.el (org-export-taskjuggler-extension)
(org-export-taskjuggler-project-tag)
(org-export-taskjuggler-resource-tag)
(org-export-taskjuggler-target-version)
(org-export-taskjuggler-default-project-version)
(org-export-taskjuggler-default-project-duration)
(org-export-taskjuggler-default-reports)
(org-export-taskjuggler-default-global-properties): Add
version tag.
* org-habit.el (org-habit-today-glyph)
(org-habit-completed-glyph): Add version tag.
* org-list.el (org-alphabetical-lists)
(org-list-ending-method, org-list-end-regexp)
(org-list-automatic-rules, org-list-use-circular-motion)
(org-list-indent-offset): Add version tag.
* ob-picolisp.el (org-babel-picolisp-cmd): Add version tag.
* org-icalendar.el (org-icalendar-alarm-time)
(org-icalendar-combined-description)
(org-icalendar-honor-noexport-tag)
(org-icalendar-date-time-format): Add version tag.
* org-src.el (org-src-tab-acts-natively): Add version tag.
* org-exp-blocks.el (org-export-blocks-postblock-hook): Add
version tag.
* org-table.el (org-table-exit-follow-field-mode-when-leaving-table)
(org-table-fix-formulas-confirm)
(org-table-duration-custom-format)
(org-table-formula-field-format): Add version tag.
* org-publish.el (org-publish-sitemap-sort-files)
(org-publish-sitemap-sort-folders)
(org-publish-sitemap-sort-ignore-case)
(org-publish-sitemap-date-format)
(org-publish-sitemap-file-entry-format): Add version tag.
* ob-js.el (org-babel-js-cmd): Add version tag.
* org-docbook.el (org-export-docbook-footnote-separator)
(org-export-docbook-xslt-stylesheet): Add version tag.
* org-entities.el (org-entities-ascii-explanatory)
(org-entities-user): Add version tag.
* ob.el (org-confirm-babel-evaluate)
(org-babel-no-eval-on-ctrl-c-ctrl-c): Add version tag.
* ob-tangle.el (org-babel-tangle-lang-exts)
(org-babel-post-tangle-hook, org-babel-pre-tangle-hook)
(org-babel-tangle-body-hook)
(org-babel-tangle-comment-format-beg)
(org-babel-tangle-comment-format-end)
(org-babel-process-comment-text): Add version tag.
* org-gnus.el (org-gnus-nnimap-query-article-no-from-file):
Add version tag.
* org-crypt.el (org-crypt-disable-auto-save): Add version tag.
* org-inlinetask.el (org-inlinetask-default-state): Add
version tag.
* ob-scheme.el (org-babel-scheme-cmd): Add version tag.
* ob-lisp.el (org-babel-lisp-dir-fmt): Add version tag.
* org-attach.el (org-attach-store-link-p): Add version tag.
* org-capture.el (org-capture-templates)
(org-capture-before-finalize-hook)
(org-capture-after-finalize-hook): Add version tag.
* org-agenda.el (org-agenda-skip-deadline-prewarning-if-scheduled)
(org-agenda-time-leading-zero, org-agenda-follow-indirect)
(org-agenda-menu-two-column, org-agenda-menu-show-matcher)
(org-agenda-timegrid-use-ampm)
(org-agenda-remove-timeranges-from-blocks)
(org-agenda-inactive-leader, org-agenda-current-time-string)
(org-agenda-show-current-time-in-grid)
(org-agenda-search-view-force-full-words)
(org-agenda-search-view-always-boolean)
(org-agenda-clock-consistency-checks)
(org-agenda-include-deadlines)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-day-face-function)
(org-agenda-category-icon-alist)
(org-agenda-bulk-custom-functions)
(org-agenda-insert-diary-extract-time): Add version tag.
* org-latex.el (org-export-latex-inputenc-alist)
(org-export-latex-tag-markup)
(org-export-latex-timestamp-inactive-markup)
(org-export-latex-href-format)
(org-export-latex-hyperref-format)
(org-export-latex-footnote-separator)
(org-export-latex-quotes)
(org-export-latex-table-caption-above)
(org-export-latex-listings-w-names)
(org-export-latex-minted-langs)
(org-export-latex-listings-options)
(org-export-latex-minted-options)
(org-latex-default-figure-position, org-export-pdf-logfiles):
Add version tag.
* org-faces.el (org-faces-easy-properties)
(org-fontify-quote-and-verse-blocks, org-cycle-level-faces):
Add version tag.
* ob-ditaa.el (org-ditaa-jar-option): Add version tag.
Thanks to Glenn Morris for reporting this.
2012-02-13 15:49:28 +01:00
3dc9cc35ec
More copyright year fixes.
2012-01-04 15:47:43 +01:00
58f1dbccf8
Remove the "Version" header in Org libraries (leave it in org.el).
...
Also remove blank lines before the ";;; org*el ends here" declarations.
Having a "Version" header forced us to update every file when releasing a
new version of Org; it also forced us to update every file when merging Org
with Emacs trunk, thus cluttering the diffs between the previously merged
version and the new one with useless information.
Glenn Morris suggested this in emacs-devel:
http://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00322.html
2011-08-17 14:42:34 +02:00
7a18799e25
Remove arch-tag at the bottom of files.
2011-08-15 20:04:38 +02:00
904ed18bc2
Fix copyright years for elisp files in core and contrib.
...
Also add "This file is not part of GNU Emacs." when this is the case.
2011-08-15 15:23:11 +02:00
7340cee33a
Update website to show 7.7 as current release
2011-07-28 10:33:35 +00:00
9c05a7c781
Bump to version 7.6
2011-07-06 21:06:03 +02:00
d54c3825a8
ob-plantuml: adding eps support -- Thanks to Michael Gauland
2011-03-30 23:25:28 -06:00
11a10bdfe7
Update website to show 7.5 as current release
2011-03-07 14:27:39 +00:00
e030d95ddb
ob: language-specific changes in response to :file arg changes
...
These languages are capable of writing results to file; for several of
them this is their only mode of operation. These changes cause the
languages to return to ob.el either the computed result, or nil, when
they have written results to file themselves. This is in place of the
previous method of returning the output file name as a string to
ob.el.
* lisp/ob-asymptote.el (org-babel-execute:asymptote): Return nil to
signal that the intended content has been written to file.
* lisp/ob-ditaa.el (org-babel-execute:ditaa): Return nil to signal
that the intended content has been written to file.
* lisp/ob-dot.el (org-babel-execute:dot): Return nil to signal that
the intended content has been written to file.
* lisp/ob-gnuplot.el (org-babel-execute:gnuplot): Return nil to signal
that the intended content has been written to file.
* lisp/ob-latex.el (org-babel-execute:latex): Return nil to signal
that the intended content has been written to file.
* lisp/ob-mscgen.el (org-babel-execute:mscgen): Return nil to
signal that the intended content has been written to file.
* lisp/ob-octave.el (org-babel-execute:octave): Return result; not
name of output file.
* lisp/ob-plantuml.el (org-babel-execute:plantuml): Return nil to
signal that the intended content has been written to file.
* lisp/ob-python.el (org-babel-execute:python): Return result; not
name of output file.
* lisp/ob-ruby.el (org-babel-execute:ruby): Return result; not
name of output file.
* lisp/ob-sass.el (org-babel-execute:sass): Return nil if result has
been written to file
2010-12-21 14:19:24 +00:00
7666ba421f
Version number back to 7.4
2010-12-10 18:49:40 +01:00
76a25715c9
Bump version number to 7.5
2010-12-10 18:43:10 +01:00
6630edbd0f
Set version number to 7.3
2010-11-07 14:52:14 +01:00
82af72eef7
Push version number to 7.02trans
2010-10-29 09:11:46 +02:00
33f836e701
babel: plantuml: Delete unnecessary language-specific expansion function
...
* ob-plantuml.el (org-babel-expand-body:plantuml): Delete
function (automatically handled by generic version)
2010-10-21 13:06:02 +01:00
2ddcf9e255
removing obsoleted optional third argument from org-babel-expand-body:LANG
...
* lisp/ob-C.el (org-babel-expand-body:c++): removing obsoleted
optional third argument
(org-babel-expand-body:c++): removing obsoleted optional third
argument
(org-babel-C-expand): removing obsoleted optional third argument
* lisp/ob-R.el:
(org-babel-expand-body:R): removing obsoleted optional third
argument
(org-babel-execute:R): removing obsoleted optional third argument
(org-babel-R-variable-assignments): removing obsoleted optional
third argument
* lisp/ob-asymptote.el:
(org-babel-expand-body:asymptote): removing obsoleted optional third
argument
(org-babel-execute:asymptote): removing obsoleted optional third
argument
* lisp/ob-clojure.el:
(org-babel-expand-body:clojure): removing obsoleted optional third
argument
(org-babel-execute:clojure): removing obsoleted optional third
argument
* lisp/ob-css.el:
(org-babel-expand-body:css): removing obsoleted optional third
argument
* lisp/ob-ditaa.el:
(org-babel-expand-body:ditaa): removing obsoleted optional third
argument
* lisp/ob-dot.el:
(org-babel-expand-body:dot): removing obsoleted optional third
argument
(org-babel-execute:dot): removing obsoleted optional third argument
* lisp/ob-emacs-lisp.el:
(org-babel-expand-body:emacs-lisp): removing obsoleted optional
third argument
(org-babel-execute:emacs-lisp): removing obsoleted optional third
argument
* lisp/ob-gnuplot.el:
(org-babel-expand-body:gnuplot): removing obsoleted optional third
argument
* lisp/ob-haskell.el:
(org-babel-expand-body:haskell): removing obsoleted optional third
argument
(org-babel-execute:haskell): removing obsoleted optional third
argument
(org-babel-load-session:haskell): removing obsoleted optional third
(org-babel-prep-session:haskell): removing obsoleted optional third
* lisp/ob-js.el:
(org-babel-expand-body:js): removing obsoleted optional third
argument
(org-babel-execute:js): removing obsoleted optional third argument
* lisp/ob-latex.el:
(org-babel-expand-body:latex): removing obsoleted optional third
argument
* lisp/ob-lisp.el:
(org-babel-expand-body:lisp): removing obsoleted optional third
argument
(org-babel-execute:lisp): removing obsoleted optional third argument
* lisp/ob-mscgen.el:
(org-babel-expand-body:mscgen): removing obsoleted optional third
argument
* lisp/ob-ocaml.el:
(org-babel-expand-body:ocaml): removing obsoleted optional third
argument
(org-babel-execute:ocaml): removing obsoleted optional third
argument
* lisp/ob-octave.el:
(org-babel-expand-body:matlab): removing obsoleted optional third
argument
(org-babel-expand-body:octave): removing obsoleted optional third
argument
(org-babel-execute:octave): removing obsoleted optional third
argument
(org-babel-octave-variable-assignments): removing obsoleted optional
third
* lisp/ob-org.el:
(org-babel-expand-body:org): removing obsoleted optional third
argument
* lisp/ob-perl.el:
(org-babel-expand-body:perl): removing obsoleted optional third
argument
(org-babel-execute:perl): removing obsoleted optional third argument
* lisp/ob-plantuml.el:
(org-babel-expand-body:plantuml): removing obsoleted optional third
argument
* lisp/ob-python.el:
(org-babel-expand-body:python): removing obsoleted optional third
argument
(org-babel-execute:python): removing obsoleted optional third
argument
(org-babel-python-variable-assignments): removing obsoleted optional
third
* lisp/ob-ruby.el:
(org-babel-expand-body:ruby): removing obsoleted optional third
argument
(org-babel-execute:ruby): removing obsoleted optional third argument
* lisp/ob-sass.el:
(org-babel-expand-body:sass): removing obsoleted optional third
argument
* lisp/ob-scheme.el:
(org-babel-expand-body:scheme): removing obsoleted optional third
argument
(org-babel-execute:scheme): removing obsoleted optional third
argument
* lisp/ob-screen.el:
(org-babel-expand-body:screen): removing obsoleted optional third
argument
* lisp/ob-sh.el:
(org-babel-expand-body:sh): removing obsoleted optional third
argument
(org-babel-execute:sh): removing obsoleted optional third argument
(org-babel-sh-variable-assignments): removing obsoleted optional
third
* lisp/ob-sql.el:
(org-babel-expand-body:sql): removing obsoleted optional third
argument
* lisp/ob-sqlite.el:
(org-babel-expand-body:sqlite): removing obsoleted optional third
argument
(org-babel-execute:sqlite): removing obsoleted optional third
argument
* lisp/ob.el:
(org-babel-expand-body:generic): removing obsoleted optional third
argument
2010-10-21 13:06:00 +01:00
ab5d7959d2
fixes bug with svg output -- Thanks to Rainer M Krug
...
* lisp/ob-plantuml.el (org-babel-execute:plantuml): fixes bug with svg
output
2010-09-30 14:18:02 -06:00
ec0b3892b9
babel: New function to process file names for use in external processes
...
* ob.el (org-babel-process-file-name): New function
(org-babel-maybe-remote-file): Delete function
* ob-sql.el (org-babel-execute:sql):
Use org-babel-process-file-name
* ob-scheme.el (org-babel-execute:scheme):
Use org-babel-process-file-name
* ob-sass.el (org-babel-execute:sass):
Use org-babel-process-file-name
* ob-ruby.el (org-babel-ruby-evaluate):
Use org-babel-process-file-name
* ob-python.el (org-babel-python-evaluate-external-process):
Use org-babel-process-file-name
(org-babel-python-evaluate-session):
Use org-babel-process-file-name
* ob-plantuml.el (org-babel-execute:plantuml):
Use org-babel-process-file-name
* ob-perl.el (org-babel-perl-evaluate):
Use org-babel-process-file-name
* ob-octave.el (org-babel-octave-evaluate-external-process):
Use org-babel-process-file-name
(org-babel-octave-evaluate-session):
Use org-babel-process-file-name,
don't use org-babel-maybe-remote-file
* ob-lisp.el (org-babel-execute:lisp):
Use org-babel-process-file-name
* ob-ledger.el (org-babel-execute:ledger):
Use org-babel-process-file-name
* ob-js.el (org-babel-execute:js):
Use org-babel-process-file-name
* ob-haskell.el (org-babel-haskell-export-to-lhs):
Use org-babel-process-file-name
* ob-gnuplot.el (org-babel-execute:gnuplot):
Use org-babel-process-file-name
* ob-eval.el (org-babel-eval-read-file): Don't use
org-babel-maybe-remote-file
* ob-dot.el (org-babel-execute:dot):
Use org-babel-process-file-name
* ob-ditaa.el (org-babel-execute:ditaa):
Use org-babel-process-file-name
* ob-clojure.el (org-babel-clojure-evaluate-external-process):
Use org-babel-process-file-name
* ob-asymptote.el (org-babel-execute:asymptote):
Use org-babel-process-file-name
* ob-R.el (org-babel-R-assign-elisp): Don't use
org-babel-maybe-remote-file, use org-babel-process-file-name
(org-babel-R-evaluate-external-process):
Use org-babel-process-file-name
(org-babel-R-evaluate-session):
Use org-babel-process-file-name
* ob-C.el (org-babel-C-execute):
Use org-babel-process-file-name
In addition to passing the file path through `expand-file-name',
tramp-style remote file names are converted to conventional (local)
file paths. The reason is that, if a tramp file name was in use in
emacs, then the shell command will be executing on the remote machine
in question. Further, by default the file name is passed through
`shell-quote-argument'.
2010-09-22 22:10:13 +01:00
2f4db36f4b
ob-plantuml: support for svg output files
...
* lisp/ob-plantuml.el (org-babel-execute:plantuml): support for svg
output files
2010-09-21 09:46:01 -06:00
5bdea686ed
ob-plantuml: raises an error when the :file header argument is not set
...
* lisp/ob-plantuml.el (org-babel-execute:plantuml):
2010-09-07 23:23:08 -06:00
b0dce5a074
ob-plantuml: now expanding file names before shell quoting
...
* lisp/ob-plantuml.el (org-babel-execute:plantuml): now expanding file
names before shell quoting
2010-09-02 17:58:08 -06:00
ebad875b12
ob-plantuml: explicitly check `org-plantuml-jar-path' before use
...
* lisp/ob-plantuml.el (org-babel-execute:plantuml): explicitly check
`org-plantuml-jar-path' before use
2010-09-02 12:47:54 -06:00
fdad92edd6
ob-plantuml: wrapping in-file and out-file in shell-quote-argument
...
Thanks to Michael Gauland for pointing out this fix
* lisp/ob-plantuml.el (org-babel-execute:plantuml): wrapping in-file
and out-file in shell-quote-argument
2010-08-29 19:33:38 -06:00
a89dc43e83
integrating ob-plantuml -- Thanks to Zhang Weize for this contribution!
...
* Makefile (LISPF): now compiling and installing ob-plantuml.el
* contrib/scripts/.gitignore : ignores the plantuml.jar file, so that
it can be located next to ditaa.jar
* lisp/ob-plantuml.el: adding copyright notice and FSF attribution
(org-plantuml-jar-path): now a defcustom
(org-babel-execute:plantuml): now using org-babel-eval which
displays error messages
* lisp/org.el (org-babel-load-languages): ob-plantuml is now part of
org-babel-load-languages
2010-08-26 09:36:08 -06:00
810bb09ef3
ob-plantuml.el support for evaluating plantuml scripts
2010-08-26 09:10:03 -06:00
Bastien Guerry
Eric Schulte
emacs
Eric Schulte
Dan Davison
Carsten Dominik
Dan Davison
Zhang Weize