浏览代码

Release 4.50

Carsten Dominik 17 年之前
父节点
当前提交
d45806cc97
共有 7 个文件被更改,包括 507 次插入282 次删除
  1. 154 137
      org
  2. 19 5
      org-publish.el
  3. 313 132
      org.el
  4. 二进制
      org.pdf
  5. 19 6
      org.texi
  6. 二进制
      orgcard.pdf
  7. 2 2
      orgcard.tex

+ 154 - 137
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.48).
+   This manual is for Org-mode (version 4.50).
 
    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.48).
+This manual is for Org-mode (version 4.50).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -701,8 +701,10 @@ basic one is `org-occur':
      body are made visible.  In order to provide minimal context, also
      the full hierarchy of headlines above the match is shown, as well
      as the headline following the match.  Each match is also
-     highlighted; the highlights disappear when the buffer is changed
-     with an editing command.
+     highlighted; the highlights disappear when the bufer is changes an
+     editing command, or by pressing `C-c C-c'.  When called with a
+     `C-u' prefix argument, previous highlights are kept, so several
+     calls to this command can be stacked.
    For frequently used sparse trees of specific search strings, you can
 use the variable `org-agenda-custom-commands' to define fast keyboard
 access to specific sparse trees.  These commands will then be
@@ -2372,7 +2374,8 @@ entry back into a TODO item again through further state cycling, that
 line will be removed again.  In the timeline (*note Timeline::) and in
 the agenda (*note Weekly/Daily agenda::), you can then use the `l' key
 to display the TODO items closed on each day, giving you an overview of
-what has been done on a day.
+what has been done on a day.  See the variable `org-log-done' for the
+possibility to record an additional note together with a timestamp.
 
 
 File: org,  Node: Clocking work time,  Prev: Closing items,  Up: Progress logging
@@ -2450,6 +2453,9 @@ also computes the total time spent on each subtree of a project.
 the agenda (*note Weekly/Daily agenda::) to show which tasks have been
 worked on or closed during a day.
 
+   See the variable `org-log-done' for the possibility to record an
+additional note together with a the clock-out time stamp.
+
    ---------- Footnotes ----------
 
    (1) Note that all parameters must be specified in a single line -
@@ -2544,7 +2550,7 @@ curly braces(1)
 
      #+TAGS: { @WORK(w)  @HOME(h)  @TENNISCLUB(t) }  Laptop(l)  PC(p)
 
-you indicate that at most one of `@WORK', `@HOME', and `@SAILBOAT'
+you indicate that at most one of `@WORK', `@HOME', and `@TENNISCLUB'
 should be selected.
 
 Don't forget to press `C-c C-c' with the cursor in one of these lines
@@ -3463,7 +3469,7 @@ File: org,  Node: LaTeX fragments,  Next: Processing LaTeX fragments,  Prev: Sub
 ===================
 
 With symbols, sub- and superscripts, HTML is pretty much at its end when
-it comes to representing mathematical formulas.  More complex
+it comes to representing mathematical formulas(1).  More complex
 expressions need a dedicated formula processor.  To this end, Org-mode
 can contain arbitrary LaTeX fragments.  It provides commands to preview
 the typeset result of these fragments, and upon export to HTML, all
@@ -3500,6 +3506,13 @@ If you need any of the delimiter ASCII sequences for other purposes, you
 can configure the option `org-format-latex-options' to deselect the
 ones you do not wish to have interpreted by the LaTeX converter.
 
+   ---------- Footnotes ----------
+
+   (1) Yes, there is MathML, but that is not yet fully supported by
+many browsers, and there is no decent converter for turning LaTeX of
+ASCII representations of formulas into MathML.  So for the time being,
+converting formulas into images seems the way to go.
+
 
 File: org,  Node: Processing LaTeX fragments,  Next: CDLaTeX mode,  Prev: LaTeX fragments,  Up: Embedded LaTeX
 
@@ -3975,7 +3988,8 @@ and where to put published files.
 `:publishing-directory'Directory (possibly remote) where output files
                        will be published.
 `:preparation-function'Function called before starting publishing
-                       proxess.
+                       process, for example to run `make' for updating
+                       files to be published.
 
 
 File: org,  Node: Selecting files,  Next: Publishing action,  Prev: Sources and destinations,  Up: Configuration
@@ -4009,6 +4023,8 @@ publishing destination.  For non-Org-mode files, you need to specify
 the publishing function.
 
 `:publishing-function' Function executing the publication of a file.
+                       This may also be a list of functions, which will
+                       all be called in turn.
 
    The function must accept two arguments: a property list containing at
 least a `:publishing-directory' property, and the name of the file to
@@ -5115,7 +5131,7 @@ Index
 * plain text external links:             External links.      (line  38)
 * presentation, of agenda items:         Presentation and sorting.
                                                               (line   6)
-* printing sparse trees:                 Sparse trees.        (line  39)
+* printing sparse trees:                 Sparse trees.        (line  41)
 * priorities:                            Priorities.          (line   6)
 * priorities, of agenda items:           Sorting of agenda items.
                                                               (line   6)
@@ -5220,7 +5236,7 @@ Index
 * variables, for customization:          Customization.       (line   6)
 * vectors, in table calculations:        Formula syntax.      (line  23)
 * visibility cycling:                    Visibility cycling.  (line   6)
-* visible text, printing:                Sparse trees.        (line  39)
+* visible text, printing:                Sparse trees.        (line  41)
 * VM links:                              External links.      (line   6)
 * WANDERLUST links:                      External links.      (line   6)
 * weekly agenda:                         Weekly/Daily agenda. (line   6)
@@ -5343,7 +5359,7 @@ Key Index
 * C-c C-e i:                             iCalendar export.    (line  13)
 * C-c C-e t:                             Export options.      (line  13)
 * C-c C-e v <1>:                         XOXO export.         (line  11)
-* C-c C-e v:                             Sparse trees.        (line  39)
+* C-c C-e v:                             Sparse trees.        (line  41)
 * C-c C-e v a:                           ASCII export.        (line  13)
 * C-c C-e v b:                           HTML export.         (line  14)
 * C-c C-e v h:                           HTML export.         (line  14)
@@ -5512,131 +5528,132 @@ Node: Archiving22735
 Node: ARCHIVE tag23293
 Node: Moving subtrees25086
 Node: Sparse trees26127
-Ref: Sparse trees-Footnote-128106
-Ref: Sparse trees-Footnote-228198
-Node: Plain lists28313
-Ref: Plain lists-Footnote-131838
-Ref: Plain lists-Footnote-232195
-Node: Tables32377
-Node: Built-in table editor32925
-Node: Narrow columns40533
-Ref: Narrow columns-Footnote-142472
-Node: Table calculations42518
-Node: Formula syntax43838
-Ref: Formula syntax-Footnote-146743
-Node: Lisp formulas47043
-Node: Column formulas47832
-Node: Advanced features49594
-Node: Named-field formulas52848
-Node: Editing/debugging formulas53488
-Node: Appetizer55246
-Node: orgtbl-mode56349
-Node: table.el56840
-Node: Hyperlinks57817
-Node: Link format58522
-Node: Internal links59815
-Ref: Internal links-Footnote-161804
-Node: Radio targets61936
-Node: CamelCase links62651
-Node: External links63149
-Node: Handling links65280
-Ref: Handling links-Footnote-169866
-Node: Search options70103
-Ref: Search options-Footnote-171877
-Node: Custom searches71958
-Node: Remember73006
-Node: TODO items76696
-Node: TODO basics77678
-Node: TODO extensions79205
-Node: Workflow states80000
-Node: TODO types80868
-Ref: TODO types-Footnote-182526
-Node: Per file keywords82608
-Ref: Per file keywords-Footnote-184062
-Node: Priorities84263
-Node: Breaking down tasks85507
-Ref: Breaking down tasks-Footnote-186027
-Node: Checkboxes86123
-Node: Timestamps88859
-Node: Time stamps89249
-Node: Creating timestamps92346
-Node: Progress logging95692
-Node: Closing items96222
-Node: Clocking work time97017
-Ref: Clocking work time-Footnote-1100453
-Node: Tags100579
-Node: Tag inheritance101341
-Node: Setting tags102278
-Ref: Setting tags-Footnote-1105408
-Ref: Setting tags-Footnote-2105520
-Node: Tag searches105600
-Node: Agenda views106809
-Node: Agenda files108698
-Ref: Agenda files-Footnote-1109658
-Ref: Agenda files-Footnote-2109807
-Node: Agenda dispatcher110000
-Node: Weekly/Daily agenda111617
-Node: Calendar/Diary integration112582
-Node: Global TODO list113920
-Node: Matching headline tags115972
-Node: Timeline116916
-Node: Presentation and sorting117579
-Node: Categories118357
-Node: Time-of-day specifications119021
-Node: Sorting of agenda items120999
-Node: Agenda commands122281
-Node: Custom agenda views128169
-Node: Storing searches128844
-Node: Block agenda130756
-Node: Setting Options131986
-Node: Batch processing134698
-Node: Embedded LaTeX135828
-Ref: Embedded LaTeX-Footnote-1136920
-Node: Math symbols137110
-Node: Subscripts and Superscripts137875
-Node: LaTeX fragments138719
-Node: Processing LaTeX fragments140788
-Node: CDLaTeX mode141734
-Ref: CDLaTeX mode-Footnote-1144218
-Node: Exporting144366
-Node: ASCII export145680
-Node: HTML export146970
-Node: XOXO export149806
-Node: iCalendar export150245
-Node: Text interpretation152068
-Node: Comment lines152547
-Node: Enhancing text153018
-Node: Export options154710
-Node: Publishing156377
-Ref: Publishing-Footnote-1157173
-Node: Configuration157369
-Node: Project alist158087
-Node: Sources and destinations159153
-Node: Selecting files159798
-Node: Publishing action160546
-Node: Publishing options161661
-Node: Publishing links163813
-Node: Project page index165326
-Node: Sample configuration166104
-Node: Simple example166596
-Node: Complex example167269
-Node: Triggering publication169345
-Node: Miscellaneous170030
-Node: Completion170664
-Node: Customization172045
-Node: In-buffer settings172630
-Node: The very busy C-c C-c key175861
-Node: Clean view177505
-Node: TTY keys180082
-Node: Interaction181691
-Node: Cooperation182088
-Node: Conflicts183955
-Node: Bugs185547
-Node: Extensions and Hacking187170
-Node: Extensions187656
-Node: Dynamic blocks189226
-Node: History and Acknowledgments191153
-Node: Index196115
-Node: Key Index220474
+Ref: Sparse trees-Footnote-128258
+Ref: Sparse trees-Footnote-228350
+Node: Plain lists28465
+Ref: Plain lists-Footnote-131990
+Ref: Plain lists-Footnote-232347
+Node: Tables32529
+Node: Built-in table editor33077
+Node: Narrow columns40685
+Ref: Narrow columns-Footnote-142624
+Node: Table calculations42670
+Node: Formula syntax43990
+Ref: Formula syntax-Footnote-146895
+Node: Lisp formulas47195
+Node: Column formulas47984
+Node: Advanced features49746
+Node: Named-field formulas53000
+Node: Editing/debugging formulas53640
+Node: Appetizer55398
+Node: orgtbl-mode56501
+Node: table.el56992
+Node: Hyperlinks57969
+Node: Link format58674
+Node: Internal links59967
+Ref: Internal links-Footnote-161956
+Node: Radio targets62088
+Node: CamelCase links62803
+Node: External links63301
+Node: Handling links65432
+Ref: Handling links-Footnote-170018
+Node: Search options70255
+Ref: Search options-Footnote-172029
+Node: Custom searches72110
+Node: Remember73158
+Node: TODO items76848
+Node: TODO basics77830
+Node: TODO extensions79357
+Node: Workflow states80152
+Node: TODO types81020
+Ref: TODO types-Footnote-182678
+Node: Per file keywords82760
+Ref: Per file keywords-Footnote-184214
+Node: Priorities84415
+Node: Breaking down tasks85659
+Ref: Breaking down tasks-Footnote-186179
+Node: Checkboxes86275
+Node: Timestamps89011
+Node: Time stamps89401
+Node: Creating timestamps92498
+Node: Progress logging95844
+Node: Closing items96374
+Node: Clocking work time97278
+Ref: Clocking work time-Footnote-1100841
+Node: Tags100967
+Node: Tag inheritance101729
+Node: Setting tags102666
+Ref: Setting tags-Footnote-1105798
+Ref: Setting tags-Footnote-2105910
+Node: Tag searches105990
+Node: Agenda views107199
+Node: Agenda files109088
+Ref: Agenda files-Footnote-1110048
+Ref: Agenda files-Footnote-2110197
+Node: Agenda dispatcher110390
+Node: Weekly/Daily agenda112007
+Node: Calendar/Diary integration112972
+Node: Global TODO list114310
+Node: Matching headline tags116362
+Node: Timeline117306
+Node: Presentation and sorting117969
+Node: Categories118747
+Node: Time-of-day specifications119411
+Node: Sorting of agenda items121389
+Node: Agenda commands122671
+Node: Custom agenda views128559
+Node: Storing searches129234
+Node: Block agenda131146
+Node: Setting Options132376
+Node: Batch processing135088
+Node: Embedded LaTeX136218
+Ref: Embedded LaTeX-Footnote-1137310
+Node: Math symbols137500
+Node: Subscripts and Superscripts138265
+Node: LaTeX fragments139109
+Ref: LaTeX fragments-Footnote-1141217
+Node: Processing LaTeX fragments141479
+Node: CDLaTeX mode142425
+Ref: CDLaTeX mode-Footnote-1144909
+Node: Exporting145057
+Node: ASCII export146371
+Node: HTML export147661
+Node: XOXO export150497
+Node: iCalendar export150936
+Node: Text interpretation152759
+Node: Comment lines153238
+Node: Enhancing text153709
+Node: Export options155401
+Node: Publishing157068
+Ref: Publishing-Footnote-1157864
+Node: Configuration158060
+Node: Project alist158778
+Node: Sources and destinations159844
+Node: Selecting files160574
+Node: Publishing action161322
+Node: Publishing options162555
+Node: Publishing links164707
+Node: Project page index166220
+Node: Sample configuration166998
+Node: Simple example167490
+Node: Complex example168163
+Node: Triggering publication170239
+Node: Miscellaneous170924
+Node: Completion171558
+Node: Customization172939
+Node: In-buffer settings173524
+Node: The very busy C-c C-c key176755
+Node: Clean view178399
+Node: TTY keys180976
+Node: Interaction182585
+Node: Cooperation182982
+Node: Conflicts184849
+Node: Bugs186441
+Node: Extensions and Hacking188064
+Node: Extensions188550
+Node: Dynamic blocks190120
+Node: History and Acknowledgments192047
+Node: Index197009
+Node: Key Index221368
 
 End Tag Table

+ 19 - 5
org-publish.el

@@ -6,7 +6,7 @@
 ;; Keywords: hypermedia, outlines
 ;; Version:
 
-;; $Id: org-publish.el,v 1.77 2006/09/07 14:20:05 dto Exp $
+;; $Id: org-publish.el,v 1.78 2006/09/10 06:41:23 dto Exp dto $
 
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -138,6 +138,7 @@
 
 ;;; List of user-visible changes since version 1.27
 
+;; 1.78: Allow list-valued :publishing-function
 ;; 1.77: Added :preparation-function, this allows you to use GNU Make etc.
 ;; 1.65: Remove old "composite projects". They're redundant.
 ;; 1.64: Allow meta-projects with :components
@@ -213,9 +214,12 @@ publishing files in the project. This can be used to extend the
 set of file types publishable by org-publish, as well as the set
 of output formats.
 
-    :publishing-function   Function to publish file. The default is
+    :publishing-function     Function to publish file. The default is
                              org-publish-org-to-html, but other
-                             values are possible.
+                             values are possible. May also be a
+                             list of functions, in which case 
+                             each function in the list is invoked
+                             in turn.
 
 Another property allows you to insert code that prepares a
 project for publishing. For example, you could call GNU Make on a
@@ -468,7 +472,12 @@ FILENAME is the filename of the file to be published."
     (if (not project-name)
 	(error (format "File %s is not part of any known project." filename)))
     (when (org-publish-needed-p filename)
-      (funcall publishing-function plist filename)
+      (if (listp publishing-function)
+	  ;; allow chain of publishing functions
+	  (mapc (lambda (f)
+		  (funcall f plist filename)) 
+		publishing-function)
+	(funcall publishing-function plist filename))
       (org-publish-update-timestamp filename))))
 
 
@@ -491,7 +500,12 @@ FILENAME is the filename of the file to be published."
       (while (setq f (pop files))
 	;; check timestamps
 	(when (org-publish-needed-p f)
-	  (funcall publishing-function plist f)
+	  (if (listp publishing-function)
+	      ;; allow chain of publishing functions
+	      (mapc (lambda (func)
+		      (funcall func plist f)) 
+		    publishing-function)
+	    (funcall publishing-function plist f))
 	  (org-publish-update-timestamp f))))))
 
 

文件差异内容过多而无法显示
+ 313 - 132
org.el


二进制
org.pdf


+ 19 - 6
org.texi

@@ -3,7 +3,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.48
+@set VERSION 4.50
 @set DATE September 2006
 
 @dircategory Emacs
@@ -806,7 +806,9 @@ match is in the body of an entry, headline and body are made visible.
 In order to provide minimal context, also the full hierarchy of
 headlines above the match is shown, as well as the headline following
 the match.  Each match is also highlighted; the highlights disappear
-when the buffer is changed with an editing command.
+when the bufer is changes an editing command, or by pressing @kbd{C-c
+C-c}.  When called with a @kbd{C-u} prefix argument, previous highlights
+are kept, so several calls to this command can be stacked.
 @end table
 @noindent
 For frequently used sparse trees of specific search strings, you can
@@ -2622,6 +2624,8 @@ state cycling, that line will be removed again.  In the timeline
 (@pxref{Timeline}) and in the agenda (@pxref{Weekly/Daily agenda}),
 you can then use the @kbd{l} key to display the TODO items closed on
 each day, giving you an overview of what has been done on a day.
+See the variable @code{org-log-done} for the possibility to record an
+additional note together with a timestamp.
 
 @node Clocking work time,  , Closing items, Progress logging
 @subsection Clocking work time
@@ -2710,6 +2714,9 @@ The @kbd{l} key may be used in the timeline (@pxref{Timeline}) and in
 the agenda (@pxref{Weekly/Daily agenda}) to show which tasks have been
 worked on or closed during a day.
 
+See the variable @code{org-log-done} for the possibility to record an
+additional note together with a the clock-out time stamp.
+
 @node Tags, Agenda views, Timestamps, Top
 @chapter Tags
 @cindex tags
@@ -2817,7 +2824,7 @@ groups are allowed.}
 @end example
 
 @noindent you indicate that at most one of @samp{@@WORK}, @samp{@@HOME},
-and @samp{@@SAILBOAT} should be selected.
+and @samp{@@TENNISCLUB} should be selected.
 
 @noindent Don't forget to press @kbd{C-c C-c} with the cursor in one of
 these lines to activate any changes.
@@ -3797,7 +3804,11 @@ are surrounded with @code{<sub>} and @code{<sup>} tags, respectively.
 @section LaTeX fragments
 
 With symbols, sub- and superscripts, HTML is pretty much at its end when
-it comes to representing mathematical formulas.  More complex
+it comes to representing mathematical formulas@footnote{Yes, there is
+MathML, but that is not yet fully supported by many browsers, and there
+is no decent converter for turning LaTeX of ASCII representations of
+formulas into MathML.  So for the time being, converting formulas into
+images seems the way to go.}.  More complex
 expressions need a dedicated formula processor.  To this end, Org-mode
 can contain arbitrary La@TeX{} fragments.  It provides commands to
 preview the typeset result of these fragments, and upon export to HTML,
@@ -4386,7 +4397,8 @@ and where to put published files.
 @item @code{:publishing-directory}
 @tab Directory (possibly remote) where output files will be published.
 @item @code{:preparation-function}
-@tab Function called before starting publishing proxess.
+@tab Function called before starting publishing process, for example to
+run @code{make} for updating files to be published.
 @end multitable
 @noindent
 
@@ -4426,7 +4438,8 @@ specify the publishing function.
 
 @multitable @columnfractions 0.3 0.7
 @item @code{:publishing-function}
-@tab Function executing the publication of a file.
+@tab Function executing the publication of a file.  This may also be a
+list of functions, which will all be called in turn.
 @end multitable
 
 The function must accept two arguments: a property list containing at

二进制
orgcard.pdf


+ 2 - 2
orgcard.tex

@@ -1,7 +1,7 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.48}
+\def\orgversionnumber{4.50}
 \def\year{2006}
-g%
+%
 %**start of header
 \newcount\columnsperpage
 

部分文件因为文件数量过多而无法显示