Carsten Dominik 17 年 前
コミット
fc984cbe7b
6 ファイル変更792 行追加372 行削除
  1. 248 215
      org
  2. 480 123
      org.el
  3. BIN
      org.pdf
  4. 43 16
      org.texi
  5. BIN
      orgcard.pdf
  6. 21 18
      orgcard.tex

+ 248 - 215
org

@@ -5,7 +5,7 @@ START-INFO-DIR-ENTRY
 * Org Mode: (org).      outline-based notes management and organizer
 END-INFO-DIR-ENTRY
 
-   This manual is for Org-mode (version 4.56).
+   This manual is for Org-mode (version 4.57).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -27,7 +27,7 @@ File: org,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 Org Mode Manual
 ***************
 
-This manual is for Org-mode (version 4.56).
+This manual is for Org-mode (version 4.57).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -635,7 +635,17 @@ File: org,  Node: Structure editing,  Next: Archiving,  Prev: Motion,  Up: Docum
      Yank subtree from kill ring.  This does modify the level of the
      subtree to make sure the tree fits in nicely at the yank position.
      The yank level can also be specified with a prefix arg, or by
-     yanking after a headline marker like `****'.
+     yanking after a headline marker like `****'.  
+
+`C-c ^'
+     Sort same-level entries.  When there is an active region, all
+     entries in the region will be sorted.  Otherwise the children of
+     the current headline are sorted.  The command prompts for the
+     sorting method, which can be alphabetically, numerically, by time
+     (using the first time stamp in each entry), and each of these in
+     reverse order.  With a `C-u' prefix, sorting will be
+     case-sensitive.  With two `C-u C-u' prefixes, duplicate entries
+     will also be removed.
 
    When there is an active region (transient-mark-mode), promotion and
 demotion work on all headlines in the region.  To select a region of
@@ -995,10 +1005,16 @@ Column and row editing
      line is created above the current line.
 
 `C-c ^'
-     Sort the table lines in the region.  Point and mark must be in the
-     first and last line to be included, and must be in the column that
-     should be used for sorting.  The command prompts for numerical
-     versus alphanumerical sorting.
+     Sort the table lines in the region.  The position of point
+     indicates the column to be used for sorting, and the range of
+     lines is the range between the nearest horizontal separator lines,
+     or the entire table.  If point is before the first column, you
+     will be prompted for the sorting column.  If there is an active
+     region, the mark specifies the first line and the sorting column,
+     while point should be in the last line to be included into the
+     sorting.  The command prompts for the sorting type
+     (alphabetically, numerically, or by time).  When called with a
+     prefix argument, alphabetic sorting will be case-sensitive.
 
 Regions
 .......
@@ -1838,7 +1854,7 @@ link, together with an explanation:
      tree with the matches.
 
    As a degenerate case, a file link with an empty file name can be used
-to search the current file.  For example, `<file:::find me>' does a
+to search the current file.  For example, `[[file:::find me]]' does a
 search for `find me' in the current file, just as `[[find me]]' would.
 
    ---------- Footnotes ----------
@@ -1908,13 +1924,13 @@ as a target for this note.
    When you call `M-x remember' to remember something, org will prompt
 for a key to select the template and then prepare the buffer like
      * TODO
-       <file:link to where you called remember>
+       [[file:link to where you called remember]]
 
 or
 
      * [2006-03-21 Tue 15:37]
 
-       <file:link to where you called remember>
+       [[file:link to where you called remember]]
 
 See the variable `org-remember-templates' for more details.
 
@@ -2309,7 +2325,7 @@ TIME STAMP WITH SCHEDULED KEYWORD
      If a time stamp is preceded by the word `SCHEDULED:', it means you
      are planning to start working on that task on the given date. So
      this is not about recording an event, but about planning your
-     work.  The headline will be listed under the given date.  In
+     work.  The headline will be listed under the given date(2).  In
      addition, a reminder that the scheduled date has passed will be
      present in the compilation for _today_, until the entry is marked
      DONE.  I.e., the task will automatically be forwarded until
@@ -2327,7 +2343,7 @@ TIME STAMP WITH DEADLINE KEYWORD
      date, and continuing until the entry is marked DONE.  An example:
 
           *** TODO write article about the Earth for the Guide
-              The editor in charge is <bbdb:Ford Prefect>
+              The editor in charge is [[bbdb:Ford Prefect]]
               DEADLINE: <2004-02-29 Sun>
 
 TIME STAMP WITH CLOSED KEYWORD
@@ -2348,6 +2364,10 @@ TIME RANGE WITH CLOCK KEYWORD
    (1) This is the standard ISO date/time format.  If you cannot get
 used to these, see *Note Custom time format::
 
+   (2) It will still be listed on that date after it has been marked
+DONE.  If you don't like this, set the variable
+`org-agenda-skip-scheduled-if-done'.
+
 
 File: org,  Node: Creating timestamps,  Next: Custom time format,  Prev: Time stamps,  Up: Timestamps
 
@@ -2443,6 +2463,7 @@ specified with the current date and time.  For example:
        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)
 
    The function understands English month and weekday abbreviations.  If
 you want to use unabbreviated names and/or other languages, configure
@@ -2861,6 +2882,11 @@ _negative selection_ combined with AND can be meaningful.  Examples:
      Select `:WORK:'-tagged TODO lines that are either `WAITING' or
      `NEXT'.
 
+   Any element of the tag/todo match can be a regular expression - in
+this case it must be enclosed in curly braces.  For example,
+`WORK+{^BOSS.*}' matches headlines that contain the tag `WORK' and any
+tag starting with `BOSS'.
+
 
 File: org,  Node: Agenda views,  Next: Embedded LaTeX,  Prev: Tags,  Up: Top
 
@@ -3356,6 +3382,9 @@ Remote editing
      deleted remotely is longer than one line, the kill needs to be
      confirmed by the user.  See variable `org-agenda-confirm-kill'.
 
+`$'
+     Archive the subtree corresponding to the current headline.
+
 `T'
      Show all tags associated with the current item.  Because of
      inheritance, this may be more than the tags listed in the line
@@ -4991,9 +5020,9 @@ The following extensions for Org-mode have been written by other people:
      A blogging plug-in for `org-publish.el'.
      `http://dto.freeshell.org/notebook/OrgMode.html'.  
 
-`org-blogging.el' by  Bastien Guerry
+`blorg.el' by  Bastien Guerry
      Publish Org-mode files as blogs.
-     `http://www.cognition.ens.fr/~guerry/org-blogging.html'.
+     `http://www.cognition.ens.fr/~guerry/blorg.html'.
 
 
 File: org,  Node: Dynamic blocks,  Prev: Extensions,  Up: Extensions and Hacking
@@ -5196,12 +5225,12 @@ Index
 * active region <1>:                     HTML export.         (line  10)
 * active region <2>:                     ASCII export.        (line   9)
 * active region <3>:                     Built-in table editor.
-                                                              (line 165)
-* active region:                         Structure editing.   (line  54)
+                                                              (line 171)
+* active region:                         Structure editing.   (line  64)
 * agenda:                                Weekly/Daily agenda. (line   6)
 * agenda dispatcher:                     Agenda dispatcher.   (line   6)
 * agenda files:                          Agenda files.        (line   6)
-* agenda files, removing buffers:        Agenda commands.     (line 217)
+* agenda files, removing buffers:        Agenda commands.     (line 220)
 * agenda views:                          Agenda views.        (line   6)
 * agenda views, custom:                  Custom agenda views. (line   6)
 * agenda, batch production:              Batch processing.    (line   6)
@@ -5217,6 +5246,7 @@ Index
 * backtrace of an error:                 Feedback.            (line  27)
 * BBDB links:                            External links.      (line   6)
 * block agenda:                          Block agenda.        (line   6)
+* blorg.el:                              Extensions.          (line  33)
 * bold text:                             Enhancing text.      (line  15)
 * Boolean logic, for tag searches:       Tag searches.        (line  21)
 * bug reports:                           Feedback.            (line   6)
@@ -5227,12 +5257,12 @@ Index
 * calc.el:                               Cooperation.         (line   6)
 * calculations, in tables <1>:           Table calculations.  (line   6)
 * calculations, in tables:               Built-in table editor.
-                                                              (line 135)
-* calendar commands, from agenda:        Agenda commands.     (line 178)
+                                                              (line 141)
+* calendar commands, from agenda:        Agenda commands.     (line 181)
 * calendar integration:                  Calendar/Diary integration.
                                                               (line   6)
 * calendar, for selecting date:          The date/time prompt.
-                                                              (line  25)
+                                                              (line  26)
 * CamelCase link completion:             Completion.          (line   6)
 * CamelCase links:                       Internal links.      (line   6)
 * CamelCase links, completion of:        CamelCase links.     (line   6)
@@ -5283,7 +5313,7 @@ Index
 * DEADLINE keyword:                      Time stamps.         (line  53)
 * deadlines:                             Time stamps.         (line   6)
 * demotion, of subtrees:                 Structure editing.   (line   6)
-* diary entries, creating from agenda:   Agenda commands.     (line 185)
+* diary entries, creating from agenda:   Agenda commands.     (line 188)
 * diary integration:                     Calendar/Diary integration.
                                                               (line   6)
 * dictionary word completion:            Completion.          (line   6)
@@ -5328,7 +5358,7 @@ Index
                                                               (line   6)
 * formula, for table column:             Column formulas.     (line   6)
 * formula, in tables:                    Built-in table editor.
-                                                              (line 135)
+                                                              (line 141)
 * global cycling:                        Visibility cycling.  (line  22)
 * global keybindings:                    Activation.          (line   6)
 * global TODO list:                      Global TODO list.    (line   6)
@@ -5413,7 +5443,6 @@ Index
 * ordered lists:                         Plain lists.         (line   6)
 * org-agenda, command:                   Weekly/Daily agenda. (line   9)
 * org-blog.el:                           Extensions.          (line  29)
-* org-blogging.el:                       Extensions.          (line  33)
 * org-mode, turning on:                  Activation.          (line  22)
 * org-mouse.el:                          Extensions.          (line  17)
 * org-publish-project-alist:             Project alist.       (line   6)
@@ -5445,8 +5474,9 @@ Index
 * region, active <1>:                    HTML export.         (line  10)
 * region, active <2>:                    ASCII export.        (line   9)
 * region, active <3>:                    Built-in table editor.
-                                                              (line 165)
-* region, active:                        Structure editing.   (line  54)
+                                                              (line 171)
+* region, active:                        Structure editing.   (line  64)
+* regular expressions, with tags search: Tag searches.        (line  58)
 * remember.el <1>:                       Cooperation.         (line  33)
 * remember.el:                           Remember.            (line   6)
 * remote editing, from agenda:           Agenda commands.     (line 100)
@@ -5540,8 +5570,8 @@ Index
 * transient-mark-mode <1>:               HTML export.         (line  10)
 * transient-mark-mode <2>:               ASCII export.        (line   9)
 * transient-mark-mode <3>:               Built-in table editor.
-                                                              (line 165)
-* transient-mark-mode:                   Structure editing.   (line  54)
+                                                              (line 171)
+* transient-mark-mode:                   Structure editing.   (line  64)
 * trees, sparse:                         Sparse trees.        (line   6)
 * trees, visibility:                     Visibility cycling.  (line   6)
 * tty keybindings:                       TTY keys.            (line   6)
@@ -5570,19 +5600,20 @@ Key Index
 [index]
 * Menu:
 
+* $:                                     Agenda commands.     (line 113)
 * ':                                     CDLaTeX mode.        (line  43)
-* +:                                     Agenda commands.     (line 132)
-* ,:                                     Agenda commands.     (line 124)
-* -:                                     Agenda commands.     (line 138)
+* +:                                     Agenda commands.     (line 135)
+* ,:                                     Agenda commands.     (line 127)
+* -:                                     Agenda commands.     (line 141)
 * .:                                     Agenda commands.     (line  94)
-* ::                                     Agenda commands.     (line 118)
+* ::                                     Agenda commands.     (line 121)
 * <:                                     The date/time prompt.
-                                                              (line  28)
+                                                              (line  29)
 * <left>:                                Agenda commands.     (line  91)
 * <RET> <1>:                             Agenda commands.     (line  41)
 * <RET> <2>:                             Setting tags.        (line  76)
 * <RET> <3>:                             The date/time prompt.
-                                                              (line  53)
+                                                              (line  54)
 * <RET>:                                 Built-in table editor.
                                                               (line  64)
 * <right>:                               Agenda commands.     (line  86)
@@ -5595,17 +5626,17 @@ Key Index
                                                               (line  57)
 * <TAB> <5>:                             Plain lists.         (line  37)
 * <TAB>:                                 Visibility cycling.  (line  10)
-* > <1>:                                 Agenda commands.     (line 160)
+* > <1>:                                 Agenda commands.     (line 163)
 * >:                                     The date/time prompt.
-                                                              (line  29)
+                                                              (line  30)
 * ^:                                     CDLaTeX mode.        (line  33)
 * _:                                     CDLaTeX mode.        (line  33)
 * `:                                     CDLaTeX mode.        (line  39)
-* a:                                     Agenda commands.     (line 121)
-* C:                                     Agenda commands.     (line 200)
-* c:                                     Agenda commands.     (line 178)
+* a:                                     Agenda commands.     (line 124)
+* C:                                     Agenda commands.     (line 203)
+* c:                                     Agenda commands.     (line 181)
 * C-#:                                   Built-in table editor.
-                                                              (line 155)
+                                                              (line 161)
 * C-,:                                   Agenda files.        (line  18)
 * C-a a L:                               Timeline.            (line  10)
 * C-c !:                                 Creating timestamps. (line  21)
@@ -5616,11 +5647,11 @@ Key Index
 * C-c ' <1>:                             Editing/debugging formulas.
                                                               (line  20)
 * C-c ':                                 Built-in table editor.
-                                                              (line 144)
+                                                              (line 150)
 * C-c *:                                 Built-in table editor.
-                                                              (line 148)
+                                                              (line 154)
 * C-c +:                                 Built-in table editor.
-                                                              (line 165)
+                                                              (line 171)
 * C-c ,:                                 Priorities.          (line  18)
 * C-c -:                                 Built-in table editor.
                                                               (line  92)
@@ -5630,21 +5661,22 @@ Key Index
 * C-c ;:                                 Comment lines.       (line  11)
 * C-c <:                                 Creating timestamps. (line  25)
 * C-c <TAB>:                             Built-in table editor.
-                                                              (line 187)
+                                                              (line 193)
 * C-c =:                                 Built-in table editor.
-                                                              (line 135)
+                                                              (line 141)
 * C-c >:                                 Creating timestamps. (line  29)
 * C-c ? <1>:                             Editing/debugging formulas.
                                                               (line  20)
 * C-c ?:                                 Built-in table editor.
-                                                              (line 161)
+                                                              (line 167)
 * C-c [:                                 Agenda files.        (line  12)
 * C-c \:                                 Tag searches.        (line   9)
 * C-c ]:                                 Agenda files.        (line  15)
-* C-c ^:                                 Built-in table editor.
+* C-c ^ <1>:                             Built-in table editor.
                                                               (line  96)
+* C-c ^:                                 Structure editing.   (line  52)
 * C-c `:                                 Built-in table editor.
-                                                              (line 181)
+                                                              (line 187)
 * C-c a a:                               Weekly/Daily agenda. (line   9)
 * C-c a C:                               Storing searches.    (line   9)
 * C-c a M:                               Matching headline tags.
@@ -5670,7 +5702,7 @@ Key Index
 * C-c C-c <7>:                           Built-in table editor.
                                                               (line  54)
 * C-c C-c:                               Plain lists.         (line  74)
-* C-c C-d <1>:                           Agenda commands.     (line 145)
+* C-c C-d <1>:                           Agenda commands.     (line 148)
 * C-c C-d:                               Creating timestamps. (line  37)
 * C-c C-e:                               Exporting.           (line  19)
 * C-c C-e a:                             ASCII export.        (line   9)
@@ -5696,9 +5728,9 @@ Key Index
 * C-c C-q <1>:                           Editing/debugging formulas.
                                                               (line  20)
 * C-c C-q:                               Built-in table editor.
-                                                              (line 119)
+                                                              (line 125)
 * C-c C-r:                               Visibility cycling.  (line  32)
-* C-c C-s <1>:                           Agenda commands.     (line 142)
+* C-c C-s <1>:                           Agenda commands.     (line 145)
 * C-c C-s:                               Creating timestamps. (line  48)
 * C-c C-t <1>:                           Clocking work time.  (line  26)
 * C-c C-t:                               TODO basics.         (line  13)
@@ -5707,7 +5739,7 @@ Key Index
 * C-c C-w:                               Creating timestamps. (line  41)
 * C-c C-x C-a:                           ARCHIVE tag.         (line  28)
 * C-c C-x C-b:                           Checkboxes.          (line  38)
-* C-c C-x C-c:                           Agenda commands.     (line 207)
+* C-c C-x C-c:                           Agenda commands.     (line 210)
 * C-c C-x C-d:                           Clocking work time.  (line  34)
 * C-c C-x C-i:                           Clocking work time.  (line  12)
 * C-c C-x C-k:                           Structure editing.   (line  39)
@@ -5718,14 +5750,14 @@ Key Index
 * C-c C-x C-t:                           Custom time format.  (line  12)
 * C-c C-x C-u:                           Dynamic blocks.      (line  21)
 * C-c C-x C-w <1>:                       Built-in table editor.
-                                                              (line 108)
+                                                              (line 114)
 * C-c C-x C-w:                           Structure editing.   (line  39)
 * C-c C-x C-x:                           Clocking work time.  (line  30)
 * C-c C-x C-y <1>:                       Built-in table editor.
-                                                              (line 112)
+                                                              (line 118)
 * C-c C-x C-y:                           Structure editing.   (line  46)
 * C-c C-x M-w <1>:                       Built-in table editor.
-                                                              (line 105)
+                                                              (line 111)
 * C-c C-x M-w:                           Structure editing.   (line  43)
 * C-c C-y <1>:                           Clocking work time.  (line  21)
 * C-c C-y:                               Creating timestamps. (line  66)
@@ -5739,7 +5771,7 @@ Key Index
 * C-u C-c $:                             Moving subtrees.     (line  12)
 * C-u C-c .:                             Creating timestamps. (line  16)
 * C-u C-c =:                             Built-in table editor.
-                                                              (line 139)
+                                                              (line 145)
 * C-u C-c C-l:                           Handling links.      (line  43)
 * C-u C-c C-x C-a:                       ARCHIVE tag.         (line  31)
 * C-u C-c C-x C-u <1>:                   Dynamic blocks.      (line  22)
@@ -5748,12 +5780,12 @@ Key Index
 * d:                                     Agenda commands.     (line  65)
 * f:                                     Agenda commands.     (line  44)
 * g:                                     Agenda commands.     (line  72)
-* H:                                     Agenda commands.     (line 204)
-* i:                                     Agenda commands.     (line 185)
-* I:                                     Agenda commands.     (line 165)
+* H:                                     Agenda commands.     (line 207)
+* i:                                     Agenda commands.     (line 188)
+* I:                                     Agenda commands.     (line 168)
 * l:                                     Agenda commands.     (line  51)
 * L:                                     Agenda commands.     (line  32)
-* M:                                     Agenda commands.     (line 191)
+* M:                                     Agenda commands.     (line 194)
 * M-<down>:                              Built-in table editor.
                                                               (line  82)
 * M-<left> <1>:                          Built-in table editor.
@@ -5774,7 +5806,7 @@ Key Index
 * M-S-<down> <2>:                        Plain lists.         (line  59)
 * M-S-<down>:                            Structure editing.   (line  36)
 * M-S-<left> <1>:                        The date/time prompt.
-                                                              (line  50)
+                                                              (line  51)
 * M-S-<left> <2>:                        Built-in table editor.
                                                               (line  76)
 * M-S-<left> <3>:                        Plain lists.         (line  65)
@@ -5783,7 +5815,7 @@ Key Index
 * M-S-<RET> <2>:                         Plain lists.         (line  52)
 * M-S-<RET>:                             Structure editing.   (line  18)
 * M-S-<right> <1>:                       The date/time prompt.
-                                                              (line  47)
+                                                              (line  48)
 * M-S-<right> <2>:                       Built-in table editor.
                                                               (line  79)
 * M-S-<right> <3>:                       Plain lists.         (line  65)
@@ -5794,54 +5826,54 @@ Key Index
 * M-S-<up>:                              Structure editing.   (line  33)
 * mouse-1 <1>:                           Agenda commands.     (line  35)
 * mouse-1 <2>:                           The date/time prompt.
-                                                              (line  32)
+                                                              (line  33)
 * mouse-1:                               Handling links.      (line  72)
 * mouse-2 <1>:                           Agenda commands.     (line  35)
 * mouse-2:                               Handling links.      (line  72)
 * mouse-3 <1>:                           Agenda commands.     (line  28)
 * mouse-3:                               Handling links.      (line  77)
 * n:                                     Agenda commands.     (line  19)
-* O:                                     Agenda commands.     (line 167)
+* O:                                     Agenda commands.     (line 170)
 * o:                                     Agenda commands.     (line  59)
-* P:                                     Agenda commands.     (line 129)
+* P:                                     Agenda commands.     (line 132)
 * p:                                     Agenda commands.     (line  20)
-* q:                                     Agenda commands.     (line 214)
+* q:                                     Agenda commands.     (line 217)
 * r <1>:                                 Agenda commands.     (line  76)
 * r:                                     Global TODO list.    (line  20)
-* S:                                     Agenda commands.     (line 195)
+* S:                                     Agenda commands.     (line 198)
 * s:                                     Agenda commands.     (line  83)
-* S-<down> <1>:                          Agenda commands.     (line 138)
+* S-<down> <1>:                          Agenda commands.     (line 141)
 * S-<down> <2>:                          The date/time prompt.
-                                                              (line  41)
+                                                              (line  42)
 * S-<down> <3>:                          Creating timestamps. (line  58)
 * S-<down> <4>:                          Priorities.          (line  25)
 * S-<down>:                              Plain lists.         (line  55)
-* S-<left> <1>:                          Agenda commands.     (line 156)
+* S-<left> <1>:                          Agenda commands.     (line 159)
 * S-<left> <2>:                          The date/time prompt.
-                                                              (line  38)
+                                                              (line  39)
 * S-<left> <3>:                          Creating timestamps. (line  53)
 * S-<left>:                              TODO basics.         (line  20)
 * S-<RET>:                               Built-in table editor.
-                                                              (line 170)
-* S-<right> <1>:                         Agenda commands.     (line 148)
+                                                              (line 176)
+* S-<right> <1>:                         Agenda commands.     (line 151)
 * S-<right> <2>:                         The date/time prompt.
-                                                              (line  35)
+                                                              (line  36)
 * S-<right> <3>:                         Creating timestamps. (line  53)
 * S-<right>:                             TODO basics.         (line  20)
 * S-<TAB> <1>:                           Built-in table editor.
                                                               (line  61)
 * S-<TAB>:                               Visibility cycling.  (line  22)
-* S-<up> <1>:                            Agenda commands.     (line 132)
+* S-<up> <1>:                            Agenda commands.     (line 135)
 * S-<up> <2>:                            The date/time prompt.
-                                                              (line  44)
+                                                              (line  45)
 * S-<up> <3>:                            Creating timestamps. (line  58)
 * S-<up> <4>:                            Priorities.          (line  25)
 * S-<up>:                                Plain lists.         (line  55)
-* T:                                     Agenda commands.     (line 113)
+* T:                                     Agenda commands.     (line 116)
 * t:                                     Agenda commands.     (line 103)
 * w:                                     Agenda commands.     (line  62)
-* x:                                     Agenda commands.     (line 217)
-* X:                                     Agenda commands.     (line 170)
+* x:                                     Agenda commands.     (line 220)
+* X:                                     Agenda commands.     (line 173)
 
 
 
@@ -5860,142 +5892,143 @@ Ref: Visibility cycling-Footnote-122201
 Ref: Visibility cycling-Footnote-222259
 Node: Motion22309
 Node: Structure editing23093
-Node: Archiving25409
-Node: ARCHIVE tag25967
-Node: Moving subtrees27760
-Node: Sparse trees28801
-Ref: Sparse trees-Footnote-130932
-Ref: Sparse trees-Footnote-231024
-Node: Plain lists31139
-Ref: Plain lists-Footnote-134664
-Ref: Plain lists-Footnote-235021
-Node: Tables35205
-Node: Built-in table editor35753
-Node: Narrow columns43361
-Ref: Narrow columns-Footnote-145300
-Node: Table calculations45346
-Node: Formula syntax46666
-Ref: Formula syntax-Footnote-149571
-Node: Lisp formulas49871
-Node: Column formulas50660
-Node: Advanced features52422
-Node: Named-field formulas55676
-Node: Editing/debugging formulas56316
-Node: Appetizer58074
-Node: orgtbl-mode59177
-Node: table.el59668
-Node: Hyperlinks60645
-Node: Link format61418
-Node: Internal links62711
-Ref: Internal links-Footnote-164700
-Node: Radio targets64832
-Node: CamelCase links65547
-Node: External links66141
-Node: Handling links68272
-Ref: Handling links-Footnote-172924
-Ref: Handling links-Footnote-273161
-Node: Link abbreviations73235
-Node: Search options74914
-Ref: Search options-Footnote-176692
-Node: Custom searches76773
-Node: Remember77821
-Node: TODO items81511
-Node: TODO basics82493
-Node: TODO extensions84020
-Node: Workflow states84815
-Node: TODO types85683
-Ref: TODO types-Footnote-187341
-Node: Per file keywords87423
-Ref: Per file keywords-Footnote-188877
-Node: Priorities89078
-Node: Breaking down tasks90322
-Ref: Breaking down tasks-Footnote-190841
-Node: Checkboxes90937
-Node: Timestamps93692
-Node: Time stamps94153
-Ref: Time stamps-Footnote-197642
-Node: Creating timestamps97758
-Node: The date/time prompt100384
-Ref: The date/time prompt-Footnote-1102077
-Node: Custom time format102183
-Node: Progress logging103742
-Node: Closing items104271
-Node: Clocking work time105175
-Ref: Clocking work time-Footnote-1108799
-Node: Tags108925
-Node: Tag inheritance109687
-Node: Setting tags110624
-Ref: Setting tags-Footnote-1114823
-Ref: Setting tags-Footnote-2114935
-Node: Tag searches115018
-Node: Agenda views117018
-Node: Agenda files119111
-Ref: Agenda files-Footnote-1120071
-Ref: Agenda files-Footnote-2120220
-Node: Agenda dispatcher120413
-Node: Weekly/Daily agenda122030
-Node: Calendar/Diary integration122995
-Node: Global TODO list124333
-Node: Matching headline tags126493
-Node: Timeline127551
-Node: Presentation and sorting128214
-Node: Categories128992
-Node: Time-of-day specifications129656
-Node: Sorting of agenda items131634
-Node: Agenda commands132916
-Node: Custom agenda views139085
-Node: Storing searches139760
-Node: Block agenda141672
-Node: Setting Options142902
-Node: Batch processing145614
-Node: Embedded LaTeX146744
-Ref: Embedded LaTeX-Footnote-1147836
-Node: Math symbols148026
-Node: Subscripts and Superscripts148791
-Node: LaTeX fragments149635
-Ref: LaTeX fragments-Footnote-1151743
-Node: Processing LaTeX fragments152005
-Node: CDLaTeX mode152951
-Ref: CDLaTeX mode-Footnote-1155435
-Node: Exporting155583
-Node: ASCII export156897
-Node: HTML export158187
-Node: XOXO export161023
-Node: iCalendar export161462
-Node: Text interpretation163285
-Node: Comment lines163764
-Node: Enhancing text164235
-Node: Export options165927
-Node: Publishing167594
-Ref: Publishing-Footnote-1168390
-Node: Configuration168586
-Node: Project alist169304
-Node: Sources and destinations170370
-Node: Selecting files171100
-Node: Publishing action171848
-Node: Publishing options173081
-Node: Publishing links175233
-Node: Project page index176746
-Node: Sample configuration177524
-Node: Simple example178016
-Node: Complex example178689
-Node: Triggering publication180765
-Node: Miscellaneous181450
-Node: Completion182084
-Node: Customization183555
-Node: In-buffer settings184140
-Node: The very busy C-c C-c key187759
-Node: Clean view189403
-Node: TTY keys191980
-Node: Interaction193589
-Node: Cooperation193986
-Node: Conflicts195853
-Node: Bugs197445
-Node: Extensions and Hacking199068
-Node: Extensions199554
-Node: Dynamic blocks201355
-Node: History and Acknowledgments203282
-Node: Index208289
-Node: Key Index235377
+Node: Archiving25919
+Node: ARCHIVE tag26477
+Node: Moving subtrees28270
+Node: Sparse trees29311
+Ref: Sparse trees-Footnote-131442
+Ref: Sparse trees-Footnote-231534
+Node: Plain lists31649
+Ref: Plain lists-Footnote-135174
+Ref: Plain lists-Footnote-235531
+Node: Tables35715
+Node: Built-in table editor36263
+Node: Narrow columns44291
+Ref: Narrow columns-Footnote-146230
+Node: Table calculations46276
+Node: Formula syntax47596
+Ref: Formula syntax-Footnote-150501
+Node: Lisp formulas50801
+Node: Column formulas51590
+Node: Advanced features53352
+Node: Named-field formulas56606
+Node: Editing/debugging formulas57246
+Node: Appetizer59004
+Node: orgtbl-mode60107
+Node: table.el60598
+Node: Hyperlinks61575
+Node: Link format62348
+Node: Internal links63641
+Ref: Internal links-Footnote-165630
+Node: Radio targets65762
+Node: CamelCase links66477
+Node: External links67071
+Node: Handling links69202
+Ref: Handling links-Footnote-173854
+Ref: Handling links-Footnote-274091
+Node: Link abbreviations74165
+Node: Search options75844
+Ref: Search options-Footnote-177624
+Node: Custom searches77705
+Node: Remember78753
+Node: TODO items82447
+Node: TODO basics83429
+Node: TODO extensions84956
+Node: Workflow states85751
+Node: TODO types86619
+Ref: TODO types-Footnote-188277
+Node: Per file keywords88359
+Ref: Per file keywords-Footnote-189813
+Node: Priorities90014
+Node: Breaking down tasks91258
+Ref: Breaking down tasks-Footnote-191777
+Node: Checkboxes91873
+Node: Timestamps94628
+Node: Time stamps95089
+Ref: Time stamps-Footnote-198583
+Ref: Time stamps-Footnote-298699
+Node: Creating timestamps98854
+Node: The date/time prompt101480
+Ref: The date/time prompt-Footnote-1103246
+Node: Custom time format103352
+Node: Progress logging104911
+Node: Closing items105440
+Node: Clocking work time106344
+Ref: Clocking work time-Footnote-1109968
+Node: Tags110094
+Node: Tag inheritance110856
+Node: Setting tags111793
+Ref: Setting tags-Footnote-1115992
+Ref: Setting tags-Footnote-2116104
+Node: Tag searches116187
+Node: Agenda views118416
+Node: Agenda files120509
+Ref: Agenda files-Footnote-1121469
+Ref: Agenda files-Footnote-2121618
+Node: Agenda dispatcher121811
+Node: Weekly/Daily agenda123428
+Node: Calendar/Diary integration124393
+Node: Global TODO list125731
+Node: Matching headline tags127891
+Node: Timeline128949
+Node: Presentation and sorting129612
+Node: Categories130390
+Node: Time-of-day specifications131054
+Node: Sorting of agenda items133032
+Node: Agenda commands134314
+Node: Custom agenda views140552
+Node: Storing searches141227
+Node: Block agenda143139
+Node: Setting Options144369
+Node: Batch processing147081
+Node: Embedded LaTeX148211
+Ref: Embedded LaTeX-Footnote-1149303
+Node: Math symbols149493
+Node: Subscripts and Superscripts150258
+Node: LaTeX fragments151102
+Ref: LaTeX fragments-Footnote-1153210
+Node: Processing LaTeX fragments153472
+Node: CDLaTeX mode154418
+Ref: CDLaTeX mode-Footnote-1156902
+Node: Exporting157050
+Node: ASCII export158364
+Node: HTML export159654
+Node: XOXO export162490
+Node: iCalendar export162929
+Node: Text interpretation164752
+Node: Comment lines165231
+Node: Enhancing text165702
+Node: Export options167394
+Node: Publishing169061
+Ref: Publishing-Footnote-1169857
+Node: Configuration170053
+Node: Project alist170771
+Node: Sources and destinations171837
+Node: Selecting files172567
+Node: Publishing action173315
+Node: Publishing options174548
+Node: Publishing links176700
+Node: Project page index178213
+Node: Sample configuration178991
+Node: Simple example179483
+Node: Complex example180156
+Node: Triggering publication182232
+Node: Miscellaneous182917
+Node: Completion183551
+Node: Customization185022
+Node: In-buffer settings185607
+Node: The very busy C-c C-c key189226
+Node: Clean view190870
+Node: TTY keys193447
+Node: Interaction195056
+Node: Cooperation195453
+Node: Conflicts197320
+Node: Bugs198912
+Node: Extensions and Hacking200535
+Node: Extensions201021
+Node: Dynamic blocks202808
+Node: History and Acknowledgments204735
+Node: Index209742
+Node: Key Index236903
 
 End Tag Table

ファイルの差分が大きいため隠しています
+ 480 - 123
org.el


BIN
org.pdf


+ 43 - 16
org.texi

@@ -3,7 +3,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.56
+@set VERSION 4.57
 @set DATE November 2006
 
 @dircategory Emacs
@@ -730,6 +730,15 @@ Yank subtree from kill ring.  This does modify the level of the subtree to
 make sure the tree fits in nicely at the yank position.  The yank
 level can also be specified with a prefix arg, or by yanking after a
 headline marker like @samp{****}.
+@kindex C-c ^
+@item C-c ^
+Sort same-level entries.  When there is an active region, all entries in
+the region will be sorted.  Otherwise the children of the current
+headline are sorted.  The command prompts for the sorting method, which
+can be alphabetically, numerically, by time (using the first time stamp
+in each entry), and each of these in reverse order.  With a @kbd{C-u}
+prefix, sorting will be case-sensitive.  With two @kbd{C-u C-u}
+prefixes, duplicate entries will also be removed.
 @end table
 
 @cindex region, active
@@ -1126,10 +1135,15 @@ is created above the current line.
 
 @kindex C-c ^
 @item C-c ^
-Sort the table lines in the region.  Point and mark must be in the first
-and last line to be included, and must be in the column that should be
-used for sorting.  The command prompts for numerical versus
-alphanumerical sorting.
+Sort the table lines in the region.  The position of point indicates the
+column to be used for sorting, and the range of lines is the range
+between the nearest horizontal separator lines, or the entire table.  If
+point is before the first column, you will be prompted for the sorting
+column.  If there is an active region, the mark specifies the first line
+and the sorting column, while point should be in the last line to be
+included into the sorting.  The command prompts for the sorting type
+(alphabetically, numerically, or by time).  When called with a prefix
+argument, alphabetic sorting will be case-sensitive.
 
 @tsubheading{Regions}
 @kindex C-c C-x M-w
@@ -2042,7 +2056,7 @@ sparse tree with the matches.
 @end table
 
 As a degenerate case, a file link with an empty file name can be used
-to search the current file.  For example, @code{<file:::find me>} does
+to search the current file.  For example, @code{[[file:::find me]]} does
 a search for @samp{find me} in the current file, just as
 @samp{[[find me]]} would.
 
@@ -2114,7 +2128,7 @@ When you call @kbd{M-x remember} to remember something, org will prompt
 for a key to select the template and then prepare the buffer like
 @example
 * TODO
-  <file:link to where you called remember>
+  [[file:link to where you called remember]]
 @end example
 
 @noindent or
@@ -2122,7 +2136,7 @@ for a key to select the template and then prepare the buffer like
 @example
 * [2006-03-21 Tue 15:37]
 
-  <file:link to where you called remember>
+  [[file:link to where you called remember]]
 @end example
 
 @noindent See the variable @code{org-remember-templates} for more details.
@@ -2554,10 +2568,12 @@ example:
 If a time stamp is preceded by the word @samp{SCHEDULED:}, it means you
 are planning to start working on that task on the given date. So this is
 not about recording an event, but about planning your work.  The
-headline will be listed under the given date.  In addition, a reminder
-that the scheduled date has passed will be present in the compilation
-for @emph{today}, until the entry is marked DONE.  I.e., the task will
-automatically be forwarded until completed.
+headline will be listed under the given date@footnote{It will still be
+listed on that date after it has been marked DONE.  If you don't like
+this, set the variable @code{org-agenda-skip-scheduled-if-done}.}.  In
+addition, a reminder that the scheduled date has passed will be present
+in the compilation for @emph{today}, until the entry is marked DONE.
+I.e., the task will automatically be forwarded until completed.
 
 @example
 *** TODO Call Trillian for a date on New Years Eve.
@@ -2575,7 +2591,7 @@ continuing until the entry is marked DONE.  An example:
 
 @example
 *** TODO write article about the Earth for the Guide
-    The editor in charge is <bbdb:Ford Prefect>
+    The editor in charge is [[bbdb:Ford Prefect]]
     DEADLINE: <2004-02-29 Sun>
 @end example
 @item Time stamp with CLOSED keyword
@@ -2707,6 +2723,7 @@ specified with the current date and time.  For example:
   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)
 @end example
 
 The function understands English month and weekday abbreviations.  If
@@ -3155,6 +3172,12 @@ Select @samp{:WORK:}-tagged TODO lines that are either @samp{WAITING} or
 @samp{NEXT}.
 @end table
 
+@cindex regular expressions, with tags search
+Any element of the tag/todo match can be a regular expression - in this
+case it must be enclosed in curly braces.  For example,
+@samp{WORK+@{^BOSS.*@}} matches headlines that contain the tag
+@samp{WORK} and any tag @i{starting} with @samp{BOSS}.
+
 @node Agenda views, Embedded LaTeX, Tags, Top
 @chapter Agenda Views
 @cindex agenda views
@@ -3686,6 +3709,10 @@ to it in the original Org-mode file.  If the text to be deleted remotely
 is longer than one line, the kill needs to be confirmed by the user.  See
 variable @code{org-agenda-confirm-kill}.
 
+@kindex $
+@item $
+Archive the subtree corresponding to the current headline.
+
 @kindex T
 @item T
 Show all tags associated with the current item.  Because of
@@ -5463,10 +5490,10 @@ caused by the preparations for the 22.1 release.  In the mean time,
 @item @file{org-blog.el} by David O'Toole
 A blogging plug-in for @file{org-publish.el}.@*
 @url{http://dto.freeshell.org/notebook/OrgMode.html}.
-@cindex @file{org-blogging.el}
-@item @file{org-blogging.el} by  Bastien Guerry
+@cindex @file{blorg.el}
+@item @file{blorg.el} by  Bastien Guerry
 Publish Org-mode files as
-blogs. @url{http://www.cognition.ens.fr/~guerry/org-blogging.html}.
+blogs. @url{http://www.cognition.ens.fr/~guerry/blorg.html}.
 @end table
 
 @node Dynamic blocks,  , Extensions, Extensions and Hacking

BIN
orgcard.pdf


+ 21 - 18
orgcard.tex

@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.56}
+\def\orgversionnumber{4.57}
 \def\year{2006}
 %
 %**start of header
@@ -613,6 +613,7 @@ To set categories, add lines like$^2$:
 \key{digit argument}{0-9}
 \key{change state of current TODO item}{t}
 \key{kill item and source}{C-k}
+\key{archive the subtree}{\$}
 \key{show tags of current headline}{T}
 \key{set tags for current headline}{:}
 \key{toggle ARCHIVE tag}{a}
@@ -624,10 +625,13 @@ To set categories, add lines like$^2$:
 \key{change timestamp to today}{>}
 \key{insert new entry into diary}{i}
 
-\key{Start the clock on current item (clock-in)}{I}
-\key{Stop the clock (clock-out)}{O}
-\key{Cancel current clock}{X}
+\key{start the clock on current item (clock-in)}{I}
+\key{stop the clock (clock-out)}{O}
+\key{cancel current clock}{X}
 
+{\bf Misc}
+
+\key{Open link in current line}{C-c C-o}
 
 {\bf Calendar commands}
 
@@ -674,20 +678,19 @@ some other place.
 \key{links become HTML links}{http:... etc}
 \key{include html tags}{@<b>...@</b>}
 
-{\bf Export options}
-
-Include additional information for export by putting these anywhere in the
-org file.  Use {\tt M-TAB} completion to make sure to get the right
-keywords. {\tt M-TAB} again just after keyword is complete inserts examples.
-
-\key{the title to be shown}{\#+TITLE:}
-\key{the author}{\#+AUTHOR:}
-\key{authors email address}{\#+EMAIL:}
-\key{language code for html}{\#+LANGUAGE:}
-\key{free text description of file}{\#+TEXT:}
-\key{... which can carry over multiple lines}{\#+TEXT:}
-%\key{settings for the export process - see below}{\#+OPTIONS:}
-\key{settings for the export process}{\#+OPTIONS:}
+%{\bf Export options}
+%
+%Include additional information for export by putting these anywhere in the
+%org file.  Use {\tt M-TAB} completion to make sure to get the right
+%keywords. {\tt M-TAB} again just after keyword is complete inserts examples.
+%
+%\key{the title to be shown}{\#+TITLE:}
+%\key{the author}{\#+AUTHOR:}
+%\key{authors email address}{\#+EMAIL:}
+%\key{language code for html}{\#+LANGUAGE:}
+%\key{free text description of file}{\#+TEXT:}
+%\key{... which can carry over multiple lines}{\#+TEXT:}
+%\key{settings for the export process}{\#+OPTIONS:}
 
 %\key{set number of headline levels for export}{H:2}
 %\key{turn on/off section numbers}{num:t}

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません