Commit Graph

9395 Commits

Author SHA1 Message Date
Nicolas Goaziou 6c9c6eff05 org-export: Fix docstrings 2012-01-19 17:14:22 +01:00
Nicolas Goaziou c12246931f org-export: Add a function to resolve id or custom-id links
* contrib/lisp/org-export.el (org-export-resolve-id-link): New function.
2012-01-19 17:07:18 +01:00
Bastien Guerry 95e71f5705 Revert "Honour existing restrictions when visiting tasks from the agenda"
This reverts commit 8f93a75cac.
2012-01-19 16:21:50 +01:00
Bastien Guerry 3a6c081367 Revert "Honour existing restrictions when regenerating the agenda"
This reverts commit a0a26cddda.
2012-01-19 16:20:12 +01:00
Bastien Guerry 9b9f2d0d8d Revert "Honour existing restrictions when clocking in from the agenda"
This reverts commit c41a6f5a33.
2012-01-19 16:20:07 +01:00
Bastien Guerry a7c6f70ab1 Revert "Remove file restrictions when generating clock report data"
This reverts commit 7a73e155a3.
2012-01-19 16:19:42 +01:00
Nicolas Goaziou 46ff3b7a56 org-export: Remove :point-max property
* contrib/lisp/org-export.el (org-export-last-sibling-p): Make use
  of :genealogy property instead.
(org-export-get-point-max): Removed function.
(org-export-collect-tree-properties): Remove :point-max property.
2012-01-18 23:45:02 +01:00
Nicolas Goaziou 0bd090379b org-element: Fix block parsing
* contrib/lisp/org-element.el (org-element-parse-elements): Fix
  erroneous block parsing introduced by recent speed improvements.
  Also refactor code a bit.
2012-01-18 22:12:36 +01:00
Nicolas Goaziou 3c4a0795df Fix some docstrings 2012-01-17 21:06:30 +01:00
Nicolas Goaziou ecfb12de19 New interactive export functions for 'e-latex back-end
* EXPERIMENTAL/org-e-latex.el (org-e-latex-export-to-latex,
  org-e-latex-export-to-pdf): New functions.
* contrib/lisp/org-export.el (org-export-dispatch): Make use of new
  functions.
2012-01-17 20:27:38 +01:00
Nicolas Goaziou 418f63c8b1 org-export: Externalize output file name retrieval
* contrib/lisp/org-export.el (org-export-output-file-name): New function.
(org-export-to-file): Remove post-process and pub-dir arguments. Add
a file argument to specify an output file.
2012-01-17 19:14:14 +01:00
Bastien Guerry 7233671658 Merge branch 'master' of orgmode.org:org-mode 2012-01-17 08:44:38 +01:00
Eric Schulte 94f10ddfd7 don't always replace <<noweb>> references when :exports both
* lisp/ob-exp.el (org-babel-exp-results): Alter a copy of info.
* testing/examples/babel.org (an): Example data for test behavior.
* testing/lisp/test-ob-exp.el (ob-exp/noweb-no-export-and-exports-both):
  Confirm proper behavior.
2012-01-16 20:39:12 -07:00
Jambunathan K bf1d5cfe95 Add support for indented tables in ODT export
* etc/styles/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.

* lisp/org-odt.el (org-odt-table-indentedp): New variable
(org-odt-begin-table): Modified.  If the table is within a
list, temporarily leave the list and begin an indented section
before emitting the table.
(org-odt-end-table): Modified.  If the table was within a
list, close the indented section and re-open the list
immediately after ending the table.
(org-odt-continue-list, org-odt-discontinue-list): Helper
routines to temporarily discontinue and continue a list.
(org-odt-list-stack-stashed): New variable to hold the state
of a pending list.
(org-odt-begin-list, org-odt-begin-list-item)
(org-odt-end-list-item): Modified. Handle nitty-gritties for
continuing a list and list item.
(org-odt-section-count): New variable that keeps track of
section count.  Used in conjunction with naming of sections.
(org-odt-begin-section, org-odt-end-section): New defuns.
(org-odt-init-outfile): Initialize
`org-odt-list-stack-stashed' and `org-odt-section-count'.

* lisp/org-lparse.el (org-lparse-list-item-count): Removed. Was a
superfluous variable.
(org-lparse-list-level): Removed.  Now derived from
`org-lparse-list-stack'.
(org-lparse-list-stack): New.  List that records the list
types - ordered, unordered or descriptive - in the following
order: self, parent, grand-parent etc.
(org-do-lparse): Added, removed above let-bound vars.
Disallowed regular tables within list-table block.
(org-lparse-begin-list, org-lparse-end-list)
(org-lparse-begin-list-item, org-lparse-end-list-item):
Propagate above changes.

OpenDocument doesn't permit tables to occur in the middle of a
list.  Use list continuations and indented sections to typeset
indented tables.

Fixes the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00515.html
2012-01-17 02:25:47 +05:30
Bastien Guerry 8ad81bfda7 Merge branch 'master' of orgmode.org:org-mode 2012-01-16 09:50:35 +01:00
Nicolas Goaziou 812d0a5375 org-e-latex: Fix customize group name and docstrings
* EXPERIMENTAL/org-e-latex.el (org-export-e-latex): Customize group,
  renamed from org-export-latex.
(org-e-latex-listings, org-e-latex-listings-options,
  org-e-latex-minted-options, org-e-latex-custom-lang-environments):
  Fix variable name in docstring.
2012-01-16 08:06:11 +01:00
Nicolas Goaziou e270792bd8 org-export: Fix regression in headline numbering
* contrib/lisp/org-export.el (org-export-collect-tree-properties):
  Ensure `:headline-offset' is filled before `:headline-numbering'
  since the latter depends on the former.
(org-export-collect-headline-numbering): Use headline elements as keys
  in the returned alist, instead of just beginning numbers.
(org-export-get-headline-number): Apply key change.
2012-01-16 00:36:26 +01:00
Nicolas Goaziou 5e970e407a org-export: Add a new predicate to test if an headline is low level
* contrib/lisp/org-export.el (org-export-low-level-p): New function.
* EXPERIMENTAL/org-e-latex.el (org-e-latex-headline): Make use of new function.
2012-01-15 18:40:40 +01:00
Bastien Guerry 9d045aa169 Merge branch 'maint' 2012-01-15 10:31:01 +01:00
Michael Brand aa321a3ed5 doc timestamp for diary-style sexp entries 2012-01-15 10:30:37 +01:00
Bastien Guerry 92c401198c org.html: Initialize `html-pre-real-contents' correctly.
* org-html.el (org-export-as-html): Initialize
`html-pre-real-contents' correctly.

Thanks to Bill Jackson for this fix.
2012-01-15 10:28:19 +01:00
Bastien Guerry e9ed31f8b9 org.html: Initialize `html-pre-real-contents' correctly.
* org-html.el (org-export-as-html): Initialize
`html-pre-real-contents' correctly.

Thanks to Bill Jackson for this fix.
2012-01-15 10:27:51 +01:00
Eric Schulte 526b3ef9ed ensure code block name is a string on export
* lisp/ob-exp.el (org-babel-exp-code): Ensure code block name is a
  string on export.
2012-01-14 12:50:31 -07:00
Eric Schulte 4ce9b8044c test for customizable code block export 2012-01-14 12:41:40 -07:00
Eric Schulte 46cc0f79cf customizeable code block export
* lisp/ob-exp.el (org-babel-exp-code-template): Customizable code
  block export format string.
  (org-babel-exp-code): Customizable code block export.
2012-01-14 12:41:40 -07:00
Nicolas Goaziou 85588714ac org-e-latex: Apply changes to org-export-resolve-fuzzy-link
* EXPERIMENTAL/org-e-latex.el (org-e-latex-link): Apply changes to
  org-export-resolve-fuzzy-link.
2012-01-14 01:02:48 +01:00
Nicolas Goaziou b03ec00a0e org-export: Change output from org-export-resolve-fuzzy-link
* contrib/lisp/org-export.el (org-export-resolve-fuzzy-link): Now
  return the full object (for a target) or element (for an headline)
  when a match is found.  Also rewrite internals so it doesn't rely
  on :headline-alist.
(org-export-collect-tree-properties): Remove :headline-alist property
  from communication channel, since `org-export-resolve-fuzzy-link'
  doesn't use it anymore. Also store full target objects
  in :target-list property, not only raw names. Fix an argument name
  mismatch, too.

Previous version of org-export-resolve-fuzzy-link returned beginning
position as the identifier for the headline found, which is pretty
weak when files are included in the parsed buffer.
2012-01-14 01:02:07 +01:00
Eric Schulte b93ed753ff Merge branch 'origin-maint' 2012-01-13 13:09:34 -07:00
Eric Schulte a370bae5d9 removed dependency on deprecated swank-clojure
* lisp/ob-clojure.el (org-babel-execute:clojure): Removed dependency
  on deprecated swank-clojure.
2012-01-13 13:07:54 -07:00
Nicolas Goaziou 117ee610e5 org-element: Fix small bug
* contrib/lisp/org-element.el (org-element-non-recursive-block-alist):
  Fix small bug.
2012-01-13 18:00:27 +01:00
Nicolas Goaziou fb046f5b59 org-element: Speed optimizations
* contrib/lisp/org-element.el (org-element--element-block-re): New
  variable.
(org-element-current-element): New function.
(org-element-parse-elements): Make use of the new specialized function
  instead of `org-element-at-point'.  Also narrow buffer to current
  container (greater element or recursive object) being parsed to
  improve search speed.
(org-element-comment-parser): Speed-up parsing for comments at column 0.
(org-element-guess-type): Make comment regexp less restrictive, due to
  comment optimizations.
2012-01-13 17:56:56 +01:00
Eric Schulte 102adf13d4 Merge branch 'origin-maint' 2012-01-12 18:12:19 -07:00
Eric Schulte fc92b2e2fe fix whole-buffer evaluation order and symbol intrusion in related macros
* lisp/ob.el (org-babel-map-src-blocks): Don't pollute symbol space.
  (org-babel-map-inline-src-blocks): Don't pollute symbol space.
  (org-babel-map-call-lines): Don't pollute symbol space.
  (org-babel-map-executables): Map over *all* executable Org-mode
  elements.
  (org-babel-execute-buffer): Execute elements in buffer order instead
  of arbitrarily.
2012-01-12 18:11:52 -07:00
Nicolas Goaziou 5b407eaabf org-export: Add another way to handle source code
* contrib/lisp/org-export.el (org-export-handle-code): Allow to delay
  processing of source code by storing line numbers and references in
  text properties attached it.
2012-01-12 20:29:25 +01:00
Nicolas Goaziou dad706d565 Merge branch 'maint' 2012-01-12 18:37:36 +01:00
Nicolas Goaziou 8c2f226b4d C-c C-c renumbers ordered lists again
* lisp/org.el (org-ctrl-c-ctrl-c): Fix a naive structure backup.
  Those must be done with `copy-tree'.

Thanks to Anthony Lander for reporting it.
2012-01-12 18:37:08 +01:00
Nicolas Goaziou 57f51dce5d org-export: Default title doesn't overwrite a blank #+title keyword
* contrib/lisp/org-export.el (org-export-collect-options): Default
  title is retrieved before in-buffer settings are read.  Also, be
  more careful about indirect buffers.
2012-01-12 17:53:47 +01:00
Bastien Guerry a7389dff1e Docfix: using `org-sort' with a double prefix doesn't delete duplicates.
Thanks to Paweł Menich for spotting this.
2012-01-12 16:13:57 +01:00
Bastien Guerry df9e196edb Docfix: using `org-sort' with a double prefix doesn't delete duplicates.
Thanks to Paweł Menich for spotting this.
2012-01-12 16:13:33 +01:00
Eric Schulte e796c91b60 Merge branch 'origin-maint' 2012-01-12 07:47:53 -07:00
Eric Schulte d9f53f17f2 Referenced code block should not be evaluated on code block edit
* lisp/org-src.el (org-edit-src-code): Referenced code block should
  not be evaluated on code block edit.
2012-01-12 07:47:30 -07:00
Nicolas Goaziou 64b554cedc org-element: Minor fix
* contrib/lisp/org-element.el (org-element-line-break-interpreter):
  Add forgotten characters from previous commit.
2012-01-12 15:35:28 +01:00
Nicolas Goaziou a566f810e2 org-element: Fix line-break object
* contrib/lisp/org-element.el (org-element-line-break-parser,
org-element-line-break-interpreter): Fix line-break object.
2012-01-12 15:25:12 +01:00
Nicolas Goaziou 886154898c org-export: Prevent footnotes definitons from being enclosed with a section
* contrib/lisp/org-export.el (org-export-initial-options): Prevent
  footnotes definitons from being enclosed with a section.
2012-01-12 12:43:30 +01:00
Bastien Guerry d3f62310ac Use uppercase for `org-structure-template-alist'.
* org.el (org-structure-template-alist): Use uppercase for
keywords.

* org-publish.el (org-publish-index-generate-theindex): Use
uppercase for the #+INCLUDE keyword.
2012-01-12 08:42:16 +01:00
Thomas Dye d4c146be58 Fix typo on manual pointed out by Francois Pinard 2012-01-12 08:38:01 +01:00
Eric Schulte d8aa48f77b capitalize RESULTS in :wrap'd code block results
* lisp/ob.el (org-babel-insert-result): Capitalize RESULTS in :wrap'd
  code block results.
2012-01-11 19:43:00 -07:00
Eric Schulte 81f0b56207 update the new :wrap documentation to match the current implementation
* doc/org.texi (wrap): Update the new :wrap documentation to match the
  current implementation.
2012-01-11 19:41:57 -07:00
Thomas Dye e9898f419c * doc/org.texi: added documentation for :wrap 2012-01-11 19:26:20 -07:00
Eric Schulte c835af862c Merge branch 'origin-maint' 2012-01-11 15:41:55 -07:00