Commit Graph

8118 Commits

Author SHA1 Message Date
Ethan Ligon 49e6bc8997 Fix for html & docbook export of description list items
The problem is illustrated by the following example:

* Illustration of bug in html export
  - This has a space after the colons :: so will work in latex and html
  - This doesn't have a space after the colons ::so is an invalid
    description item according to the org manual.  Won't work in html
    or docbook.  Will nevertheless work in latex, provided /first/
    description item is valid.
  - Has a terminating space ::
    - So it works in both html and latex export!
    - Even though it's difficult to distinguish from the next example.
  - Lacks a terminating space ::
    - At present, *doesn't* work in html or docbook export, does in
      latex.  This is the case that the following patch fixes.
2011-04-09 18:40:45 +02:00
Bastien Guerry 098ef03fa9 Minor cleanup. 2011-04-09 16:20:46 +02:00
Bastien Guerry acdf82f66e Merge branch 'master' of orgmode.org:org-mode 2011-04-09 16:20:18 +02:00
Nicolas Goaziou a7a4693f66 org-list: don't forget to allow alphabetical counters 2011-04-09 16:09:32 +02:00
Bastien Guerry a8a436317c Merge branch 'master' of orgmode.org:org-mode 2011-04-09 14:56:00 +02:00
Julien Danjou 5c5468dc60 org-table: use point-min instead of 1
* lisp/org-table.el (org-table-cleanup-narrow-column-properties): Use
point-min rather than 1 when moving in the buffer.

Signed-off-by: Julien Danjou <julien@danjou.info>
2011-04-09 14:46:45 +02:00
Bastien Guerry 814b767608 Merge branch 'master' of orgmode.org:org-mode 2011-04-09 14:21:51 +02:00
Julien Danjou f6c8fb0be1 org-contacts: make Gnus usage optional
Signed-off-by: Julien Danjou <julien@danjou.info>
2011-04-09 14:16:30 +02:00
Nicolas Goaziou abad1b4994 Auto-fill shouldn't insert new items
* lisp/org-list.el (org-list-in-valid-context-p): renamed from
  org-list-in-valid-block-p.
  (org-at-item-p,org-list-search-generic): use renamed function.

* lisp/org.el (org-fill-item-nobreak-p): new function.
  (org-set-autofill-regexps): modify `fill-nobreak-predicate' to
  prevent auto-fill from breaking line just before an item regexp.
2011-04-09 13:20:37 +02:00
Nicolas Goaziou 9a8dab1436 Correctly fontify description items
* lisp/org.el (org-set-font-lock-defaults): Be more strict when
  recognizing description items, and do not fontify wrong cases like:
  "- term ::description" or "1. term :: description"
2011-04-09 13:18:13 +02:00
Bastien Guerry aaad53f50a Merge branch 'master' of orgmode.org:org-mode 2011-04-09 12:45:04 +02:00
Nicolas Goaziou 5efc6f5fc4 org-latex: fix footnotes wrt lists and links
* lisp/org-latex.el: pay attention to end of footnote. Before closing
  the command, ensure that list is properly closed or that last link
  is separated from the curly brace.
2011-04-09 11:57:12 +02:00
Nicolas Goaziou a1458ba5ec Don't indent footnote definitions
* lisp/org.el (org-indent-line-function): footnote definition must
  stay at column 0 to be recognized as such. Body below can have
  normal indentation, so it should ignore its definition when
  computing indentation.
2011-04-09 11:50:59 +02:00
Bastien Guerry 97ae094960 Merge branch 'master' of orgmode.org:org-mode 2011-04-09 09:24:41 +02:00
Eric Schulte 9fc5577646 doc: link from markup->literate-examples to working-with-source-code
* doc/org.texi (Literal examples): Link from "Markup" > "Literate
  Examples" to "Working with Source Code"
2011-04-08 15:54:54 -06:00
Puneeth Chaganti c717044a7c * doc/org.texi (Agenda commands): Doc for function option to bulk action. 2011-04-08 19:21:33 +02:00
Bastien Guerry b20bb56ba9 * org-agenda.el (org-agenda-start-day): Minor docstring update. 2011-04-08 18:48:08 +02:00
Bastien Guerry a92aaf4db0 doc/org.texi: minor update.
Document `org-agenda-append-agenda' and `org-agenda-bulk-mark-regexp'.
2011-04-08 18:32:20 +02:00
Bastien Guerry 9a0645bcfd org-protocol.el: more appropriate message when capture is done.
* org-protocol.el (org-protocol-remember)
(org-protocol-capture): More appropriate message.
2011-04-08 18:18:02 +02:00
Bastien Guerry 8cf35f0ab1 org-capture.el: Fix bugs about handling the :clock-keep parameter.
* org-capture.el (org-capture-clock-keep): New local variable.
(org-capture, org-capture-finalize): Use it and fix a bug when
:clock-keep is set to `t'.
2011-04-08 18:04:47 +02:00
Carsten Dominik a0a526bc3e Export: handle include files before processing macros.
* lisp/org-exp.el (org-export-preprocess-string): Handle include files
before processing macros.

Patch by Benny Simonsen.  TINYCHANGE
2011-04-08 12:35:37 +02:00
Bernt Hansen 770c2ddfba Remove obsolete functionality to add todo list in front of agenda
* lisp/org-agenda.el: Remove obsolete code for adding todo list in front
of the agenda

Todo lists should be built with the TODO list or a block agenda instead.

This code was triggered for C-u R in block agendas which is used to
limit the clock report to the current tags filter applied to the
agenda.
2011-04-08 12:27:27 +02:00
Lawrence Mitchell 44bb6ef974 org-latex: Fix export of table.el tables with captions
* lisp/org-latex.el (org-export-latex-convert-table.el-table): Fix
format-string for insertion of captions.

This fixes a bug introduced in caa5da1 since when the caption itself
is not placed inside the caption command.
2011-04-08 12:16:27 +02:00
Nick Dokos 9e15cf4fc2 Fix begin/end comment
* lisp/org-exp.el (org-export-remove-comment-blocks-and-subtrees): Fix regexp.

Rasmus <rasmus.pank@gmail.com> wrote:

> Hi,
> It seems that
>
> ,----
> | #+BEGIN_COMMENT
> |  ...
> | #+END_COMMENT
> `----
>
> Might be broken in Org-mode 7.5. According to the manual,
>
> ,----
> | Finally, regions surrounded by
> |  #+BEGIN_COMMENT  ...  #+END_COMMENT  will not be exported.
> `----
>
> Consider the following example generated with Org-mode 7.5 in Emacs 24.0.50
> (started without config files).
>
> ,----
> | #+TITLE: this is a test
> |
> | #+BEGIN_COMMENT
> | Don't export me
> | #+END_COMMENT
> |
> | I'd like to be exposed
> `----
>
> The HTML export is:
>
> ,----
> | <snip>
> | <h1 class="title">this is a test</h1>
> |
> | <div class="org-comment">
> | </br>
> | <p>
> | <p>
> | Don't export me
> | </p>
> | </div>
> |
> | I'd like to be exposed
> | <snip>
> `----
>
> The LaTeX export is:
>
> ,----
> | \begin{verbatim}
> | Don't export me
> | \end{verbatim}
> | I'd like to be exposed
> `----
>

Indeed.

It seems that one of the hair-raising regexps that Carsten manages
to come up with is not quite right. Try this patch for now:

--8<---------------cut here---------------start------------->8---
--8<---------------cut here---------------end--------------->8---

Nick
2011-04-08 12:10:32 +02:00
Carsten Dominik cd806a5d0d Help matching dotted European dates, like 31. 12. 2007
* lisp/org.el (org-read-date-analyze): Help matching dotted European
dates, like 31. 12. 2007

Patch by Jan Seeger.
TINYCHANGE
2011-04-08 12:06:51 +02:00
Eric Schulte 4036da1986 ob-lisp: fixed bug in recent commit
* lisp/ob-lisp.el (org-babel-execute:lisp): Fix typo.
2011-04-07 12:51:12 -06:00
Eric Schulte fa9464ede2 ob-lisp: turning vector results into lists for easy elisp reading
* lisp/ob-lisp.el (org-babel-execute:lisp): Turn vectors into lists
  before reading by elisp
  (org-bable-lisp-vector-to-list): Stub of a vector->list function,
  should be replaced with a cl-vector->el-vector function.
2011-04-07 12:31:10 -06:00
Eric Schulte ad976c66cb ob-lisp: now reads/applies :colnames and :rownames header arguments
* lisp/ob-lisp.el (org-babel-execute:lisp): Now using
  `org-babel-reassemble-table' to apply the appropriate header
  arguments to results.
2011-04-07 11:31:56 -06:00
Carsten Dominik 27fe8e0dd7 Fix bug introduced with previous commit 2011-04-07 18:42:11 +02:00
Carsten Dominik a54afa7e8e Merge branch 'capture-plain-text-into-nodes' 2011-04-07 17:03:26 +02:00
Carsten Dominik f1ffed8a6c Allow to capture plain templates into Org nodes
* lisp/org.el (org-end-of-meta-data-and-drawers): New function.
* lisp/org-capture.el (org-capture-place-plain-text): Implement adding
plain text templates to Org nodes.

This is something which came out of a discussion with Philip Rooke, in
the thread

Philip tried to use a capture template with template type plain, but
using a date tree as a target.  Plain templates where placed at the
end of the file, not at the end of the entry.  I complained first that
mixing headlined entries and plain snippets into the same capture
target is not possible, but I realized that there is a way to make
this work OK.  The headlined entries become children, and the plain
text snippets become part of the text before the first child.
2011-04-07 08:47:13 +02:00
Carsten Dominik 4168fccdc7 Fix docstring
* lisp/org-beamer.el (org-beamer-environments-extra): Fix docstring
2011-04-06 10:50:34 +02:00
Lawrence Mitchell 56cb9cff34 Ensure org-export-handle-comments protects its insertions
* lisp/org-exp.el (org-export-handle-comments): Add the org-protected
property to the replacement string.

Although org-export-handle-comments adds the org-protected property to
the matched string, the subsequent `replace-match' call to change the
comment character does not add this property to the entire format
string.  Fix this by propertizing the entirety of the newtext argument
to replace-match.
2011-04-06 10:42:57 +02:00
Lawrence Mitchell 5259210cfb org-html: Fix logic for export of section numbers
* lisp/org-html.el (org-export-as-html) (org-html-level-start): Fix
logic for section number printing when NUM is an integer.

Fixes a bug introduced in 9f57b8e which considered all non-integer
values of the num option to be nil.
2011-04-06 10:35:55 +02:00
Lawrence Mitchell 0e8f873c88 Prefer matching line beginnings in org-export-latex-special-chars
* lisp/org-latex.el (org-export-latex-special-chars): Fix regexp for
`single' special characters and ellipsis.

Repeated special characters are exported differently depending on
their position in the buffer.  A "&&" string at the start of a line is
exported as "&\&" whereas in the middle of a line you get "\&\&".  The
former is incorrect.  Fix this by matching the beginning of a line
before a character.  While we're at it, amalgamate the regexps for the

different special characters.
2011-04-06 10:34:14 +02:00
Lawrence Mitchell f4ba6dc6ee org: Match case of todo keywords when determining empty headings
* lisp/org.el (org-point-at-end-of-empty-headline): Bind
case-fold-search to nil.
2011-04-06 10:27:58 +02:00
Carsten Dominik 1df06e0fa9 Merge branch 'master' of orgmode.org:org-mode 2011-04-06 09:24:56 +02:00
Carsten Dominik 8a831e8f6c Introduce a new org-capture escape for arbitrarily defined time strings
* lisp/org-capture.el (org-capture-fill-template): Resolve new %<...>
template escape.
(org-capture-templates): Document new %<...> template escape.
* doc/org.texi (Template expansion): Document new %<...> template escape.
2011-04-06 08:49:12 +02:00
Eric Schulte 7021f70f02 ob: fix collection of table column names during export
* lisp/ob.el (org-babel-process-params): Make this function
  idempotent, as it will sometimes be called multiple times.
2011-04-04 11:28:45 -06:00
Carsten Dominik b869bc5a7e Remove forgotten (debug) 2011-04-03 12:26:05 +02:00
Carsten Dominik 857146b484 Merge branch 'master' of orgmode.org:org-mode 2011-04-03 12:25:44 +02:00
Carsten Dominik 5d5ea7bccc Fix two bugs in time regular expressions
* lisp/org.el (org-ts-regexp-both): Add "]" to class of characters that
should not be matched.
(org-ts-regexp0):
(org-ts-regexp1): Do not start a class with "^]-+", because that tries
to (not) match characters between "]" and "+".  Instead, move the "-"
to the end of the class where it causes no harm.
2011-04-03 12:25:31 +02:00
Eric Schulte 15e860dc1b Merge branch 'master' of orgmode.org:org-mode 2011-04-02 11:48:43 -06:00
Eric Schulte 30931bfe1d edit-prep: language specific src-edit buffer preparation, with R session association
* lisp/ob-R.el (org-babel-edit-prep:R): Associate the appropriate R
  process with the edit buffer when :session is specified.

* lisp/org-src.el (org-edit-src-code): Allow language-specific
  edit-buffer preparation by calling the org-babel-edit-prep:lang
  function when it is defined.
2011-04-02 11:46:08 -06:00
Nicolas Goaziou 346ef1f65f small documentation fix on checkboxes 2011-04-02 17:27:32 +02:00
Carsten Dominik a9e6c07b6a Remove recently added code to support meeting actions
This code is now in the tutorial describing this work flow.
It is too specialized to be in org.el.

Thanks for Matt Lundin for checking on me.
2011-04-02 00:32:13 +02:00
Eric Schulte cd4ce49449 ob-tangle: fix link extraction for newer version of org-store-link
* lisp/ob-tangle.el (org-babel-tangle-collect-blocks): Brought the
  link extraction code into line with a newer version of the
  org-store-link function.
2011-04-01 10:34:49 -06:00
Eric Schulte 0e3a8100f3 library-of-babel: adding vc-log by Luke Crook 2011-03-31 18:32:00 -06:00
Eric Schulte a6aa21b0bb ob-lisp: rebuilt on top of ob-clojure
* lisp/ob-lisp.el (org-babel-expand-body:lisp): New body expansion
  wrapping the expression in either a let or progn, and possibly a
  pretty-print function invocation.
  (org-babel-execute:lisp): Greatly simplified method of executing
  lisp code blocks.
2011-03-31 18:30:44 -06:00
Eric Schulte a73a689785 ob-octave: do not echo variables to STDOUT -- Thanks to Eric S Fraga 2011-03-30 23:28:59 -06:00