Release 5.12

This commit is contained in:
Carsten Dominik 2008-01-31 11:36:42 +01:00
parent 01d0656bcf
commit 2856cf1927
10 changed files with 1016 additions and 628 deletions

View File

@ -1,3 +1,38 @@
2007-10-12 Carsten Dominik <dominik@science.uva.nl>
* org.texi: Small fixes.
2007-10-11 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-get-date-from-calendar): New function.
(org-at-timestamp-p, org-timestamp-change)
(org-remember-templates): First element of each entry is now a
name for the template.
(org-store-log-note): Check for `org-note-abort'.
(org-kill-note-or-show-branches): New command.
(org-fontify-priorities): New option.
(org-fontify-priorities): New function.
(org-cut-subtree, org-copy-subtree): New argument N to
act on N sequential subtrees.
(org-paste-subtree): Fix the level at which a tree is pasted.
(org-fit-agenda-window): Limitations on window size removed.
(org-agenda-find-same-or-today-or-agenda): Renamed from
`org-agenda-find-today-or-agenda'.
(org-scheduled-past-days): New option.
(org-agenda-scheduled-leaders)
(org-agenda-deadline-leaders): New options.
(org-agenda-get-deadlines): Use `org-agenda-deadline-leaders'.
(org-agenda-get-scheduled): Use `org-agenda-scheduled-leaders'.
(org-export-with-tags, org-export-plist-vars)
(org-infile-export-plist): New "tags" option.
(org-use-property-inheritance): New option.
(org-cached-entry-get): Use `org-use-property-inheritance'.
(org-remember-apply-template): Fixed typo.
----------------------------------------------------------------------
Installed as 5.11
2007-10-05 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-additional-option-like-keywords): New constant.

View File

@ -67,7 +67,7 @@ HTMLDIR = /home/dominik/public_html/Tools/org
.SUFFIXES: .el .elc .texi
SHELL = /bin/sh
DISTFILES= README ${LISPFILES} ${DOCFILES} ${CARDFILES} Makefile dir ChangeLog
DISTFILES= README ${LISPFILES} ${DOCFILES} ${CARDFILES} Makefile dir ChangeLog request-assign.future
DISTFILES_xemacs= xemacs/noutline.el xemacs/ps-print-invisible.el xemacs/README
all: $(ELCFILES)

933
org

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
;;
;; Emacs Lisp Archive Entry
;; Filename: org-export-latex.el
;; Version: 5.11
;; Version: 5.12
;; Author: Bastien Guerry <bzg AT altern DOT org>
;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
;; Keywords: org, wp, tex
@ -58,7 +58,7 @@
(defvar org-latex-add-level 0)
(defvar org-latex-sectioning-depth 0)
(defvar org-export-latex-list-beginning-re
"^\\([ \t]*\\)\\([-+]\\|[0-9]+\\(?:\\.\\|)\\)\\) *?")
"^\\([ \t]*\\)\\([-+*]\\|[0-9]+[.)]\\) +?")
(defvar org-latex-special-string-regexps
'(org-ts-regexp
@ -579,14 +579,16 @@ Argument OPT-PLIST is the options plist for current buffer."
;; insert the title
(format
"\\title{%s}\n"
(or (plist-get opt-plist :title)
(and (not
(plist-get opt-plist :skip-before-1st-heading))
(org-export-grab-title-from-buffer))
(and buffer-file-name
(file-name-sans-extension
(file-name-nondirectory buffer-file-name)))
"UNTITLED"))
;; convert the title
(org-export-latex-content
(or (plist-get opt-plist :title)
(and (not
(plist-get opt-plist :skip-before-1st-heading))
(org-export-grab-title-from-buffer))
(and buffer-file-name
(file-name-sans-extension
(file-name-nondirectory buffer-file-name)))
"UNTITLED")))
;; insert author info
(if (plist-get opt-plist :author-info)
@ -626,7 +628,9 @@ COMMENTS is either nil to replace them with the empty string or a
formatting string like %%%%s if we want to comment them out."
(save-excursion
(goto-char (point-min))
(let* ((end (if (re-search-forward "^\\*" nil t)
(let* ((pt (point))
(end (if (and (re-search-forward "^\\*" nil t)
(not (eq pt (match-beginning 0))))
(goto-char (match-beginning 0))
(goto-char (point-max)))))
(org-export-latex-content
@ -954,7 +958,7 @@ Valid parameters are
(let* ((beg (org-table-begin))
(end (org-table-end))
(raw-table (buffer-substring-no-properties beg end))
fnum line lines olines gr colgropen line-fmt alignment)
fnum fields line lines olines gr colgropen line-fmt align)
(if org-export-latex-tables-verbatim
(let* ((tbl (concat "\\begin{verbatim}\n" raw-table
"\\end{verbatim}\n")))
@ -1133,7 +1137,7 @@ Valid parameters are
(when (and (re-search-forward (regexp-quote foot-prefix) nil t))
(replace-match "")
(let ((end (save-excursion
(if (re-search-forward "^$\\|\\[[0-9]+\\]" nil t)
(if (re-search-forward "^$\\|^#.*$\\|\\[[0-9]+\\]" nil t)
(match-beginning 0) (point-max)))))
(setq footnote
(concat

524
org.el

File diff suppressed because it is too large Load Diff

BIN
org.pdf

Binary file not shown.

117
org.texi
View File

@ -3,7 +3,7 @@
@setfilename ../info/org
@settitle Org Mode Manual
@set VERSION 5.11b
@set VERSION 5.12
@set DATE October 2007
@dircategory Emacs
@ -839,9 +839,10 @@ Move subtree down (swap with next subtree of same level).
@item C-c C-x C-w
@itemx C-c C-x C-k
Kill subtree, i.e. remove it from buffer but save in kill ring.
With prefix arg, kill N sequential subtrees.
@kindex C-c C-x M-w
@item C-c C-x M-w
Copy subtree to kill ring.
Copy subtree to kill ring. With prefix arg, copy N sequential subtrees.
@kindex C-c C-x C-y
@item C-c C-x C-y
Yank subtree from kill ring. This does modify the level of the subtree to
@ -994,12 +995,15 @@ headline structure above it@footnote{See also the variables
shown around each match.}. Just try it out and you will see immediately
how it works.
Org-mode contains several commands creating such trees. The most
basic one is @command{org-occur}:
Org-mode contains several commands creating such trees, all these
commands can be accessed through a dispatcher:
@table @kbd
@kindex C-c /
@item C-c /
This prompts for an extra key to select a sparse-tree creating command.
@kindex C-c / r
@item C-c / r
Occur. Prompts for a regexp and shows a sparse tree with all matches.
If the match is in a headline, the headline is made visible. If the
match is in the body of an entry, headline and body are made visible.
@ -1025,8 +1029,8 @@ For example:
@noindent will define the key @kbd{C-c a f} as a shortcut for creating
a sparse tree matching the string @samp{FIXME}.
Other commands use sparse trees as well. For example @kbd{C-c
C-v} creates a sparse TODO tree (@pxref{TODO basics}).
The other sparse tree commands select headings based on TODO keywords,
tags, or properties and will be discussed later in this manual.
@kindex C-c C-e v
@cindex printing sparse trees
@ -2624,8 +2628,10 @@ TODO state. For this you need to assign keys to TODO state, like this:
@noindent See @ref{Per file keywords} and @ref{Setting tags} for more
information.
@kindex C-c C-v
@kindex C-c / t
@cindex sparse tree, for TODO
@item C-c C-v
@itemx C-c / t
View TODO items in a @emph{sparse tree} (@pxref{Sparse trees}). Folds
the entire buffer, but shows all TODO items and the headings hierarchy
above them. With prefix arg, search for a specific TODO. You will be
@ -3095,6 +3101,7 @@ Tags are normal words containing letters, numbers, @samp{_}, and
@node Tag inheritance, Setting tags, Tags, Tags
@section Tag inheritance
@cindex tag inheritance
@cindex inheritance, of tags
@cindex sublevels, inclusion into tags match
@ -3258,7 +3265,9 @@ information into special lists.
@table @kbd
@kindex C-c \
@kindex C-c / T
@item C-c \
@itemx C-c / T
Create a sparse tree with all headlines matching a tags search. With a
@kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
@kindex C-c a m
@ -3408,6 +3417,10 @@ The following commands help to work with properties:
@item M-@key{TAB}
After an initial colon in a line, complete property keys. All keys used
in the current file will be offered as possible completions.
@kindex C-c C-x p
@item C-c C-x p
Set a property. This prompts for a property name and a value. If
necessary, the property drawer is created as well.
@item M-x org-insert-property-drawer
Insert a property drawer into the current entry. The drawer will be
inserted early in the entry, but after the lines with planning
@ -3454,6 +3467,9 @@ SCHEDULED @r{The scheduling time stamp, without the angular brackets.}
@node Property searches, Column view, Special properties, Properties and columns
@section Property searches
@cindex properties, searching
@cindex properties, inheritance
@cindex searching, of properties
@cindex inheritance, of properties
To create sparse trees and special lists with selection based on
properties, the same commands are used as for tag searches (@pxref{Tag
@ -3469,6 +3485,23 @@ also have a priority value @samp{A}, a @samp{:coffee:} property with the
value @samp{unlimited}, and a @samp{:with:} property that is matched by
the regular expression @samp{Sarah\|Denny}.
During a search, properties will be inherited from parent entries only
if you configure the variable @code{org-use-property-inheritance}.
There is also a special command for creating sparse trees based on a
single property:
@table @kbd
@kindex C-c / p
@item C-c / p
Create a sparse tree based on the value of a property. This first
prompts for the name of a property, and then for a value. A sparse tree
is created with all entries that define this property with the given
value. If you enclose the value into curly braces, it is interpreted as
a regular expression and matched against the property values.
@end table
@node Column view, Property API, Property searches, Properties and columns
@section Column View
@ -3823,17 +3856,32 @@ ISO date. But it will in fact accept any string containing some date
and/or time information. You can, for example, use @kbd{C-y} to paste a
(possibly multi-line) string copied from an email message. Org-mode
will find whatever information is in there and will replace anything not
specified with the current date and time. For example:
specified with the @emph{default date and time}. The default is usually
the current date and time, but when modifying an existing time stamp, or
when entering the second stamp of a range, it is taken from the stamp in
the buffer. For example:
@example
3-2-5 --> 2003-02-05
feb 15 --> currentyear-02-15
sep 12 9 --> 2009-09-12
12:45 --> today 12:45
22 sept 0:34 --> currentyear-09-22 0:34
12 --> currentyear-currentmonth-12
Fri --> nearest Friday (today or later)
+4 --> 4 days from now (if +N is the only thing given)
3-2-5 --> 2003-02-05
feb 15 --> defaultyear-02-15
sep 12 9 --> 2009-09-12
12:45 --> default-date 12:45
22 sept 0:34 --> defaultyear-09-22 0:34
12 --> defaultyear-defaultmonth-12
Fri --> nearest Friday (defaultdate or later)
@end example
Furthermore you can specify a relative date by giving, as the
@emph{first} thing in the input: a plus/minus sign, a number and a
letter [dwmy] to indicate change in days weeks, months, years. With a
single plus or minus, the date is always relative to today. With a
double plus or minus, it is relative to the default date. E.g.
@example
+4d --> four days from today
+4 --> same as above
+2w --> two weeks from today
++5 --> five days from default date
@end example
The function understands English month and weekday abbreviations. If
@ -4182,7 +4230,7 @@ little interruption of your work flow. See
@uref{http://www.emacswiki.org/cgi-bin/wiki/RememberMode} for more
information. It is an excellent way to add new notes and TODO items to
Org-mode files. Org-mode significantly expands the possibilities of
@i{remember}: You may define templates for different note types, and to
@i{remember}: You may define templates for different note types, and
associate target files and headlines with specific templates. It also
allows you to select the location where a note should be stored
interactively, on the fly.
@ -4220,16 +4268,18 @@ use:
@example
(setq org-remember-templates
'((?t "* TODO %?\n %i\n %a" "~/org/TODO.org" "Tasks")
(?j "* %U %?\n\n %i\n %a" "~/org/JOURNAL.org")
(?i "* %^@{Title@}\n %i\n %a" "~/org/JOURNAL.org" "New Ideas")))
'(("Todo" ?t "* TODO %?\n %i\n %a" "~/org/TODO.org" "Tasks")
("Journal" ?j "* %U %?\n\n %i\n %a" "~/org/JOURNAL.org")
("Idea" ?i "* %^@{Title@}\n %i\n %a" "~/org/JOURNAL.org" "New Ideas")))
@end example
@noindent In these entries, the character specifies how to select the
template. The first string specifies the template. Two more (optional)
strings give the file in which, and the headline under which the new
note should be stored. The file defaults (if not present or @code{nil})
to @code{org-default-notes-file}, the heading to
@noindent In these entries, the first string is just a name, and the
character specifies how to select the template. It is useful if the
character is also the first letter of the name. The next string
specifies the template. Two more (optional) strings give the file in
which, and the headline under which the new note should be stored. The
file defaults (if not present or @code{nil}) to
@code{org-default-notes-file}, the heading to
@code{org-remember-default-headline}. Both defaults help to get to the
storing location quickly, but you can change the location interactively
while storing the note.
@ -4242,14 +4292,6 @@ more than one template) and then prepare the buffer like
[[file:link to where you called remember]]
@end example
@noindent or
@example
* [2006-03-21 Tue 15:37]
[[file:link to where you called remember]]
@end example
@noindent
During expansion of the template, special @kbd{%}-escapes allow dynamic
insertion of content:
@ -4440,10 +4482,6 @@ Remove current file from the list of agenda files.
@item C-,
@itemx C-'
Cycle through agenda file list, visiting one file after the other.
@kindex C-c C-x /
@item C-c C-x /
Search for a regular rexpression in all agenda files and display the
results in an @code{occur} buffer.
@end table
@noindent
@ -4472,6 +4510,12 @@ tags and properties}).
Create the timeline view for the current buffer (@pxref{Timeline}).
@item # @r{/} !
Create a list of stuck projects (@pxref{Stuck projects}).
@item /
Search for a regular expression in all agenda files and additionally in
the files listed in @code{org-agenda-multi-occur-extra-files}. This
uses the Emacs command @code{multi-occur}. A prefix argument can be
used to specify the number of context lines for each match, default is
1.
@item 1
Restrict an agenda command to the current buffer. After pressing
@kbd{1}, you still need to press the character selecting the command.
@ -6379,6 +6423,7 @@ LaTeX: @r{turn on/off La@TeX{} fragments}
skip: @r{turn on/off skipping the text before the first heading}
author: @r{turn on/off inclusion of author name/email into exported file}
timestamp: @r{turn on/off inclusion creation time into exported file}
p: @r{turn on/off inclusion of tags}
@end example
These options take effect in both the HTML and La@TeX{} export, except

Binary file not shown.

View File

@ -1,5 +1,5 @@
% Reference Card for Org Mode
\def\orgversionnumber{5.11}
\def\orgversionnumber{5.12}
\def\versionyear{2007} % latest update
\def\year{2007} % latest copyright year
@ -547,6 +547,7 @@ after ``{\tt :}'', and dictionary words elsewhere.
\section{Properties and Column View}
\key{set property}{C-c C-x p}
\key{special commands in property lines}{C-c C-c}
\key{next/previous allowed value}{S-left/right}
\key{turn on column view}{C-c C-x C-c}

Binary file not shown.