Release 5.15

This commit is contained in:
Carsten Dominik 2008-01-31 11:37:56 +01:00
parent 93570c03c7
commit 1f8c193b44
8 changed files with 211 additions and 169 deletions

View File

@ -1,3 +1,9 @@
2007-11-27 Carsten Dominik <dominik@science.uva.nl>
* norg.el (org-entry-properties): Return keyword-less time strings.
(org-clock-heading-function): New option.
(org-clock-in): Use `org-clock-heading-function'.
2007-11-25 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Property inheritance): New section

288
org
View File

@ -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.14).
This manual is for Org-mode (version 5.15).
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.14).
This manual is for Org-mode (version 5.15).
Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
@ -3223,6 +3223,8 @@ used as keys in the properties drawer:
PRIORITY The priority of the entry, a string with a single letter.
DEADLINE The deadline time string, without the angular brackets.
SCHEDULED The scheduling time stamp, without the angular brackets.
TIMESTAMP The first keyword-less time stamp in the entry.
TIMESTAMP_IA The first inactive time stamp in the entry.

File: org, Node: Property searches, Next: Property inheritance, Prev: Special properties, Up: Properties and columns
@ -8850,146 +8852,146 @@ Node: Tag searches125206
Node: Properties and columns127982
Node: Property syntax129153
Node: Special properties131843
Node: Property searches132786
Node: Property inheritance134047
Node: Column view135494
Node: Defining columns136728
Node: Scope of column definitions137126
Node: Column attributes138048
Node: Using column view140444
Node: Capturing Column View142525
Node: Property API144252
Node: Dates and times144606
Node: Time stamps145335
Ref: Time stamps-Footnote-1147699
Node: Creating timestamps147815
Node: The date/time prompt149894
Ref: The date/time prompt-Footnote-1153250
Ref: The date/time prompt-Footnote-2153306
Ref: The date/time prompt-Footnote-3153412
Node: Custom time format153505
Node: Deadlines and scheduling155197
Ref: Deadlines and scheduling-Footnote-1157275
Node: Inserting deadline/schedule157430
Node: Repeated tasks158548
Ref: Repeated tasks-Footnote-1160226
Node: Clocking work time160347
Ref: Clocking work time-Footnote-1165199
Ref: Clocking work time-Footnote-2165277
Node: Remember165403
Node: Setting up remember166349
Ref: Setting up remember-Footnote-1167258
Node: Remember templates167324
Ref: Remember templates-Footnote-1170963
Ref: Remember templates-Footnote-2171146
Node: Storing notes171244
Ref: Storing notes-Footnote-1173755
Node: Refiling notes173857
Node: Agenda views175122
Node: Agenda files177073
Ref: Agenda files-Footnote-1178161
Ref: Agenda files-Footnote-2178310
Node: Agenda dispatcher178503
Ref: Agenda dispatcher-Footnote-1180557
Ref: Agenda dispatcher-Footnote-2180651
Node: Built-in agenda views180745
Node: Weekly/Daily agenda181327
Ref: Weekly/Daily agenda-Footnote-1184625
Node: Global TODO list184829
Node: Matching tags and properties187109
Node: Timeline188200
Node: Stuck projects188874
Node: Presentation and sorting190727
Node: Categories191520
Ref: Categories-Footnote-1192231
Node: Time-of-day specifications192668
Node: Sorting of agenda items194641
Node: Agenda commands195925
Node: Custom agenda views203388
Node: Storing searches204109
Ref: Storing searches-Footnote-1206643
Node: Block agenda206760
Node: Setting Options207992
Node: Exporting Agenda Views210733
Ref: Exporting Agenda Views-Footnote-1215090
Ref: Exporting Agenda Views-Footnote-2215147
Node: Extracting Agenda Information for other programs215333
Node: Embedded LaTeX219461
Ref: Embedded LaTeX-Footnote-1220555
Node: Math symbols220745
Node: Subscripts and Superscripts221512
Node: LaTeX fragments222358
Ref: LaTeX fragments-Footnote-1224591
Ref: LaTeX fragments-Footnote-2224852
Node: Processing LaTeX fragments224986
Node: CDLaTeX mode225934
Ref: CDLaTeX mode-Footnote-1228420
Node: Exporting228568
Node: ASCII export230035
Node: HTML export231536
Node: HTML Export commands232162
Node: Quoting HTML tags233949
Node: Links234584
Node: Images235281
Ref: Images-Footnote-1236152
Node: CSS support236213
Ref: CSS support-Footnote-1237532
Node: LaTeX export237645
Node: LaTeX export commands237994
Node: Quoting LaTeX code239156
Node: Sectioning structure239690
Node: XOXO export240191
Node: iCalendar export240631
Node: Text interpretation242100
Node: Comment lines242755
Node: Initial text243150
Node: Footnotes244819
Node: Quoted examples245611
Node: Enhancing text246386
Node: Export options248835
Node: Publishing251296
Ref: Publishing-Footnote-1252257
Ref: Publishing-Footnote-2252401
Node: Configuration252552
Node: Project alist253270
Node: Sources and destinations254336
Node: Selecting files255066
Node: Publishing action255814
Node: Publishing options257148
Node: Publishing links259654
Node: Project page index261169
Node: Sample configuration261947
Node: Simple example262439
Node: Complex example263112
Node: Triggering publication265188
Node: Miscellaneous265873
Node: Completion266507
Node: Customization268177
Node: In-buffer settings268760
Node: The very busy C-c C-c key274430
Node: Clean view276285
Node: TTY keys278862
Node: Interaction280472
Node: Cooperation280869
Node: Conflicts283745
Node: Bugs285755
Node: Extensions and Hacking287251
Node: Extensions287976
Node: Adding hyperlink types290238
Node: Tables in arbitrary syntax293900
Node: Radio tables295292
Node: A LaTeX example297795
Ref: A LaTeX example-Footnote-1301473
Ref: A LaTeX example-Footnote-2301621
Node: Translator functions302056
Ref: Translator functions-Footnote-1305185
Node: Radio lists305273
Ref: Radio lists-Footnote-1306395
Node: Dynamic blocks306515
Node: Special agenda views308487
Node: Using the property API311732
Node: History and Acknowledgments313330
Node: Index319891
Node: Key Index356323
Node: Property searches132914
Node: Property inheritance134175
Node: Column view135622
Node: Defining columns136856
Node: Scope of column definitions137254
Node: Column attributes138176
Node: Using column view140572
Node: Capturing Column View142653
Node: Property API144380
Node: Dates and times144734
Node: Time stamps145463
Ref: Time stamps-Footnote-1147827
Node: Creating timestamps147943
Node: The date/time prompt150022
Ref: The date/time prompt-Footnote-1153378
Ref: The date/time prompt-Footnote-2153434
Ref: The date/time prompt-Footnote-3153540
Node: Custom time format153633
Node: Deadlines and scheduling155325
Ref: Deadlines and scheduling-Footnote-1157403
Node: Inserting deadline/schedule157558
Node: Repeated tasks158676
Ref: Repeated tasks-Footnote-1160354
Node: Clocking work time160475
Ref: Clocking work time-Footnote-1165327
Ref: Clocking work time-Footnote-2165405
Node: Remember165531
Node: Setting up remember166477
Ref: Setting up remember-Footnote-1167386
Node: Remember templates167452
Ref: Remember templates-Footnote-1171091
Ref: Remember templates-Footnote-2171274
Node: Storing notes171372
Ref: Storing notes-Footnote-1173883
Node: Refiling notes173985
Node: Agenda views175250
Node: Agenda files177201
Ref: Agenda files-Footnote-1178289
Ref: Agenda files-Footnote-2178438
Node: Agenda dispatcher178631
Ref: Agenda dispatcher-Footnote-1180685
Ref: Agenda dispatcher-Footnote-2180779
Node: Built-in agenda views180873
Node: Weekly/Daily agenda181455
Ref: Weekly/Daily agenda-Footnote-1184753
Node: Global TODO list184957
Node: Matching tags and properties187237
Node: Timeline188328
Node: Stuck projects189002
Node: Presentation and sorting190855
Node: Categories191648
Ref: Categories-Footnote-1192359
Node: Time-of-day specifications192796
Node: Sorting of agenda items194769
Node: Agenda commands196053
Node: Custom agenda views203516
Node: Storing searches204237
Ref: Storing searches-Footnote-1206771
Node: Block agenda206888
Node: Setting Options208120
Node: Exporting Agenda Views210861
Ref: Exporting Agenda Views-Footnote-1215218
Ref: Exporting Agenda Views-Footnote-2215275
Node: Extracting Agenda Information for other programs215461
Node: Embedded LaTeX219589
Ref: Embedded LaTeX-Footnote-1220683
Node: Math symbols220873
Node: Subscripts and Superscripts221640
Node: LaTeX fragments222486
Ref: LaTeX fragments-Footnote-1224719
Ref: LaTeX fragments-Footnote-2224980
Node: Processing LaTeX fragments225114
Node: CDLaTeX mode226062
Ref: CDLaTeX mode-Footnote-1228548
Node: Exporting228696
Node: ASCII export230163
Node: HTML export231664
Node: HTML Export commands232290
Node: Quoting HTML tags234077
Node: Links234712
Node: Images235409
Ref: Images-Footnote-1236280
Node: CSS support236341
Ref: CSS support-Footnote-1237660
Node: LaTeX export237773
Node: LaTeX export commands238122
Node: Quoting LaTeX code239284
Node: Sectioning structure239818
Node: XOXO export240319
Node: iCalendar export240759
Node: Text interpretation242228
Node: Comment lines242883
Node: Initial text243278
Node: Footnotes244947
Node: Quoted examples245739
Node: Enhancing text246514
Node: Export options248963
Node: Publishing251424
Ref: Publishing-Footnote-1252385
Ref: Publishing-Footnote-2252529
Node: Configuration252680
Node: Project alist253398
Node: Sources and destinations254464
Node: Selecting files255194
Node: Publishing action255942
Node: Publishing options257276
Node: Publishing links259782
Node: Project page index261297
Node: Sample configuration262075
Node: Simple example262567
Node: Complex example263240
Node: Triggering publication265316
Node: Miscellaneous266001
Node: Completion266635
Node: Customization268305
Node: In-buffer settings268888
Node: The very busy C-c C-c key274558
Node: Clean view276413
Node: TTY keys278990
Node: Interaction280600
Node: Cooperation280997
Node: Conflicts283873
Node: Bugs285883
Node: Extensions and Hacking287379
Node: Extensions288104
Node: Adding hyperlink types290366
Node: Tables in arbitrary syntax294028
Node: Radio tables295420
Node: A LaTeX example297923
Ref: A LaTeX example-Footnote-1301601
Ref: A LaTeX example-Footnote-2301749
Node: Translator functions302184
Ref: Translator functions-Footnote-1305313
Node: Radio lists305401
Ref: Radio lists-Footnote-1306523
Node: Dynamic blocks306643
Node: Special agenda views308615
Node: Using the property API311860
Node: History and Acknowledgments313458
Node: Index320019
Node: Key Index356451

End Tag Table

View File

@ -8,7 +8,7 @@
;;;;;; org-remember-insinuate org-open-at-point-global org-insert-link-global
;;;;;; org-store-link orgtbl-mode turn-on-orgtbl org-run-like-in-org-mode
;;;;;; turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle
;;;;;; org-cycle org-mode) "org" "org.el" (18250 40473))
;;;;;; org-cycle org-mode) "org" "org.el" (18253 34117))
;;; Generated autoloads from org.el
(autoload (quote org-mode) "org" "\

78
org.el
View File

@ -1,11 +1,11 @@
;;; org.el --- Outline-based notes management and organizer
;; org.el --- Outline-based notes management and organizer
;; Carstens outline-mode for keeping track of everything.
;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;;
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 5.14-alpha7
;; Version: 5.15
;;
;; This file is part of GNU Emacs.
;;
@ -83,7 +83,7 @@
;;; Version
(defconst org-version "5.14-alpha7"
(defconst org-version "5.15"
"The version number of the file org.el.")
(defun org-version ()
(interactive)
@ -1886,6 +1886,13 @@ moved to the new date."
:group 'org-time
:type 'boolean)
(defcustom org-clock-heading-function nil
"When non-nil, should be a function to create `org-clock-heading'.
This is the string shown in the mode line when a clock is running.
The function is called with point at the beginning of the headline."
:group 'org-time ; FIXME: Should we have a separate group????
:type 'function)
(defgroup org-tags nil
"Options concerning tags in Org-mode."
:tag "Org Tags"
@ -4882,11 +4889,10 @@ The time stamps may be either active or inactive.")
(add-text-properties (match-end 4) (match-beginning 5)
'(invisible org-link))
(add-text-properties (match-beginning 3) (match-end 3)
'(invisible org-link)))
(backward-char 1))))
'(invisible org-link)))))
(backward-char 1))
rtn))
(defun org-emphasize (&optional char)
"Insert or change an emphasis, i.e. a font like bold or italic.
If there is an active region, change that region to a new emphasis.
@ -15025,7 +15031,8 @@ Returns the new tags string, or nil to not change the current settings."
;;; Setting and retrieving properties
(defconst org-special-properties
'("TODO" "TAGS" "ALLTAGS" "DEADLINE" "SCHEDULED" "CLOCK" "PRIORITY")
'("TODO" "TAGS" "ALLTAGS" "DEADLINE" "SCHEDULED" "CLOCK" "PRIORITY"
"TIMESTAMP" "TIMESTAMP_IA")
"The special properties valid in Org-mode.
These are properties that are not defined in the property drawer,
@ -15121,7 +15128,7 @@ If WHICH is nil or `all', get all properties. If WHICH is
(org-with-point-at pom
(let ((clockstr (substring org-clock-string 0 -1))
(excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY"))
beg end range props sum-props key value)
beg end range props sum-props key value string)
(save-excursion
(when (condition-case nil (org-back-to-heading t) (error nil))
(setq beg (point))
@ -15141,17 +15148,23 @@ If WHICH is nil or `all', get all properties. If WHICH is
(when (setq value (org-get-tags-at))
(push (cons "ALLTAGS" (concat ":" (mapconcat 'identity value ":") ":"))
props))
(while (re-search-forward org-keyword-time-regexp end t)
(setq key (substring (org-match-string-no-properties 1) 0 -1))
(unless (member key excluded) (push key excluded))
(push (cons key
(if (equal key clockstr)
(org-no-properties
(org-trim
(buffer-substring
(match-beginning 2) (point-at-eol))))
(org-match-string-no-properties 2)))
props)))
(while (re-search-forward org-maybe-keyword-time-regexp end t)
(setq key (if (match-end 1) (substring (org-match-string-no-properties 1) 0 -1))
string (if (equal key clockstr)
(org-no-properties
(org-trim
(buffer-substring
(match-beginning 3) (goto-char (point-at-eol)))))
(substring (org-match-string-no-properties 3) 1 -1)))
(unless key
(if (= (char-after (match-beginning 3)) ?\[)
(setq key "TIMESTAMP_IA")
(setq key "TIMESTAMP")))
(when (or (equal key clockstr) (not (assoc key props)))
(push (cons key string) props)))
)
(when (memq which '(all standard))
;; Get the standard properties, like :PORP: ...
(setq range (org-get-property-block beg end))
@ -17657,9 +17670,12 @@ If necessary, clock-out of the currently active clock."
(let (ts)
(save-excursion
(org-back-to-heading t)
(if (looking-at org-todo-line-regexp)
(setq org-clock-heading (match-string 3))
(setq org-clock-heading "???"))
(if (and org-clock-heading-function
(functionp org-clock-heading-function))
(setq org-clock-heading (funcall org-clock-heading-function))
(if (looking-at org-todo-line-regexp)
(setq org-clock-heading (match-string 3))
(setq org-clock-heading "???")))
(setq org-clock-heading (propertize org-clock-heading 'face nil))
(org-clock-find-position)
@ -24126,7 +24142,8 @@ lang=\"%s\" xml:lang=\"%s\">
;; replace "&" by "&amp;", "<" and ">" by "&lt;" and "&gt;"
;; handle @<..> HTML tags (replace "@&gt;..&lt;" by "<..>")
;; Also handle sub_superscripts and checkboxes
(setq line (org-html-expand line))
(or (string-match org-table-hline-regexp line)
(setq line (org-html-expand line)))
;; Format the links
(setq start 0)
@ -27218,6 +27235,21 @@ variable for the duration of the command."
'(font-lock-multiline t)))))
rtn)))
(defun org-find-first-timestamp (keyword inactive end)
"Return location of first timestamp matching KEYWORD and INACTIVE.
KEYWORD may be any of the timestamp keywords, or nil.
INACTIVE means it should be an inactive timestamp.
If there is no such time stamp, return nil."
(catch 'exit
(let (key ia)
(setq inactive (and inactive t))
(while (re-search-forward org-maybe-keyword-time-regexp end t)
(setq key (and (match-end 1) (substring (match-string 1) 0 -1))
(equal (char-after (match-beginning 3)) ?\[))
(when (and (equal keyword key)
(equal inactive ia))
(throw 'exit (match-beginning 3)))))))
;;;; Finish up
(provide 'org)

BIN
org.pdf

Binary file not shown.

View File

@ -3,7 +3,7 @@
@setfilename ../../info/org
@settitle Org Mode Manual
@set VERSION 5.14
@set VERSION 5.15
@set DATE December 2007
@dircategory Emacs
@ -3506,6 +3506,8 @@ ALLTAGS @r{All tags, including inherited ones.}
PRIORITY @r{The priority of the entry, a string with a single letter.}
DEADLINE @r{The deadline time string, without the angular brackets.}
SCHEDULED @r{The scheduling time stamp, without the angular brackets.}
TIMESTAMP @r{The first keyword-less time stamp in the entry.}
TIMESTAMP_IA @r{The first inactive time stamp in the entry.}
@end example
@node Property searches, Property inheritance, Special properties, Properties and columns

Binary file not shown.

View File

@ -1,5 +1,5 @@
% Reference Card for Org Mode
\def\orgversionnumber{5.14}
\def\orgversionnumber{5.15}
\def\versionyear{2007} % latest update
\def\year{2007} % latest copyright year