Commit Graph

1663 Commits

Author SHA1 Message Date
Bastien Guerry 440b9388d4 ob.el: Reintroduce ":results org" but using "#+BEGIN_SRC org", not "#+BEGIN_ORG"
* ob.el (org-babel-common-header-args-w-values)
(org-babel-insert-result): Reintroduce ":results org" but
using "#+BEGIN_SRC org", not "#+BEGIN_ORG".

* org.texi (results): Update documentation for ":results
drawer" and ":results org".
2012-09-26 10:56:16 +02:00
Bastien Guerry 1fa24e89ff Merge branch 'maint' 2012-09-26 00:44:05 +02:00
Bastien Guerry 6ea8cf7f27 org.texi (Column width and alignment): Fix typo
* org.texi (Column width and alignment): Fix typo.

Thanks to Erich Neuwirth for spotting this.
2012-09-26 00:38:32 +02:00
Bastien Guerry a65b5bd36c New command `org-copy' to copy a subtree/region
* org.el (org-refile-keep): New variable.
(org-copy): New command to copy notes.
(org-refile): New parameter msg to override the "Refile"
string in the default prompt.
(org-mode-map): Bind "C-c M-w" to `org-copy'.

* org.texi (Refile and copy): Document the new command `org-copy'.

* orgguide.texi (Refile and copy): Ditto.

Thanks to Kalev Takkis who triggered this change.
2012-09-23 11:42:41 +02:00
Bastien Guerry 5a5abba09f org.texi (Activation): Point to the "Conflicts" section
* org.texi (Activation): Point to the "Conflicts" section.
2012-09-21 11:08:15 +02:00
Bastien Guerry 7e5b746b66 org.texi (Activation): Point to the "Conflicts" section
* org.texi (Activation): Point to the "Conflicts" section.
2012-09-21 11:07:34 +02:00
Bastien Guerry 5abc82b3ab Merge branch 'maint' 2012-09-21 11:02:15 +02:00
Bastien Guerry 6cb676f65a org.texi (Conflicts): Mention filladapt.el in the list of conflicting packages
* org.texi (Conflicts): Mention filladapt.el in the list of
conflicting packages.

Thanks to Anthony Lander for the hook.
2012-09-21 11:02:00 +02:00
Bastien Guerry 39da4f455a Merge branch 'maint' 2012-09-18 16:22:03 +02:00
Bastien Guerry c19364464a org.texi (Activation): Adding org-mode to `auto-mode-alist' is not needed for versions of Emacs > 22.1
* org.texi (Activation): Adding org-mode to `auto-mode-alist'
is not needed for versions of Emacs > 22.1.

Thanks to Robert P. J. Day for suggesting this.
2012-09-18 16:21:36 +02:00
Michael Brand 137bfd0aa7 org.texi: Mention Calc defmath
* org.texi (Formula syntax for Calc): Add a sentence to mention Calc
defmath.
2012-09-12 09:50:59 +02:00
Bastien Guerry cc1e2cf6f6 Merge branch 'maint' 2012-09-04 00:07:00 +02:00
Bastien Guerry 320a1201cd org.texi (History and Acknowledgments): Fix typo
* org.texi (History and Acknowledgments): Fix typo.
2012-09-04 00:00:33 +02:00
Bastien Guerry c02fe61361 Merge branch 'maint' 2012-09-03 12:37:18 +02:00
Bastien Guerry 74c57911a7 org.texi (History and Acknowledgments): Add my own acknowledgments
* org.texi (History and Acknowledgments): Add my own acknowledgments.
2012-09-03 12:37:10 +02:00
Bastien Guerry f43c8c8100 Merge branch 'maint' 2012-09-02 13:45:18 +02:00
Bastien Guerry f011496ceb `k' now calls org-agenda-capture from agenda. Also add `org-capture-use-agenda-date' option.
* org-capture.el (org-capture-use-agenda-date): New option.
(org-capture): Use it.

* org-agenda.el (org-agenda-capture): New command.
(org-agenda-mode-map): Bind it to `k'.
(org-agenda-menu): Add it to the menu.

* org.texi (Agenda commands): Document the new command and the
new option.

Thanks to Eric Abrahamsen who suggested this change, along with
other merging about bulk actions.
2012-09-02 12:52:38 +02:00
Bastien Guerry 916c300414 org-agenda.el: Delete `org-agenda-action'
* org-agenda.el (org-agenda-action, org-agenda-do-action):
Delete.
(org-agenda-mode-map): Delete related keys.

* org.texi (Agenda commands): Delete `org-agenda-action'
section.
(Agenda commands): Reorder.  Document `*' to toggle persistent
marks.
2012-09-02 11:20:01 +02:00
Bastien Guerry 0a78e90362 Merge branch 'maint' 2012-08-28 13:39:45 +02:00
Bastien Guerry f6af827013 doc/org.texi: Fix typos in the manual
* org.texi (Agenda dispatcher): Mention
`org-toggle-agenda-sticky'.
(Agenda commands, Exporting Agenda Views): Fix typo.
2012-08-28 13:14:46 +02:00
Achim Gratz 6c9a6ae8d1 Merge branch 'maint' 2012-08-26 20:02:59 +02:00
Achim Gratz ac0667b841 Makefile: add description of ORG_ADD_CONTRIB to info documentation
* doc/org.texi: Add description of ORG_ADD_CONTRIB to info
  documentation.  Add link to Worg for more details.
2012-08-26 20:01:24 +02:00
Achim Gratz 57c4a4aa07 Merge branch 'maint' 2012-08-26 19:06:39 +02:00
Achim Gratz c32d456f72 Makefile: Improve documentation.
* doc/org.texi: Clarify installation procedure.  Provide link to the
  build system description on Worg.
2012-08-26 17:50:10 +02:00
Achim Gratz db0e306658 Merge branch 'maint' 2012-08-26 15:28:47 +02:00
Achim Gratz bf352eceda Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout
* Makefile: Include default.mk and targets.mk from mk/ where they've
  been moved to.

* README_maintainer: Rename utils to make throughout.

* doc/Makefile: Rename utils to make throughout.

* doc/org.texi: Remove reference to utils/, x11idle.c is now in
  contrib/scripts.

* mk/make_emacs_changelog: Add mk/ to list of directories not to be
  reported in Emacs' ChangeLog.  Also retain utils/ and re-add
  UTILITIES; add a comment explaining why these need to stay.

* mk/default.mk: Rename utils to make throughout.  Include version.mk
  from mk/ where it's been moved to.

* mk/targets.mk: Rename utils to make throughout.

* mk/server.mk: Rename utils to make throughout.  Only put those files
  from mk/ into the archives that are needed outside the server:
  default.mk targets.mk version.mk and org-fixup.el.

* lisp/org-compat.el: Rename utils to make throughout.

* .gitignore:  Rename utils to make throughout.
2012-08-26 15:27:19 +02:00
Yann Hodique e48d77aa98 org-taskjuggler.el: Update doc to reflect latest changes 2012-08-26 09:54:57 +02:00
Achim Gratz 4ca67b8164 Merge branch 'maint' 2012-08-26 09:28:08 +02:00
Achim Gratz f8cc3189f5 Makefile: deactivate perl scripts unless server configuration is active
* doc/Makefile: Do not use perl scripts in util/ unless the server
  configuration $(SERVERMK) is set.
2012-08-26 09:25:34 +02:00
Bastien Guerry d09a6b3db5 Merge branch 'maint' 2012-08-25 10:29:09 +02:00
Bastien Guerry eaa1dee2d0 Fix version in README_DIST and doc/orgcard.tex 2012-08-25 10:28:59 +02:00
Michael Brand efab563317 org.texi: Mention when a table header is mandatory
* org.texi (Column formulas): Add a sentence to be more explicit about
when a table header is mandatory.
2012-08-24 19:53:04 +02:00
Bastien Guerry 10dbdf5fc2 Update the handling of agenda/capture keys contextualization.
* org.el (org-contextualize-keys): Rename from
`org-contextualize-agenda-or-capture'.  Fix normalization to
handle empty key replacement string.
(org-contextualize-validate-key): Rename from
`org-contexts-validate'.  Allow checking against a custom
function.

* org-agenda.el (org-agenda-custom-commands-contexts): Update.
(org-agenda): Use `org-contextualize-keys'.

* org-capture.el (org-capture-templates-contexts): Ditto.

* org.texi (Templates in contexts, Setting Options): Update to
reflect changes in how contexts options are processed.
2012-08-24 12:18:05 +02:00
Bastien Guerry 6c94ea0518 Implement key replacement depending on the contexts.
* org.el (org-contextualize-agenda-or-capture): Handle key
replacement depending on the contexts.

* org-capture.el (org-capture-templates-contexts): Allow to
use the context as a way to replace one capture template by
another one.

* org-agenda.el (org-agenda-custom-commands-contexts): Allow
to use the context as a way to replace one agenda custom
command by another one.

* org.texi (Templates in contexts): Document the new structure
of the variables `org-agenda-custom-commands-contexts' and
`org-capture-templates-contexts'.

In the setup below, X is not a real capture template, it is just
an alias to templates A and B in .txt and .el files.  A and B are
deactivated by default in all files.

(setq org-capture-templates
      '(("X" "Nothing but an alias")
	("A" "AAAA" entry (file+headline [...]))
	("B" "BBBB" entry (file+headline [...]))))

(setq org-capture-templates-contexts
      '(("A" "A" ((not-in-file . ".*")))
	("B" "B" ((not-in-file . ".*")))
	("X" "A" ((in-file . "\\.txt")))
	("X" "B" ((in-file . "\\.el")))))

Thanks to Carsten for suggesting this "key-replacement" idea!
2012-08-24 12:17:58 +02:00
Bastien Guerry 0c8e87b8d2 Rename UTILITIES/ to utils/ 2012-08-23 12:47:10 +02:00
Bastien Guerry d378c7b41b Implement context filtering for agenda commands and capture templates.
* org.el (org-contextualize-agenda-or-capture)
(org-rule-validate): New functions, implement context
filtering for agenda commands and capture templates.

* org-agenda.el (org-agenda-custom-commands-contexts): New
option.
(org-agenda): Use it.

* org-capture.el (org-capture-templates-contexts): New option.
(org-capture-select-template): Use it.

* org.texi (Templates in contexts): Document the new option
`org-capture-templates-contexts'.
(Storing searches): Document the new option
`org-agenda-custom-commands-contexts'.

This idea comes from Sylvain Rousseau, who implemented a similar
feature with org-context.el: https://github.com/thisirs/org-context

This implementation is a bit simpler and more general.  Simpler
because it relies on existing templates, no need to define other
contextual ones.  More general because contexts can be defined
wrt files and modes.

Thanks *very much* to Sylvain for paving the way -- certainly a
great addition to Org.
2012-08-23 11:08:47 +02:00
Charles b0dc7ec164 org.texi (Advanced features): Fix error in table
* org.texi (Advanced features): Fix error in table.

TINYCHANGE
2012-08-22 00:12:21 +02:00
Bastien Guerry cd5fa2396c org.texi (Formula syntax for Lisp): Reformat
* org.texi (Formula syntax for Lisp): Reformat.
2012-08-21 18:28:35 +02:00
Nicolas Goaziou 9b4f5a2fc2 org.texi: Fix reference to an unknown variable
* doc/org.texi (Literal examples): Remove reference to unknown
  `org-export-latex-minted' variable. Also simplify footnote since
  `org-export-latex-listings' documentation is exhaustive already.
2012-08-20 16:53:21 +02:00
Nicolas Goaziou 445a90ceeb Update documentation with regards to lists
* doc/org.texi (Plain lists): Remove reference to now hard-coded
  `bullet' automatic rule.
2012-08-18 10:00:58 +02:00
François Allisson 97685b6b60 org.texi: Fix typo
* doc/org.texi: Remove extra curly bracket.

TINYCHANGE
2012-08-05 16:29:20 +02:00
Bastien Guerry de271e3751 Introduce a new special property CLOCKSUM_T for today's clocked time.
* org.el (org-special-properties): New special property
CLOCKSUM_T.
(org-entry-properties): Handle the new special property.

* org-colview.el (org-columns): Handle a new special property
CLOCKSUM_T.
(org-agenda-colview-summarize, org-agenda-colview-compute):
Ditto.

* org-clock.el (org-clock-sum-today): New function.
(org-clock-sum): New argument PROPNAME to set a custom text
property instead of :org-clock-minutes.

* org.texi (Special properties, Column attributes)
(Agenda column view): Document the new special property
CLOCKSUM_T.

Thanks to Brian Wood who asked a question wrt this.
2012-08-05 11:12:04 +02:00
Bastien Guerry 21ec0159b8 org-capture.el: New template %l to insert the literal link.
* org-capture.el (org-capture-templates): New template %l to
insert the literal link pointing at the current buffer.

* org.texi (Template expansion): Document the new %l template.

Thanks to Eric Abrahamsen for this idea.
2012-08-02 17:06:22 +02:00
Bastien Guerry aa490ffa04 Small doc fix.
* org.texi (Fast access to TODO states): Fix documentation
about allowed characters for fast todo selection.

* org.el (org-todo-keywords): Ditto.

This fixes this wrong change here:
http://orgmode.org/w/?p=org-mode.git;a=commit;h=b6cb72
2012-08-02 11:59:27 +02:00
Bastien Guerry a865abb5fe Let's a :APPT_WARNTIME: property override `appt-message-warning-time' in `org-agenda-to-appt'.
* org.el (org-speed-commands-default): New speedy command to
quickly add the :APPT_WARNTIME: property.

* org-agenda.el (org-agenda-to-appt): Use the :APPT_WARNTIME:
property to override `appt-message-warning-time' when adding
an appointment from an entry.

* org.texi (Weekly/daily agenda): Mention APPT_WARNTIME and
its use in `org-agenda-to-appt'.

This feature has been suggested, along with preliminary patches,
by Ivan Kanis.  Thanks!
2012-08-01 16:05:47 +02:00
Bastien Guerry 79ac009b58 Update the manual wrt comments.
* org.texi (Comment lines): Update wrt comments.

* orgguide.texi (Comment lines): Update wrt comments.
2012-08-01 14:35:13 +02:00
Bastien Guerry ba10c6a27e org.texi: Small documentation fix. 2012-07-30 09:35:37 +02:00
Bastien Guerry f250f6beba New keybinding `C-c C-x C-z' for `org-resolve-clocks'.
* org.el (org-mode-map): Bind `org-resolve-clocks' to `C-c C-x C-z'.

* org.texi (Resolving idle time): Document new keybinding.

Thanks to Joseph Thomas for suggesting this.
2012-07-28 01:23:37 +02:00
Bastien Guerry b86a6f6f34 S-M-<up/down> now adjusts previous/next clock when hit on clock timestamps.
* org.el (org-clock-history, org-clock-adjust-closest): New
variables.
(org-timestamp-change): Maybe adjust the next or previous
clock in `org-clock-history'.
(org-shiftmetaup, org-shiftmetadown): On clock logs, update
the timestamp at point and adjust the next or previous clock
in `org-clock-history', when possible.

* org.texi (Clocking commands): Document the use of
S-M-<up/down> on clock timestamps.

Thanks to Joseph Thomas who suggested this.
2012-07-27 17:29:29 +02:00
Giovanni Ridolfi 12a53c7161 org.texi: Update the key sequence for `org-clock-in-last' and `org-clock-cancel'.
* doc/org.texi (org-clock-in-last and org-clock-cancel): Update the
  defkeys.

TINYCHANGE

After commit fea1b82bef the manual has not been updated, let's do it now.
2012-07-24 17:05:16 +02:00
Bastien Guerry b6cb722377 Explicitely says only letters are supported as fast TODO selection keys.
* org.texi (Fast access to TODO states): Explicitely says only
letters are supported as fast TODO selection keys.

* org.el (org-todo-keywords): Ditto.

Thanks to Samuel Wales for pointing at this.
2012-07-14 09:15:50 +02:00
Bastien Guerry ef3d4b5965 org.el: Allow %(my-function) as a specifier in abbreviated links.
* org.el (org-link-expand-abbrev): Implement "%(my-function)"
as a new specifier.  Update the docstring.

* org.texi (Link abbreviations): Illustrate the use of the
"%h" specifier.  Document the new "%(my-function)" specifier.

Thanks to Takaaki ISHIKAWA who came all the way down from Tokyo
to Paris and raised a not-so-distant issue: "could we translate
emails from the mailing list and have a URI for each translated
email?"  See the update in the manual for an answer.
2012-07-13 18:22:45 +02:00
Bastien Guerry 3528fc6b42 Implement continuous clocking. Small other improvements. Update documentation.
* org.el (org-mode-map): Add `C-c C-x C-I' as a keybinding for
`org-clock-in-last'.

* org-clock.el (org-clock-continuously): New option.
(org-clock-in): Three universal prefix arguments set
`org-clock-continuously' to `t' temporarily.
(org-clock-in-last): Fix call to `org-clock-select-task' and
support continuous clocking.
(org-clock-out-time): New variable.
(org-clock-out): set `org-clock-out-time' when clocking out.
Small docstring rewriting.
(org-clock-remove-empty-clock-drawer): Fix "invalid search
bound" bug when trying to delete empty logbook drawer.
(org-clock-cancel): If the clock log is gone, send a warning
instead of deleting the region that is supposed to contain it.

* org.texi (Clocking commands): New cindex.
(Clocking commands): Update documentation for `org-clock-in'.
Document `org-clock-in-last'.  Mention `org-clock-out' and
`org-clock-in-last' as commands that can be globally bound.
(Resolving idle time): Document continuous clocking.
2012-07-12 14:04:54 +02:00
Bastien Guerry 7445ee7d04 org.texi: Small update.
* org.texi (Top, Introduction): Fix formatting.
(Activation): Add index entries.
(Conventions): Update section.
(Embedded @LaTeX{}): Fix formatting.

Mention that `C-c a' is assumed to be the keybinding for `org-capture'
in the whole manual.  Thanks to Vagn Johansen who triggered this.
2012-07-12 09:11:10 +02:00
Thomas S. Dye 69aa5ab26f Manual does not list :results output graphics as babel header arg
Aloha all,

The attached patch changes the link to the languages supported by babel
from a directory listing to the Worg page that uses a table to link to
the language-specific documentation pages.  It was suggested by John
Hendy.

All the best,
Tom
John Hendy <jw.hendy@gmail.com> writes:

> On Tue, Jul 10, 2012 at 10:19 AM, Thomas S. Dye <tsd@tsdye.com> wrote:
>> John Hendy <jw.hendy@gmail.com> writes:
>>
>>> On Mon, Jul 9, 2012 at 7:35 PM, Thomas S. Dye <tsd@tsdye.com> wrote:
>>>> John Hendy <jw.hendy@gmail.com> writes:
>>>>
>>>>> I have typically outputted graphics from R via tikzDevice manually,
>>>>> but gave my first whirl to just including things via the :file
>>>>> argument in my block header. In the process, I was trying to get this
>>>>> to work and found I needed to use:
>>>>>
>>>>> -----
>>>>> :results output graphics
>>>>> -----
>>>>>
>>>>> This is listed on Worg ob-R-doc:
>>>>> - http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-R.html#sec-4-3
>>>>>
>>>>> But I didn't originally know about it, as it's not a listed header
>>>>> argument in the manual, which is where I check since they're all
>>>>> listed in one place:
>>>>> - http://orgmode.org/manual/results.html#results
>>>>>
>>>>> Does the manual only list universal babel header arguments and R is in
>>>>> a subset of ones using =:results output graphics= or should it be
>>>>> there?
>>>>>
>>>>
>>>> Hi John,
>>>>
>>>> The babel header arguments are implemented at two levels.
>>>>
>>>> There are general babel arguments that apply to all the supported
>>>> languages.  These are described in the manual.
>>>>
>>>> It is also possible for the individual language implementations to
>>>> define their own header arguments.  R is a good example, where the very
>>>> many arguments to the various R output devices are built into ob-R.el.
>>>> These language specific header arguments are not described in the
>>>> manual, but instead appear in the language specific documentation on
>>>> Worg.
>>>>
>>>> Re: your specific question about :results output graphics.  I believe
>>>> this is an R specific header argument and that it is described in the
>>>> appropriate place in the documentation on Worg (see lines 68 and 230
>>>> of ob-R.el).
>>>>
>>>> The manual is not a one-stop source for answers to all Babel questions.
>>>> Recourse to the language specific documentation is typically necessary,
>>>> which is why it would be great if someone could find time to work up
>>>> documentation for the 20 or so languages that still lack it :)
>>>
>>> Thanks for the clarification and that answers the question. This was a
>>> specific header argument for R. Perhaps the manual could link to this
>>> page?
>>> - http://orgmode.org/worg/org-contrib/babel/languages.html
>>>
>>> Maybe with a diddy: "Some languages feature their own unique header
>>> arguments. The above document only universal, system wide Babel header
>>> arguments and one should consult the specific language page on Worg
>>> for additional features."
>>>
>>> Just a thought.
>>
>> Hi John,
>>
>> Thanks for this thought, which is indeed reasonable.  I thought the
>> manual might lack this structure, but when I went back to the
>> manual I found that
>> http://orgmode.org/manual/Specific-header-arguments.html#Specific-header-arguments
>> has this at the bottom of the page: "Additional header arguments are
>> defined on a language-specific basis, see Languages", where "Languages"
>> is a link to another manual page, one with a table of supported
>> languages and a link to the Worg page you cite.
>>
>
> Wow. You see only what you look for. :embarrassed:
>
>> The language is a bit different than your proposal, but the path seems
>> clear enough to me.
>
> Technically the path points to
> http://orgmode.org/worg/org-contrib/babel/languages/; I'd point it to
> http://orgmode.org/worg/org-contrib/babel/languages.html as it looks
> cleaner vs. just looking at the directory of .html files. Either
> way... the manual totally does it's job and I missed it!
>
> Thanks for bearing with me!
> John
>
>>
>> Of course, there is still the issue of the languages that lack
>> language-specific documentation :)
>>
>> All the best,
>> Tom
>>
>> --
>> T.S. Dye & Colleagues, Archaeologists
>> 735 Bishop St, Suite 315, Honolulu, HI 96813
>> Tel: 808-529-0866, Fax: 808-529-0884
>> http://www.tsdye.com

>From 0438f0ae1e23321dbacd0666119205985959433e Mon Sep 17 00:00:00 2001
From: Thomas Dye <tsd@tsdye.com>
Date: Tue, 10 Jul 2012 07:12:13 -1000
Subject: [PATCH] Changed babel languages link following a suggestion by John
 Hendy
2012-07-10 21:34:03 +02:00
Jan Böcker 436b5a0ee9 fix typo in org.texi
The attached patch fixes a typo in the documentation.
I hope I got the format of the commit message right.

Best regards,
   Jan

>From 7daa1f794794d515624ab28310db81a0e4099ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6cker?= <jan.boecker@jboecker.de>
Date: Sat, 16 Jun 2012 15:04:43 +0200
Subject: [PATCH] org.texi: fix typo

* doc/org.texi (The spreadsheet): fix typo
2012-07-06 10:35:58 +02:00
Bastien Guerry 6fb93276ea org.texi (Visibility cycling): Document `show-children'.
* org.texi (Visibility cycling): Document `show-children'.

Thanks to Gustav Wikström for a preliminary patch for this.
2012-07-06 10:27:33 +02:00
Achim Gratz 80d4f778c7 Re-normalize to "Org mode" in manual
* doc/org.texi: Re-normalize to "Org mode" in manual.
2012-06-04 08:41:01 +02:00
Achim Gratz 45b7bb4bdf Adapt documentation to new build system
* doc/org.texi (Installation): Adapt documentation to new build
system.  Mention GNU ELPA (since it needs to be handled like Emacs
built-in Org).
2012-06-04 08:41:01 +02:00
Bastien Guerry 9eabcb899b Revert "Fix small typo in org.texi."
This reverts commit 4144c55ec7.
2012-06-01 09:37:06 +02:00
Bastien Guerry 4144c55ec7 Fix small typo in org.texi. 2012-05-31 12:14:44 +02:00
Achim Gratz 0db8233460 replace the remaining occurences of sed with emacs scripts, implement mkdir with install
* UTILITIES/org-fixup.el (org-make-local-mk): New function to create a
  local.mk template from default.mk.

* UTILITIES/org-fixup.el (org-make-letterformat): New function to
  replace the format string for A4 with one for Letter.

* default.mk: Few cosmetic changes to the template section.  Add
  definition MAKE_LOCAL_MK for call to org-make-local-mk.  Remove
  definition for SED, which is not used anymore.  Implement MKDIR with
  'install -d' by default.  Since both CP and MKDIR are now
  implemented with install, this reduces the number of external
  dependencies.  Add mode settings to both invocations of install to
  keep the modes of installed files sane even if umask is set to a
  strange value.

* targets.mk: Remove sed script and use $(MAKE_LOCAL_MK) instead.

* doc/Makefile: Remove sed script and replace with emacs script.  This
  script can not be placed into a variable since it would expand $<
  and $@ in the context of the "card" target rather than the pattern
  rule.
2012-05-30 12:30:21 +02:00
Bastien Guerry f71d45a913 New option `org-capture-bookmark' (mentioned in the manual.)
* org.texi (Using capture): Mention the
`org-capture-last-stored' bookmark as a way to jump to the
last stored capture.

* org-capture.el (org-capture-bookmark): New option.
(org-capture-finalize): Use it.
2012-05-25 23:45:31 +02:00
Bastien Guerry 747d71675c Merge branch 'maint'
Conflicts:
	doc/org.texi
	doc/orgguide.texi
	lisp/org.el
2012-05-25 09:42:02 +02:00
Bastien Guerry 60587ea91c Bump to version 7.8.11. 2012-05-25 09:36:15 +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
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 b4693de937 clean up server targets in doc/Makefile and make sure they are working
* doc/Makefile: ignore errors from removing directory (may not exist),
  manual depends on 'org-version.inc'.
2012-05-18 07:45:46 +02:00
Achim Gratz bcced6a51d Makefile: avoid spurious recompilations of documentation
* doc/Makefile: org-version.inc is again dependent on org.texi.  This
  avoids recompilation when nothing has been changed; target "clean"
  still removes orgversion.texi to produce a consistent set of
  documentation and code after a "make clean" on toplevel

* targets.mk: add "doc" as prerequisite to "all" and "compile" to have
  it call "clean" in the doc subdir.
2012-05-18 07:45:45 +02:00
Bastien Guerry 9212ff07de Merge branch 'maint'
Conflicts:
	doc/org.texi
	lisp/org.el
2012-05-16 19:21:33 +02:00
Bastien Guerry 429e6aafa6 Bump to version 7.8.10. 2012-05-16 19:20:07 +02:00
Bastien Guerry cb23085ac2 Merge branch 'maint' 2012-05-16 19:08:48 +02:00
Bastien Guerry e6560f2528 Backport change in org.texi by Glenn Morris.
See http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=d38a0a
2012-05-16 19:08:29 +02:00
Bastien Guerry e70068feed org.texi (Uploading files): Fix typo.
* org.texi (Uploading files): Fix typo.

Thanks to François Pinard for spotting this.
2012-05-06 00:53:42 +02:00
Jason Dunsmore 6a38c1fac3 Fixed indentation in capture template doc. 2012-05-04 14:57:34 -05:00
Jason Dunsmore 67f9bbb7fa Clarified to capture template expansion doc. 2012-05-04 14:47:40 -05:00
Bastien Guerry 1c4ac932f3 Merge branch 'maint' 2012-05-01 18:43:41 +02:00
Bastien Guerry 9fa0b5e794 org.texi (Durations and time values): Fix typo.
* org.texi (Durations and time values): Fix typo.
2012-05-01 18:43:28 +02:00
Bastien Guerry d6e56bce71 org.texi: Document `C-0' as a prefix argument for `org-capture'.
* org.texi (Using capture): Document `C-0' as a prefix
argument for `org-capture'.

Thanks to Charles for this.
2012-04-29 10:58:36 +02:00
Brian van den Broek a178bc9d84 Small grammar tweaks in export sections of org.texi
* org.texi The sections in the Exporting section of the manual left
out articles in the description of the org-export-as-* commands, among
other places. This patch adds them, adds a few missing prepositions,
and switches instances of "an HTML" to "a html" for internal
consistency.

TINYCHANGE
2012-04-24 23:27:59 +02:00
Bastien Guerry 5add9cdef0 org-agenda.el: Implement `org-agenda-persistent-marks' for bulk actions.
* org-agenda.el (org-agenda-persistent-marks): New option to
keep marks after a bulk action.  The option defaults to nil.
(org-agenda-bulk-action): Use the new option.

* org.texi (Agenda commands): Document persistent marks.
2012-04-24 18:10:55 +02:00
Bastien Guerry 1666b910fe org-capture.el: Use %\n instead of %n.
* org-capture.el (org-capture-fill-template): Use %\n instead of %n as a
template element to be replaced with the nth prompted string.
(org-capture-templates): Update docstring.

* org.texi (Template expansion): Update doc to reflect change.

Using %n triggers errors when the template contains escaped strings,
which happens a lot with links.
2012-04-24 11:54:16 +02:00
Bastien Guerry e9d34dcd72 org.texi: Fix insertion of {} chars.
Thanks to Richard Stanton for spotting this.
2012-04-23 19:24:04 +02:00
Toby S. Cubitt b7982a0024 org-capture.el: Fixed bug in org-capture-templates %<n> expandos
* lisp/org-capture.el (org-capture-fill-template): Fixed regexp for
  %<n> expandos to match any positive integer.
  (org-capture-templates): Updated docstring accordingly.

* doc/org.texi: Updated documentation accordingly.
2012-04-23 17:34:15 +02:00
Bastien Guerry b1618e2d69 Fix missing } in org.texi. 2012-04-23 12:59:32 +02:00
Toby Cubitt e13d182ce8 Allow %<num> escapes to capture templates, expanded to text entered in <num>'th prompt
* org-capture.el (org-capture-fill-template): Expand %<num>
escape sequences into text entered for <num>'th %^{PROMPT} escape.
2012-04-23 12:48:40 +02:00
Bastien Guerry e9dec29bb1 org-table.el: Escape some special characters when sending radio tables.
* org-table.el (orgtbl-send-table): Escape special characters.
Introduce a new parameter :no-escape to prevent escaping.

* org.texi (Radio tables): Document the :no-escape parameter.

Thanks to Alexander Willand for raising this issue.
2012-04-23 00:09:35 +02:00
Achim Gratz 0a9c29d305 allow customization of the "doc" target to skip certain types of documentation
* doc/Makefile: read targets to make for "doc" from $(ORG_MAKE_DOC),
  defaults to "info html pdf"; can be overridden by the user in
  local.mk.

* targets.mk: read targets to make for "doc" and "docs" from
  $(ORG_MAKE_DOC), defaults to "info html pdf"; can be overridden by
  the user in local.mk.

* default.mk: document ORG_MAKE_DOC and provide a (commented) example
  of how to have make only produce info documentation.
2012-04-22 10:51:29 +02:00
Achim Gratz 22447fe485 fix typo
* doc/Makefile: fix typo, it is org-version.inc, not org-version.texi
2012-04-22 10:51:21 +02:00
Achim Gratz c5377f6034 always make version files
* doc/Makefile: make org-version.inc .PHONY so that it is always re-made.

* lisp/Makefile: make org-version.el .PHONY so that it is always re-made.
2012-04-21 17:38:43 +02:00
Andrew Hyatt 44e7ed1a59 Allow archiving to a datetree.
* org-archive.el (org-archive-subtree): Allow archiving to a
datetree.

* org.el (org-archive-location): Ditto.

* org.texi (Moving subtrees): Document the ability to archive
to a datetree.

TINYCHANGE
2012-04-21 17:37:48 +02:00
Achim Gratz f6c2848dfb * add missing dependencies on org-version.inc
* doc/Makefile: org-version.inc must be a dependency of "pdf" and "html"
2012-04-21 16:09:02 +02:00
Ippei FURUHASHI 32bd764573 org.texi: Fix typos of function names in Agenda commands
* org.texi (Agenda commands): Fix two typos by giving corresponding
function names, according to `org-agenda-view-mode-dispatch'.

TINYCHANGE
2012-04-21 12:13:25 +02:00
Bastien Guerry 08bd0b8892 Merge branch 'local-Makefile' into test-makefile-merge 2012-04-21 10:02:28 +02:00
Brian van den Broek 8f3dc945b2 Change example timestamps to not occur in headlines.
* org.texi: Alter several examples of headings with timestamps
in them to include the timestamps in the body instead of the heading.

* orgguide.texi: Alter the same examples in the same way as for
org.texi.

The Org-mode manual explicitly discourages the inclusion of timestamps
in headlines, yet examples do just that. These changes make the manual
consistent with its own advice.

TINYCHANGE
2012-04-21 00:43:24 +02:00
Feng Shu a9d3ce0bcd Allow to use imagemagick for previewing LaTeX fragements.
* org.el (org-latex-create-formula-image-program): New option
to use either dvipng or imagemagick to convert and preview
LaTeX fragments.
(org-preview-latex-fragment, org-format-latex): Handle the new
option.
(org-create-formula-image-with-dvipng): Rename from
`org-create-formula-image'.
(org-create-formula-image-with-imagemagick): New defun to
handle LaTeX preview with imagemagick.
(org-latex-color, org-latex-color-format): New defuns to
handle color conversions.

* org-latex.el (org-latex-to-pdf-process, org-export-as-pdf):
Allow to use imagemagick to convert LaTeX fragments.

* org-html.el (org-export-html-preprocess): Ditto.

* org-exp.el (org-export-with-LaTeX-fragments): Ditto.

* org.texi (@LaTeX{} fragments): Document imagemagick as an
alternative to dvipng.
2012-04-21 00:42:59 +02:00
Bastien Guerry ec921a2a68 Support hourly repeat cookies.
* org.el (org-repeat-re)
(org-clone-subtree-with-time-shift, org-auto-repeat-maybe)
(org-deadline, org-schedule, org-matcher-time)
(org-time-stamp, org-read-date, org-read-date-get-relative)
(org-display-custom-time, org-get-wdays)
(org-time-string-to-absolute, org-closest-date)
(org-timestamp-change): Allow to set hourly repeat cookie.
Send an error when an hourly repeat cookie is set and no hour
is specified in the timestamp.

* org.texi (Repeated tasks): Document repeat cookies for
years, months, weeks, days and hours.

* org-agenda.el (org-agenda-get-timestamps): Match hourly
repeat cookies.

* org-icalendar.el (org-print-icalendar-entries): Handle
hourly repeat cookies.

Thanks a lot to Takafumi Arakaki for this idea and for a preliminary
version of this patch.
2012-04-21 00:42:56 +02:00
Achim Gratz e102e411e4 doc/Makefile: rename/add auto-generated files to be compatible with Emacs
* doc/Makefile: rename auto-generated file "git-describe.texi" to
  "org-version.inc" to allow for easier inclusion into Emacs.

* doc/org.texi: include "org-version.inc" instead of
  "git-describe.texi".

* lisp/Makefile: new auto-generated file org-version.el with autoload
  cookies.  The version strings will be pulled during autoload
  extraction into org-install.el (standalone org-mode) or
  ../loaddefs.el (Emacs).
2012-04-20 21:04:14 +02:00
Achim Gratz 6a3ec67abd Introduce $(datadir), prefix all installation paths with $(DESTDIR)
Makefile: remove includes for maintainer targets, these will go
	into local.mk on the server

	default.mk: introduce $(datadir) to replace $(etcdir) in etc/Makefile

	doc/Makefile: replace $etcdir) with $(datadir)

	lisp/Makefile: record ODT styles location as defconst in org-install

	{doc,etc,lisp}/Makefile: prefix all installation targets with $(DESTDIR)
2012-04-20 21:04:11 +02:00
Achim Gratz 6da2d089b0 move all version strings into org-install.el
* targets.mk: check for release and git version and record this
	into environment variables for use in sub-make invocations; add
	new target "compile-dirty" that does not invoke "make clean" first
	* doc/Makefile, lisp/Makefile: remove git version check, since
	they are now provided by first-level make
	* lisp/Makefile: add insertion of version information into
	org-install.el, have org-install.el depend on LISPF rather than
	LISPC so that autoloads can be produced without compiling
	everything and remove insertion into org.el and re-compilation
	during install; add new target "compile-dirty" to support
	invocation from first-level make
	* lisp/org.el (org-version): remove determination of version
	information, show "N/A" if the information is not provided via
	org-install.el
2012-04-20 21:04:10 +02:00
Achim Gratz 306c748f63 inject git-describe version and date into org manual
* doc/Makefile: introduce target for git-describe.texi, which is an
	  automatically generated file that records the output of git-describe
	  and date; remove this file during make clean
	* doc/org.texi: remove @set for VERSION and DATE and do an @include
	  git-describe.texi instead
2012-04-20 21:04:09 +02:00
Achim Gratz 8bbf77a748 finish cleanup on infodir, some refinements on rules
* doc/Makefile: cleanall additionally removes the directories for
	manual and guide; fix the dir file in infodir after removal of org
	documentation

	* lisp/Makefile: remove debug statement
2012-04-20 21:04:08 +02:00
Achim Gratz 501f9b1741 use sed instead of perl, add target clean-install
* Makefile, lisp/Makefile, doc/Makefile: add target clean-install
	to remove files in install-directories

	* default.mk: add customization variable $(SED)

	* doc/Makefile: do not remove dir while cleaning

	* lisp/Makefile: use sed instead of perl to weave git-status into
	org.el and ignore any errors while doing it.  Keep git status in
	$(GITSTATUS) to make it more clear what happens in the check.
2012-04-20 21:04:08 +02:00
Achim Gratz a5cb04dcd8 hand off ./doc to sub-make
* Makefile: use info function for output and call shell only once
* default.mk: add PDFTEX and RMR variables for customization
* lisp/Makefile: add target 'all' and create $(lispdir) if necessary
* maint-targets.mk: invoke sub-make for HTML manuals
* maint.mk: remove unsused VARIABLES
* targets.mk: invoke sub-make for ./doc and clean up some targets
2012-04-20 21:04:07 +02:00
Bastien Guerry d1f1c586d5 Fix merge conflict. 2012-04-20 11:43:27 +02:00
Ippei FURUHASHI ec7052d1c7 org.texi: Fix typos of function names in Agenda commands
* org.texi (Agenda commands): Fix two typos by giving corresponding
function names, according to `org-agenda-view-mode-dispatch'.

TINYCHANGE
2012-04-20 11:30:13 +02:00
Max Mikhanosha 7212801808 Merged origin/master into max-sticky-agenda 2012-04-13 18:15:18 -04:00
Bastien Guerry ac2cb80ec0 orgcard.tex: Fix copyright year. 2012-04-11 13:01:23 +02:00
Bastien Guerry fd6b2a6b77 orgcard.tex: Fix copyright year. 2012-04-11 13:00:40 +02:00
Bastien Guerry fe5e004e39 Merge branch 'hotfix' 2012-04-11 12:30:55 +02:00
Bastien Guerry 148e8c7724 Bump to version 7.8.09. 2012-04-11 12:30:40 +02:00
Bastien Guerry 49645b6014 org.texi: State that you can use the d: option by specifying a list of drawers.
* org.texi (Export options): State that you can use the d:
option by specifying a list of drawers.

Thanks to François Pinard for requesting this.
2012-04-11 08:17:53 +02:00
Jambunathan K d6773457a2 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-04-10 22:30:11 +05:30
Jambunathan K e1c83760bc doc/org.texi: Fix compilation error 2012-04-10 22:24:54 +05:30
Bastien Guerry e8912e1bd8 Merge branch 'hotfix' 2012-04-10 14:33:01 +02:00
Jérémie Courrèges-Anglas 1e12cbdeda Deadlines and scheduling: Fix order in DEADLINE example
* doc/org.texi (Deadlines and scheduling): Fix the example: the DEADLINE
item should come right after the headline.

TINYCHANGE
2012-04-10 14:32:52 +02:00
Bastien Guerry 00f59ff30b Merge branch 'hotfix' 2012-04-09 12:35:15 +02:00
Julian Gehring 2d8913f1fc org.texi: Fix missing links and formatting in 'Exporting' section 2012-04-09 12:35:06 +02:00
Bastien Guerry 4899b81483 Merge branch 'hotfix' 2012-04-05 08:51:51 +02:00
Ippei FURUHASHI 4e35c21c09 doc/org.texi: Fix two typos in Agenda commands
doc/org.texi: Fix two typos in Agenda commands

* doc/org.texi (Agenda commands): Fix typos by swapping
the equivalent keybindings to `org-agenda-next-line'
with the ones to `org-agenda-previous-line'.

TINYCHANGE
2012-04-05 08:51:41 +02:00
Bastien Guerry 3b04635542 Small doc improvement about HTML pre/postamble.
* org-html.el (org-export-html-preamble-format)
(org-export-html-postamble-format): Improve the docstring.

* org.texi (HTML preamble and postamble): Small doc improvement.

Thanks to Zachary Jones who asked for this.
2012-04-02 23:28:52 +02:00
Bastien Guerry c187c512af Merge branch 'hotfix-7.8.06' 2012-04-02 17:58:01 +02:00
Bastien Guerry 60b6f60dfe Bump to version number 7.8.08. 2012-04-02 17:57:49 +02:00
Bastien Guerry 5651adb133 Merge branch 'hotfix-7.8.06' 2012-04-02 07:52:09 +02:00
Bastien Guerry ccd84a9f63 Fix spelling mistakes.
Thanks to Paul Eggert for spotting these.
2012-04-02 07:51:52 +02:00
Bastien Guerry 33e5cdd358 org.texi: Fix copyright year. 2012-04-01 22:05:49 +02:00
Eric Schulte 1193844018 documentation for the new file-desc header argument 2012-03-31 14:49:21 -04:00
Bastien Guerry 61106491b3 Merge branch 'hotfix-7.8.06' 2012-03-31 11:25:28 +02:00
Bastien Guerry a3ca0e43e5 Update version to 7.8.07 from hotfix. 2012-03-31 11:24:57 +02:00
Bastien Guerry 3c57eb297b doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
Thanks to David Niemi for the fix.
2012-03-26 22:37:59 +02:00
Bastien Guerry d1ed590320 doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
Thanks to David Niemi for the fix.
2012-03-26 22:37:29 +02:00
Jambunathan K e2f490826c Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-21 02:51:09 +05:30
Jambunathan K aa20053803 org.texi (Customizing tables in ODT export): Fix errors
* doc/org.texi (Customizing tables in ODT export): Correct few
errors.
2012-03-21 02:47:55 +05:30
Jambunathan K acec9db838 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-21 02:15:24 +05:30
Jambunathan K 1cc2af2f25 org.texi: Udpate ODT section
* doc/org.texi (Links in ODT export): Update.
(Labels and captions in ODT export): New node.
2012-03-21 02:13:55 +05:30
Jambunathan K b137bc4eae Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-20 20:31:04 +05:30
Jambunathan K f2fc168a73 org.texi (Literal examples in ODT export): Update
* doc/org.texi (Literal examples in ODT export):
htmlfontify.el in Emacs-24.1 now supports fontification.  So
ODT source blocks will be fontified by default.

(Evaluating code blocks, Evaluating code blocks):
Whitespace-only change.
2012-03-20 20:23:47 +05:30
Bastien Guerry 05ca3731f2 Merge branch 'hotfix-7.8.06' 2012-03-20 12:37:37 +01:00
Rustom Mody 4ef3304ac2 doc/org.texi: Small doc fix.
TINYCHANGE
2012-03-20 12:31:26 +01:00
Bastien Guerry cc46c9627b Merge branch 'hotfix-7.8.06' 2012-03-20 12:26:16 +01:00
Julian Gehring 04c9e0e64c doc/org.texi: Remove duplicated keybinding for 'org-refile-cache-clear'.
* org.texi (Refiling notes): Remove duplicated keybinding.

TINYCHANGE
2012-03-20 12:25:51 +01:00
Julian Gehring e2444eab93 doc/org.texi: Tiny stylistic improvements.
TINYCHANGE
2012-03-20 12:23:05 +01:00
Bastien Guerry 00365ede15 Bump to version 7.8.06. 2012-03-19 22:23:16 +01:00
Bastien Guerry ecd0562c5f Fix the master branch.
I started from the 78ec8e commit then cherry-picked and squashed
commits that have been done in master since then, except the bad
commits that overwrote the tree (in master) with the tree in maint.

This commit also bumps the version number to 7.8.06.

The only "fix" that was made between 78ec8e and the previous commit
is e0072f which has been reported to break stuff.
2012-03-19 22:01:29 +01:00
Bastien Guerry 73cbeabe1b Merge branch 'maint' 2012-03-18 12:12:09 +01:00
Bastien Guerry 095e578676 Update to 7.8.05 2012-03-17 16:43:26 +01:00
Bastien Guerry 218e8e444a Update version 7.8.05 2012-03-17 16:41:44 +01:00
Bastien Guerry 560624fcc7 Set version 7.8.04 in maint. 2012-03-17 16:32:53 +01:00
Bastien Guerry de42649f7b Manually revert maint to e85080.
e85080 is the last correct commit in the maint branch
before releasing 7.8.04.  The 7.8.05 release should be
done from this commit.
2012-03-17 16:28:46 +01:00
Ilya Shlyakhter 9382faf592 Documentation: Clarified current role of ITEM special property
doc/org.texi (section on Special Properties) Clarified that ITEM refers
to the headline of the entry not the whole entry text.
(section on Matching Tags and Properties) Clarified that matching on
the value of ITEM special property is not currently supported,
and added a footnote about a partial workaround.
Also added missing -if suffix to references to org-agenda-skip-entry-if.

TINYCHANGE
2012-03-17 16:02:59 +01:00
Bastien Guerry 73bb18ba37 Manually revert to the Release 7.8.04 tag. 2012-03-17 15:52:24 +01:00
Bastien Guerry 552b0edb25 Manually revert to 78ec8e21 (Release 7.8.04)
Let's take a fresh start.  Sorry Mama.
2012-03-17 15:44:41 +01:00
Bastien Guerry 6e534f9c61 Manually revert back to commit e85080.
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.

This commit reverts back the maint branch to its state before
merging the master branch.  From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
2012-03-17 14:34:01 +01:00
Bastien Guerry d254b05500 Revert "Release 7.8.04"
This reverts commit 78ec8e21b8.
2012-03-17 14:24:27 +01:00
Bastien Guerry 78ec8e21b8 Release 7.8.04 2012-03-16 19:04:04 +00:00
Bastien Guerry 7e903acccd Merge branch 'maint' 2012-03-16 20:02:48 +01:00
Bastien Guerry e85080bb2b doc/org.texi: Use "ODT" instead of @acronym{ODT}.
Using @acronym{} is better but we need to make this
change on the whole document and check that the doc
compiles correctly on the server with it.
2012-03-16 20:02:30 +01:00
Eric Schulte 6e525c73f7 documentation of this new option to the :noweb header argument
* doc/org.texi (noweb): Documentation of this new option to the :noweb
  header argument.
2012-03-14 15:12:44 -04:00
Carsten Dominik 39c763020a Clean up local variable stuff and document sticky agenda buffers
* lisp/org-agenda.el (org-agenda-local-vars): Clean up the variable list.
(org-agenda-get-restriction-and-command): Add a key for toggling
sticky agenda views.

* doc/org.texi (Agenda dispatcher): Document sticky agenda views
and the new key for them.
2012-03-10 08:02:46 +01:00
Suvayu Ali e896ca6707 Add example demonstrating LaTeX_CLASS_OPTIONS
* org.texi (Header and sectioning): Add example demonstrating how to use
  "LaTeX_CLASS_OPTIONS".

TINY CHANGE
2012-03-08 13:44:49 +01:00
Eric Schulte dad33a6b3d Merge branch 'origin-maint' 2012-03-05 14:55:05 -07:00
Eric Schulte 9371465aab describe the ability to execute noweb references in the manual
* doc/org.texi (Noweb reference syntax): Describe the ability to
  execute noweb references in the manual.
2012-03-05 14:54:56 -07:00
Eric Schulte 15d2a7f3d4 Merge branch 'origin-maint' 2012-03-02 12:37:30 -07:00
Eric Schulte 000afe01ab improve cache documentation when session evaluation is used
* doc/org.texi (cache): Improve cache documentation when session
  evaluation is used.
2012-03-02 12:37:05 -07:00
Jambunathan K 92da128bf9 Pull up ODT files from "maint" to "master" levels
2012-01-17   Jambunathan K   <kjambunathan@gmail.com>

* 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

Add support for indented tables in ODT export

2012-01-20   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-format-textbox): Honor user-specified
width in captioned images.

Fix for bug reported here:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00641.html

Honor user-specified width in captioned images

2012-01-23   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-table-style-format): New.  Template for
auto-generated table styles.
(org-odt-automatic-styles, org-odt-object-counters): New
variables.
(org-odt-add-automatic-style): New function.
(org-odt-write-automatic-styles): New function.  Create
automatic styles for tables that have custom :rel-width.
(org-odt-begin-table): Parse attributes specified with
"#+ATTR_ODT: " option and use it to create an automatic table
style.
(org-odt-save-as-outfile): Call
`org-odt-add-write-automatic-styles'.
(org-odt-init-outfile): Init newly add variables.
(org-odt-section-count): Remove it.
(org-odt-begin-section): Use `org-odt-add-automatic-style' to
generate an automatic section name.

Customize table width using :rel-width option.  For example,
to create a table of width 60% use:

    #+attr_odt: :rel-width 60
    | A | B |
    |---+---|
    |   |   |

org-odt.el: Put table width under user-control

2012-01-23   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-label-styles): Add a new style.
(org-odt-category-map-alist):  Use it.

Andreas Leha writes:

The following snippet exports correctly to LaTeX and to html, but
produces the text "Figure Figure" in odt.

Could the behaviour be synchronized?

=== example.org ==========================
* Test ref
  plot(1:10, 1:10)

Here is a reference to Figure \ref{fig:bar}
=== example.org ==========================

org-odt.el: Make label references consistent with LaTeX export

2012-01-24   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-entity-frame-styles): Add frame params
for images that are anchored as character.
(org-export-odt-format-image): Handle new anchor type
"as-char".
(org-export-odt-default-image-sizes-alist): Misc. change.
(org-export-odt-format-formula): Misc. change.

With this change, one can use the below snippet to produce
images that are laid out side-by-side.
    #+ATTR_ODT: :width 7 :height 7 :anchor as-char
    #+header: :file foo.png
    [[./foo.png]]
    #+caption: bar
    #+ATTR_ODT: :width 7 :height 7 :anchor as-char
    #+header: :file bar.png
    [[./bar.png]]

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00677.html.

org-odt.el: Allow images to be anchored as characters

2012-01-24   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-export-odt-format-formula): Use :style
property to specify custom table styles.

Continuation of the earlier commit titled: "Put table width
under user-control".

org-odt.el: Fix regression in typesetting of MathML formulae

2012-01-27   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-format-preamble): Don't insert TOC here.
Delay it till the end of export.
(org-odt-begin-document-body): Make a note of the default
position of TOC in `org-lparse-dyn-first-heading-pos'.
(org-odt-insert-toc): Insert TOC as directed by
[TABLE-OF-CONTENTS] line or at the default position.
(org-odt-end-export): Call `org-odt-insert-toc'.

Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00974.html

org-odt.el: Honor "[TABLE-OF-CONTENTS]" directive

2012-01-27   Jambunathan K   <kjambunathan@gmail.com>

org-odt.el: Fix earlier commit

2012-01-30   Jambunathan K   <kjambunathan@gmail.com>

* OrgOdtStyles.xml (OrgTitlePage): New page style.  Include no
footer.  Use "OrgFrontMatterPage" for the following page.
(OrgFrontMatterPage): New page style.  Include a footer that
displays page numbers in Roman style.  Use mirrored pages.
Use "OrgFrontMatterPage" for the following page.
(OrgPage): New page style.  Include a footer that displays
page numbers.  Use mirrored pages.  Use "OrgPage" for the
following page.
(OrgFirstPage): New page style.  Include a footer that
displays page numbers.  Right page only.  Use "OrgPage" for
the following page.
(Standard): Modify to include a footer that displays page
numbers.  Use mirrored pages.  Use "Standard" for the
following page.

None of the above page styles have a header.

The newly added page styles are not used as yet.

org-odt.el: By default, include page numbers in the page footer

2012-01-31   Jambunathan K   <kjambunathan@gmail.com>

org-odt.el: Do `clear-image-cache' before `create-image'

2012-02-03   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-lparse.el (org-lparse-do-convert): Replace
`call-process' with `shell-command-to-string'.

* lisp/org-odt.el (org-export-odt-convert-processes): Add a new
converter which depends solely on LibreOffice and nothing
else.
(org-export-odt-convert-process): Make the above native
converter the default.

Thanks to Giles for introducing the "--convert-to" option of
soffice.exe.  The option seems to be a fairly recent
development.

http://imperfectsoftware.blogspot.in/2012/01/one-of-my-less-enjoyable-tasks-is-to.html

With this change, one can export to pdf via odt by a simple
  (setq org-export-odt-preferred-output-format "pdf")
There is no need to install additional converters.

org-odt.el: Make LibreOffice the default converter

2012-02-09   Jambunathan K   <kjambunathan@gmail.com>

* org-odt.el (org-export-odt-convert-capabilities): Change the
default value.

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg00293.html.

Offer "docx" as an option in `org-export-odt-preferred-output-format'

2012-02-12   Jambunathan K   <kjambunathan@gmail.com>

org-odt.el: Fix indentation

2012-02-12   Jambunathan K   <kjambunathan@gmail.com>

org-odt.el: Tag all custom variables with Emacs version

2012-02-12   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-export-odt-convert-processes): Re-define
(org-export-odt-convert-capabilities): Fix an accidental
regression.

* lisp/org-lparse.el (org-lparse-do-convert): Related change.

Simplify definition of `org-export-odt-convert-processes'

2012-02-12   Jambunathan K   <kjambunathan@gmail.com>

Retire support for BasicODConverter

2012-02-14   Jambunathan K   <kjambunathan@gmail.com>

* org-odt.el (org-export-as-odt-to-buffer)
(org-replace-region-by-odt, org-export-region-as-odt): Remove
these interactive functions.  They are of questionable value.

org-odt.el: Remove interactive functions of questionable value

2012-02-15   Jambunathan K   <kjambunathan@gmail.com>

Improve converting from ODT to other formats

2012-02-15   Jambunathan K   <kjambunathan@gmail.com>

* org-odt.el (org-export-odt-image-size-probe-method)
(org-odt-do-image-size): Use imagemagick preferentially to
determine image sizes.

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg00288.html

org-odt.el: Use imagemagick to determine image sizes

2012-02-16   Jambunathan K   <kjambunathan@gmail.com>

* org.texi (Top, OpenDocument Text export)
(ODT export commands, Extending ODT export)
(Images in ODT export, Tables in ODT export)
(Configuring a document converter): Add or Update.

org.texi: Update ODT section
2012-02-20 10:25:31 +05:30
Nicolas Goaziou 8b7a3f2498 org-list: Remove two defcustoms
* lisp/org-list.el (org-list-ending-method, org-list-end-regexp):
  Removed variables.
(org-in-item-p, org-list-separating-blank-lines-number,
org-list-parse-list, org-list-struct): Apply changes.
* lisp/org-exp.el (org-export-mark-list-end,
  org-export-mark-list-properties): Apply changes.
* lisp/org-latex.el (org-export-latex-lists): Apply changes.
* doc/org.texi (Plain lists): Document removal.

Conflicts:

	lisp/org-list.el
2012-02-19 09:16:21 -07:00
Bastien Guerry b3274408e2 org.texi: fix typo.
Thanks to Takaaki ISHIKAWA for spotting this.
2012-02-19 08:28:09 -07:00
Bastien Guerry cb5d5121f5 org.texi: fix tiny typo.
Thanks to Paul Eggert for this fix in Emacs trunk.
2012-02-19 08:23:48 -07:00
Bastien Guerry 4a5f40e88b org.texi: Fix spelling mistakes.
Thanks to Paul Eggert for this fixes in Emacs trunk.

Conflicts:

	doc/org.texi
2012-02-19 08:23:27 -07:00
Bastien Guerry 2e615798a1 Merge branch 'maint' 2012-02-18 18:21:41 +01:00
Michael Brand 40b3b323f8 manual: fix references to Calc manual
* doc/org.texi: Decapitalize file name in references to Calc manual.

On a case sensitive file system the references from the HTML Org
manual (e. g. the link href="Calc.html#Embedded-Mode" or
href="../Calc/Embedded-Mode.html#Embedded-Mode") to the HTML Calc
manual (e. g. the file calc.html or calc/Embedded-Mode.html) do not
match.
2012-02-18 18:21:32 +01:00
Nicolas Goaziou cf87d15483 org-list: Remove two defcustoms
* lisp/org-list.el (org-list-ending-method, org-list-end-regexp):
  Removed variables.
(org-in-item-p, org-list-separating-blank-lines-number,
org-list-parse-list, org-list-struct): Apply changes.
* lisp/org-exp.el (org-export-mark-list-end,
  org-export-mark-list-properties): Apply changes.
* lisp/org-latex.el (org-export-latex-lists): Apply changes.
* doc/org.texi (Plain lists): Document removal.
2012-02-17 00:04:34 +01:00
Jambunathan K c7f3e4abf1 org.texi: Update ODT section
* org.texi (Top, OpenDocument Text export)
(ODT export commands, Extending ODT export)
(Images in ODT export, Tables in ODT export)
(Configuring a document converter): Add or Update.
2012-02-16 23:04:46 +05:30
Bastien Guerry 23faca5b97 org.texi: Fix sentences with double-space endings. 2012-02-15 12:08:16 +01:00
Carsten Dominik 58479692be Modify the doc to give better appreciation for MobileOrg Android
* doc/org.texi (MobileOrg): Change the wording to reflect that the
Android Version is no longer just the little brother of the iOS version.
* doc/orgguide.texi (MobileOrg): Change the wording to reflect that the
Android Version is no longer just the little brother of the iOS version.
2012-02-08 06:22:22 +00:00
Eric Schulte 647340619c Merge branch 'origin-maint' 2012-02-03 11:45:36 -07:00
Eric Schulte 9e2a3cfe9b updated babel key binding documentation in manual
* doc/org.texi (Key bindings and useful functions): Updated babel key
  binding documentation in manual.
2012-02-03 11:44:58 -07:00
Eric Schulte a3e5f97ee7 New strip-export noweb header argument value
* lisp/ob-exp.el (org-babel-exp-src-block): Strip noweb references on
  export when "strip-export".
* lisp/ob.el (org-babel-common-header-args-w-values): New noweb
  header value.
  (org-babel-merge-params): New noweb header value.
  (org-babel-noweb-p): New noweb header value.
* testing/examples/babel.org (an): Testing new noweb header value.
* testing/lisp/test-ob-exp.el (ob-exp/noweb-strip-export-ensure-strips):
  Testing new noweb header value.
* doc/org.texi (noweb): Document new noweb header value.
2012-02-01 08:19:29 -07:00
Suvayu Ali 347b1a1d2f Minor fix in info documentation.
TINY CHANGE
2012-02-01 07:36:42 +01:00
Bastien Guerry e4d5ccc1ae org.texi: Whitespaces cleanup. 2012-01-29 00:48:33 +01:00
Bastien Guerry 5bb59a3fdf Let #+DRAWERS append new drawers to `org-drawers', instead of replacing them.
* org.el (org-set-regexps-and-options): Set the value of
`org-drawers' by adding the value of the infile #+DRAWERS
option to that of the existing `org-drawers'.

* org.texi (Drawers): Clearly states that #+DRAWERS will add
drawers to the one originally listed in `org-drawers'.
2012-01-29 00:47:50 +01:00
Bastien Guerry 952abb2c46 org.texi: Small precision.
I'm not sponsoring the hosting costs of orgmode.org, this
is taken care by Jason Dunsmore.
2012-01-28 13:34:32 +01:00
Bastien Guerry 471ddbd14e Improve `org-insert-drawer' and related documentation.
* org.el (org-insert-property-drawer): Not an interactive
command anymore.
(org-insert-drawer): With a prefix argument, insert a property
drawer.  Check for headline within the region before inserting
the drawer.  Don't include special drawers in the completion
table.
(org-mode-map): New keybinding `C-c C-x d' for
`org-insert-drawer'.

* org.texi (Drawers): How to insert/complete drawers.

Thanks to Nicolas Goaziou for the discussion and the patch.
2012-01-26 09:18:10 +01:00
Bastien Guerry 94dbe6ea89 org.texi: fix typo.
Thanks to Takaaki ISHIKAWA for spotting this.
2012-01-25 07:16:46 +01:00
Bastien Guerry a0bee00428 org.texi: add a note about using C-u SPC in the agenda view. 2012-01-25 07:11:57 +01:00
Gregor Zattler efc3bdf3f3 Document max number of stars in clocking section
Clocking only works with all headings indented with less than `30'
stars (hardcoded `lmax' value in `org-clock-sum').
2012-01-24 17:11:08 +01:00
Gregor Zattler 9578537edf Document max number of stars in headings in manual
Clocking only works with headings indented with less than `30' stars
(hardcoded `lmax' value in `org-clock-sum').
2012-01-24 17:10:44 +01:00
Eric Schulte 2395c3eff1 Merge branch 'origin-maint' 2012-01-24 00:02:52 -07:00
Eric Schulte 11d31e89c4 replace org-babel-noweb-separator variable with :noweb-sep header argument
* doc/org.texi (noweb-sep): Document new header argument.
* lisp/ob.el (org-babel-common-header-args-w-values): Add new header
  argument.
  (org-babel-expand-noweb-references): Use header argument rather than
  customization variable.
2012-01-23 23:57:51 -07:00
Eric Schulte fce92180d1 Merge branch 'origin-maint' 2012-01-23 19:43:28 -07:00
Eric Schulte 269a509615 customizable noweb reference separator
* lisp/ob.el (org-babel-noweb-separator): Custom variable for
  accumulated noweb references.
  (org-babel-expand-noweb-references): Allow separator for noweb
  references.
* doc/org.texi (noweb-ref): Documentation of this new custom variable.
2012-01-23 19:42:06 -07:00
Bastien Guerry 8a7799473c orgguide.texi: Fix small typo.
Thanks to Guido Arnold for spotting this.
2012-01-23 16:14:34 +01:00
Konrad Hinsen f2a9d83824 Support for links to IMAP folders in org-vm.el 2012-01-20 17:06:04 +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 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
Thomas Dye d4c146be58 Fix typo on manual pointed out by Francois Pinard 2012-01-12 08:38:01 +01: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