Commit Graph

8197 Commits

Author SHA1 Message Date
Nicolas Goaziou 6eee91a117 org-latex: correct bugs in footnote export
* lisp/org-exp (org-export-preprocess-string): normalize footnotes
  before marking lists ending.
* lisp/org-latex.el (org-export-latex-preprocess): work with labels as
  strings and not as numbers.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou 789380330a Insert a customizable separator between footnotes
* lisp/org-docbook.el (org-export-docbook-footnote-separator): new
  variable
  (org-export-as-docbook): add a separator between footnotes.
* lisp/org-html.el (org-export-html-footnote-separator): new variable.
  (org-export-as-html): add a separator between footnotes.
* lisp/org-latex.el (org-export-latex-footnote-separator): new
  variable.
  (org-export-latex-preprocess): add a separator between footnotes.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou ab9c52fd79 Improve footnotes handling in exporters
* lisp/org-exp.el (org-export-footnotes-markers,
  org-export-footnotes-data): new variables.
  (org-export-preprocess-string): use a more explicit argument.

* lisp/org-html.el (org-export-as-html): initialize new variables.

* lisp/org-docbook.el (org-export-as-docbook): initialize new variables.

* lisp/org-latex.el (org-export-latex-footmark-seen): new variable.
  (org-export-as-latex): initialize new variables.
  (org-export-latex-preprocess): allow to export two or more footnotes
  in a row. Also permit to have footnotes refering to previously
  defined footnotes.

* lisp/org-ascii.el (org-export-as-ascii): feed org-footnote-normalize
  with data so it can normalize footnotes before first headline, or
  footnotes with their definition outside exported region.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou 9c31654077 org-footnote: remove unnecessary checks in footnotes regexps
* lisp/org-footnote.el (org-footnote-goto-definition): now,
  determining if point is at a footnote reference is entirely
  determined by `org-footnote-at-reference-p'. No need to check if
  pattern isn't at beginning of the line elsewhere.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou c9d01b3bbd org-footnote: refactor code 2011-06-29 12:00:42 +02:00
Nicolas Goaziou 1eac25a438 Adjust fontification of footnotes
* lisp/org-footnote.el (org-footnote-next-reference-or-definition):
  new function.
* lisp/org.el (org-activate-footnote-links): activate the whole
  footnote, but only fontify its label.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou 460d093da8 org-footnote: rewrite normalize function
* lisp/org-footnote.el (org-footnote-normalize): make use of changes
  to `org-footnote-at-reference-p' and creation of various functions..
  Also comment code.
  (org-footnote-get-next-reference, org-footnote-delete-references,
  org-footnote-delete-definitions): new functions
  (org-footnote-goto-previous-reference, org-footnote-all-labels,
  org-insert-footnote-reference-near-definition, org-footnote-delete):
  rewrite to use org-footnote-get-next-reference.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou 62fe76b5dc org-footnote: parse footnotes references with more accuracy
* lisp/org-footnote.el (org-footnote-re): don't end an inline footnote
  at unrelated closing square brackets.
  (org-footnote-at-reference-p): improve accuracy of the function to
  determine if point is at a reference and to extract definition of an
  inline footnote.
  (org-footnote-all-labels, org-footnote-action, org-footnote-delete,
  org-footnote-auto-adjust-maybe): make use of previous function.
2011-06-29 12:00:42 +02:00
Bastien Guerry e48c3221de Merge branch 'master' of orgmode.org:org-mode 2011-06-29 11:28:03 +02:00
Julian Gehring e01e160f31 org-html: fix typo in doc
Hi,

this patch fixes a typo in the documentation of org-html.

Best
Julian

>From 40483bb63d236595d6982dca26a2a3d80bfd39bc Mon Sep 17 00:00:00 2001
From: Julian Gehring <julian.gehring@googlemail.com>
Date: Wed, 29 Jun 2011 10:31:21 +0200
Subject: [PATCH] org-html: fix typo in doc
2011-06-29 11:27:16 +02:00
Eric Schulte 1357344a76 adding ob-lilypond to contrib/babel/langs/ 2011-06-28 17:40:31 -07:00
Bastien Guerry 22f34369fd Merge branch 'master' of orgmode.org:org-mode 2011-06-29 01:56:51 +02:00
Bastien Guerry 7311ac5d4f Keep warning cookie when timestamping/rescheduling/redeadlining.
* install/git/org-mode/lisp/org.el (org-deadline, org-schedule):
keep warning cookie when rescheduling/redeadlining.
(org-time-stamp): Fix problem with warning cookie.
2011-06-29 01:56:40 +02:00
Eric Schulte 0bcdf0b72b ob-clojure: force escaping of clojure source into elisp source
* lisp/ob-clojure.el (org-babel-execute:clojure): Force escaping of
  clojure source into elisp source.
2011-06-28 16:39:02 -07:00
Eric Schulte b055f0d372 ob: escaping scripts now treats {} in the same manner as []
* lisp/ob.el (org-babel-script-escape): Treats {} in the same manner
  as [] and allows for forcing string conversion.
2011-06-28 16:38:30 -07:00
Eric Schulte 20044297a4 exp: strip protective commas from literal code blocks
* lisp/org-exp.el (org-export-select-backend-specific-text): Strip
  protective commas from literal code blocks.
2011-06-28 15:43:20 -07:00
Eric Schulte cb67a439b1 ob-ref: bug fix in new function
* lisp/ob-ref.el (org-babel-ref-goto-headline-id): Fix bug.
2011-06-28 14:20:10 -07:00
Eric Schulte 554021ad7f doc: Explicit about the ability to tangle to other directories.
* doc/org.texi (tangle): Be explicit about the ability to tangle to
  other directories.
2011-06-28 13:27:33 -07:00
Eric Schulte b18e0cb117 test: tests for expanding noweb references 2011-06-28 13:04:58 -07:00
Eric Schulte 5b7646ce08 ob: expand noweb references to headline contents
* lisp/ob-ref.el (org-babel-ref-goto-headline-id): Split out into its
  own function.
  (org-babel-ref-headline-body): Split out into its own function.
  (org-babel-ref-resolve): Using new functions, and alignment.
* lisp/ob.el (org-babel-ref-goto-headline-id): Declare function.
  (org-babel-ref-headline-body): Declare function.
  (org-babel-expand-noweb-references): Now expands noweb references to
  headlines during expansion.
2011-06-28 13:04:58 -07:00
Eric Schulte a2cf4b43f2 ob-ref: resolve variable references to headline contents
* lisp/ob-ref.el (org-babel-ref-resolve): Now resolves references to
  headlines by either global or custom id, in which case the contents
  of the headline are returned literally.
2011-06-28 13:04:58 -07:00
Eric Schulte 8348f9cfbb test: another order of arguments test 2011-06-28 13:04:57 -07:00
Eric Schulte ef42f3cc9c ob-lob: inline calls should export even when preceeded by an "="
* lisp/ob-exp.el (org-babel-in-example-or-verbatim): Also check for in
  verbatim emphasis.
  (org-babel-exp-lob-one-liners): Cleaner checking for escaped call
  lines.
2011-06-28 13:04:57 -07:00
Eric Schulte c399484313 test: inline export of raw results 2011-06-28 13:04:57 -07:00
Nicolas Goaziou cc76e76509 org-list: fix bug with item cycling
* lisp/org-list.el (org-cycle-item-indentation): cycling back to
  original position deleted any additional information in the item,
  like a counter or a tag.
2011-06-28 20:26:49 +02:00
Nicolas Goaziou c4086ad1e4 org-list: doc-strings white-spaces fixes 2011-06-28 20:26:49 +02:00
Bastien Guerry f9cc3f525b org.el: make org-time-stamp also keep warning periods.
... not only repeaters.

Thanks to Karl Voit for spotting this.
2011-06-28 19:27:12 +02:00
Laurence Mitchell 8d93fc8a3b lisp/org-latex.el: Convert quotes to their LaTeX equivalents
Convert quotes to their LaTeX equivalents using
org-export-latex-quotation-marks.
2011-06-28 19:18:02 +02:00
Bastien Guerry ed8627de92 Fix binding problem in org-without-partial-completion.
Thanks to Paul Sexton for spotting this.
2011-06-28 18:47:56 +02:00
Paul M. Rodriguez fd2a82743d contrib/lisp/org-velocity.el: Major enhancements.
This patch makes Org-Velocity display search results incrementally, and
implements a more general approach to completion based on dabbrev. The
documentation has also been rewritten.
2011-06-28 15:42:23 +02:00
Bastien Guerry 3765304c85 doc/org.texi: footnote: don't put timestamps in headlines.
This was suggested by Simon Guest.
2011-06-28 15:30:50 +02:00
Pieter Praet 7bae223536 org-crypt: make org-decrypt disable auto-save-mode (configurable)
As auto-save-mode can only cause leakage when there's actual decrypted
data lying around, don't check for it (and potentially cause annoyance)
on init, but only when org-decrypt-entry is called.

* lisp/org-crypt.el:
  - add defcustom `org-crypt-disable-auto-save'
  - `org-decrypt-entry': before decrypting, check whether
    `auto-save-mode' is enabled for the current buffer, and act
    on it according to how `org-crypt-disable-auto-save' is set.
  - remove comment re "encrypt[ing] Org auto-saved buffers"
  - remove on-init check for `auto-save-default'
2011-06-28 12:04:16 +02:00
Michael Markert 21df1289c7 org-contacts: Require cl on compilation.
Signed-off-by: Michael Markert <markert.michael@googlemail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
2011-06-27 22:43:40 +02:00
Michael Markert 0a92b13a49 org-contacts: Use `with-current-buffer' instead of `save-excursion'+`with-current-buffer'.
Signed-off-by: Michael Markert <markert.michael@googlemail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
2011-06-27 22:43:40 +02:00
Eric Schulte 214acebac9 test: more tests of exporting call lines in a variety of situations 2011-06-27 11:34:00 -07:00
Eric Schulte 27c3cad589 ob: preserve the order of variable parameters
* lisp/ob.el (org-babel-merge-params): Ensure variable parameters are
  not reversed.

* lisp/ob-ref.el (org-babel-ref-split-args): Ensure variable
  parameters are not reversed.
2011-06-27 11:31:12 -07:00
Eric Schulte d1f0ae650f ob: fix results insertion for inline blocks which happen to start a line
* lisp/ob.el (org-babel-insert-result): Fix results insertion for
  inline blocks which happen to start a line.
2011-06-27 10:36:27 -07:00
Eric Schulte acec7eb7c3 ob-lob: fix the logic checking if a call line is commented
* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Fix the logic
  checking if a call line is commented.
2011-06-27 10:36:27 -07:00
Bastien Guerry 5fb7c161da org.texi: complete org-crypt config example
Complete org-crypt config example with a hackish workaround
to disabling auto-save locally in a buffer:

# -*- buffer-auto-save-file-name: nil; -*-

Thanks to Bill Day for suggesting this.
2011-06-27 18:54:31 +02:00
Bastien Guerry bff1445d49 doc/org.texi: mention (setq auto-save-default nil) in org-crypt.el section. 2011-06-27 18:48:49 +02:00
Bastien Guerry d7c693c1ff org.el: fix bug about repeater not kept when using org-time-stamp
Thanks to Karl Voit for reporting this.
2011-06-27 18:22:37 +02:00
Vincent Belaïche 6d18e03519 * org.el (org-read-property-name): Propose default property name.
Propose default property name value by looking at whether current line
is already some property setting.
2011-06-27 12:35:08 +02:00
Achim Gratz d37223562d Introduce CLOCK_INTO_DRAWER property like the existing LOG_INTO_DRAWER
* lisp/org.el (defcustom org-log-into-drawer): correct typo
* lisp/org-clock.el: new function org-clock-into-drawer to change
  the location of clock events based on properties CLOCK_INTO_DRAWER
  or, as fallback, LOG_INTO_DRAWER, like it is already possible for
  state change logs.
* lisp/org-clock.el (org-clock-jump-to-current-clock): add statement
  to let clause to bind org-clock-into-drawer to result of function
  eval
* lisp/org-clock.el (org-clock-find-position): add statement
  to let clause to bind org-clock-into-drawer to result of function
  eval, change let to let* since the binding is used later in the
  same clause
* doc/org.texi: document that both CLOCK_INTO_DRAWER and
  LOG_INTO_DRAWER can be used to override the contents of variable
  org-clock-into-drawer (or if unset, org-log-into-drawer)
* doc/org.texi: @xref->@pxref
2011-06-27 12:12:23 +02:00
Bastien Guerry 4c21956151 contrib/doc/fr-orgcard.tex: Add Thierry Stoehr, Vincent-Xavier Jumel as french translators.
Also fix some translations.
2011-06-27 11:43:25 +02:00
Bastien Guerry 164214668e Delete suspicious + sign.
Thanks to Nick Dokos for spotting this.
2011-06-27 09:31:27 +02:00
Eric Schulte 85cabe1eab ob-lob: ensure 'cl is loaded during compilation so we can use flet
* lisp/ob-lob.el (require): Ensure 'cl is loaded during compilation so
  we can use flet.
2011-06-26 17:13:18 -07:00
Eric Schulte 4e0387a766 ob-lob: correctly indent results of non-inline call lines.
* lisp/ob-lob.el (org-babel-lob-get-info): Correctly indent results of
  non-inline call lines.
2011-06-25 17:56:40 -07:00
Eric Schulte 8d7d4428cc test: explicitly testing inline call lines at the beginning of a line 2011-06-25 17:46:57 -07:00
Eric Schulte dceaf7da4f ob-exp: don't export inline call_ blocks which aren't whitespace padded
* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Don't export inline
  call_ blocks which aren't whitespace padded.
2011-06-25 17:45:06 -07:00
Eric Schulte e28cba02dd tests: ensure un-named variables are assigned in the correct order -- passing all tests 2011-06-25 15:21:02 -07:00