X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f4eb5e10576c10a6a6b80f0ed9bc49ed47f3bcc4..b2e6b10fe2d40020a75ab0025af98a4abf339cd2:/etc/orgcard.tex

diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index 242695a593..2b3496c05e 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -1,30 +1,31 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.35}
-\def\year{2006}
-%
+\def\orgversionnumber{5.03}
+\def\versionyear{2007}          % latest update
+\def\year{2007}                 % latest copyright year
+
 %**start of header
 \newcount\columnsperpage
+\newcount\letterpaper
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
-% At the moment this card works quite nicely in 3 column format and
-% currently takes 2 full pages.  It is thus suited to producing one 
-% double-side page when printed.
+% Specify how many you want here.
 
-% There are a couple of tweaks in the format of this card which make it work
-% slightly better on A4 paper.  The changes due, I think, to Stephen Eglen,
-% are commented below.  Revert the changes if you want letter sized paper.
+\columnsperpage=3
 
-% Try running something like
-% tex org-mode-ref.tex; dvips -t landscape org-mode-ref.dvi
-% to print the card
+% Set letterpapaer to 0 for A4 paper, 1 for letter (US) paper.  Useful
+% only when columnsperpage is 2 or 3.
 
-\columnsperpage=3
+\letterpaper=0
 
-% Copyright (c) 2004 Philip Rooke, 2005, 2006 Free Software Foundation
+% Nothing else needs to be changed below this line.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
+%   2005, 2006, 2007  Free Software Foundation, Inc.
+
+% This file is part of GNU Emacs.
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
@@ -34,8 +35,8 @@
 
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -53,6 +54,10 @@
 %    For this you need a dvi device driver that can print sideways.
 % Which mode to use is controlled by setting \columnsperpage above.
 %
+% To compile and print this document:
+% tex refcard.tex
+% dvips -t landscape refcard.dvi
+%
 % Author:
 %  Stephen Gildea
 %  Internet: gildea@stop.mail-abuse.org
@@ -61,13 +66,13 @@
 % for their many good ideas.
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
-  \centerline{\small \copyright\ 2004, 2005, 2006\ Free Software Foundation, Inc.
+  \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
   Permissions on back.  v\orgversionnumber}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 100 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\orgversionnumber{} for Org-Mode \orgversionnumber{}, \year}
+\centerline{v\orgversionnumber{} for Org-Mode \orgversionnumber{}, \versionyear}
 \centerline{Author: Philip Rooke}
 \centerline{based on refcard design and format by Stephen Gildea}
 
@@ -81,20 +86,20 @@ are preserved on all copies.
 % can be scanned without complaint.
 \def\bye{\par\vfill\supereject\end}
 
-\newdimen\intercolumnskip       %horizontal space between columns
-\newbox\columna                 %boxes to hold columns already built
+\newdimen\intercolumnskip	%horizontal space between columns
+\newbox\columna			%boxes to hold columns already built
 \newbox\columnb
 
 \def\ncolumns{\the\columnsperpage}
 
-\message{[\ncolumns\space 
+\message{[\ncolumns\space
   column\if 1\ncolumns\else s\fi\space per page]}
 
 \def\scaledmag#1{ scaled \magstep #1}
 
 % This multi-way format was designed by Stephen Gildea October 1986.
 % Note that the 1-column format is fontfamily-independent.
-\if 1\ncolumns                  %one-column format uses normal size
+\if 1\ncolumns			%one-column format uses normal size
   \hsize 4in
   \vsize 10in
   \voffset -.7in
@@ -105,15 +110,18 @@ are preserved on all copies.
 
   \footline{\hss\folio}
   \def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
-\else                           %2 or 3 columns uses prereduced size
-  \hsize 3.2in
-
-% FIXME - Try to make things more A4 friendly
-%  \vsize 7.95in
-  \vsize 7.65in
-%  \hoffset -.75in
-  \hoffset -.25in
-  \voffset -.745in
+\else				%2 or 3 columns uses prereduced size
+  \if 1\the\letterpaper
+     \hsize 3.2in
+     \vsize 7.95in
+     \hoffset -.75in
+     \voffset -.745in
+  \else
+     \hsize 3.2in
+     \vsize 7.65in
+     \hoffset -.25in
+     \voffset -.745in
+  \fi
   \font\titlefont=cmbx10 \scaledmag2
   \font\headingfont=cmbx10 \scaledmag1
   \font\smallfont=cmr6
@@ -131,13 +139,14 @@ are preserved on all copies.
   \def\bf{\eightbf}
   \def\it{\eightit}
   \def\tt{\eighttt}
-
-% FIXME - Try to make things more A4 friendly
-%  \normalbaselineskip=.8\normalbaselineskip
-  \normalbaselineskip=.7\normalbaselineskip
+  \if 1\the\letterpaper
+     \normalbaselineskip=.8\normalbaselineskip
+  \else
+     \normalbaselineskip=.7\normalbaselineskip
+  \fi
   \normallineskip=.8\normallineskip
   \normallineskiplimit=.8\normallineskiplimit
-  \normalbaselines\rm           %make definitions take effect
+  \normalbaselines\rm		%make definitions take effect
 
   \if 2\ncolumns
     \let\maxcolumn=b
@@ -153,16 +162,16 @@ are preserved on all copies.
 
   \intercolumnskip=.46in
   \def\abc{a}
-  \output={%                    %see The TeXbook page 257
+  \output={%			%see The TeXbook page 257
       % This next line is useful when designing the layout.
       %\immediate\write16{Column \folio\abc\space starts with \firstmark}
       \if \maxcolumn\abc \multicolumnformat \global\def\abc{a}
       \else\if a\abc
-        \global\setbox\columna\columnbox \global\def\abc{b}
+	\global\setbox\columna\columnbox \global\def\abc{b}
         %% in case we never use \columnb (two-column mode)
         \global\setbox\columnb\hbox to -\intercolumnskip{}
       \else
-        \global\setbox\columnb\columnbox \global\def\abc{c}\fi\fi}
+	\global\setbox\columnb\columnbox \global\def\abc{c}\fi\fi}
   \def\multicolumnformat{\shipout\vbox{\makeheadline
       \hbox{\box\columna\hskip\intercolumnskip
         \box\columnb\hskip\intercolumnskip\columnbox}
@@ -172,7 +181,7 @@ are preserved on all copies.
   \def\bye{\par\vfill\supereject
     \if a\abc \else\null\vfill\eject\fi
     \if a\abc \else\null\vfill\eject\fi
-    \end}  
+    \end}
 \fi
 
 % we won't be using math mode much, so redefine some of the characters
@@ -224,7 +233,7 @@ are preserved on all copies.
 \def\<#1>{{\it #1\/}}
 
 % kbd - argument is characters typed literally.  Like the Texinfo command.
-\def\kbd#1{{\tt#1}\null}        %\null so not an abbrev even if period follows
+\def\kbd#1{{\tt#1}\null}	%\null so not an abbrev even if period follows
 
 % beginexample...endexample - surrounds literal text, such a code example.
 % typeset in a typewriter font with line breaks preserved
@@ -284,14 +293,14 @@ are preserved on all copies.
 \key{rotate current subtree between states}{TAB}
 \key{rotate entire buffer between states}{S-TAB}
 \key{show the whole file}{C-c C-a}
+\key{reveal context around point}{C-c C-r}
+\key{show subtree in indirect buffer, ded.\ frame}{C-c C-k}
 %\key{show branches}{C-c C-k}
 
 \section{Motion}
 
-\key{next heading}{C-c C-n}
-\key{previous heading}{C-c C-p}
-\key{next heading, same level}{C-c C-f}
-\key{previous heading, same level}{C-c C-b}
+\key{next/previous heading}{C-c C-n/p}
+\key{next/previous heading, same level}{C-c C-f/b}
 \key{backward to higher level heading}{C-c C-u}
 \key{jump to another place in document}{C-c C-j}
 \key{previous/next plain list item}{S-UP/DOWN$^3$}
@@ -299,25 +308,31 @@ are preserved on all copies.
 \section{Structure Editing}
 
 \key{insert new heading/item at current level}{M-RET}
-\key{insert new TODO entry}{M-S-RET}
+\key{insert new TODO entry/checkbox item}{M-S-RET}
 
 \key{promote current heading up one level}{M-LEFT}
 \key{demote current heading down one level}{M-RIGHT}
 \key{promote current subtree up one level}{M-S-LEFT}
 \key{demote current subtree down one level}{M-S-RIGHT}
 
-\key{move subtree/list item up}{M-S-UP}
-\key{move subtree/list item down}{M-S-DOWN}
+\key{move subtree/list item up/down}{M-S-UP/DOWN}
 \key{kill subtree}{C-c C-x C-w}
 \key{copy subtree}{C-c C-x M-w}
 \key{yank subtree}{C-c C-x C-y}
+\key{narrow buffer to current subtree}{C-x n s}
 
-\key{archive subtree}{C-c \$}
-To set archive location for current file, add a line like$^2$:
-\vskip -1mm
-\beginexample%
-\#+ARCHIVE: archfile::* Archived Tasks
-\endexample
+\section{Archiving}
+
+\key{toggle ARCHIVE tag}{C-c C-x C-a}
+%\metax{mark fully done children}{C-u C-c C-x C-a}
+\key{force cycling of an ARCHIVEd tree}{C-TAB}
+\key{move subtree to archive file}{C-c C-x C-s}
+%\metax{move all fully done children}{C-u C-c C-x C-s}
+%To set archive location for current file, add a line like$^2$:
+%\vskip -1mm
+%\beginexample%
+%\#+ARCHIVE: archfile::* Archived Tasks
+%\endexample
 
 \section{Filtering and Sparse Trees}
 
@@ -325,51 +340,101 @@ To set archive location for current file, add a line like$^2$:
 \key{view TODO's in sparse tree}{C-c C-v}
 \key{global TODO list in agenda mode}{C-c t$^1$}
 \key{create sparse tree with all deadlines due}{C-c C-w}
-\key{time sorted view of current org file}{C-c C-r}
+\key{time sorted view of current org file}{C-c a L}
 %\key{agenda for the week}{C-c a$^1$}
 %\key{agenda for date at cursor}{C-c C-o}
 
-\section{Tags}
+\section{Tables}
 
-\key{set tags for current heading}{C-c C-c}
-\key{realign tags in all headings}{C-u C-c C-c}
-\key{create sparse tree with matching tags}{C-c \\}
-\key{globally (agenda) match tags at cursor}{C-c C-o}
+{\bf Creating a table}
 
-\section{TODO Items}
+%\metax{insert a new Org-mode table}{M-x org-table-create}
+\metax{just start typing, e.g.}{|Name|Phone|Age RET |- TAB}
+\key{convert region to table}{C-c |}
+\key{... separator at least 3 spaces}{C-3 C-c |}
 
-\key{rotate the state of the current item}{C-c C-t}
-\key{view TODO items in a sparse tree}{C-c C-v}
-\key{view 3rd TODO keyword's sparse tree}{C-3 C-c C-v}
+{\bf Commands available inside tables}
 
-\key{set the priority of the current item}{C-c , [ABC]}
-\key{remove priority cookie from current item}{C-c , SPC}
-\key{raise priority of current item}{S-UP$^3$}
-\key{lower priority of current item}{S-DOWN$^3$}
+The following commands work when the cursor is {\it inside a table}.
+Outside of tables, the same keys may have other functionality.
 
-\key{\kbd{\#+SEQ_TODO: TODO TRY BLUFF DONE}}{\rm todo workflow}
-\key{\kbd{\#+TYP_TODO: Phil home work DONE}}{\rm todo types}
+{\bf Re-aligning and field motion}
 
-\section{Timestamps}
+\key{re-align the table without moving the cursor}{C-c C-c}
+\key{re-align the table, move to next field}{TAB}
+\key{move to previous field}{S-TAB}
+\key{re-align the table, move to next row}{RET}
 
-\key{prompt for date and insert timestamp}{C-c .}
-\key{like \kbd{C-c} . but insert date and time format}{C-u C-c .}
-\key{Like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME
-\key{insert DEADLINE timestamp}{C-c C-d}
-\key{insert SCHEDULED timestamp}{C-c C-s}
-\key{create sparse tree with all deadlines due}{C-c C-w}
-\key{the time between 2 dates in a time range}{C-c C-y}
-\key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^3$}
-\key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^3$}
-\key{access the calendar for the current date}{C-c >}
-\key{insert timestamp matching date in calendar}{C-c <}
-\key{access agenda for current date}{C-c C-o}
-\key{Select date while prompted}{mouse-1/RET}
-%\key{... select date in calendar}{mouse-1/RET}
-%\key{... scroll calendar back/forward one month}{< / >}
-%\key{... forward/backward one day}{S-LEFT/RIGHT}
-%\key{... forward/backward one week}{S-UP/DOWN}
-%\key{... forward/backward one month}{M-S-LEFT/RIGT}
+{\bf Row and column editing}
+
+\key{move the current column left}{M-LEFT/RIGHT}
+\key{kill the current column}{M-S-LEFT}
+\key{insert new column to left of cursor position}{M-S-RIGHT}
+
+\key{move the current row up/down}{M-UP/DOWN}
+\key{kill the current row or horizontal line}{M-S-UP}
+\key{insert new row above the current row}{M-S-DOWN}
+\key{insert hline below (\kbd{C-u} : above) current row}{C-c -}
+\key{sort lines in region}{C-c \^{}}
+
+{\bf Regions}
+
+\key{cut rectangular region}{C-c C-x C-w}
+\key{copy rectangular region}{C-c C-x M-w}
+\key{paste rectangular region}{C-c C-x C-y}
+\key{fill paragraph across selected cells}{C-c C-q}
+
+{\bf Miscellaneous}
+
+\key{to limit column width to \kbd{N} characters, use}{...| <N> |...}
+\key{edit the current field in a separate window}{C-c `}
+\key{make current field fully visible}{C-u TAB}
+\metax{export as tab-separated file}{M-x org-table-export}
+\metax{import tab-separated file}{M-x org-table-import}
+\key{sum numbers in current column/rectangle}{C-c +}
+
+{\bf Tables created with the \kbd{table.el} package}
+
+\key{insert a new \kbd{table.el} table}{C-c ~}
+\key{recognize existing table.el table}{C-c C-c}
+\key{convert table (Org-mode $\leftrightarrow$ table.el)}{C-c ~}
+
+{\bf Spreadsheet}
+
+Formulas typed in field are executed by \kbd{TAB},
+\kbd{RET} and \kbd{C-c C-c}.  \kbd{=} introduces a column
+formula, \kbd{:=} a field formula.
+
+\key{Example: Add Col1 and Col2}{|=\$1+\$2      |}
+\key{... with printf format specification}{|=\$1+\$2;\%.2f|}
+\key{... with constants from constants.el}{|=\$1/\$c/\$cm |}
+\metax{sum from 2nd to 3rd hline}{|:=vsum(@II..@III)|}
+\key{apply current column formula}{| = |}
+
+\key{set and eval column formula}{C-c =}
+\key{set and eval field formula}{C-u C-c =}
+\key{re-apply all stored equations to current line}{C-c *}
+\key{re-apply all stored equations to entire table}{C-u C-c *}
+\key{iterate table to stability}{C-u C-u C-c *}
+\key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
+\key{show line, column, formula reference}{C-c ?}
+\key{toggle coordinate grid}{C-c \}}
+\key{toggle formula debugger}{C-c \{}
+
+\newcolumn
+{\it Formula Editor}
+
+\key{edit formulas in separate buffer}{C-c '}
+\key{exit and install new formulas}{C-c C-c}
+\key{exit, install, and apply new formulas}{C-u C-c C-c}
+\key{abort}{C-c C-q}
+\key{toggle reference style}{C-c C-r}
+\key{pretty-print Lisp formula}{TAB}
+\key{complete Lisp symbol}{M-TAB}
+\key{shift reference point}{S-cursor}
+\key{shift test line for column references}{M-up/down}
+\key{scroll the window showing the table}{M-S-up/down}
+\key{toggle table coordinate grid}{C-c \}}
 
 \section{Links}
 
@@ -378,11 +443,14 @@ To set archive location for current file, add a line like$^2$:
 \key{insert file link with file name completion}{C-u C-c C-l}
 \key{edit (also hidden part of) link at point}{C-c C-l}
 
-\key{open file links in emacs (\kbd{C-u} : in emacs)}{C-c C-o}
-\key{open link at point (3: in emacs)}{mouse-2/3}
-%\key{open file links in emacs}{mouse-3}
-%\key{record a position in mark ring}{C-c \%}
+\key{open file links in emacs}{C-c C-o}
+\key{...force open in emacs/other window}{C-u C-c C-o}
+\key{open link at point}{mouse-1/2}
+\key{...force open in emacs/other window}{mouse-3}
+\key{record a position in mark ring}{C-c \%}
 \key{jump back to last followed link(s)}{C-c \&}
+\key{Find next link}{C-c C-x C-n}
+\key{Find previous link}{C-c C-x C-p}
 
 {\bf Internal Links}
 
@@ -397,10 +465,10 @@ To set archive location for current file, add a line like$^2$:
 \key{\kbd{file:/home/dominik/img/mars.jpg}}{\rm file, absolute}
 \key{\kbd{file:papers/last.pdf}}{\rm file, relative}
 \key{\kbd{file:projects.org::*that text}}{\rm find headline}
-\key{\kbd{file:projects.org::find me}}{\rm find tgt/string}
+\key{\kbd{file:projects.org::find me}}{\rm find trgt/string}
 %\key{\kbd{file:projects.org::/regexp/}}{\rm regexp search}
 \key{\kbd{http://www.astro.uva.nl/~dominik}}{\rm on the web}
-\key{\kbd{mailto:adent@galaxy.net}}{\rm EMail address}
+\key{\kbd{mailto:adent@galaxy.net}}{\rm Email address}
 \key{\kbd{news:comp.emacs}}{\rm Usenet group}
 \key{\kbd{bbdb:Richard Stallman}}{\rm BBDB person}
 \key{\kbd{gnus:group}}{\rm GNUS group}
@@ -413,110 +481,136 @@ To set archive location for current file, add a line like$^2$:
 \metax{\kbd{[[external link][description]]}}{\rm optional link text}
 %\key{\kbd{vm://myself@some.where.org/folder\#id}}{\rm VM remote}
 
-\section{Tables}
 
-%Org-mode has its own built-in intuitive table editor with unique
-%capabilities.
+% \section{Remember-mode Integration}
 
-{\bf Creating a table}
+% See the manual for how to make remember.el use Org-mode links and
+% files.  The note-finishing command \kbd{C-c C-c} will first prompt for
+% an org file. In the file, find a location with:
 
-%\metax{insert a new Org-mode table}{M-x org-table-create}
-\metax{just start typing, e.g.}{|Name|Phone|Age RET |- TAB}
-\key{convert region to table}{C-c |}
-\key{... separator at least 3 spaces}{C-3 C-c |}
+% \key{rotate subtree visibility}{TAB}
+% \key{next heading}{DOWN}
+% \key{previous heading}{UP}
 
-{\bf Commands available inside tables}
+% Insert the note with one of the following: 
 
-The following commands work when the cursor is {\it inside a table}.
-Outside of tables, the same keys may have other functionality.
+% \key{as sublevel of heading at cursor}{RET}
+% \key{right here (cursor not on heading)}{RET}
+% \key{before current heading}{LEFT}
+% \key{after current heading}{RIGHT}
+% \key{shortcut to end of buffer (cursor at buf-start)}{RET}
+% \key{Abort}{q}
 
-{\bf Re-aligning and field motion}
+\section{Completion}
 
-\key{re-align the table without moving the cursor}{C-c C-c}
-\key{re-align the table, move to next field}{TAB}
-\key{move to previous field}{S-TAB}
-\key{re-align the table, move to next row}{RET}
+In-buffer completion completes TODO keywords at headline start, TeX
+macros after ``{\tt \\}'', option keywords after ``{\tt \#-}'', TAGS
+after  ``{\tt :}'', and dictionary words elsewhere.
 
-{\bf Row and column editing}
+\key{Complete word at point}{M-TAB}
 
-\key{move the current column left}{M-LEFT}
-\key{move the current column right}{M-RIGHT}
-\key{kill the current column}{M-S-LEFT}
-\key{insert new column to left of cursor position}{M-S-RIGHT}
 
-\key{move the current row up}{M-UP}
-\key{move the current row down}{M-DOWN}
-\key{kill the current row or horizontal line}{M-S-UP}
-\key{insert new row above the current row}{M-S-DOWN}
-\key{insert horizontal line below the current row}{C-c -}
-\key{insert horizontal line above the current row}{C-u C-c -}
-\key{sort lines in region}{C-c \^{}}
+\newcolumn
+\title{Org-Mode Reference Card (2/2)}
 
-{\bf Regions}
+\centerline{(for version \orgversionnumber)}
 
-\key{cut rectangular region}{C-c C-x C-w}
-\key{copy rectangular region}{C-c C-x M-w}
-\key{paste rectangular region}{C-c C-x C-y}
-\key{fill paragraph across selected cells}{C-c C-q}
+\section{TODO Items and Checkboxes}
 
-{\bf Calculations} (in combination with Emacs \kbd{calc} package)
+\key{rotate the state of the current item}{C-c C-t}
+\metax{select next/previous state}{S-LEFT/RIGHT}
+\metax{select next/previous set}{C-S-LEFT/RIGHT}
+\key{view TODO items in a sparse tree}{C-c C-v}
+\key{view 3rd TODO keyword's sparse tree}{C-3 C-c C-v}
 
-\key{set and eval column formula}{C-c =}
-\key{set and eval named-field formula}{C-u C-c =}
-\key{edit formulas in separate buffer}{C-c '}
-\key{re-apply all stored equations to current line}{C-c *}
-\key{re-apply all stored equations to entire table}{C-u C-c *}
+\key{set the priority of the current item}{C-c , [ABC]}
+\key{remove priority cookie from current item}{C-c , SPC}
+\key{raise/lower priority of current item}{S-UP/DOWN$^3$}
+%\key{lower priority of current item}{S-DOWN$^3$}
 
-%\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
-%in lines starting with: {\tt | \# |}.
+%\key{\kbd{\#+SEQ_TODO: TODO TRY BLUFF DONE}}{\rm todo workflow}
+%\key{\kbd{\#+TYP_TODO: Phil home work DONE}}{\rm todo types}
 
-\key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
+\key{insert new checkbox item in plain list}{M-S-RET}
+\key{toggle checkbox(es) in region/entry/at point}{C-c C-x C-b}
+\key{toggle checkbox at point}{C-c C-c}
+\metax{checkbox statistics cookies: insert {\tt [/]} or {\tt [\%]}}{}
+\key{update checkbox statistics (\kbd{C-u} : whole file)}{C-c \#}
 
-\key{display column number cursor is in}{C-c ?}
-\key{sum numbers in current column/rectangle}{C-c +}
-\key{copy down with increment}{S-RET$^3$}
+\section{Tags}
 
-Formulas typed in field are executed by \kbd{TAB},
-\kbd{RET} and \kbd{C-c C-c}.  \kbd{=} introduces a column
-formula, \kbd{:=} a named-field formula.
+\key{set tags for current heading}{C-c C-c}
+\key{realign tags in all headings}{C-u C-c C-c}
+\key{create sparse tree with matching tags}{C-c \\}
+\key{globally (agenda) match tags at cursor}{C-c C-o}
 
-\key{Example: Add Col1 and Col2}{=\$1+\$2}
-\key{... with printf format specification}{=\$1+\$2;\%.2f}
-\key{... with constants from constants.el}{=\$1/\$c/\$cm}
-\key{sum from 3rd hline above to here}{:=vsum(\&III)}
-\key{apply current column formula}{=}
+\section{Properties and Column View}
 
-{\bf Miscellaneous}
+\key{special commands in property lines}{C-c C-c}
+\key{next/previous allowed value}{S-left/right}
+\key{turn on column view}{C-c C-x C-c}
 
-\key{to limit column width to \kbd{N} characters, use}{...| <N> |...}
-\key{edit the current field in a separate window}{C-c `}
-\key{make current field fully visible}{C-u TAB}
-\metax{export as tab-separated file}{M-x org-table-export}
-\metax{import tab-separated file}{M-x org-table-import}
+\key{quit column view}{q}
+\key{next/previous allowed value}{S-left/right}
+\key{next/previous allowed value}{n / p}
+\key{edit value}{e}
+\key{edit allowed values list}{a}
+\key{show value}{v}
+\key{make column wider/narrower}{> / <}
+\key{move column left/right}{M-left/right}
+\key{add new column}{M-S-right}
+\key{Delete current column}{M-S-left}
 
-{\bf Tables created with the \kbd{table.el} package}
 
-\key{insert a new \kbd{table.el} table}{C-c ~}
-\key{recognize existing table.el table}{C-c C-c}
-\key{convert table (Org-mode $\leftrightarrow$ table.el)}{C-c ~}
+\section{Timestamps}
+
+\key{prompt for date and insert timestamp}{C-c .}
+\key{like \kbd{C-c} . but insert date and time format}{C-u C-c .}
+\key{Like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME
+\key{insert DEADLINE timestamp}{C-c C-d}
+\key{insert SCHEDULED timestamp}{C-c C-s}
+\key{create sparse tree with all deadlines due}{C-c C-w}
+\key{the time between 2 dates in a time range}{C-c C-y}
+\key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^3$}
+\key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^3$}
+\key{access the calendar for the current date}{C-c >}
+\key{insert timestamp matching date in calendar}{C-c <}
+\key{access agenda for current date}{C-c C-o}
+\key{Select date while prompted}{mouse-1/RET}
+%\key{... select date in calendar}{mouse-1/RET}
+%\key{... scroll calendar back/forward one month}{< / >}
+%\key{... forward/backward one day}{S-LEFT/RIGHT}
+%\key{... forward/backward one week}{S-UP/DOWN}
+%\key{... forward/backward one month}{M-S-LEFT/RIGT}
+\key{Toggle custom format display for dates/times}{C-c C-x C-t}
 
 \newcolumn
-\title{Org-Mode Reference Card (2/2)}
 
-\centerline{(for version \orgversionnumber)}
+{\bf Clocking time}
+
+\key{start clock on current item}{C-c C-x C-i}
+\key{stop clock on current item}{C-c C-x C-o}
+\key{cancel current clock}{C-c C-x C-x}
+\key{display total subtree times}{C-c C-x C-d}
+\key{remove displayed times}{C-c C-c}
+\key{insert/update table with clock report}{C-c C-x C-r}
 
 \section{Agenda Views}
 
 \key{add/move current file to front of agenda}{C-c [}
 \key{remove current file from your agenda}{C-c ]}
-\key{cycle through agenda file list}{C-,}
+\key{cycle through agenda file list}{C-'}
 
 \key{compile agenda for the current week}{C-c a a$^1$}
 \key{compile global TODO list}{C-c a t$^1$}
 \key{compile TODO list for specific keyword}{C-c a T$^1$}
 \key{match tags in agenda files}{C-c a m$^1$}
+\key{match tags in TODO entries}{C-c a M$^1$}
+\key{find stuck projects}{C-c a \#$^1$}
+\key{show timeline of current org file}{C-c a L$^1$}
+\key{configure custom commands}{C-c a C$^1$}
+\key{configure stuck projects}{C-c a !$^1$}
 \key{agenda for date at cursor}{C-c C-o}
-\key{show timeline of current org file}{C-c C-r}
 
 \vskip 1mm
 To set categories, add lines like$^2$:
@@ -529,22 +623,24 @@ To set categories, add lines like$^2$:
 
 {\bf View Org file}
 
-\key{show original location of item}{SPC}
-\key{... also available with}{mouse-3}
+\key{show original location of item}{SPC/mouse-3}
+%\key{... also available with}{mouse-3}
 \key{show and recenter window}{L}
-\key{goto original location in other window}{TAB}
-\key{... also available with}{mouse-2}
+\key{goto original location in other window}{TAB/mouse-2}
+%\key{... also available with}{mouse-2}
 \key{goto original location, delete other windows}{RET}
+\key{show subtree in indirect buffer, ded.\ frame}{b}
 \key{toggle follow-mode}{f}
 
 {\bf Change display}
 
 \key{delete other windows}{o}
-\key{switch to daily / weekly view}{d / w}
+\key{switch to day/week/month/year view}{d w m y}
 \key{toggle inclusion of diary entries}{D}
 \key{toggle time grid for daily schedule}{g}
 \key{toggle display of logbook entries}{l}
 \key{refresh agenda buffer with any changes}{r}
+\key{save all org-mode buffers}{s}
 \key{display the following \kbd{org-agenda-ndays}}{RIGHT}
 \key{display the previous \kbd{org-agenda-ndays}}{LEFT}
 \key{goto today}{.}
@@ -553,8 +649,11 @@ 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}
 \key{set priority of current item}{p}
 \key{raise/lower priority of current item}{S-UP/DOWN$^3$}
 \key{display weighted priority of current item}{P}
@@ -563,6 +662,15 @@ To set categories, add lines like$^2$:
 \key{change timestamp to today}{>}
 \key{insert new entry into diary}{i}
 
+\newcolumn
+\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}
 
 \key{find agenda cursor date in calendar}{c}
@@ -577,61 +685,67 @@ To set categories, add lines like$^2$:
 \key{quit agenda, remove agenda buffer}{q}
 \key{exit agenda, remove all agenda buffers}{x}
 
-\section{Exporting}
+\section{Calendar and Diary Integration}
 
-Exporting creates files with extensions {\it .txt\/} and {\it .html\/}
-in the current directory.
+Include Emacs diary entries into Org-mode agenda with:
+\beginexample%
+(setq org-agenda-include-diary t)
+\endexample
 
-\key{export as ASCII file}{C-c C-x a}
-\key{export visible text only (e.g. for printing)}{C-c C-x v}
-\key{export as HTML file}{C-c C-x h}
-\key{export as HTML and open in browser}{C-c C-x b}
-\key{prefix arg sets nb. of headline levels, e.g.}{C-3 C-c C-x h}
+\section{LaTeX and cdlatex-mode}
 
-\key{export as iCalendar file}{C-c C-x i}
-\key{export all agenda files as iCalendar files}{C-c C-x C-i}
-\key{combine all agenda files to single iCal file}{C-c C-x C-c}
+\key{preview LaTeX fragment}{C-c C-x C-l}
+\key{Expand abbreviation (cdlatex-mode)}{TAB}
+\key{Insert/modify math symbol (cdlatex-mode)}{` / '}
 
-\key{insert template of export options}{C-c C-x t}
+\section{Exporting and Publishing}
+
+Exporting creates files with extensions {\it .txt\/} and {\it .html\/}
+in the current directory.  Publishing puts the resulting file into
+some other place.
 
+\key{export/publish dispatcher}{C-c C-e}
+
+\key{export visible part only}{C-c C-e v}
+\key{insert template of export options}{C-c C-x t}
 \key{toggle fixed width for entry or region}{C-c :}
 
-{\bf HTML formatting}
-
-\key{make words {\bf bold}}{*bold*}
-\key{make words {\it italic}}{/italic/}
-\key{make words \underbar{underlined}}{_underlined_}
-\key{sub- and superscripts}{x\^{}3, J_dust}
-\key{\TeX{}-like macros}{\\alpha, \\to}
-\key{typeset lines in fixed width font}{start with :}
-\key{tables are exported as HTML tables}{start with |}
-\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{set number of headline levels for export}{H:2}
-\key{turn on/off section numbers}{num:t}
-\key{turn on/off table of contents}{toc:t}
-\key{turn on/off linebreak preservation}{\\n:nil}
-\key{turn on/off quoted html tags}{@:t}
-\key{turn on/off fixed width sections}{::t}
-\key{turn on/off tables}{|:t}
-\key{turn on/off \TeX\ syntax for sub/super-scripts}{\^{}:t}
-\key{turn on/off emphasised text}{*:nil}
-\key{turn on/off \TeX\ macros}{TeX:t}
+%{\bf HTML formatting}
+
+%\key{make words {\bf bold}}{*bold*}
+%\key{make words {\it italic}}{/italic/}
+%\key{make words \underbar{underlined}}{_underlined_}
+%\key{sub- and superscripts}{x\^{}3, J_dust}
+%\key{\TeX{}-like macros}{\\alpha, \\to}
+%\key{typeset lines in fixed width font}{start with :}
+%\key{tables are exported as HTML tables}{start with |}
+%\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}{\#+OPTIONS:}
+
+%\key{set number of headline levels for export}{H:2}
+%\key{turn on/off section numbers}{num:t}
+%\key{turn on/off table of contents}{toc:t}
+%\key{turn on/off linebreak preservation}{\\n:nil}
+%\key{turn on/off quoted html tags}{@:t}
+%\key{turn on/off fixed width sections}{::t}
+%\key{turn on/off tables}{|:t}
+%\key{turn on/off \TeX\ syntax for sub/super-scripts}{\^{}:t}
+%\key{turn on/off emphasised text}{*:nil}
+%\key{turn on/off \TeX\ macros}{TeX:t}
 
 {\bf Comments: Text not being exported}
 
@@ -642,60 +756,10 @@ Subtrees whose header starts with COMMENT are never exported.
 
 \key{toggle COMMENT keyword on entry}{C-c ;}
 
+\section{Dynamic Blocks}
 
-\section{Publishing (requires org-publish.el)}
-\key{publishcurrent file}{C-c C-e C-f}
-\key{publish current project}{C-c C-e C-p}
-\key{publish project (prompted for)}{C-c C-e C-c}
-\key{publish all projects}{C-c C-e C-a}
-
-\section{Completion}
-
-In-buffer completion completes TODO keywords at headline start, TeX
-macros after ``{\tt \\}'', option keywords after ``{\tt \#-}'', TAGS
-after  ``{\tt :}'', and dictionary words elsewhere.
-
-\key{Complete word at point}{M-TAB}
-
-\section{Calendar and Diary Integration}
-
-To include entries from the Emacs diary in your Org-mode agenda:
-\beginexample%
-(setq org-agenda-include-diary t)
-\endexample
-
-\section{Remember-mode Integration}
-
-See the manual for how to make remember.el use Org-mode links and
-files.  The note-finishing command \kbd{C-c C-c} will first prompt for
-an org file. In the file, find a location with:
-
-\key{rotate subtree visibility}{TAB}
-\key{next heading}{DOWN}
-\key{previous heading}{UP}
-
-Insert the note with one of the following: 
-
-\key{as sublevel of heading at cursor}{RET}
-\key{right here (cursor not on heading)}{RET}
-\key{before current heading}{LEFT}
-\key{after current heading}{RIGHT}
-\key{shortcut to end of buffer (cursor at buf-start)}{RET}
-\key{Abort}{q}
-
-\section{CUA and pc-select compatibility}
-
-Configure the variable {\tt org-CUA-compatibility} to make Org-mode
-avoid the \kbd{S-<cursor>} bindings used by these modes.  When set,
-Org-mode will change the following keybindings (also in the agenda
-buffer, but not during date selection). See note mark four$^3$
-throughout the reference card.
-%\vskip-mm
-\beginexample
-S-UP    $\to$ M-p             S-DOWN  $\to$ M-n
-S-LEFT  $\to$ M--             S-RIGHT $\to$ M-+
-S-RET   $\to$ C-S-RET
-\endexample
+\key{update dynamic block at point}{C-c C-x C-u}
+\metax{update all dynamic blocks}{C-u C-c C-x C-u}
 
 \section{Notes}
 $^1$ This is only a suggestion for a binding of this command.  Choose
@@ -710,10 +774,8 @@ $^3$ Keybinding affected by {\tt org-CUA-compatibility}.
 
 \bye
 
+% Local variables:
+% compile-command: "tex refcard"
+% End:
 
 % arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: t
-%%% End: