Commit Graph

13104 Commits

Author SHA1 Message Date
Bastien Guerry 72cc2e99d8 Merge branch 'maint' 2013-02-27 08:46:36 +01:00
Bastien Guerry 5f47cb2b9f Fix commit 41882a99
Thanks to Tassilo Horn for reporting this.
2013-02-27 08:46:26 +01:00
Rick Frankel 43297f9ab7 Slideshow bugfixes and sync with ox-html function name changes.
* contrib/lisp/ox-deck.el: Default org-deck-directories to "./deck.js".
(org-deck-toc): Sync w/ ox-html name change (org-html--toc-text.)
(org-deck-inner-template): Remove duplicate toc generation code.
* contrib/lisp/ox-s5.el: Add inner template to fix duplicate content
  div error.
(org-s5-toc): Sync w/ ox-html name change (org-html--toc-text) and
make toc entries static since s5 doesn't support deep linking.
2013-02-27 00:15:37 +01:00
Nicolas Goaziou 86563e0119 org-element: OPTIONAL_TITLE becomes ALT_TITLE property
* lisp/org-element.el (org-element-headline-parser):
  Rename :optional-title into :alt-title.
* lisp/ox.el (org-export-get-alt-title): Renamed from
  `org-export-get-optional-title'.
* lisp/ox-ascii.el (org-ascii--build-title): Apply name change.
* lisp/ox-html.el (org-html--format-toc-headline): Apply name change.
* lisp/ox-latex.el (org-latex-headline): Apply name change.
* lisp/ox-texinfo.el (org-texinfo--get-node,
  org-texinfo--generate-menu-items): Apply name change.
* testing/lisp/test-ox.el: Update tests.
* doc/org.texi (Table of contents): Update documentation.
2013-02-27 00:03:59 +01:00
Nicolas Goaziou bb45dd1074 Fix function declaration 2013-02-26 23:47:07 +01:00
Nicolas Goaziou 677433d9b4 ox: Fix bug where properties read from setupfile overwrite previous properties
* lisp/ox.el (org-export--get-inbuffer-options): Remove an optional
  argument.  Rewrite function.  Properties read from a setupfile do
  not overwrite anymore previously computed properties.
(org-export-get-environment): Apply changes to previous function.
* lisp/org.el (org-create-formula--latex-header): Apply arity change
  from `org-export--get-inbuffer-options'.
* testing/lisp/test-ox.el: Add test.
* testing/examples/setupfile.org: New file.
2013-02-26 23:35:36 +01:00
Tokuya Kameshima 7604fe1e80 org-mew.el: Major enhancement
* org-mew.el (org-mew-inbox-folder, org-mew-use-id-db)
(org-mew-subject-alist, org-mew-capture-inbox-folders)
(org-mew-capture-guess-alist): New options.
(org-mew-store-link, org-mew-open): Rewrite.
(org-mew-folder-name, org-mew-follow-link)
(org-mew-folder-eixsts-p, org-mew-get-msgnum)
(org-mew-open-by-message-id, org-mew-search, org-mew-capture)
(org-mew-capture-guess-selection-keys): New functions.
2013-02-26 23:28:58 +01:00
Bastien Guerry 4a40c215f9 Merge branch 'maint' 2013-02-26 23:17:42 +01:00
Aaron Ecay c30ba6f156 contrib/org-toc.el: add forward and back commands
These commands navigate among siblings in the outline, and are bound to
the ‘f’ and ‘b’ keys.  Move the function for toggling toc-follow to ‘F’.
2013-02-26 23:17:30 +01:00
Bastien Guerry 78c4199310 Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-02-26 22:45:41 +01:00
Bastien Guerry 41882a99d3 Fix a longstanding issue with ellispsis on top of the window
* org.el (org-show-context): Remove useless catch.  Make sure the
top of the window is a visible headline.
* org.el (org-activate-plain-links): Remove unused catch.

* org-macs.el (org-get-alist-option): Return nil, not (nil), so
that `org-show-context' DTRT.

Thanks to Samuel Wales for his patience in reporting this.
2013-02-26 22:45:04 +01:00
Bastien Guerry ebe0fbd6a8 Merge branch 'maint' 2013-02-26 22:02:25 +01:00
Bastien Guerry 2b13d090d1 org.el (org-imenu-get-tree): Fix bug when matching against empty headlines
* org.el (org-imenu-get-tree): Fix bug when matching against empty
headlines.

Thanks to Jambunathan for reporting this.
2013-02-26 22:02:13 +01:00
Bastien Guerry 5bdb84ba74 org.el: Add :version and :package-version to `orgstruct-heading-prefix-regexp' 2013-02-26 18:23:53 +01:00
Bastien Guerry 3ee229dcd1 Merge branch 'master' of orgmode.org:org-mode 2013-02-26 18:21:40 +01:00
Bastien Guerry 295b0ba5d1 Bump :version to "24.4" and add :package-version.
The options updated are those who won't be in Emacs 24.3.
2013-02-26 18:21:28 +01:00
Bastien Guerry c7092b796d Remove :version keyword in non-emacs libraries 2013-02-26 17:57:13 +01:00
Bastien Guerry 751db690a0 contrib/babel/langs/ob-mathomatic.el: Delete whitespaces 2013-02-26 17:56:36 +01:00
Christopher Schmidt ff92e688dd org.el: Rebind structure-related variables within org-run-like-in-org-mode
* org.el (orgstruct-make-binding): Rebind structure-related
variables within org-run-like-in-org-mode.
2013-02-26 17:52:32 +01:00
Bastien Guerry f20ae92e88 Merge branch 'maint' 2013-02-26 16:28:36 +01:00
Bastien Guerry 2efbd0f138 org.el (org-overview): Stay on current line
* org.el (org-overview): Stay on current line.

This circumvents a bug in hide-sublevels which displays the
"..." ellipsis on top of the window when hiding levels that
are past the middle of the window---at least this is the
way I could understand the problem.

Thanks to Samuel Wales for reporting the problem, Arun Persaud and
William for creating reproducible recipes, Suvayu Ali, Nick Dokos
and Achim Gratz for further help.
2013-02-26 16:28:30 +01:00
Bastien Guerry 3ce1457546 Merge branch 'master' of orgmode.org:org-mode
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-02-26 16:14:40 +01:00
Bastien Guerry 76cca82fc1 Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-02-26 16:14:03 +01:00
Bastien Guerry 95375260e5 Fix commit 83bebfd880 2013-02-26 16:13:39 +01:00
sabof 929b9f0a52 updated org-bullets to 0.2.2 2013-02-26 14:33:30 +00:00
Bastien Guerry 04fd44708a Merge branch 'maint' 2013-02-26 15:14:42 +01:00
Bastien Guerry 6042e93fa4 org.el (org-map-entries): Fix docstring
* org.el (org-map-entries): Fix docstring.

Thanks to Christopher Schmidt for reporting this.
2013-02-26 15:14:37 +01:00
Bastien Guerry 92d08a3efd Merge branch 'maint' 2013-02-26 14:37:15 +01:00
Bastien Guerry 889d671277 Fix typo. 2013-02-26 14:37:05 +01:00
Bastien Guerry de73b35909 Merge branch 'maint'
Conflicts:
	contrib/oldexp/org-exp.el
	lisp/org.el
2013-02-26 14:36:36 +01:00
Bastien Guerry 83bebfd880 Use `org-autoload' instead of `autoload'. 2013-02-26 14:35:25 +01:00
Bastien Guerry 8f49547aaf Remove top-level autoloads sexps.
These autoloads were erroneously introduced by commit e4c31cf98.
2013-02-26 14:35:01 +01:00
Nicolas Goaziou 58fc1b4bf4 Use `org-latex-compile' when processing formulas with imagemagick
* lisp/ox-latex.el (org-latex-compile): Add an optional argument for
  latex snippet previewing.
* lisp/org.el (org-create-formula-image-with-imagemagick): Use
  `org-latex-compile' instead of rewriting it.
2013-02-26 13:43:48 +01:00
Bastien Guerry c4a69a3b4c mk/server.mk: Add the AUTHORS file to ORGFULL
We do not add this file to the ELPA-with-contrib distribution
since the list of AUTHORS includes authors of contributed files.
2013-02-26 11:31:06 +01:00
Bastien Guerry 48bc6ad52c Add AUTHORS, update contrib/README, clean-up and fix comment sections in other files 2013-02-26 11:28:59 +01:00
Bastien Guerry 0c9b468545 Merge branch 'maint' 2013-02-26 11:09:06 +01:00
Bastien Guerry 467f7ff9b5 Fix commit b6b509.
Thanks to Sébastien Vauban for reporting this.
2013-02-26 11:08:50 +01:00
Nicolas Goaziou b0fd7a51ee Revert "ox: Use tabulated list mode for asynchronous stack"
This reverts commit a965c06213.
2013-02-26 09:46:02 +01:00
Rick Frankel a8f0c39e66 Whitespace cleanup 2013-02-26 09:07:38 +01:00
Rick Frankel 2e04ffe413 Update contributed slide output to use uppercase properties
* contrib/lisp/ox-deck.el: Change menu key to ?d to avoid conflict
  with ox-s5.
(org-deck-toc): Use HTML_CONTAINER_CLASS instead of html-container-class.
(org-deck-headline): Simplify code to use HTML_CONTAINER_CLASS
directly, and use org-element-get-relative-level.
(org-deck-item): Use uppercase property.

* contrib/lisp/ox-s5.el (s5): Add configuration variables for S5 meta data.
(org-s5--build-meta-info): ditto.
(org-s5-headline): Simplify code to use HTML_CONTAINER_CLASS directly,
and use org-element-get-relative-level.
(org-s5-plain-list): Use uppercase property.
(org-s5-template-alist): Fix bug. (Don't try and substring nil.)
2013-02-26 09:06:15 +01:00
Nicolas Goaziou 36f5aa316f ox-html: Fix stack overflow in regexp matching
* lisp/ox-html.el (org-html-fontify-code): Do not use [^\000] in
  regexps that may match large strings.

Thanks to Kyle Machulis for reporting it.
2013-02-26 00:29:04 +01:00
Nicolas Goaziou ef6c1498b4 Re-introduce #+latex_header value when previewing a LaTeX snippet
* lisp/org.el (org-create-formula--latex-header): New function.
(org-create-formula-image-with-dvipng,
org-create-formula-image-with-imagemagick): Use new function.

This functionality was removed in
0484c5c64d, when clearing out old export
framework from "org.el".
2013-02-26 00:04:05 +01:00
Nicolas Goaziou 367e680582 ox: Change order of retured elements in `org-export-get-previous-element'
* lisp/ox.el (org-export-get-previous-element): Change order of
  retured elements in `org-export-get-previous-element'.
* testing/lisp/test-ox.el: Update test.
2013-02-25 23:17:42 +01:00
Nicolas Goaziou 7cd6fdcd34 org-element: Only allow plain links in links
* lisp/org-element.el (org-element-all-successors): Add `plain-link'
  successor.
(org-element-object-restrictions): Remove `link' within `link'.  Allow
`plain-link' instead.
(org-element-plain-link-successor): New function.
* testing/lisp/test-org-element.el: Add test.

Plain links within links are needed for the following kind of syntax:

  [[http://orgmode.org][file:unicorn.png]]

No other link type is allowed within links.
2013-02-25 22:16:01 +01:00
Nicolas Goaziou 11033a97dc sub/superscript character has to follow a non-blank character
* lisp/org.el (org-match-substring-regexp,
  org-match-substring-with-braces-regexp): Update regexp.
  A sub/superscript cannot start anymore at the beginning of the line
  or after a space.
2013-02-25 21:53:14 +01:00
Nicolas Goaziou e024beaa7e org-element: Refactor object parsing
* lisp/org-element.el (org-element--get-next-object-candidates):
  Rewrite function to simplify algorithm.
(org-element-context, (org-element--parse-elements)): Apply
changes.
* lisp/org.el (org-fill-paragraph): Apply changes.
2013-02-25 21:52:54 +01:00
Jonathan Leech-Pepin be9d3bc3a7 ox-texinfo.el: Fix node listing description formatting
* lisp/ox-texinfo.el (org-texinfo--format-menu): Ensure two spaces
  after :: before including description.  Also adjusted logic to
  insert description on desired column (by accounting for added text
  when inserting node.
2013-02-25 12:25:45 -05:00
Christopher Schmidt de5ff236d4 org.el: Bind org-shift* in orgstruct-mode.
* org.el (orgstruct-setup): Bind org-shift*.
2013-02-25 17:12:21 +01:00
Jonathan Leech-Pepin b632d6ff6e ox-texinfo.el: Use :OPTIONAL_TITLE: instead of backend-specific
property

* lisp/ox-texinfo.el (org-texinfo--get-node)
  and (org-texinfo--generate-menu-items): Use :OPTIONAL_TITLE:.
  (org-export-define-backend): Remove :TEXINFO_MENU_TITLE from
  options-alist
2013-02-25 10:59:03 -05:00
Jonathan Leech-Pepin c94cae1ee6 ox-texinfo.el: Fix issue with long headlines and node listings
* lisp/ox-texinfo.el (org-texinfo-node-description-column): New custom
  variable.
  (org-texinfo--format-menu): Use new variable to set column for
  description in node listings.  If the headline extends past this
  column, add the description after the headline.

The default column is 32 as suggested by Thomas S. Dye,
http://article.gmane.org/gmane.emacs.orgmode/66664
2013-02-25 10:44:18 -05:00