Carsten Dominik 17 anni fa
parent
commit
01d0656bcf
5 ha cambiato i file con 247 aggiunte e 240 eliminazioni
  1. 227 224
      org
  2. 15 14
      org.el
  3. BIN
      org.pdf
  4. 5 2
      org.texi
  5. BIN
      orgcard.pdf

+ 227 - 224
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 5.11).
+   This manual is for Org-mode (version 5.11b).
 
    Copyright (C) 2004, 2005, 2006, 2007 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 5.11).
+This manual is for Org-mode (version 5.11b).
 
    Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
 
@@ -3786,7 +3786,10 @@ also computes the total time spent on each subtree of a project.
 
 `C-c C-x C-r'
      Insert a dynamic block (*note Dynamic blocks::) containing a clock
-     report as an org-mode table into the current file.
+     report as an org-mode table into the current file.  When the
+     cursor is at an existing clock table, just update it.  When called
+     with a prefix argument, jump to the first clock report in the
+     current document and update it.
           #+BEGIN: clocktable :maxlevel 2 :emphasize nil :scope file
 
           #+END: clocktable
@@ -8070,7 +8073,7 @@ Key Index
 * C-c C-c <2>:                           Cooperation.         (line  37)
 * C-c C-c <3>:                           The very busy C-c C-c key.
                                                               (line   6)
-* C-c C-c <4>:                           Clocking work time.  (line  86)
+* C-c C-c <4>:                           Clocking work time.  (line  89)
 * C-c C-c <5>:                           Property syntax.     (line  54)
 * C-c C-c <6>:                           Setting tags.        (line  10)
 * C-c C-c <7>:                           Checkboxes.          (line  37)
@@ -8159,7 +8162,7 @@ Key Index
 * C-c C-x C-s:                           Moving subtrees.     (line  10)
 * C-c C-x C-t:                           Custom time format.  (line  12)
 * C-c C-x C-u <1>:                       Dynamic blocks.      (line  21)
-* C-c C-x C-u:                           Clocking work time.  (line  88)
+* C-c C-x C-u:                           Clocking work time.  (line  91)
 * C-c C-x C-w <1>:                       Structure editing.   (line  43)
 * C-c C-x C-w:                           Built-in table editor.
                                                               (line 116)
@@ -8197,7 +8200,7 @@ Key Index
 * C-u C-c C-t:                           TODO basics.         (line  22)
 * C-u C-c C-x C-a:                       ARCHIVE tag.         (line  31)
 * C-u C-c C-x C-s:                       Moving subtrees.     (line  14)
-* C-u C-c C-x C-u <1>:                   Clocking work time.  (line  90)
+* C-u C-c C-x C-u <1>:                   Clocking work time.  (line  93)
 * C-u C-c C-x C-u:                       Dynamic blocks.      (line  22)
 * C-u C-u C-c *:                         Updating the table.  (line  22)
 * C-u C-u C-c =:                         Editing and debugging formulas.
@@ -8349,223 +8352,223 @@ Key Index
 
 
 Tag Table:
-Node: Top970
-Node: Introduction13081
-Node: Summary13496
-Node: Installation16623
-Node: Activation18001
-Node: Feedback19238
-Node: Document structure21307
-Node: Outlines22199
-Node: Headlines22864
-Ref: Headlines-Footnote-123868
-Node: Visibility cycling23979
-Ref: Visibility cycling-Footnote-126189
-Ref: Visibility cycling-Footnote-226247
-Ref: Visibility cycling-Footnote-326297
-Node: Motion26567
-Node: Structure editing27521
-Node: Archiving30515
-Node: ARCHIVE tag31073
-Node: Moving subtrees32866
-Ref: Moving subtrees-Footnote-134413
-Node: Sparse trees34700
-Ref: Sparse trees-Footnote-136835
-Ref: Sparse trees-Footnote-237017
-Node: Plain lists37132
-Ref: Plain lists-Footnote-141329
-Ref: Plain lists-Footnote-241687
-Node: Drawers41868
-Node: orgstruct-mode42706
-Node: Tables43606
-Node: Built-in table editor44187
-Node: Narrow columns51593
-Ref: Narrow columns-Footnote-153528
-Node: Column groups53574
-Node: orgtbl-mode55107
-Node: The spreadsheet55910
-Node: References56997
-Ref: References-Footnote-161461
-Node: Formula syntax for Calc61750
-Node: Formula syntax for Lisp64207
-Node: Field formulas65925
-Node: Column formulas67233
-Node: Editing and debugging formulas68832
-Node: Updating the table72985
-Node: Advanced features74038
-Node: Hyperlinks78563
-Node: Link format79341
-Node: Internal links80634
-Ref: Internal links-Footnote-182559
-Node: Radio targets82694
-Node: External links83394
-Node: Handling links85798
-Ref: Handling links-Footnote-191114
-Ref: Handling links-Footnote-291351
-Node: Using links outside Org-mode91425
-Node: Link abbreviations91935
-Node: Search options93628
-Ref: Search options-Footnote-195408
-Node: Custom searches95489
-Node: TODO items96520
-Node: TODO basics97558
-Node: TODO extensions99763
-Node: Workflow states100707
-Ref: Workflow states-Footnote-1101882
-Node: TODO types101975
-Ref: TODO types-Footnote-1103558
-Node: Multiple sets in one file103640
-Node: Fast access to TODO states105260
-Node: Per file keywords106403
-Ref: Per file keywords-Footnote-1107705
-Node: Faces for TODO keywords107906
-Node: Progress logging108612
-Node: Closing items109043
-Ref: Closing items-Footnote-1109977
-Ref: Closing items-Footnote-2110182
-Node: Tracking TODO state changes110255
-Ref: Tracking TODO state changes-Footnote-1111440
-Node: Priorities111515
-Ref: Priorities-Footnote-1113165
-Node: Breaking down tasks113235
-Ref: Breaking down tasks-Footnote-1113755
-Node: Checkboxes113851
-Node: Tags116700
-Node: Tag inheritance117472
-Node: Setting tags118409
-Ref: Setting tags-Footnote-1122932
-Ref: Setting tags-Footnote-2123044
-Node: Tag searches123127
-Node: Properties and columns125844
-Node: Property syntax126949
-Node: Special properties129496
-Node: Property searches130412
-Node: Column view131067
-Node: Defining columns132234
-Node: Scope of column definitions132632
-Node: Column attributes133554
-Node: Using column view135802
-Node: Property API137789
-Node: Timestamps138143
-Node: Time stamps138554
-Ref: Time stamps-Footnote-1140908
-Node: Creating timestamps141024
-Node: The date/time prompt143098
-Ref: The date/time prompt-Footnote-1145086
-Node: Custom time format145192
-Node: Deadlines and scheduling146884
-Ref: Deadlines and scheduling-Footnote-1148957
-Node: Inserting deadline/schedule149112
-Node: Repeated tasks150230
-Ref: Repeated tasks-Footnote-1151908
-Node: Clocking work time152029
-Ref: Clocking work time-Footnote-1156690
-Ref: Clocking work time-Footnote-2156768
-Node: Remember156894
-Node: Setting up remember157776
-Node: Remember templates158379
-Ref: Remember templates-Footnote-1161896
-Ref: Remember templates-Footnote-2162079
-Node: Storing notes162177
-Ref: Storing notes-Footnote-1164656
-Node: Agenda views164758
-Node: Agenda files166709
-Ref: Agenda files-Footnote-1167801
-Ref: Agenda files-Footnote-2167950
-Node: Agenda dispatcher168143
-Node: Built-in agenda views169842
-Node: Weekly/Daily agenda170424
-Node: Global TODO list173761
-Node: Matching tags and properties176041
-Node: Timeline177132
-Node: Stuck projects177806
-Node: Presentation and sorting179659
-Node: Categories180452
-Ref: Categories-Footnote-1181163
-Node: Time-of-day specifications181483
-Node: Sorting of agenda items183456
-Node: Agenda commands184740
-Node: Custom agenda views192203
-Node: Storing searches192924
-Node: Block agenda194838
-Node: Setting Options196070
-Node: Exporting Agenda Views198811
-Ref: Exporting Agenda Views-Footnote-1203097
-Ref: Exporting Agenda Views-Footnote-2203154
-Node: Extracting Agenda Information for other programs203340
-Node: Embedded LaTeX207468
-Ref: Embedded LaTeX-Footnote-1208562
-Node: Math symbols208752
-Node: Subscripts and Superscripts209519
-Node: LaTeX fragments210365
-Ref: LaTeX fragments-Footnote-1212598
-Ref: LaTeX fragments-Footnote-2212859
-Node: Processing LaTeX fragments212993
-Node: CDLaTeX mode213941
-Ref: CDLaTeX mode-Footnote-1216427
-Node: Exporting216575
-Node: ASCII export218042
-Node: HTML export219543
-Node: HTML Export commands220169
-Node: Quoting HTML tags221956
-Node: Links222591
-Node: Images223288
-Ref: Images-Footnote-1224159
-Node: CSS support224220
-Ref: CSS support-Footnote-1225539
-Node: LaTeX export225652
-Node: LaTeX export commands225976
-Node: Quoting LaTeX code227138
-Node: XOXO export227643
-Node: iCalendar export228083
-Node: Text interpretation229552
-Node: Comment lines230143
-Node: Initial text230538
-Node: Footnotes232207
-Node: Enhancing text232998
-Ref: Enhancing text-Footnote-1234867
-Node: Export options234957
-Node: Publishing237310
-Ref: Publishing-Footnote-1238271
-Ref: Publishing-Footnote-2238415
-Node: Configuration238566
-Node: Project alist239284
-Node: Sources and destinations240350
-Node: Selecting files241080
-Node: Publishing action241828
-Node: Publishing options243162
-Node: Publishing links245537
-Node: Project page index247050
-Node: Sample configuration247828
-Node: Simple example248320
-Node: Complex example248993
-Node: Triggering publication251069
-Node: Miscellaneous251754
-Node: Completion252388
-Node: Customization254058
-Node: In-buffer settings254641
-Node: The very busy C-c C-c key260203
-Node: Clean view262058
-Node: TTY keys264635
-Node: Interaction266245
-Node: Cooperation266642
-Node: Conflicts269518
-Node: Bugs271521
-Node: Extensions and Hacking273017
-Node: Extensions273742
-Node: Adding hyperlink types276004
-Node: Tables in arbitrary syntax279666
-Node: Radio tables280755
-Node: A LaTeX example283258
-Ref: A LaTeX example-Footnote-1286904
-Ref: A LaTeX example-Footnote-2287052
-Node: Translator functions287487
-Ref: Translator functions-Footnote-1290596
-Node: Dynamic blocks290684
-Node: Special agenda views292656
-Node: Using the property API295901
-Node: History and Acknowledgments297382
-Node: Index303944
-Node: Key Index338721
+Node: Top971
+Node: Introduction13083
+Node: Summary13498
+Node: Installation16625
+Node: Activation18003
+Node: Feedback19240
+Node: Document structure21309
+Node: Outlines22201
+Node: Headlines22866
+Ref: Headlines-Footnote-123870
+Node: Visibility cycling23981
+Ref: Visibility cycling-Footnote-126191
+Ref: Visibility cycling-Footnote-226249
+Ref: Visibility cycling-Footnote-326299
+Node: Motion26569
+Node: Structure editing27523
+Node: Archiving30517
+Node: ARCHIVE tag31075
+Node: Moving subtrees32868
+Ref: Moving subtrees-Footnote-134415
+Node: Sparse trees34702
+Ref: Sparse trees-Footnote-136837
+Ref: Sparse trees-Footnote-237019
+Node: Plain lists37134
+Ref: Plain lists-Footnote-141331
+Ref: Plain lists-Footnote-241689
+Node: Drawers41870
+Node: orgstruct-mode42708
+Node: Tables43608
+Node: Built-in table editor44189
+Node: Narrow columns51595
+Ref: Narrow columns-Footnote-153530
+Node: Column groups53576
+Node: orgtbl-mode55109
+Node: The spreadsheet55912
+Node: References56999
+Ref: References-Footnote-161463
+Node: Formula syntax for Calc61752
+Node: Formula syntax for Lisp64209
+Node: Field formulas65927
+Node: Column formulas67235
+Node: Editing and debugging formulas68834
+Node: Updating the table72987
+Node: Advanced features74040
+Node: Hyperlinks78565
+Node: Link format79343
+Node: Internal links80636
+Ref: Internal links-Footnote-182561
+Node: Radio targets82696
+Node: External links83396
+Node: Handling links85800
+Ref: Handling links-Footnote-191116
+Ref: Handling links-Footnote-291353
+Node: Using links outside Org-mode91427
+Node: Link abbreviations91937
+Node: Search options93630
+Ref: Search options-Footnote-195410
+Node: Custom searches95491
+Node: TODO items96522
+Node: TODO basics97560
+Node: TODO extensions99765
+Node: Workflow states100709
+Ref: Workflow states-Footnote-1101884
+Node: TODO types101977
+Ref: TODO types-Footnote-1103560
+Node: Multiple sets in one file103642
+Node: Fast access to TODO states105262
+Node: Per file keywords106405
+Ref: Per file keywords-Footnote-1107707
+Node: Faces for TODO keywords107908
+Node: Progress logging108614
+Node: Closing items109045
+Ref: Closing items-Footnote-1109979
+Ref: Closing items-Footnote-2110184
+Node: Tracking TODO state changes110257
+Ref: Tracking TODO state changes-Footnote-1111442
+Node: Priorities111517
+Ref: Priorities-Footnote-1113167
+Node: Breaking down tasks113237
+Ref: Breaking down tasks-Footnote-1113757
+Node: Checkboxes113853
+Node: Tags116702
+Node: Tag inheritance117474
+Node: Setting tags118411
+Ref: Setting tags-Footnote-1122934
+Ref: Setting tags-Footnote-2123046
+Node: Tag searches123129
+Node: Properties and columns125846
+Node: Property syntax126951
+Node: Special properties129498
+Node: Property searches130414
+Node: Column view131069
+Node: Defining columns132236
+Node: Scope of column definitions132634
+Node: Column attributes133556
+Node: Using column view135804
+Node: Property API137791
+Node: Timestamps138145
+Node: Time stamps138556
+Ref: Time stamps-Footnote-1140910
+Node: Creating timestamps141026
+Node: The date/time prompt143100
+Ref: The date/time prompt-Footnote-1145088
+Node: Custom time format145194
+Node: Deadlines and scheduling146886
+Ref: Deadlines and scheduling-Footnote-1148959
+Node: Inserting deadline/schedule149114
+Node: Repeated tasks150232
+Ref: Repeated tasks-Footnote-1151910
+Node: Clocking work time152031
+Ref: Clocking work time-Footnote-1156878
+Ref: Clocking work time-Footnote-2156956
+Node: Remember157082
+Node: Setting up remember157964
+Node: Remember templates158567
+Ref: Remember templates-Footnote-1162084
+Ref: Remember templates-Footnote-2162267
+Node: Storing notes162365
+Ref: Storing notes-Footnote-1164844
+Node: Agenda views164946
+Node: Agenda files166897
+Ref: Agenda files-Footnote-1167989
+Ref: Agenda files-Footnote-2168138
+Node: Agenda dispatcher168331
+Node: Built-in agenda views170030
+Node: Weekly/Daily agenda170612
+Node: Global TODO list173949
+Node: Matching tags and properties176229
+Node: Timeline177320
+Node: Stuck projects177994
+Node: Presentation and sorting179847
+Node: Categories180640
+Ref: Categories-Footnote-1181351
+Node: Time-of-day specifications181671
+Node: Sorting of agenda items183644
+Node: Agenda commands184928
+Node: Custom agenda views192391
+Node: Storing searches193112
+Node: Block agenda195026
+Node: Setting Options196258
+Node: Exporting Agenda Views198999
+Ref: Exporting Agenda Views-Footnote-1203285
+Ref: Exporting Agenda Views-Footnote-2203342
+Node: Extracting Agenda Information for other programs203528
+Node: Embedded LaTeX207656
+Ref: Embedded LaTeX-Footnote-1208750
+Node: Math symbols208940
+Node: Subscripts and Superscripts209707
+Node: LaTeX fragments210553
+Ref: LaTeX fragments-Footnote-1212786
+Ref: LaTeX fragments-Footnote-2213047
+Node: Processing LaTeX fragments213181
+Node: CDLaTeX mode214129
+Ref: CDLaTeX mode-Footnote-1216615
+Node: Exporting216763
+Node: ASCII export218230
+Node: HTML export219731
+Node: HTML Export commands220357
+Node: Quoting HTML tags222144
+Node: Links222779
+Node: Images223476
+Ref: Images-Footnote-1224347
+Node: CSS support224408
+Ref: CSS support-Footnote-1225727
+Node: LaTeX export225840
+Node: LaTeX export commands226164
+Node: Quoting LaTeX code227326
+Node: XOXO export227831
+Node: iCalendar export228271
+Node: Text interpretation229740
+Node: Comment lines230331
+Node: Initial text230726
+Node: Footnotes232395
+Node: Enhancing text233186
+Ref: Enhancing text-Footnote-1235055
+Node: Export options235145
+Node: Publishing237498
+Ref: Publishing-Footnote-1238459
+Ref: Publishing-Footnote-2238603
+Node: Configuration238754
+Node: Project alist239472
+Node: Sources and destinations240538
+Node: Selecting files241268
+Node: Publishing action242016
+Node: Publishing options243350
+Node: Publishing links245725
+Node: Project page index247238
+Node: Sample configuration248016
+Node: Simple example248508
+Node: Complex example249181
+Node: Triggering publication251257
+Node: Miscellaneous251942
+Node: Completion252576
+Node: Customization254246
+Node: In-buffer settings254829
+Node: The very busy C-c C-c key260391
+Node: Clean view262246
+Node: TTY keys264823
+Node: Interaction266433
+Node: Cooperation266830
+Node: Conflicts269706
+Node: Bugs271709
+Node: Extensions and Hacking273205
+Node: Extensions273930
+Node: Adding hyperlink types276192
+Node: Tables in arbitrary syntax279854
+Node: Radio tables280943
+Node: A LaTeX example283446
+Ref: A LaTeX example-Footnote-1287092
+Ref: A LaTeX example-Footnote-2287240
+Node: Translator functions287675
+Ref: Translator functions-Footnote-1290784
+Node: Dynamic blocks290872
+Node: Special agenda views292844
+Node: Using the property API296089
+Node: History and Acknowledgments297570
+Node: Index304132
+Node: Key Index338909
 
 End Tag Table

+ 15 - 14
org.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 5.11
+;; Version: 5.11b
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -12843,12 +12843,13 @@ This means to empty the block, parse for parameters and then call
 the correct writing function."
   (save-window-excursion
     (let* ((pos (point))
+	   (line (org-current-line))
 	   (params (org-prepare-dblock))
 	   (name (plist-get params :name))
 	   (cmd (intern (concat "org-dblock-write:" name))))
-      (message "Updating dynamic block %s at %d..." name pos)
+      (message "Updating dynamic block `%s' at line %d..." name line)
       (funcall cmd params)
-      (message "Updating dynamic block %s at %d...done" name pos)
+      (message "Updating dynamic block `%s' at line %d...done" name line)
       (goto-char pos))))
 
 (defun org-beginning-of-dblock ()
@@ -16503,14 +16504,14 @@ If necessary, clock-out of the currently active clock."
 (defun org-clock-find-position ()
   "Find the location where the next clock line should be inserted."
   (org-back-to-heading t)
-  (beginning-of-line 2)
   (catch 'exit
-    (let ((beg (point)) (end (progn (outline-next-heading) (point)))
+    (let ((beg (point-at-bol 2)) (end (progn (outline-next-heading) (point)))
 	  (re (concat "^[ \t]*" org-clock-string))
 	  (cnt 0)
 	  first last)
       (goto-char beg)
-      (when (re-search-forward "^[ \t]*:CLOCK:" nil t)
+      (when (eobp) (newline) (setq end (max (point) end)))
+      (when (re-search-forward "^[ \t]*:CLOCK:" end t)
 	;; we seem to have a CLOCK drawer, so go there.
 	(beginning-of-line 2)
 	(throw 'exit t))
@@ -16764,20 +16765,20 @@ If yes, offer to stop it and to save the buffer with the changes."
     (when (y-or-n-p "Save changed buffer?")
       (save-buffer))))
 
-(defun org-clock-report ()
+(defun org-clock-report (&optional arg)
   "Create a table containing a report about clocked time.
 If the cursor is inside an existing clocktable block, then the table
 will be updated.  If not, a new clocktable will be inserted.
-
-The BEGIN line can contain parameters.  See the manual for details."
-  (interactive)
+When called with a prefix argument, move to the first clock table in the
+buffer and update it."
+  (interactive "P")
   (org-remove-clock-overlays)
+  (when arg (org-find-dblock "clocktable"))
   (if (org-in-clocktable-p)
-      (progn
-	(goto-char (org-in-clocktable-p))
-	(org-update-dblock))
+      (goto-char (org-in-clocktable-p))
     (org-create-dblock (list :name "clocktable"
-			     :maxlevel 2 :scope 'file))))
+			     :maxlevel 2 :scope 'file)))
+  (org-update-dblock))
 
 (defun org-in-clocktable-p ()
   "Check if the cursor is in a clocktable."

BIN
org.pdf


+ 5 - 2
org.texi

@@ -3,7 +3,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 5.11
+@set VERSION 5.11b
 @set DATE October 2007
 
 @dircategory Emacs
@@ -4111,7 +4111,10 @@ when you change the buffer (see variable
 @kindex C-c C-x C-r
 @item C-c C-x C-r
 Insert a dynamic block (@pxref{Dynamic blocks}) containing a clock
-report as an org-mode table into the current file.
+report as an org-mode table into the current file.  When the cursor is
+at an existing clock table, just update it.  When called with a prefix
+argument, jump to the first clock report in the current document and
+update it.
 @example
 #+BEGIN: clocktable :maxlevel 2 :emphasize nil :scope file
 

BIN
orgcard.pdf