Commit Graph

10761 Commits

Author SHA1 Message Date
Achim Gratz c656052326 use load instead of require in org-fixup.el
* UTILITIES/org-fixup.el: Use load instead of require so that the
  current definitions are used regardless of any previous provision of
  the requested feature.
2012-05-25 01:25:02 +02:00
Jambunathan K d4b3c199f3 Merge remote-tracking branch 'origin/maint' 2012-05-24 21:45:28 +05:30
Jambunathan K 1e811161c5 org-odt.el: Fix corruption due to multiple XML declarations
* lisp/org-odt.el (org-odt-init-outfile)
(org-odt-write-manifest-file): Disable
`nxml-auto-insert-xml-declaration-flag'.

* lisp/org-lparse.el (org-do-lparse): Don't trigger auto-mode
processing.

Guard against insertion of multiple XML declarations within
component XML files when
`nxml-auto-insert-xml-declaration-flag' is on.

Fixes bug
http://lists.gnu.org/archive/html/emacs-orgmode/2012-05/msg00510.html.
2012-05-24 21:41:38 +05:30
Bastien Guerry be8d545092 Allow to open the agenda from a timestamp in a headline.
* org.el (org-open-at-point): Allow to open the agenda from an
active or inactive timestamp in a headline.

TINYCHANGE

Thanks to Ingo Lohmar for this patch.
2012-05-24 11:33:00 +02:00
Nicolas Goaziou 5d1c7e741b Update some docstrings and comments
* contrib/lisp/org-e-ascii.el (org-e-ascii-table,
  org-e-ascii--table-cell-width): Update docsring.
* contrib/lisp/org-e-html.el (org-e-html-table): Update docstring.
* contrib/lisp/org-e-latex.el (org-e-latex-table): Update docstring.
* contrib/lisp/org-e-odt.el (org-e-odt-table): Update docstring.
2012-05-23 23:21:25 +02:00
Nicolas Goaziou 00a4bf0663 org-e-latex: Reordering functions 2012-05-23 16:29:16 +02:00
Bastien Guerry 31aa82c998 Merge branch 'maint' 2012-05-23 12:13:39 +02:00
Bastien Guerry 141d0fd24b org.el (org-scan-tags): Fix bug when building the scanner regexp.
* org.el (org-scan-tags): Fix bug when building the scanner regexp.

Thanks to Mike McLean, who first reported this issue and provided a
reproducible recipe.  Thanks to Laurynas Biveinis and Loris Bennett
who provided complementary feedback on this.
2012-05-23 12:13:21 +02:00
Bastien Guerry b62b49bc2b Make the column mandatory after #+include:.
* org-publish.el (org-publish-cache-file-needs-publishing):
Make the column mandatory after #+include:.

* org-exp.el (org-export-handle-include-files): Ditto.
2012-05-23 01:26:45 +02:00
Nicolas Goaziou 4721052ec6 org-e-ascii: Small refactoring
* contrib/lisp/org-e-ascii.el (org-e-ascii--unique-links): Small refactoring.
2012-05-21 21:54:09 +02:00
Nicolas Goaziou dc976e1139 org-export: Only number elements with a caption
* contrib/lisp/org-export.el (org-export-collect-elements): Collect
  elements with a caption only.
(org-export-collect-tables, org-export-collect-figures,
org-export-collect-listings): Update docstring.
* contrib/lisp/org-e-ascii.el (org-e-ascii--has-caption-p): Renamed
  from `org-e-ascii--has-caption-or-name-p'.
(org-e-ascii-link): Use previous function.
(org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables): Do not use #+NAME keyword as a fallback caption.
2012-05-21 21:38:42 +02:00
Bastien Guerry 937b56ec89 org-bibtex.el: Rename *org-bibtex-entries* to org-bibtex-entries.
* org-bibtex.el (org-bibtex-entries): Rename from
(org-bibtex-read, org-bibtex-write): Use the new name.
2012-05-21 18:30:09 +02:00
Eric Schulte f64a859db8 force cap of auto-inserted begin/end example block
* lisp/ob.el (org-babel-capitalize-examplize-region-markers): Controls
  the capitalization of begin and end example blocks.
  (org-babel-examplize-region): Optionally capitalize example block
  delimiters.
2012-05-21 09:46:47 -04:00
Achim Gratz 372948a88f use only relative paths for better compatibility with mixed Cygwin/NTEmacs installations
* UTILITIES/org-fixup.el(org-make-org-install): Use relative filenames
  throughout, and query Emacs for directory names where a full path is
  required.  This avoids Cygwin/POSIX paths being misinterpreted by a
  stock NTEmacs.  Use the same regex as (org-reload) for enumerating
  the files to byte-compile.

* default.mk: Factor out standard load-path for Emacs started in lisp/
  into BATCHL and use this in defaults.  Make all paths to be
  interpreted by Emacs relative so Cygwin and NTEmacs can coexist.
2012-05-21 15:34:25 +02:00
Nicolas Goaziou 42f7ba0d02 org-element: Fix ill-defined keywords parsing
* contrib/lisp/org-element.el (org-element-comment-parser):
  Ill-defined keywords (without the colons) are treated as comments.
(org-element-comment-interpreter): Apply changes to lexer.
* testing/lisp/test-org-element.el: Add test.
2012-05-20 17:33:36 +02:00
Nicolas Goaziou 65c0e18892 org-e-ascii: Ensure consistent cross-referencing between elements and links
* contrib/lisp/org-e-ascii.el (org-e-ascii--has-caption-or-name-p):
  New function.
(org-e-ascii--build-caption, org-e-ascii-link): Use new function.

This patch ensures only elements with a name or a caption are counted
in when a fuzzy link pointing to an element is resolved.
2012-05-20 13:57:58 +02:00
Nicolas Goaziou c91bcb368f org-export: Fix macro expansion when back-end protects dollar signs
* contrib/lisp/org-export.el (org-export-get-inbuffer-options): Return
  an "eval" macro as a regular secondary string instead of a plain
  string.
(org-export-expand-macro): Replace arguments before exporting
them (and possibly protecting dollar signs).  Refactor code.
* testing/lisp/test-org-export.el: Add tests.
2012-05-20 12:18:16 +02:00
Nicolas Goaziou 368a7f69c4 org-export: Move translate-alist into communication channel
* contrib/lisp/org-export.el (org-export-get-environment): Move
  translate-alist in communication channel.  Refactor code.
(org-export-transcoder): Retrieve transcoder from communication
channel instead of global variable.
2012-05-20 12:18:11 +02:00
Nicolas Goaziou 57cfa6aa9b org-export: Fix macro expansion error
* contrib/lisp/org-export.el (org-export-expand-macro): Fix code typo.
2012-05-20 09:57:33 +02:00
Eric Schulte 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
Achim Gratz 7b33d9f56b make functions in org-fixup.el more robust, add full build functionality
* UTILITIES/org-fixup.el(org-make-org-version): Use temporary buffer.

* UTILITIES/org-fixup.el(org-make-org-install): Use temporary buffer.

* UTILITIES/org-fixup.el(org-make-autoloads): New function, generates
  autoload files using (org-make-org-version)
  and (org-make-org-install).  Uses (org-fixup) to determine version
  strings.

* UTILITIES/org-fixup.el(org-make-autoloads-compile): New function,
  generates autoload files using (org-make-autoloads) and
  byte-compiles files in lisp.  Optional argument forces
  re-compilation of all files.

* UTILITIES/org-fixup.el(org-fixup): Clean up whitespace and correct the
  unwind form.
2012-05-19 20:04:34 +02:00
Achim Gratz 40a789ecd1 fix org-reload and add parameters to customize output from org-version
* org.el(org-version): Add optional parameters 'full and 'message
  to optionally return the full version string and echo to message
  area in non-interactive calls.

* org.el(org-submit-bug-report): Add optional parameter 'full to
  call of (org-version) so that the bug report has all version
  information.

* org.el(org-reload): Simplify file-re (orgtbl-*.el files do not
  exist anymore).  Keep org-*.el at the end of the files list.
  Explicitely load org-version.el (since it doesn't provide feature
  'org-version) at the very end, but ignore errors when it doesn't
  exist.  Add parameters 'full and 'message to the call
  of (org-version) so that after reload the full version information
  is displayed in the message area again.
2012-05-19 10:52:09 +02:00
Bastien Guerry 584b869d38 org-exp.el: Allow to use #+include with no column.
* org-exp.el (org-export-handle-include-files): Allow to use
#+include with no column.

Thanks to Albert for spotting this.
2012-05-19 10:25:19 +02:00
Achim Gratz 595d451280 use org-no-warnings macro for XEmacs compatibility
* lisp/org-agenda.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org-bbdb.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org-clock.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org.el: Replace with-no-warnings with org-no-warnings (defined
  in org-macs.el).
2012-05-19 09:48:57 +02:00
Achim Gratz 160cde6c0e corrections to build system
* targets.mk: Only the first dependecy was used, remove them entirely
  and replace with explicit foreach.  Change "check" to only depend on
  "compile", so it does not re-make documentation.
2012-05-19 08:05:15 +02:00
Nicolas Goaziou c84cda961f Fix some more comments in export back-ends 2012-05-18 21:06:12 +02:00
Nicolas Goaziou 946230bae4 A few fixes to comments and docstrings 2012-05-18 17:26:53 +02:00
Eric Schulte fc5d53d910 Merge branch 'origin-maint' 2012-05-18 09:07:05 -04:00
Eric Schulte 038cdffe0c indent block boundaries when body is no-indent
Thanks to Seb and Nick for pointing this out.

* lisp/org-exp-blocks.el (org-export-blocks-preprocess): Even when the
  body of a block is not indented the boundary markers should be
  indented to their original positions so things like list indentation
  still work.
2012-05-18 09:06:42 -04:00
Nicolas Goaziou 893a0915b5 org-e-latex: Customizable format string for broken links
* contrib/lisp/org-e-latex.el (org-e-latex-link-with-unknown-path-format):
  New variable.
(org-e-latex-link): Use new variable.
2012-05-18 12:42:32 +02:00
Nicolas Goaziou 5ab59625e6 org-e-publish: Apply #+INCLUDE keyword regexp change
* contrib/lisp/org-e-publish.el (org-e-publish-cache-file-needs-publishing):
  Make quotes mandatory around the file name and allow spaces in
  it.
2012-05-18 11:48:15 +02:00
Nicolas Goaziou 507b3c937b org-export: Fill `org-export-current-backend' before pre-parsing hook
* contrib/lisp/org-export.el (org-export-as): Store current back-end
  in `org-export-current-backend' before running
  `org-export-before-parsing-hook'.
2012-05-18 11:42:16 +02:00
Nicolas Goaziou 51472b4d33 org-export: Implement `org-export-resolve-radio-link'
* contrib/lisp/org-export.el (org-export-resolve-coderef): New function.
* contrib/lisp/org-e-ascii.el (org-e-ascii-link): Use new function.
* contrib/lisp/org-e-html.el (org-e-html-link): Use new function.
* contrib/lisp/org-e-latex.el (org-e-latex-link): Use new function.
* contrib/lisp/org-e-odt.el (org-e-odt-link): Use new function.
* testing/lisp/test-org-export.el: Add tests.
2012-05-18 11:42:16 +02:00
Nicolas Goaziou e1eb6a4af2 org-export: Rename `org-export-option-alist' into `org-export-options-alist'
* contrib/lisp/org-e-ascii.el (org-e-ascii-options-alist): Renamed
  from `org-e-ascii-option-alist'.
* contrib/lisp/org-e-html.el (org-e-html-options-alist): Renamed from
  `org-e-html-option-alist'.
* contrib/lisp/org-e-latex.el (org-e-latex-options-alist): Renamed
  from `org-e-latex-option-alist'.
* contrib/lisp/org-e-odt.el (org-e-odt-options-alist): Renamed from
  `org-e-odt-option-alist'.
* contrib/lisp/org-export.el (org-export-define-derived-backend,
  org-export-parse-option-keyword, org-export-get-inbuffer-options,
  org-export-get-global-options): Rename `org-export-option-alist'
  into `org-export-options-alist'.
2012-05-18 11:42:16 +02:00
Nicolas Goaziou 69f7a9b67f org-export: Implement `org-export-define-derived-backend'
* contrib/lisp/org-export.el (org-export-define-derived-backend): New
  function.
2012-05-18 11:42:15 +02:00
Nicolas Goaziou 7421e96536 org-export: Remove naming convening for back-ends
* contrib/lisp/org-e-ascii.el (org-e-ascii-translate-alist): New variable.
* contrib/lisp/org-e-html.el (org-e-html-translate-alist): New
  variable.
(org-e-html-filters-alist): Move variable into an appropriate section.
* contrib/lisp/org-e-latex.el (org-e-latex-translate-alist): New variable.
* contrib/lisp/org-e-odt.el (org-e-odt-translate-alist): New variable.
(org-e-odt-option-alist): Move variable into an appropriate section.
* contrib/lisp/org-export.el (org-export-transcoder): Retrieve
  translators from `org-BACKEND-translate-alist' instead of applying
  a naming convention to each of them.
* testing/lisp/test-org-export.el: Update tests.
2012-05-18 11:42:15 +02:00
Nicolas Goaziou 1c2aaca837 org-e-ascii: Table cells are exported with proper export options
* contrib/lisp/org-e-ascii.el (org-e-ascii-superscript): Table cells
  are exported with proper export options.
2012-05-18 11:42:15 +02:00
Bastien Guerry 7da0d6b994 org-publish.el: #+INCLUDE now use mandatory quotes, spaces are allowed in file names.
* org-publish.el (org-publish-cache-file-needs-publishing):
Make quotes mandatory around the file name and allow spaces in
it.

Thanks to Albert for this suggestion.
2012-05-18 09:17:58 +02:00
Bastien Guerry 4565bf0630 org-html.el (org-export-as-html): Add link to Org's and Emacs's websites.
* org-html.el (org-export-as-html): Add link to Org's and
Emacs's websites.
2012-05-18 08:32:08 +02:00
Adam Spiers e1630f60c7 Add hyperlink to Org website from HTML export footer
* lisp/org-html.el: add hyperlink to http://orgmode.org/ from export footer
2012-05-18 08:30:02 +02:00
Adam Spiers b57e23694f Fix typo in manual index's description of the 'Hooks' section
* doc/org.texi: Fix typo in description of the 'Hooks' section
2012-05-18 08:30:00 +02:00
Adam Spiers 677a94a961 Document ID special property.
* doc/org.texi: add ID to the list of special properties.
2012-05-18 08:29:57 +02:00
Bastien Guerry 0c17921815 Merge branch 'master' of orgmode.org:org-mode 2012-05-18 07:48:49 +02:00
Bastien Guerry 2369090328 UTILITIES/server.mk: delete whitespaces. 2012-05-18 07:46:25 +02:00
Achim Gratz 4ea1573b9d Remove "release_" prefix from org-version when org-fixup is run
* UTILITIES/org-fixup.el: Remove "release_" prefix from org-version
  when it is established from git.
2012-05-18 07:45:47 +02:00
Achim Gratz 58e4e212f2 Re-introduce server.mk
* UTILITIES/server.mk: Re-introduce, keep in UTILITIES like the other
  server stuff.  Implement "helpserver" and link into "help" and
  "helpall" targets.  Add "reltest" target to clean up the work tree
  and produce release archives, uses internal target "rel-dirty" for
  the actual archive creation.  Warn if $(ORGVERSION) is different
  from $(GITVERSION), as a release should only be made from a revision
  that has an annotated tag.
2012-05-18 07:45:47 +02:00
Achim Gratz 837ccf464c avoid accumulation of the ".dirty" suffix on $(GITVERSION) during sub-make invocations
* targets.mk: Strip ".dirty" suffix from $(GITVERSION) before
  potentially re-adding it, to avoid accumulation of the suffix during
  sub-make invocations.
2012-05-18 07:45:47 +02:00
Achim Gratz cd9476e774 Remove more autosave cruft with "cleanall"
* targets.mk: Remove more autosave cruft with "cleanall": "#*#" and ".#*".
2012-05-18 07:45:47 +02:00
Achim Gratz a0a344bff1 inject version strings into orgguide
* doc/orgguide.texi: Include version strings from "org-version.inc".

* doc/Makefile: Make "org-version.inc" a dependency of "guide".
2012-05-18 07:45:46 +02:00
Achim Gratz b3b7769457 guard invocation of org-mode and suppress warning from byte-compiler
* lisp/org.el: Add with-not-warnings around call of (org-fixup).
2012-05-18 07:45:46 +02:00