Mercurial > emacs

changeset 83559:edf631bdbb7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-650 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-651 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-652 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-653 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-654 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-655 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-656 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-657 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-658 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-659 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-203 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-204 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-205 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-599
author Karoly Lorentey <karoly@lorentey.hu>
date Sun, 22 Apr 2007 11:42:03 +0000
parents 8e46638e99c7 (current diff) 6f86cadf3faa (diff)
children 738ce3540ffb
files ChangeLog admin/FOR-RELEASE configure configure.in etc/orgcard.ps etc/orgcard.tex lib-src/etags.c lisp/ChangeLog lisp/allout.el lisp/emulation/cua-base.el lisp/files.el lisp/isearch.el lisp/ldefs-boot.el lisp/progmodes/gdb-ui.el lisp/startup.el lisp/version.el lispref/ChangeLog lispref/elisp.texi lwlib/xlwmenu.c man/ChangeLog man/emacs.texi oldXMenu/Activate.c oldXMenu/AddPane.c oldXMenu/AddSel.c oldXMenu/ChgPane.c oldXMenu/ChgSel.c oldXMenu/Create.c oldXMenu/DelPane.c oldXMenu/DelSel.c oldXMenu/Destroy.c oldXMenu/Error.c oldXMenu/EvHand.c oldXMenu/FindPane.c oldXMenu/Imakefile oldXMenu/InsPane.c oldXMenu/InsSel.c oldXMenu/Internal.c oldXMenu/Locate.c oldXMenu/Post.c oldXMenu/Recomp.c oldXMenu/SetAEQ.c oldXMenu/SetFrz.c oldXMenu/SetPane.c oldXMenu/SetSel.c oldXMenu/X10.h oldXMenu/XMenu.h oldXMenu/XMenuInt.h src/.gdbinit src/keymap.c src/process.c
diffstat 135 files changed, 16801 insertions(+), 10272 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Sat Feb 24 20:29:24 2007 +0000
+++ b/AUTHORS	Sun Apr 22 11:42:03 2007 +0000
@@ -127,7 +127,7 @@
   process.c and 449 other files
 
 Andreas Seltenreich: changed nnweb.el gnus.texi nnslashdot.el mm-uu.el
-  battery.el easy-mmode.el gmm-utils.el gnus-art.el gnus-ml.el
+  battery.el comint.el easy-mmode.el gmm-utils.el gnus-art.el gnus-ml.el
   gnus-srvr.el gnus-start.el gnus-sum.el gnus-util.el gnus.el mm-url.el
   url-cookie.el url-http.el xterm.c
 
@@ -335,7 +335,7 @@
   display.texi longlines.el text.texi custom.texi files.texi
   image-mode.el info.el keyboard.c compile.el frames.texi mouse.el
   startup.el wid-edit.el xdisp.c xterm.c cus-theme.el misc.texi
-  and 224 other files
+  and 225 other files
 
 Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c
   hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el
@@ -343,7 +343,8 @@
   indent.c info.el man.el and 17 other files
 
 Chris Moore: changed dired.el hexl.el replace.el Makefile.in gnus-sum.el
-  isearch.el jka-cmpr-hook.el tutorial.el wdired.el
+  isearch.el jka-cmpr-hook.el pgg-gpg.el pgg-pgp.el pgg-pgp5.el
+  tutorial.el wdired.el
 
 Chris Prince: changed w32term.c
 
@@ -414,7 +415,7 @@
 and changed term.el xterm.el hideshow.el isearch.el icon.el lisp.h
   cus-edit.el faces.el font-lock.el sh-script.el eterm-color.ti grep.el
   ibuffer.el rxvt.el vhdl-mode.el xterm.c bindings.el compile.el
-  dabbrev.el imenu.el outline.el and 161 other files
+  dabbrev.el imenu.el outline.el and 164 other files
 
 Daniel Brockman: changed cus-start.el format-spec.el ibuffer.el rcirc.el
 
@@ -544,8 +545,9 @@
   no-handle.xpm open.png open.xpm and 20 other files
 
 David Reitter: wrote mailclient.el
-and changed commands.h easy-mmode.el emacsbug.el emacsclient.c keymap.c
-  macterm.c menu-bar.el minibuf.c sendmail.el url-http.el
+and changed commands.h cus-edit.el easy-mmode.el emacsbug.el
+  emacsclient.c keymap.c macterm.c menu-bar.el minibuf.c sendmail.el
+  url-http.el
 
 David Robinson: changed menu-bar.el x-win.el
 
@@ -643,7 +645,7 @@
 and changed msdos.c Makefile.in makefile.w32-in files.el info.el fileio.c
   startup.el mainmake.v2 config.bat menu-bar.el pc-win.el msdos.h
   rmail.el simple.el internal.el xfaces.c frame.c dosfns.c emacs.c
-  faces.el frame.el and 525 other files
+  faces.el frame.el and 526 other files
 
 Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el
   sh-script.el text.texi
@@ -738,9 +740,9 @@
 
 Francesco Potort,Al(B: wrote cmacexp.el
 and changed etags.c man.el delta.h undigest.el etags.1 comint.el
-  configure.in uniquify.el latin-post.el rmail.el etags.el latin-alt.el
-  maintaining.texi sgml-mode.el Makefile.in data.c european.el filelock.c
-  files.el generic-x.el gud.el and 42 other files
+  configure.in uniquify.el latin-post.el rmail.el Makefile.in etags.el
+  latin-alt.el maintaining.texi sgml-mode.el data.c european.el
+  filelock.c files.el generic-x.el gud.el and 42 other files
 
 Francis J. Wright: wrote woman.el
 and changed dired.el comint.el files.el
@@ -847,10 +849,10 @@
 Giuseppe Scrivano: changed buffer.c configure.in sysdep.c xsmfns.c
 
 Glenn Morris: changed f90.el calendar.el diary-lib.el fortran.el
-  calendar.texi appt.el sh-script.el timeclock.el cal-menu.el Makefile.in
+  calendar.texi appt.el sh-script.el timeclock.el Makefile.in cal-menu.el
   abbrevs.texi cal-hebrew.el cal-islam.el files.el holidays.el
   orgcard.tex programs.texi scroll-all.el startup.el TUTORIAL.eo
-  cal-coptic.el and 93 other files
+  cal-coptic.el and 103 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1173,7 +1175,7 @@
   erc-nickserv.el erc-ring.el erc-speak.el erc-track.el simple.el
   align.el calendar.el cl.texi custom.el dired-aux.el display.texi
   erc-bbdb.el erc-button.el erc-compat.el erc-dcc.el erc-list.el
-  erc-log.el and 11 other files
+  erc-log.el and 12 other files
 
 Johan Vromans: wrote forms-d2.el forms.el iso-acc.el
 and changed complete.el
@@ -1199,10 +1201,10 @@
 John Mongan: changed f90.el
 
 John Paul Wallington: changed ibuffer.el ibuf-ext.el subr.el files.el
-  help-fns.el thumbs.el fns.c rmail.el bindings.el bytecomp.el
+  help-fns.el rmail.el thumbs.el fns.c bindings.el bytecomp.el
   cus-theme.el info.el re-builder.el simple.el startup.el xfns.c
   apropos.el arc-mode.el browse-url.el comint.el cus-start.el
-  and 115 other files
+  and 117 other files
 
 John Robinson: wrote bg-mouse.el
 
@@ -1446,7 +1448,7 @@
 and changed xdisp.c dispextern.h simple.el window.c process.c keyboard.c
   xterm.c w32term.c dispnew.c subr.el lisp.h fringe.c macterm.c
   display.texi fns.c alloc.c xfaces.c keymap.c xfns.c xterm.h .gdbinit
-  and 248 other files
+  and 250 other files
 
 Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el
   gnus-win.el gnus-xmas.el gnus.texi message.el nndraft.el nnml.el
@@ -1538,8 +1540,8 @@
 Leigh Stoller: changed emacsclient.c emacsserver.c server.el
 
 Lennart Borgman: changed tutorial.el window.el ada-xref.el emacsclient.c
-  filesets.el flymake.el help-fns.el mouse.el recentf.el shell.el
-  texinfmt.el w32term.c w32term.h
+  filesets.el flymake.el help-fns.el isearch.el mouse.el recentf.el
+  replace.el shell.el texinfmt.el w32term.c w32term.h
 
 Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c
 
@@ -1560,14 +1562,14 @@
   delsel.el disass.el faces.el font-lock.el lmenu.el lselect.el
   mailabbrev.el select.el xfaces.c xselect.c
 
+$,1 a(Bukasz Demianiuk: changed erc.el
+
 Lute Kamstra: changed modes.texi generic.el debug.el generic-x.el
   font-lock.el subr.el Makefile.in debugging.texi easy-mmode.el
   elisp.texi hl-line.el simple.el battery.el bindings.el calc.el
   cmdargs.texi edebug.texi emacs.texi info.el make-tarball.txt
   octave-inf.el and 216 other files
 
-$,1 a(Bukasz Demianiuk: changed erc.el
-
 Lynn Slater: wrote help-macro.el
 
 L,Bu(Brentey K,Ba(Broly: changed spam.el gnus-sum.el
@@ -1923,7 +1925,7 @@
 
 Nick Roberts: wrote gdb-ui.el
 and changed gud.el building.texi tooltip.el speedbar.el bindings.el
-  thumbs.el DEBUG cc-mode.el .gdbinit frames.texi subr.el xt-mouse.el
+  thumbs.el .gdbinit DEBUG cc-mode.el frames.texi subr.el xt-mouse.el
   comint.el display.texi help-mode.el descr-text.el dired.el
   gud-display.pbm speedbar.texi t-mouse.el tumme.el and 114 other files
 
@@ -2259,7 +2261,7 @@
   comint.el compile.el message.el puresize.h replace.el subr.el
   files.texi gnus-fun.el gnus.texi help-fns.el make-dist rcirc.el
   antlr-mode.el bookmark.el buffer.c diary-lib.el dired.el
-  and 129 other files
+  and 130 other files
 
 Roman Belenov: changed which-func.el
 
@@ -2401,7 +2403,7 @@
 and changed vc.el font-lock.el pcvs.el newcomment.el subr.el lisp.h
   keyboard.c keymap.c tex-mode.el fill.el alloc.c compile.el files.el
   regex.c easy-mmode.el simple.el info.el syntax.c vc-hooks.el xdisp.c
-  sh-script.el and 514 other files
+  sh-script.el and 515 other files
 
 Steinar Bang: changed imap.el
 
@@ -2464,8 +2466,8 @@
 
 Stuart D. Herring: changed minibuf.c widget.texi
 
-Stuart Herring: changed isearch.el align.el allout.el comint.el edebug.el
-  files.el
+Stuart Herring: changed files.el isearch.el align.el allout.el comint.el
+  edebug.el find-lisp.el
 
 Sudish Joseph: changed mac-win.el
 
@@ -2522,9 +2524,9 @@
 
 Thien-Thi Nguyen: wrote hideshow.el make-mms-derivative.el
 and changed ewoc.el info.el processes.texi zone.el Makefile.in vc.el
-  fileio.c lisp-mode.el scheme.el text.texi bindat.el dcl-mode.el
-  display.texi files.el pcvs.el sysdep.c MORE.STUFF TUTORIAL.it
-  TUTORIAL.ja diary-lib.el diff-mode.el and 124 other files
+  fileio.c lisp-mode.el scheme.el text.texi TUTORIAL.it bindat.el
+  dcl-mode.el display.texi files.el pcvs.el sysdep.c MORE.STUFF
+  TUTORIAL.ja diary-lib.el diff-mode.el and 125 other files
 
 Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
 
@@ -2647,7 +2649,7 @@
   printing.el ps-mule.el
 and changed ps-print.el ps-prin1.ps ps-bdf.el ps-prin0.ps ps-prin3.ps
   ps-prin2.ps lpr.el ps-print.ps subr.el TUTORIAL.pt_BR easymenu.el
-  ps-print-def.el ps-print0.ps ps-vars.el
+  loading.texi ps-print-def.el ps-print0.ps ps-vars.el
 
 Vivek Dasmohapatra: changed emacs.c sh-script.el xterm.c xterm.h
 
--- a/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,7 +1,18 @@
+2007-02-27  Glenn Morris  <rgm@gnu.org>
+
+	* make-dist (oldXMenu): Remove Imakefile.
+	(etc/images): Add README.
+
+2007-02-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* configure.in (xtensa-*-linux-gnu*): New configuration.
+
+	* configure: Regenerate.
+
 2007-02-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* config.guess, config.sub: Updated from master source.
-	
+
 2007-01-31  Sascha Wilde  <wilde@sha-bang.de>  (tiny change)
 
 	* configure.in (PKG_CHECK_MODULES): Change ///* to / in cflags and libs.
--- a/admin/FOR-RELEASE	Sat Feb 24 20:29:24 2007 +0000
+++ b/admin/FOR-RELEASE	Sun Apr 22 11:42:03 2007 +0000
@@ -1,20 +1,25 @@
 Tasks needed before the next release.
 
-* COPYRIGHTS
-  See the outstanding issues at the end of admin/notes/copyright.
-
 * TO BE DONE SHORTLY BEFORE RELEASE
 
 ** Check for widow and orphan lines in manuals;
 make sure all the pages really look ok in the manual as formatted.
 
 ** Check for text in manuals that assumes current version is 21.
-
-** Update AUTHORS.
+eshell.texi 'Known Problems' (does section need updating?)
+cc-mode.texi 'Performance Issues': "21.3 as of this writing"
 
 ** Cleanup temporary +++/--- lines in etc/NEWS.
 
 ** Regenerate the postscript files of the reference cards in etc.
+As of 2007/2/26, only ps files older than the associated tex files are:
+  cs-dired-ref.ps sk-dired-ref.ps
+
+May need update for Emacs-22:
+dired-ref.tex cs-dired-ref.tex fr-drdref.tex sk-dired-ref.tex
+
+Fix overfull lines p3 fr-refcard.ps.
+
 
 ** Ask maintainers of refcard translations to update them.
 
@@ -53,18 +58,14 @@
 * BUGS
 
 ** Fix up copyright confusions.
-  See admin/notes/copyright.
+  See end of admin/notes/copyright.
 
 ** simon.marshall@misys.com, Jan 12:
-  Font-lock decides function call is function declaration in C+ +
-
-** Fix needed for communication with gpg-agent
+  Font-lock decides function call is function declaration in C++
 
 ** md5i@cs.cmu.edu, Feb 20: move-end-of-line in comint buffers
 
-** 2007-02-23 change to process.c is broken (2 reports so far).
-
-
+** daniel@bigwalter.net, Feb 25: Echoing of keys and process I/O
 
 * DOCUMENTATION
 
--- a/admin/notes/copyright	Sat Feb 24 20:29:24 2007 +0000
+++ b/admin/notes/copyright	Sun Apr 22 11:42:03 2007 +0000
@@ -27,6 +27,9 @@
 3. If you add a lot of text to a previously trivial file that had no
 legal notices, consider if you should add a copyright statement.
 
+4. Please don't just add an FSF copyright without checking that is the
+right thing to do.
+
 
 Every non-trivial file distributed through the Emacs CVS should be
 self-explanatory in terms of copyright and license. This includes
@@ -49,6 +52,9 @@
 consider whether your changes have made the file worthy of a copyright
 notice, and if so, please add one.
 
+It can be helpful to put a reminder comment at the start of a trivial
+file, eg: "add a license notice if this grows to > 10 lines of code".
+
 The years in the copyright notice should be updated every year (see
 file "years" in this directory). The PS versions of refcards etc
 should display copyright notices (an exception to the rule about
@@ -133,6 +139,12 @@
 etc/emacs.csh
   - keep simple license for this simple file
 
+etc/future-bug
+ - doesn't need a humourless disclaimer, because Karl Fogel says we
+ can consider it part of Emacs, and he has a blanker disclaimer for
+ Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug",
+ 2007028)
+
 etc/letter.pbm,letter.xpm
   - trivial, no notice needed.
 <http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html>
@@ -158,14 +170,37 @@
 leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns,
 pinyin.map, ziranma.cin
   - leave the copyright alone.
+Note that pinyin.map, ziranma.cin (and hence the generated
+leim/quail/PY.el, ZIRANMA.el) are under GPLv1 or later.
 
 leim/SKK-DIC/SKK-JISYO.L
 ja-dic/ja-dic.el
   (the latter is auto-generated from the former). Leave the copyright alone.
 
 lib-src/etags.c
-  - this has a copyright Ken Arnold. We are still deciding what should
-  be done here (see below).
+  Copyright information is duplicated in etc/ETAGS.README. Update that
+  file too.
+
+  Until 2007 etags.c was described as being copyright FSF and Ken Arnold.
+  After some investigation in Feb 2007, then to the best of our
+  knowledge we believe that the original 1984 Emacs version was based
+  on the version in BSD4.2. See for example this 1985 post from Ken Arnold:
+  <http://groups.google.com/group/mod.sources/browse_thread/thread/ffe5c55845a640a9>
+    I have received enough requests for the current source to ctags
+    to post it. Here is the latest version (what will go out with
+    4.3, modulo any bugs fixed during the beta period). It is the
+    4.2 ctags with recognition of yacc and lex tags added.
+
+  See also a 1984 version of ctags (no copyright) posted to net.sources:
+  <http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d>
+  Version of etags.c in emacs-16.56 duplicates comment typos.
+
+  Accordingly, in Feb 2007 we added a 1984 copyright for the
+  University of California and a revised BSD license. The terms of
+  this require that the full license details be available in binary
+  distributions - hence the file etc/ETAGS.README. The fact that the
+  --version output just says "Copyright <year> FSF" is apparently OK
+  from a legal point of view.
 
 lib-src/getopt1.c, getopt_int.h
   - these are from the GNU C library. Leave the copyrights alone.
@@ -184,14 +219,129 @@
 lisp/net/tramp.el
   - there are also copyrights in the body of the file. Update these too.
 
+
 lwlib/
 rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider
 it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib."
 
-msdos/is_exec.c, sigaction.c
-  - these files are copyright DJ Delorie. Leave the copyrights alone.
-  Leave the Eli Zaretskii copyright in is_exec.c alone. See the
-  msdos/README file for the legal history of these files.
+NB don't change the GPL version used for lwlib .c and .h files (see
+below).
+
+FSF copyrights should only appear in files which have undergone
+non-trivial cumulative changes from the original versions in the Lucid
+Widget Library. NB this means that if you make non-trivial changes to
+a file with no FSF copyright, you should add one. Also, if changes are
+reverted to the extent that a file becomes basically the same as the
+original version, the FSF copyright should be removed.
+
+In my (rgm) opinion, as of Feb 2007, all the non-trivial files differ
+significantly from the original versions, with the exception of
+lwlib-Xm.h. Most of the changes that were made to this file have
+subsequently been reverted. Therefore I removed the FSF copyright from
+this file (which is arguably too trivial to merit a notice anyway). I
+added FSF copyright to the following files which did not have them
+already: Makefile.in, lwlib-Xaw.c, lwlib-int.h (borderline),
+lwlib-utils.c (borderline), lwlib.c, lwlib.h.
+
+Copyright years before the advent of public CVS in 2001 were those
+when I judged (from the CVS logs) that non-trivial amounts of change
+had taken place. I also adjusted the existing FSF years in xlwmenu.c,
+xlwmenu.h, and xlwmenuP.h on the same basis.
+
+Note that until Feb 2007, the following files in lwlib were lacking
+notices: lwlib-int.h, lwlib.h, lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h
+
+The following files did not list a Lucid copyright: xlwmenu.h,
+xlwmenuP.h.
+
+To the best of our knowledge, all the code files in lwlib were
+originally part of the Lucid Widget Library, even if they did not say
+so explicitly. For example, they were all present in Lucid Emacs 19.1
+in 1992. The exceptions are the two Xaw files, which did not appear
+till Lucid Emacs 19.9 in 1994. The file lwlib-Xaw.h is too trivial to
+merit a copyright notice, but would presumably have the same one as
+lwlib-Xaw.c. We have been unable to find a true standalone version of
+LWL, if there was such a thing, to check definitively.
+
+To clarify the situation, in Feb 2007 we added Lucid copyrights and
+GPL notices to those files lacking either that were non-trivial,
+namely: lwlib-int.h, lwlib.h, xlwmenu.h, xlwmenuP.h. This represents
+our best understanding of the legal status of these files. We also
+clarified the notices in Makefile.in, which was originally the
+Makefile auto-generated from Lucid's Imakefile.
+
+As of Feb 2007, the following files are considered too trivial for
+notices: lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h.
+
+The version of lwlib/ first installed in Emacs seems to be the same as
+that used in Lucid Emacs 19.8 (released 6-sep-93); except the two Xaw
+files, which did not appear till Athena support was added in Lucid
+Emacs 19.9. In Lucid Emacs 19.1, all files were under GPLv1 or later,
+but by Lucid Emacs 19.8, lwlib.c and xlwmenu.c had been switched to v2
+or later. These are the versions that were first installed in Emacs.
+So in GNU Emacs, these two files have been under v2 or later since
+1994.
+
+It seems that it was the intention of Lucid to use v1 or later
+(excepting the two files mentioned previously); so this is the license
+we have used when adding notices to code that did not have notices
+originally. Although we have the legal right to switch to v2 or later,
+rms prefers that we do not do so.
+
+
+msdos/is_exec.c, sigaction.c - these files are copyright DJ Delorie.
+Leave the copyrights alone. Leave the Eli Zaretskii copyright in
+is_exec.c alone. See the msdos/README file for the legal history of
+these files.
+
+
+oldXMenu/
+  Keep the "copyright.h" method used by X11, rather than moving the
+  licenses into the files. Note that the original X10.h did not use
+  copyright.h, but had an explicit notice, which we retain.
+
+If you make non-trivial changes to a file which does not have an FSF
+notice, add one and a GPL notice (as per Activate.c). If changes to a
+file are reverted such that it becomes essentially the same as the
+original X11 version, remove the FSF notice and GPL.
+
+Only the files which differ significantly from the original X11
+versions should have FSF copyright and GPL notices. At time of writing
+(Feb 2007), this is: Activate.c, Create.c, Internal.c. I (rgm)
+established this by diff'ing the current files against those in X11R1,
+and when I found significant differences looking in the ChangeLog for
+the years they originated (the CVS logs are truncated before 1999). I
+therefore removed the FSF notices (added in 200x) from the other
+files. There are some borderline cases IMO: AddSel.c, InsSel.c,
+XMakeAssoc.c, XMenu.h. For these I erred on the side of NOT adding FSF
+notices.
+
+With regards to whether the files we have changed should have GPL
+added or not, rms says (2007-02-25, "oldXmenu issues"):
+
+    It does not make much difference, because oldXmenu is obsolete
+    except for use in Emacs (and it is not normally used in Emacs any
+    more either).
+
+    So, to make things simple, please put our changes under the GPL.
+
+insque.c had no copyright notice until 2005. The version of insque.c
+added to Emacs 1992-01-27 is essentially the same as insremque.c added
+to glic three days later by Roland McGrath, with an FSF copyright and
+GPL, but no ChangeLog entry:
+<http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/libc/misc/insremque.c?\
+rev=1.1&cvsroot=glibc>
+To the best of his recollection, McGrath (who has a copyright
+assignment) was the author of this file (email from roland at frob.com
+to rms, 2007-02-23, "Where did insque.c come from?"). The FSF
+copyright and GPL in this file are therefore correct as far as we
+understand it.
+
+Imakefile had no legal info in Feb 2007, but was obviously based on
+the X11 version (which also had no explicit legal info). As it was
+unused, I removed it. It would have the same MIT copyright as
+Makefile.in does now.
+
 
 src/gmalloc.c
   - contains numerous copyrights from the GNU C library. Leave them alone.
@@ -328,6 +478,9 @@
     Emacs 22 is released (though if they can be fixed before, that is
     obviously good):
 
+Maybe some relevant comments here?
+<http://groups.google.com/group/linux.debian.legal/browse_thread/thread/123547ea95437a1f>
+
 
 Is it OK to just `cvs remove' a file for legal reasons, or is
 something more drastic needed? A removed file is still available from
@@ -356,30 +509,6 @@
   contact image authors in regards to future switch to v3.
 
 
-REMOVED src/unexhp9k800.c
-  - we would like to re-add this file if possible. Please let us know
-  if you can clarify its legal status.
-  http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
-
-
-*** These are copyright issues still to be addressed:
-
-NB apart from switching the TUTORIALs to GPL, I think there is nothing
-here that anyone can work on without further input from rms.
-
-
-Maybe some relevant comments here?
-<http://groups.google.com/group/linux.debian.legal/browse_thread/thread/123547ea95437a1f>
-
-
-etc/gnus-logo.eps, gnus-booklet.ps, gnus-refcard.ps
- just to be safe, papers are on the way for the "Gnus logo", even
- though it is very similar to the already-assigned "Emacs logo".
-
-
-etc/ms-kermit - no copyright, but ms-7bkermit has one
-
-
 etc/TUTORIAL* (translations)
   switch to GPL (see english TUTORIAL)
   rms: "We can leave the TUTORIAL translations alone until their
@@ -390,69 +519,18 @@
   previous version.
 Done: TUTORIAL.eo
 
-[waiting for legal advice]
-lib-src/etags.c
- - was it ok to use Ken Arnold's code as a basis?
-   1984 version of ctags, with no copyright, posted to net.sources:
-   http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d)
-   version of etags.c in emacs-16.56 seems to be derived from this
-   (duplicate typos in comments).
+
+REMOVED src/unexhp9k800.c
+  - we would like to re-add this file if possible. Please let us know
+  if you can clarify its legal status.
+  http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
 
 
-[waiting for legal advice on lwlib/*]
-lwlib/lwlib-Xaw.c
-  copyright Chuck Thompson; but under GPL, so OK?
-
-lwlib/lwlib-Xlw.c, lwlib-Xm.c, lwlib-Xm.h, xlwmenu.c
-  copyright lucid and FSF, but under GPL, so OK?
-  FSF copyrights were added in 200x, was that right?
-
-lwlib/lwlib-int.h, lwlib.h, lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h
-  no copyright. last three trivial?
-  suspect these must have been part of the "Lucid Widget Library",
-  which is under GPL. Can't find an original version of this to check.
-
-lwlib/Makefile.in
- "some parts" copyright Lucid, no license
-
-lwlib/lwlib-utils.c, lwlib.c
-  copyright Lucid, Inc; but under GPL, so OK?
-
-lwlib/xlwmenu.h, xlwmenuP.h
-  part of 'Lucid Widget Library', but only FSF copyright (when files
-  were first checked into RCS, there were no copyrights). Was it right
-  to add FSF copyright?
-  should we add a 1992 Lucid copyright?
-
-lwlib/*
-  should we:
-  1) ensure all files that were originally in the "Lucid Widget
-  Library" have 1992 Lucid copyright?
-  2) add or remove FSF copyrights to any files we have made non-trivial
-  changes to since 1992?
+*** These are copyright issues still to be addressed:
 
 
-[waiting for legal advice]
-oldXMenu/
- - should there be any FSF copyrights at all in here? Some were added
-   in 2005, without licence notices. Was this right?
-   Eg don't think copyright.h should have FSF copyright!
-   Should add copyright details for X11R1 to the README file. (see
-   copyright.h). I suggest we remove copyright.h and add the notices
-   directly into the files.
-
+etc/ms-kermit - no copyright, but ms-7bkermit has one
 
-The general issue is, as with some of the Lucid code in lwlib, suppose
-file foo.c is Copyright (C) 2000 John Smith, and released under the
-GPL. We check it into Emacs CVS and make non-trivial changes to it.
-Should we add a FSF copyright or not? Can we add such a notice as soon
-as we check it check it in to CVS?
-
-
-[waiting for legal advice]
-oldXMenu/Makefile.in, Makefile, Imakefile, descrip.mms, insque.c
-  - issues described in mail to rms, 2006/12/17.
-rms: "I have asked for lawyer's advice about these."
 
 
 This file is part of GNU Emacs.
--- a/config.guess	Sat Feb 24 20:29:24 2007 +0000
+++ b/config.guess	Sun Apr 22 11:42:03 2007 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
-#   Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+#                 2002, 2003, 2004, 2005, 2006, 2007
+#                 Free Software Foundation, Inc.
 
-timestamp='2007-01-15'
+timestamp='2007-02-26'
 
 # 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
--- a/config.sub	Sat Feb 24 20:29:24 2007 +0000
+++ b/config.sub	Sun Apr 22 11:42:03 2007 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
-#   Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+#                 2002, 2003, 2004, 2005, 2006, 2007
+#                 Free Software Foundation, Inc.
 
-timestamp='2007-01-18'
+timestamp='2007-02-26'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
--- a/configure	Sat Feb 24 20:29:24 2007 +0000
+++ b/configure	Sun Apr 22 11:42:03 2007 +0000
@@ -3100,6 +3100,11 @@
     machine=amdx86-64 opsys=gnu-linux
   ;;
 
+  ## Tensilica Xtensa Linux-based GNU system
+  xtensa-*-linux-gnu* )
+    machine=xtensa opsys=gnu-linux
+    ;;
+
   * )
     unported=yes
   ;;
--- a/configure.in	Sat Feb 24 20:29:24 2007 +0000
+++ b/configure.in	Sun Apr 22 11:42:03 2007 +0000
@@ -1134,6 +1134,11 @@
     machine=amdx86-64 opsys=gnu-linux
   ;;
 
+  ## Tensilica Xtensa Linux-based GNU system    
+  xtensa-*-linux-gnu* )
+    machine=xtensa opsys=gnu-linux
+    ;;
+
   * )
     unported=yes
   ;;
--- a/etc/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,64 @@
+2007-03-01  Kim F. Storm  <storm@cua.dk>
+
+	* ORDERS: Reformat text.
+
+	* NEWS (About external Lisp packages): New section.
+
+2007-02-28  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	* TUTORIAL.it: Fix typo.
+
+2007-02-27  Glenn Morris  <rgm@gnu.org>
+
+	* cs-dired-ref.tex: Increase in 2 column case to make room
+	for copyright notice.
+	(nopagenumbers): Call to turn off numbers in 1 page document.
+	(N,Aa(Bpov,Al(Bda, Modifikace Dired bufferu): Swap sections to
+	balance column length in presence of copyright notice.
+	(copyrightnotice): Uncomment so that notice is displayed.
+
+	* dired-ref.tex (vsize): Increase in 2 column case to make room
+	for copyright notice.
+	(nopagenumbers): Call to turn off numbers in 1 page document.
+	(Getting Help, Modifying the Dired Buffer): Swap sections to
+	balance column length in presence of copyright notice.
+	(copyrightnotice): Uncomment so that notice is displayed.
+
+	* fr-drdref.tex (vsize): Increase in 2 column case.
+	(\key): Tweak space for description.
+	(\overfullrule): Set to 0pt to hide small overflows.
+	(nopagenumbers): Call to turn off numbers in 1 page document.
+	(Obtenir de l'aide, Modifier le tampon Dired): Swap sections to
+	balance column length.
+	(Mettre un flag sur les fichiers \`a d\'etruire): Hack in a line
+	break to prevent overfull line.
+	(find-names-dired): Use \key rather than \metax as a hack fix for
+	overflow.
+
+	* sk-dired-ref.tex (vsize): Increase in 2 column case to make room
+	for copyright notice.
+	(nopagenumbers): Call to turn off numbers in 1 page document.
+	(N,Aa(Bpoveda, Modifik,Aa(Bcia Dired bufferu): Swap sections to
+	balance column length in presence of copyright notice.
+	(copyrightnotice): Uncomment so that notice is displayed.
+
+2007-02-26  Carsten Dominik  <dominik@science.uva.nl>
+
+	* orgcard.tex (section{Visibility Cycling}): Document key for
+	indirect buffer access.
+	(section{Archiving}): New keys for archiving.
+	(section{Tables}): Combine two lines for hline creation.
+	Named-field formula changed to Field formula.
+	(section{Links}): Document keys for finding links.
+	(section{Agenda Views}): New key for agenda file cycling.
+	Document keys for stuck projects.  Typos fixed.
+	(section{Exporting and Publishing}): Export options no longer in
+	reference card.
+
+2007-02-25  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* PROBLEMS: Gtk+ and cygwin doesn't work.
+
 2007-02-23  Eli Zaretskii  <eliz@gnu.org>
 
 	* MORE.STUFF: Add a pointer to Phil Sung's Emacs slides on MIT.
--- a/etc/DEVEL.HUMOR	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/DEVEL.HUMOR	Sun Apr 22 11:42:03 2007 +0000
@@ -2,6 +2,9 @@
 --                                                                  --
 -- Humor (sometimes unintended) on the Emacs developer's list       --
 --                                                                  --
+-- The Free Software Foundation claims no copyright on this file,   --
+-- compiled from the public emacs-devel mailing list.               --
+--                                                                  --
 ----------------------------------------------------------------------
 
   "Is it legal for a `struct interval' to have a total_length field of
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/ETAGS.README	Sun Apr 22 11:42:03 2007 +0000
@@ -0,0 +1,49 @@
+etags is distributed under the following conditions:
+
+
+Copyright (C) 1984 The Regents of the University of California
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the
+   distribution.
+3. Neither the name of the University nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
+  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+
+This file is not considered part of GNU Emacs.
+
+This program 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 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--- a/etc/JOKES	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/JOKES	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,8 @@
+The Free Software Foundation claims no copyright on this file,
+compiled largely from postings to public newsgroups and mailing lists,
+and the GNU project email archives.
+
+
 From:  Don Chiasson <G.CHIASSON@DREA-XX.ARPA>
 Subject: Some gnu jokes
 To: jokes@DREA-XX.ARPA, gergely@DREA-XX.ARPA, broome@DREA-XX.ARPA
--- a/etc/NEWS	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/NEWS	Sun Apr 22 11:42:03 2007 +0000
@@ -22,6 +22,25 @@
 so we will look at it and add it to the manual.
 
 
+* About external Lisp packages
+
+When you upgrade to Emacs 22 from a previous version, some older
+versions of external Lisp packages are known to behave badly.
+So in general, it is recommended that you upgrade to the latest
+versions of any external Lisp packages that you are using.
+
+You should also be aware that many Lisp packages have been included
+with Emacs 22 (see the extensive list below), and you should remove
+any older versions of these packages to ensure that the Emacs 22
+version is used.  You can use M-x list-load-path-shadows to find such
+older packages.
+
+Some specific packages which are known to cause problems are:
+
+** Semantic (used by CEDET, ECB, JDEE): upgrade to latest version.
+** cua.el, cua-mode.el: remove old versions.
+
+
 * Installation Changes in Emacs 22.1
 
 ---
@@ -115,6 +134,9 @@
 ** Support for GNU/Linux systems on S390 machines was added.
 
 ---
+** Support for GNU/Linux systems on Tensilica Xtensa machines was added.
+
+---
 ** Support for MacOS X was added.
 See the files mac/README and mac/INSTALL for build instructions.
 
@@ -1682,8 +1704,11 @@
 When Emacs is running in an xterm more key bindings are available.
 The following should work:
 {C,S,C-S,A}-{right,left,up,down,prior,next,delete,insert,F1-12}.
-These key bindings work on xterm from X.org 6.8, they might not work on
-some older versions of xterm, or on some proprietary versions.
+These key bindings work on xterm from X.org 6.8 (and later versions),
+they might not work on some older versions of xterm, or on some
+proprietary versions.
+The various keys generated by xterm when the "modifyOtherKeys"
+resource is set are also supported.
 
 ** Character terminal color support changes:
 
@@ -1797,6 +1822,10 @@
 region (like delete-selection-mode).  Do not enable these modes with
 cua-mode.  Customize the variable `cua-mode' to enable cua.
 
+The cua-selection-mode enables the CUA keybindings for the region but
+does not change the bindings for C-z/C-x/C-c/C-v. It can be used as a
+replacement for pc-selection-mode.
+
 In addition, cua provides unified rectangle support with visible
 rectangle highlighting: Use C-return to start a rectangle, extend it
 using the movement commands (or mouse-3), and cut or copy it using C-x
@@ -3831,7 +3860,7 @@
 
 ---
 ** The variables post-command-idle-hook and post-command-idle-delay have
-    been removed.  Use run-with-idle-timer instead.
+been removed.  Use run-with-idle-timer instead.
 
 +++
 ** `suppress-keymap' now works by remapping `self-insert-command' to
--- a/etc/ORDERS	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/ORDERS	Sun Apr 22 11:42:03 2007 +0000
@@ -1,9 +1,13 @@
 Printed copies of the GNU Emacs Manual, the Emacs Lisp Reference
 Manual, "Programming in Emacs Lisp: An Introduction", and other
 materials can be ordered directly from the Free Software Foundation.
+
 For more information, see the order form on the web at
-<http://www.gnu.org/order/order.html>.  Your purchases will help support
-further development of Emacs and other free software programs.  You
-can also make tax-deductable donations to the Free Software Foundation,
-a not-for-profit organization (assuming you pay US taxes) - see
-<http://www.gnu.org/help/donate.html>.
+<http://www.gnu.org/order/order.html>.
+
+Your purchases will help support further development of Emacs and
+other free software programs.
+
+You can also make tax-deductable donations to the Free Software
+Foundation, a not-for-profit organization (assuming you pay US taxes)
+- see <http://www.gnu.org/help/donate.html>.
--- a/etc/PROBLEMS	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/PROBLEMS	Sun Apr 22 11:42:03 2007 +0000
@@ -213,6 +213,17 @@
 This happens because of bugs in Gtk+.  Gtk+ 2.10 seems to be OK.  See bug
 http://bugzilla.gnome.org/show_bug.cgi?id=85715.
 
+** Emacs compiled with Gtk+ crashes on startup on cygwin.
+
+A typical error message is
+  ***MEMORY-ERROR***: emacs[5172]: GSlice: failed to allocate 504 bytes 
+  (alignment: 512): Function not implemented
+
+Emacs supplies its own malloc, but glib (part of Gtk+) calls memalign and on
+cygwin that becomes the cygwin supplied memalign.  As malloc is not the
+cygwin malloc, the cygwin memalign always returns ENOSYS.  A fix for this
+problem would be welcome.
+
 * General runtime problems
 
 ** Lisp problems
@@ -318,14 +329,6 @@
 If your system uses the lock file protocol, and fascist restrictions
 prevent ordinary users from writing the lock files in /usr/spool/mail,
 you may need to make `movemail' setgid to a suitable group such as
-`mail'.  You can use these commands (as root):
-
-	chgrp mail movemail
-	chmod 2755 movemail
-
-If your system uses the lock file protocol, and fascist restrictions
-prevent ordinary users from writing the lock files in /usr/spool/mail,
-you may need to make `movemail' setgid to a suitable group such as
 `mail'.  To do this,  use the following commands (as root) after doing the
 make install.
 
@@ -2436,25 +2439,38 @@
 defines the `assert' macro with a trailing semi-colon.  The following
 patch to assert.h should solve this:
 
-*** include/assert.h.orig	Sun Nov  7 02:41:36 1999
---- include/assert.h	Mon Jan 29 11:49:10 2001
-***************
-*** 41,47 ****
-  /*
-   * If not debugging, assert does nothing.
-   */
-! #define assert(x)	((void)0);
-
-  #else /* debugging enabled */
-
---- 41,47 ----
-  /*
-   * If not debugging, assert does nothing.
-   */
-! #define assert(x)	((void)0)
-
-  #else /* debugging enabled */
-
+ *** include/assert.h.orig	Sun Nov  7 02:41:36 1999
+ --- include/assert.h	Mon Jan 29 11:49:10 2001
+ ***************
+ *** 41,47 ****
+   /*
+    * If not debugging, assert does nothing.
+    */
+ ! #define assert(x)	((void)0);
+
+   #else /* debugging enabled */
+
+ --- 41,47 ----
+   /*
+    * If not debugging, assert does nothing.
+    */
+ ! #define assert(x)	((void)0)
+
+   #else /* debugging enabled */
+
+
+*** Building the MS-Windows port with Visual Studio 2005 fails.
+
+Microsoft no longer ships the single threaded version of the C library
+with their compiler, and the multithreaded static library is missing
+some functions that Microsoft have deemed non-threadsafe.  The
+dynamically linked C library has all the functions, but there is a
+conflict between the versions of malloc in the DLL and in Emacs, which
+is not resolvable due to the way Windows does dynamic linking.
+
+We recommend the use of the MingW port of GCC for compiling Emacs, as
+not only does it not suffer these problems, but it is also Free
+software like Emacs.
 
 ** Linking
 
--- a/etc/TUTORIAL.it	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/TUTORIAL.it	Sun Apr 22 11:42:03 2007 +0000
@@ -20,7 +20,7 @@
 indicano le direttive per provare a usare un comando.  Per esempio:
 <<Blank lines inserted here by startup of help-with-tutorial>>
 >> Adesso premi C-v (Vedi schermata successiva) per spostarti
-   alla prossima schermata. (Vai avanti, tieni premuto il tasto
+   alla prossima schermata.  (Vai avanti, tieni premuto il tasto
    CONTROL mentre premi v).  D'ora in poi dovrai fare così ogni volta
    che finisci di leggere lo schermo.
 
@@ -44,7 +44,7 @@
     M-v    Vai indietro di una schermata
     C-l    Cancella lo schermo e riscrivi tutto il testo, muovendo
            il testo che si trova vicino al cursore al centro dello
-           schermo. (Il tasto è CONTROL-L, non CONTROL-1.)
+           schermo.  (Il tasto è CONTROL-L, non CONTROL-1.)
 
 >> Trova il cursore, osserva quale parte di testo gli è vicina.  Premi
    C-l.  Trova di nuovo il cursore e osserva che si trova sullo stesso
@@ -75,7 +75,7 @@
    schermo.
 
 Le quattro lettere dei comandi sono mnemoniche in inglese: P per
-precedente (previuos), N per successivo (next), B per indietro (backward)
+precedente (previous), N per successivo (next), B per indietro (backward)
 e F per avanti (forward).  Questi sono tutti i comandi elementari per
 posizionare il cursore, li userai IN CONTINUAZIONE e conviene perciò
 impararli subito.
@@ -85,7 +85,7 @@
    l'effetto di un C-p quando il cursore si trova a metà della riga.
 
 Ogni riga di testo termina con un carattere Newline, che serve a separarla
-dalla successiva. È bene che l'ultima riga del tuo file termini con un
+dalla successiva.  È bene che l'ultima riga del tuo file termini con un
 carattere Newline, benché Emacs non lo richieda.
 
 >> Prova a usare C-b all'inizio di una riga.  Sposterà il cursore
@@ -96,7 +96,7 @@
 C-b.
 
 >> Premi alcune volte C-b per vedere dove si trova il cursore.  Poi usa
-   C-f per tornare alla fine della riga. Usa quindi C-f per andare alla
+   C-f per tornare alla fine della riga.  Usa quindi C-f per andare alla
    riga successiva.
 
 Quando ci si sposta oltre l'inizio o la fine della schermata, il testo che
@@ -289,7 +289,7 @@
    scompare.
 
 Questo comando è diverso da tutti quelli imparati finora perché contiene
-due caratteri.  Inizia con il carattere CONTROL-x. C'è un'ampia serie di
+due caratteri.  Inizia con il carattere CONTROL-x.  C'è un'ampia serie di
 comandi che iniziano con CONTROL-x; molti di essi riguardano finestre,
 file, buffer, e cose simili.  Questi comandi possono essere lunghi due,
 tre o quattro caratteri.
@@ -320,12 +320,12 @@
 Quando una riga di testo diventa troppo lunga per essere visualizzata su
 una riga di schermo essa viene "continuata" su una seconda riga dello
 schermo.  Un carattere barra retroversa ("\") posto accanto al margine
-sinistro indica la prosecuzione della riga precedente. Quando si usa un
+sinistro indica la prosecuzione della riga precedente.  Quando si usa un
 sistema a finestre grafico, invece della barra retroversa comparirà una
 piccola freccia ricurva.
 
 >> Inserisci del testo fino a raggiungere il margine destro e poi
-   continua. Vedrai apparire la prosecuzione della riga.
+   continua.  Vedrai apparire la prosecuzione della riga.
 >> Usa <Delete> per cancellare il testo fino a quando la riga di testo è
    di nuovo tutta contenuta in una sola riga dello schermo.  La
    prosecuzione alla riga successiva scompare.
@@ -391,7 +391,7 @@
 non è possibile recuperare quel testo).
 
 >> Muovi il cursore all'inizio di una riga non vuota.  Usa C-k per
-   eliminare il testo di quella riga.  Premi C-k una seconda volta. Ti
+   eliminare il testo di quella riga.  Premi C-k una seconda volta.  Ti
    accorgerai di come viene cancellato il carattere Newline posto dopo la
    riga stessa.
 
@@ -423,7 +423,7 @@
 Adesso, per recuperare il testo eliminato:
 
 >> Premi C-y.  Sposta il cursore alcune righe più in basso e premi di
-   nuovo C-y. Hai appena visto come copiare una parte di testo.
+   nuovo C-y.  Hai appena visto come copiare una parte di testo.
 
 Cosa succede se c'è del testo da recuperare tra quello eliminato ma è
 stato eliminato altro testo dopo di esso?  C-y restituirebbe il testo
@@ -439,11 +439,11 @@
 Quando si usa M-y un certo numero di volte si arriva di nuovo al testo di
 partenza (quello eliminato per ultimo).
 
->> Elimina una riga, sposta il cursore, elimina un'altra riga. Usa C-y per
+>> Elimina una riga, sposta il cursore, elimina un'altra riga.  Usa C-y per
    recuperare la seconda riga eliminata.  Premi M-y e verrà sostituita
    dalla riga eliminata prima.  Usa di nuovo M-y e osserva cosa succede.
    Continua fino a quando non ritrovi la riga che avevi eliminato per
-   seconda. Se vuoi puoi usare un argomento numerico sia positivo che
+   seconda.  Se vuoi puoi usare un argomento numerico sia positivo che
    negativo per M-y.
 
 
@@ -544,7 +544,7 @@
 scritto.  Si dovrebbero salvare le modifiche piuttosto spesso in modo da
 non perdere troppo lavoro se per caso il sistema dovesse bloccarsi.
 
->> Usa C-x C-f per salvare la tua copia di questa esercitazione. Questo
+>> Usa C-x C-f per salvare la tua copia di questa esercitazione.  Questo
    dovrebbe mostrare il messaggio "Wrote ...TUTORIAL.it" nella parte bassa
    dello schermo.
 
@@ -574,7 +574,7 @@
 all'interno di Emacs.
 
 >> Crea un file chiamato "pippo" usando C-x C-f pippo <Invio>.  Inserisci
-   del testo e poi salva "pippo" con C-x C-s. Poi usa C-x C-f TUTORIAL.it
+   del testo e poi salva "pippo" con C-x C-s.  Poi usa C-x C-f TUTORIAL.it
    <Invio> per tornare all'esercitazione.
 
 Emacs conserva il testo di ogni file all'interno di un oggetto chiamato
@@ -600,7 +600,7 @@
 solo all'interno di Emacs, nel buffer relativo a quel file.  La creazione
 o la modifica del buffer del secondo file non ha alcun effetto sul buffer
 del primo.  Sarebbe fastidioso dover tornare al primo file con C-x C-f per
-salvarlo con C-x C-s. Così c'è il comando
+salvarlo con C-x C-s.  Così c'è il comando
 
     C-x s    Salva alcuni buffer
 
@@ -608,8 +608,8 @@
 modificato e non ancora salvato.  Chiede, per ognuno di quei buffer, se si
 voglia salvarne il contenuto nel file corrispondente.
 
->> Inserisci una riga di testo e poi premi C-x s. Dovrebbe chiederti se
-   vuoi salvare il buffer chiamato TUTORIAL.it. Rispondi di sì battendo
+>> Inserisci una riga di testo e poi premi C-x s.  Dovrebbe chiederti se
+   vuoi salvare il buffer chiamato TUTORIAL.it.  Rispondi di sì battendo
    "y".
 
 
@@ -620,8 +620,8 @@
 posto su tutti i caratteri CONTROL e META.  Emacs risolve questo problema
 usando il comando "estendi" (eXtend).  Ce ne sono di due tipi:
 
-    C-x    Comando esteso carattere. Seguito da un carattere.
-    M-x    Comando esteso con nome. Seguito da un nome di comando.
+    C-x    Comando esteso carattere.  Seguito da un carattere.
+    M-x    Comando esteso con nome.  Seguito da un nome di comando.
 
 Si tratta di comandi utili ma meno utilizzati di quelli che già osservati.
 Se ne sono visti due: il comando C-x C-f per visitare un file e quello C-x
@@ -652,7 +652,7 @@
 punto di fare un log-out è meglio sospendere l'esecuzione di Emacs
 piuttosto che interromperla.
 
-Ci sono molti comandi che usano C-x. Ecco una lista di quelli già
+Ci sono molti comandi che usano C-x.  Ecco una lista di quelli già
 conosciuti:
 
     C-x C-f    Apri un file.
@@ -716,7 +716,7 @@
 -----------
 
 La riga immediatamente sopra all'area di eco è chiamata "mode line" (riga
-di modo). La "mode line" si presenta più o meno così:
+di modo).  La "mode line" si presenta più o meno così:
 
 --:** TUTORIAL.it (Fundamental)--L720--64%---------------
 
@@ -736,7 +736,7 @@
 indicato dal cursore in quel momento.
 
 I due asterischi vicino all'inizio indicano che sono state fatte delle
-modifiche al testo. Se il file è stato appena aperto o appena salvato
+modifiche al testo.  Se il file è stato appena aperto o appena salvato
 quella parte della "mode line" non mostra alcun asterisco, solo trattini.
 
 La parte di "mode line" racchiusa tra parentesi serve ad indicare in quale
@@ -999,13 +999,13 @@
 e poi un carattere o una sequenza di caratteri; Emacs mostrerà una breve
 descrizione del comando stesso.
 
->> Prova C-h c C-p. Dovresti leggere un messaggio del tipo
+>> Prova C-h c C-p.  Dovresti leggere un messaggio del tipo
 
     C-p runs the command previous-line (purtroppo in inglese!)
 
 Questo messaggio indica il "nome della funzione".  I nomi di funzione sono
 usati principalmente per personalizzare ed estendere Emacs e sono scelti
-anche in modo da indicare che cosa il comando fa. Servono quindi anche da
+anche in modo da indicare che cosa il comando fa.  Servono quindi anche da
 breve descrizione, sufficiente per ricordarsi di comandi già imparati.
 
 I comandi con più caratteri come ad esempio C-x C-s e (se non c'è il tasto
@@ -1036,7 +1036,7 @@
 
     C-h a    "Apropos" comando.  Inserisci una parola ed Emacs ti
              elencherà tutti i comandi il cui nome contiene quella
-             parola. Questi comandi possono tutti essere eseguiti con
+             parola.  Questi comandi possono tutti essere eseguiti con
              META-x.  Per alcuni comandi ti sarà mostrata anche una
              sequenza di uno o due caratteri che serve a far partire il
              comando senza doverlo inserire per esteso.
@@ -1089,7 +1089,7 @@
    NOTA BENE: la licenza che definisce a tutti gli effetti i termini
    secondo i quali è possibile la copia e la distribuzione di questo
    documento è quella originale in lingua inglese contenuta nel file
-   "TUTORIAL". Qui di seguito se ne riporta una traduzione a scopo
+   "TUTORIAL".  Qui di seguito se ne riporta una traduzione a scopo
    indicativo, restando comunque inteso il fatto che è quella originale a
    fare fede.
 
--- a/etc/calccard.tex	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/calccard.tex	Sun Apr 22 11:42:03 2007 +0000
@@ -20,7 +20,7 @@
 
 % 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 1, or (at your option)
+% the Free Software Foundation; either version 2, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
--- a/etc/cs-dired-ref.tex	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/cs-dired-ref.tex	Sun Apr 22 11:42:03 2007 +0000
@@ -103,7 +103,7 @@
   \def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
 \else                           %2 or 3 columns uses prereduced size
   \hsize 3.4in
-  \vsize 7.95in
+  \vsize 9.2in
   \hoffset -.75in
   \voffset -.745in
   \font\titlefont=csbx10 \scaledmag2
@@ -334,10 +334,17 @@
 \key{zmìò znaèku na jiné písmeno}{* c}
 \key{oznaè soubory, pro které elispový výraz vrací t}{* ( \dx}
 
-\section{Nápovìda}
+\section{Modifikace Dired bufferu}
 
-\key{zobraz nápovìdu}{h}
-\key{pøehled pøíkazù dired}{?}
+\key{vlo¾ do tohoto bufferu podadresáø}{i}
+\key{odstraò oznaèené soubory z bufferu}{k}
+\key{odstraò z bufferu výpis podadresáøe}{C-u k}
+\key{znovu naèti adresáøe (znaèky se zachovají)}{g}
+\key{pøepni tøídìní adresáøe podle jména/data}{s}
+\key{uprav volby pøíkazu ls}{C-u s}
+\key{obnov znaèky, skryté øádky apod.}{C-_}
+\key{skryj v¹echny podadresáøe}{M-\$}
+\key{skryj nebo odkryj v¹echny podadresáøe}{\$}
 
 \section{Pøíkazy nad oznaèenými soubory}
 
@@ -373,18 +380,6 @@
 \key{proveï výmaz souborù oznaèených ke smazání}{x}
 \key{oznaè soubory vyhovující regulárnímu výrazu}{\% d}
 
-\section{Modifikace Dired bufferu}
-
-\key{vlo¾ do tohoto bufferu podadresáø}{i}
-\key{odstraò oznaèené soubory z bufferu}{k}
-\key{odstraò z bufferu výpis podadresáøe}{C-u k}
-\key{znovu naèti adresáøe (znaèky se zachovají)}{g}
-\key{pøepni tøídìní adresáøe podle jména/data}{s}
-\key{uprav volby pøíkazu ls}{C-u s}
-\key{obnov znaèky, skryté øádky apod.}{C-_}
-\key{skryj v¹echny podadresáøe}{M-\$}
-\key{skryj nebo odkryj v¹echny podadresáøe}{\$}
-
 \section{Pøíkazy s regulárními výrazy}
 
 \key{oznaè soubory vyhovující regulárnímu výrazu}{\% m}
@@ -400,7 +395,12 @@
 \metax{otevøi v dired soubory obsahující vzorek}{M-x find-grep-dired}
 \metax{otevøi v dired soubory podle výstupu \kbd{find}}{M-x find-dired}
 
-%\copyrightnotice
+\section{Nápovìda}
+
+\key{zobraz nápovìdu}{h}
+\key{pøehled pøíkazù dired}{?}
+
+\copyrightnotice
 
 \bye
 
--- a/etc/dired-ref.ps	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/dired-ref.ps	Sun Apr 22 11:42:03 2007 +0000
@@ -1,15 +1,17 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.86d Copyright 1999 Radical Eye Software
+%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software
 %%Title: dired-ref.dvi
 %%Pages: 1
 %%PageOrder: Ascend
-%%BoundingBox: 0 0 596 842
+%%BoundingBox: 0 0 595 842
+%%DocumentFonts: CMBX10 CMR8 CMBX8 CMTT8 CMR6 CMSY6
+%%DocumentPaperSizes: a4
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips -o dired-ref.ps dired-ref.dvi
-%DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2002.02.12:1310
-%%BeginProcSet: texc.pro
+%DVIPSCommandLine: dvips dired-ref.dvi
+%DVIPSParameters: dpi=600
+%DVIPSSource:  TeX output 2007.02.22:0120
+%%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
 N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72
@@ -28,22 +30,10 @@
 definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get
 }B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub}
 B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr
-1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3
-1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx
-0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx
-sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{
-rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp
-gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B
-/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{
-/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{
-A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy
-get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse}
-ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp
-fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17
-{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add
-chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{
-1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop}
-forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn
+1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S
+/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy
+setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask
+restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn
 /BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put
 }if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{
 bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A
@@ -67,587 +57,1831 @@
 rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
 
 %%EndProcSet
-TeXDict begin 39158280 55380996 1000 600 600 (dired-ref.dvi)
-@start
-%DVIPSBitmapFont: Fa cmtt8 8 63
-/Fa 63 127 df<123812FEB3A8127C1200A7123812FEA51238072A72A923>33
-D<EB3C0F90387E1F80A6EBFE3F01FC1300A2007FB512F8B612FCA4003F14F83901F87E00
-AA003FB512F8B612FCA46C14F83903F0FC00EA07F1EBE1F8A63803C0F01E297EA823>35
-D<130E131FA4EB7FC03803FFF04813FC001F7F487FD87FDF1380EB1F1F00FEEB0FC012FC
-00F8131FA312FCEC0F8000FEEB0700007F90C7FCEA3FDF13FF000F13C06C13F0000113FC
-6C6C7EEB1FFFEC7F80141F15C0007C130F00FE1307A400FC130FA2007EEB1F80007F133F
-9038DFFF006CB45A6C5B00075B6C13E038007F80011FC7FCA5130E1A347CAD23>I<000F
-EB01C0391F8003E0383FC007EA7FE0140FD8F9F013C0141F00F01480A2143F150000F95B
-147EEA7FE014FE6C485AEA1F80EA0F0100005B13035CA213075C130F5CA2131F5C133F91
-C7FCA25B137E9038FE03C09038FC07E0EC0FF00001EB1FF813F8EC3E7C12039038F03C3C
-120713E0A2000FEB3E7C13C0001FEB1FF81380EC0FF0000FEB07E039070003C01E347EAD
-23>I<137CEA01FE487E487FA2EBCFC0EA0F87A21303A31307A290380FCFF8EC9FFC139F
-13BF3907FF0FF801FE138013FCA29038F81F00EA0FF0381FE01E383FF03E13F8007F5BEA
-7E7C00FC1378EB3EF812F86D5AA290380FE03C1307EAFC0F90381FF07C387E3FFC007FB5
-12FC393FFE7FF8EBFC3F390FF01FE03907E007C01E2B7EA923>I<EB0380EB0FC0131FEB
-3F80EBFF005BEA01F81203485A485A5B485AA248C7FCA2123E127EA2127CA212FCA25AA8
-7EA2127CA2127EA2123E123FA26C7EA26C7E7F6C7E6C7E1201EA00FE7FEB3F80EB1FC013
-0FEB0380123476AD23>40 D<131EA2131F131EA30070EB0380007C130F00FEEB1FC0397F
-9E7F8090B5FC001FEBFE00000713F8000113E038007F803801FFE0000713F8001F13FE00
-7FEBFF80EB9E7F39FE1E1FC0007CEB0F8000701303000090C7FCA3131F131EA21A1D7CA2
-23>42 D<EB0780497EAB007FB512F8B612FCA46C14F839000FC000AB6D5A1E1E7EA223>
-I<007FB51280B612C0A46C14801A067C9623>45 D<123E127FEAFF80A5EA7F00123E0909
-738823>I<EC0380EC07C0140FA2141F1580143F15005C147EA214FE5C13015C13035C13
-075CA2130F5C131F5C133F91C7FCA25B137E13FE5B12015BA212035B12075B120F5B121F
-5BA2123F90C8FC5A127E12FE5AA25A12781A347CAD23>I<EB7FC03803FFF04813FC001F
-7F48EBFF80EA7F80397E003FC000FEEB0FE04813076CEB03F0A31401127C1238C7FC1403
-A2EC07E0A2EC0FC0141FEC3F80150014FE1301EB03F8495A495AEB3FC0495A01FEC7FC48
-5A485AD80FF013E0391FE001F0EA3F8048B5FCB6FCA36C14E01C2A7DA923>50
-D<EB7FC03801FFF0000713FC487F487F393FE07F809038801FC0140F1407A3EA0E00C712
-0FA2EC1F80143F903801FF00EB7FFE495A5C806DB4FC9038007F80EC1FC0EC0FE01407EC
-03F0A21401A2127C12FE1403A2EC07E048130F6CEB1FC0387FC07F6CB512806C14006C13
-FC00035B38007FC01C2B7DA923>I<EC0380EC0FC0141F143F14FF491380903807FE0049
-5A495AEB7FE0495A4890C7FCEA07FE485AEA1FF0EA7FE0485A90C8FCA213C06C7EEA1FF0
-EA0FFC6C7EEA01FF6C13C06D7EEB1FF86D7E6D7E903801FF806D13C0143F141F140FEC03
-801A247CA523>60 D<007FB512F8B612FCA4003F14F8C9FCA6003FB512F8B612FCA46C14
-F81E127E9C23>I<127012FC7E7E13C06C7EEA1FF86C7E6C7E3801FF806C7FEB3FE0EB1F
-F86D7EEB03FE903801FF806D13C0143FA214FF491380903803FE00EB0FFC495AEB3FE0EB
-FFC0485BD807FEC7FC485A485AEA7FE0485A90C8FC5A5A12701A247CA523>I<3801FFC0
-000713F8001F13FE487F48148039FF007FC048130F1407A2140F007C131F0038EB7F80C7
-12FF01031300EB07FCEB0FF0495A5C495AA291C7FCA6133E90C8FCA7131C137FA5131C1A
-297CA823>I<EB07F0EB1FFCEB7FFE48B5FC4814803907FC1FC0380FE0079038C0FFE0EA
-1F83485AEA3E0FD87E1F13F0007C138FEB3F0738783E0338F87C01A212F0EB7800A5EB7C
-0112F8A239783E03E0387C3F0790381F8FC0007E13FFD83E0F1380D83F071300381F83FE
-390FC0F9E09038E007F03807FC0F6CB5FC6C14C06C6C138090381FFE00EB07F81C297DA8
-23>I<EB0FC0A2497EA4EB3CF0A5EB7CF8A3EB7878EBF87CA548487EA40003133F497EA2
-90B5FCA2481480A3EBC00F000F14C0EB8007A3397FF03FF800FF14FCA3007F14F81E2A7E
-A923>I<B512F014FE80158015C0390F800FE01407EC03F01401A5140315E01407EC1FC0
-90B5128015005C8015C09038800FE01407EC03F0140115F81400A5140115F01403EC0FE0
-B6FC15C01580150014FC1D297EA823>I<90380FE0E090383FF9F0EBFFFD4813FF5A3807
-FC3F380FF00F381FC007A2383F80031300481301127EA2007CEB00E000FC1400A25AA97E
-A2127C007E14E0EC01F0127F7EEB8003EA1FC0EC07E0380FF00F3907FC1FC06CB512806C
-14006C5BEB3FF8EB0FE01C2B7DA923>I<90381FC1C090387FF3E090B5FC12035AEBF83F
-380FE01F381FC00F1380003F13071300007E1303A3007CEB01C000FC90C7FCA25AA6EC7F
-F815FCA27E15F8007CEB03E0127E1407A27EEB800F121FEBC01FEA0FE03807F87F90B5FC
-7EC613FB90387FF1C090381FC0001E2B7EA923>71 D<397FF00FFE39FFF81FFFA3397FF0
-0FFE390F8001F0AC90B5FCA5EB8001AE397FF00FFE39FFF81FFFA3397FF00FFE20297FA8
-23>I<B512FEA538007C00B3ADB512FEA517297AA823>I<EA7FFEB5FCA36C5AEA07C0B3A6
-157CA7007FB512FCB6FCA36C14F81E297EA823>76 D<39FF8001FFA26D5AA3391EE00778
-A3EBF00FEB700EA2EB781EA2EB381CEB3C3CA2EB1C38EB1E78A2EB0E70A3EB07E0A3EB03
-C0A290C7FCA939FFC003FFA520297FA823>I<3803FFF0000F13FC487F487FA2397F807F
-80387E001F007C130FA200FC14C0481307B3A46C130FA2007C1480A2007E131F387F807F
-6CB51200A26C5B6C5B000313F01A2B7CA923>79 D<B512F014FE80158015C0390F801FE0
-EC07F01403140115F81400A5140115F014031407EC1FE090B512C0158015005C14F00180
-C7FCABEAFFF87FA35B1D297EA823>I<3803FFF0000F13FC487F487FA2397F807F80387E
-001F007C130FA200FC14C0481307B3A3131F148700FC138F397C0FCF80A2387E07FFEA7F
-876CB51200A26C5B6C5B1203C7FC147EA280A2EC1F80A2140F1A337CA923>I<387FFFC0
-B512F88014FF7E390F807F80EC1FC0140F6E7E1403A514074A5A141FEC7F8090B5C7FCA2
-14FC8080EB807F6E7E141F140FA61587ED8F80A215CFD87FF013DF39FFF807FF1600806C
-486C5AC812F8212A7FA823>I<9038FF83800003EBE3C04813FF121F5AEA7FC0EB003F00
-FE131F48130FA25A1407A26CEB038091C7FC127E127FEA3FF06CB4FC6C13F06C13FC0001
-7F39001FFF80010113C0EB001FEC0FE01407EC03F0A20070130112F8A36C1303A26CEB07
-E06C130F9038E03FC090B5FC15005C00F15B38703FE01C2B7DA923>I<39FFF81FFFA539
-0F8001F0B3A7EBC003A2000714E0EBE007EBF00F000314C0EBFC3F6CB512806C14006D5A
-EB1FF8EB07E0202A7FA823>85 D<397FF07FF0EBF8FFA3EBF07F3907E03F000003133EEB
-F07E0001137CEBF8FC00005B13FDEB7DF0137F6D5AA26D5AA26D5AA280131F80133F8013
-7DEB7CF813F8147CEA01F0801203497E12079038C00F80120F397FE03FF8D8FFF013FCA3
-D87FE013F81E297EA823>88 D<397FF00FFE39FFF81FFFA3397FF00FFE3907C003E0EBE0
-07000314C013F00001130F01F813800000131F01FC1300137C143E133E147EEB1F7CA26D
-5AA26D5AA25C1303ACEB1FFC497EA36D5A20297FA823>I<003FB512E04814F0A4397C00
-07E0140FEC1FC01580143F0038EB7F00C7127E14FE495A5C1303495A5C130F495A5C133F
-49C7FC137E13FE485A5B1203485A4913E0000FEB01F0EA1FC01380123FEA7F00127EB6FC
-A46C14E01C297DA823>I<133013FCEA03FF000F13C0003F13F0B512FC1387EAFE0138F8
-007C00601318160A7AA823>94 D<007FB51280B612C0A46C14801A067C7E23>I<3803FF
-80000F13E04813F8487F80EB80FFEC3F80381F001FC7FC140F14FF137F0003B5FC120F5A
-387FF00F130012FCA25A141F7E6C133F387F81FF90B512FC6C14FE7E000713C73901FE01
-FC1F1D7D9C23>97 D<EB3FF0EBFFFC000313FF5A5A381FE07FEA3F80387F003E007E90C7
-FCA25AA25AA57EA2007E1307007FEB0F80141FEA3FC0391FF07F006CB5FC6C5B6C5BC613
-F0EB3FC0191D7B9C23>99 D<ECFF8015C0A41407A7EB7F873801FFE74813F7000F13FF5A
-13E0383F803F387F001F007E130FA2481307A25AA56C130FA2127E141F007F133F383F80
-7FEBE0FF6CB512FE7E000313F76C13C738007F031F297EA823>I<EB3FC0EBFFF800037F
-4813FF481480381FF07F393F801FC0EB000F007E130715E05AB6FCA415C000F8C8FC7EA2
-007EEB01C0007FEB03E0383F800713E0391FF81FC06CB5FC6C14800001EBFE006C6C5AEB
-1FE01B1D7D9C23>I<147F903801FFC0010713E05B5BEB3FCF140F90383E07C091C7FCA4
-007FB51280B612C0A36C1480D8003EC7FCB3383FFFFE487FA36C5B1B297EA823>I<EC01
-F090383F07FC9038FFDFFE000313FF5A48147E381FE1FE9038807E18393F003F00A2003E
-7FA4003F5BA2381F807EEBE1FE6CB45A485B5C001E13C0013FC7FC90C8FC121F1340380F
-FFFCECFF804814C04814F0397E0007F8007C130048147CA248143CA36C147C6C14FC007F
-EB03F8EBE01F6CB512F0000F14C06C14800001EBFE0038003FF01F2E7E9D23>I<B47E7F
-A41207A7EBC1FCEBC7FF01DF138090B512C0A29038FE0FE0EBF807EBF00313E0A313C0AD
-39FFFE1FFF5CA38020297FA823>I<133813FEA5133890C7FCA6EA7FFC487EA3127FEA00
-3EB3387FFFFEB6FCA36C13FE182A7AA923>I<14E0EB03F8A5EB00E01400A63803FFF048
-13F8A37EC7FCB3AB13011238387C03F012FEEB0FE0B5FC14C06C13006C5AEA0FF815397D
-A923>I<EA7F80487EA3127F1203A7ECFFFC13C1A313C0EC3F00147E5CEBC1F8EBC3F0EB
-C7E0EBCFC0EBDFE0EBFFF0A2EBFCF8497EEBF07EEBE03E497E1580EC0FC01407EC03E039
-7FFE0FFFB55AA36C487E20297FA823>I<EA7FFEB5FCA37EEA001FB3AD007FB512C0B612
-E0A36C14C01B297CA823>I<397E1F01F039FF7FC7FC9038FFEFFE14FF6C80390FE1FE1F
-EBC1FC01C07FEB80F8A2EB00F0AE3A7FE3FE3FE026FFF3FF13F0A3267FE3FE13E0241D81
-9C23>I<38FF81FCEBC7FF01DF138090B512C0A23907FE0FE0EBF807EBF00313E0A313C0
-AD39FFFE1FFF5CA380201D7F9C23>I<133F3801FFE0487F487F487F381FC0FE383F807F
-383E001F007E1480007C130F00FC14C0481307A66C130FA2007C1480007E131F6CEB3F00
-6D5A381FE1FE6CB45A6C5B6C5B6C5BD8003FC7FC1A1D7C9C23>I<38FF81FCEBC7FF01DF
-13C090B512E015F03907FE0FF8EBF8039038F001FCEBE000A249137EA2153EA5157E7F15
-FC7F14019038F803F89038FE0FF090B5FC15E001DF138001CF1300EBC3F801C0C7FCAAEA
-FFFEA51F2C7F9C23>I<90383FC1C09038FFF3E0000313FB4813FF5A381FF07F383FC01F
-387F000F127E14075A14035AA57E1407127E140F007F131FEA3F80381FE07F90B5FC1207
-6C13FB6C13E338003F83EB0003AAEC7FFF91B51280A36E1300212C7E9C23>I<397FF00F
-E039FFF87FF8ECFFFC13FB6CB5FCC613F8ECC078EC800091C7FC5BA25BA35BAA387FFFFC
-B57EA36C5B1E1D7E9C23>I<3801FF9C000F13FE5A127FA2EAFF0000FC137E48133EA26C
-131C6C1300EA7FF0383FFF80000F13E06C13F838007FFCEB01FEEB007F0070133F00F813
-1F7E143F7E38FF80FFEBFFFE14FC14F814F000701380181D7B9C23>I<137013F8A7007F
-B51280B612C0A36C1480D800F8C7FCACEC01C0EC03E0A3EBFC07140F9038FE1FC0EB7FFF
-158090383FFE00EB0FFCEB07F01B257EA423>I<39FF807FC001C013E0A400071303B014
-07140FEBE03F90B6FC7EA2C613F3EB3FC1201D7F9C23>I<39FFF03FFCA5390F8007C000
-071480A2EBC00F00031400A26D5A0001131EA2EBF03E0000133CA2EBF87CEB7878A2EB7C
-F8EB3CF0A2133F6D5AA36D5A6D5A1E1D7E9C23>I<397FF00FFE39FFF81FFFA3397FF00F
-FE001FC712F86C14F0A57F390783E1E0EB87F1A3EB8FF90003EB79C013CFA2EBDF7BA2EB
-DE3B00011480EBFE3FA2EBFC1FA23900F80F00201D7F9C23>I<397FF07FF039FFF8FFF8
-A3397FF07FF03903E03E003801F03C3800F87CEB78F8EB7CF0EB3FE0131F6D5A5C130749
-7E497E133DEB3CF0EB7878EBF07C0001133C497E3803C01F397FF03FF839FFF87FFCA339
-7FF03FF81E1D7E9C23>I<EC1FE0ECFFF05B130715E090380FF00014C05CAE131F137FD8
-7FFFC7FC485A5BA27F6C7EC66C7E131F130FAE8014F0903807FFE015F013017FEC1FE01C
-347DAD23>123 D<EA7FC0EAFFF87F13FF7EC66C7E131F130FAE8014F0903807FFE06D13
-F07FA25B4913E090380FF00014C05CAE131F137FD87FFFC7FCB5FC13FC5BEA7FC01C347D
-AD23>125 D<3803C038380FF07C381FF8FCEA3FFF4813F8B512F038FC7FE038F83FC038
-700F0016097AA823>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fb cmbx10 12 37
-/Fb 37 122 df<923B1FFF8001FFC00203B5D8F01F13F0021FDAF87F13FC027F91B67E90
-2701FFF803ECC3FF49D9C001EBFE0790270FFE000349481380494815F84A4913F0494815
-E0495AA201FF4C6C13004A6D6E5A735A70EC00707092C7FCAABA12FCA5C601E0C701E0C8
-FCB3B0007F9026FFC07FEBFFF0A549467EC543>11 D<ED1FFF0203B512E0021F14F8027F
-80903A01FFF803FE499038C0007F010F90390001FF80D91FFC497F4A5B495A495AA201FF
-4A7F4A6D5BA3705B7090C7FC705A94C8FCA693387FFFE0B9FCA5C601E0C7FCB3B0007F90
-26FFC07FEBFFC0A53A467EC540>I<EE0FC04C7EA24C7EA34C7EA24C7EA24B7FA34B7FA2
-4B80A34B8016CF031F80168F1687033F801603037F80157E8203FE804B7E0201814B137F
-A20203814B7F0207824B7FA2020F824B7F021F824B7F023F82A292C77E4AB77EA291B87E
-A3D901FCC87F4A157F0103835C840107844A81010F844A81A2011F844A81013F84496C81
-B600C0010FB612FCA54E457CC457>65 D<B912C018FCF0FF8019E019F8D8001F90C70003
-7F9438007FFE727E7213807213C0841AE0A2841AF0A71AE0601AC0604E13801A004E5AF0
-FFFC050313F0053F5B92B7C7FC18FCF0FFC019F892C86C7EF01FFF7213807213C07213E0
-1AF07213F8A27213FCA31AFEA2197FA319FFA21AFCA2601AF8604E13F0A2061F13E04E13
-C04DB51280BAEAFE006119F0198006F0C7FC47447DC351>I<DCFFFC141C031FD9FFC013
-7C4AB600F813FC0207EDFE01021FEDFF03027FD9F00113C749B5C7EA3FEF4901F8EC0FFF
-010F01E01403490180804990C9FC4948167F4948163F4849161F4849160F5C4818074849
-1603A2485B19015A91CAFC19005AA3491800A212FFAC127FA27F1A7CA27EA2806C19FC1A
-F86C7F19016C7F6CF003F0806C6DEE07E06C6DEE0FC06D6C161F6D6CEE3F806D6DED7F00
-6D01E0EC01FE010301F8EC07FC6D01FFEC1FF86D6C9039F801FFE0021F90B65A020793C7
-FC020115FCDA001F14E0030049C8FC46467AC453>I<B97E18F818FF19E019F8D8001F90
-C7000F13FE05007F061F7F06077F7213F084727F737E737E737EA2731380A27313C0A21B
-E085A21BF0A51BF8A285A961A21BF0A41BE0A2611BC0A2611B801B00614F5A62197F4F5A
-06035B4E5B061F5B95B5C7FC050F5BBA12F819E0198006FCC8FC18804D447CC358>I<BA
-12FCA485D8001F9038800001EF003F180F180318011800A2197F85A385A2177CA2F10F80
-A405FC90C7FCA316011603161F92B5FCA5ED801F160316011600F101F0A2177CF103E0A5
-94C71207A21AC0A2190FA2191FA2193FF17F8019FF601807181F4DB5FCBBFC1A00A44443
-7DC24B>I<BA12E0A419F0D8001F903880000F1700183F181F180F1807180319F81801A3
-1800A3EE01F0197CA419001603A31607160F163F92B5FCA5ED803F160F16071603A31601
-A693C9FCAEB712FCA53E437CC248>I<DCFFFC1438033FD9FF8013F84AB6EAF001020FED
-FC03023FEDFF0791B5D8F003138F4991C7EA7FDF010701F8EC1FFF4901E0140749018080
-4990C9FCD97FFC167F495A48183F4849161F4A160F5A48491607A2485B19035A91CAFC19
-015AA34994C8FC12FFAC057FB612F8A2127F7FA2DD0001EBF8007EA2807EA26C7FA26C7F
-7E806C7F6C7F6D7E6D6C5D6D13C06D6D5C6D01F85C010101FF143F6D9139F801FFDF023F
-90B6128F020F16030201EDFC00DA003F02E01338030049C9FC4D467AC45A>I<B7D8F007
-B71280A5D8001F0180C801FCC7FCB3A792B8FCA50380C8FCB3AAB7D8F007B71280A55144
-7CC35A>I<B712F0A5D8001FEB8000B3B3B3A4B712F0A524447DC32B>I<B600C0051FB512
-F06F5FA26F5FA2D8001FF380006F17F7A2DABFFCEE01E7A2DA9FFEEE03C7A2DA8FFFEE07
-87A202876DED0F07A302836D151EA202816D153CA202806D1578A26F6C15F0A36F6CEC01
-E0A26F6CEC03C0A26F6CEC0780A26F6DEB0F00A36F6D131EA26F6D5BA26F6D5BA2706C5B
-A2706C485AA3706C485AA2706C485AA270018FC7FCA27013DEA37013FCA2705BA2715AA2
-715A497EB600F0043FB612F0715AA2715A71C7FC64447CC36D>77
-D<B812FEEFFFF018FE727E85D8001F90C7001F13F005037F05007F727E727E841A801AC0
-84A21AE0A91AC0A24E1380A21A00604E5A4E5A05035B051F13E092B75A96C7FC18F818C0
-0380CAFCB3A7B712F0A543447CC34E>80 D<B812F8EFFFC018F818FF19C0D8001F90C700
-3F7F050313F805007F727E727E84868684A286A762A24E5BA297C8FC4E5A4E5A4D485A05
-075B053F13C092B7C9FC18FC18F018FC92C77F94383FFF80050F7F717F717F85838583A6
-85A61B0773EB0F80A372141F1A8072EC3F00B700E06D13C072EBF0FE72EBFFFC06015C72
-6C13E0CC0003138051457CC356>82 D<DAFFF8130701079038FF800F013FECE01F49ECF8
-3F48B6EAFE7F48D9C00FB5FC3907FE00014848EB003FD81FF080160748488082484880A2
-8312FF83A27F837F7F7F01FF92C7FC6C13C014FEECFFE06C14FF16F06C15FC16FF6C16C0
-6C826C826C826C82013F81010F811303D9003F15801403DA001F14C01500163F040F13E0
-1603A200788100F881A3177F7EA218C07EA26CEEFF80A26D4A130013E06D4A5A01FE4A5A
-6D6CEB1FF802FCEBFFF0486CB65AD8FC1F5DD8F80792C7FC48C614FC48010713C033467A
-C440>I<B700F0011FB512FEA5D8001F0180C83807F800735AB3B3A71907A26D6D5EA219
-0F7F6F4B5A7F6F4B5A6D4DC7FC6D6D5D6E6C4A5A6E6CEC07FC91261FFFC0EB1FF8020790
-39F801FFF06E90B612C0020093C8FC033F5C030714F0DB003F90C9FC4F457CC358>85
-D<903801FFF8011FEBFF80017F14E090B612F8489038807FFC3A03FE001FFE486CEB07FF
-486E7F0280806F7FA36F7F6C90C7FCA26C5AEA00F890C8FCA2150F021FB5FC0103B6FC13
-1F017F13C03901FFFC004813E0000F13804890C7FC485A5B485AA2485AA45DA26C6C5BED
-07BF6C6C010F13FC6CB490391F3FFFE06C9026C0FE1F13F06CEBFFFC6CECF007C66CD9E0
-0113E0010790C9FC342F7DAD38>97 D<EB7FC0B5FCA512037EB1ED1FFC92B512C002C314
-F002CF14FC9139DFF01FFF9126FF800713809126FE000113C04A6D13E002F015F04A147F
-18F8173F18FCA2EF1FFEA318FFAB18FEA3173F18FCA218F8177F6E15F06EECFFE06E4913
-C06E49138091263F800F1300903AFE1FE03FFE496CB55AD9F80314F049C61480C8D81FF8
-C7FC38467DC440>I<EC3FFE49B512E0010F14F8013F8090397FF807FE9039FFE001FF48
-4948138048018014C048495A485A121FA2485A6F1380A2007F6E130049EB007C93C7FC12
-FFAC127F7FA2123FEE03E06C7E16076C6C15C06C150F6C6DEB1F806C6DEB3F006C01F013
-FE90397FFE03FC6DB55A010F5C010314C09026003FFCC7FC2B2F7CAD33>I<EFFF804BB5
-FCA5ED000782B1EC1FFC49B51283010F14E3013F14F390267FFC07B5FC9038FFF0004801
-C0133F48497F4890C77E484880121F5B123FA2127F5BA312FFAB127FA36C7EA2121F7F00
-0F5D6C6C5C5E6C6D90B512C06CD9E00114FF39007FF80F6DB512E7010F14C70103140790
-26003FF0EBFC0038467CC440>I<EC1FFE49B512C0010714F0011F14FC90397FFC0FFE90
-3AFFE003FF804849C613C0485B4890C7EA7FE048ED3FF0485AEE1FF8485AA2007F150F49
-15FCA212FFA390B7FCA317F801F8C9FCA5127FA27FA2003F1638177C6C6C15FCA26C6CEC
-01F86C6D13036CED07F06C6DEB0FE06C01F0EB3FC0903A3FFE01FF806DB5EAFE0001075C
-010014F0020F90C7FC2E2F7DAD35>I<913801FFC0021F13F0027F13FC49B57E49EBC3FF
-903807FE074948481380EB1FF8EB3FF0EB7FE0A349486C13006F5A6F5AED007093C7FCAA
-B612FCA5C601E0C8FCB3B0007FEBFFE0A529467DC523>I<902601FFF013FF010FD9FE03
-1380013FD9FF8F13C090B812E048D9C07F13BF489039001FF83F4848EB0FFC4848EB07FE
-001F9238FF1FC0496DEB0F8094C7FC003F82A7001F93C7FCA26D5B000F5D6C6C495A6C6C
-495A6C9038C07FF04890B55A1680D8078F49C8FC018113F0D80F80CAFCA47F7F13F890B6
-12E016FEEEFFC06C16F0836C826C82831207481780D81FF8C77ED83FE014074848020113
-C000FF8149157FA56D15FF007F17806D5C6C6C4A1300D81FFCEC0FFE6CB4EC3FFC6C9039
-E001FFF8000190B612E06C6C1580010F02FCC7FCD9007F138033427DAC39>I<EB7FC0B5
-FCA512037EB1923803FF80031F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF9126C7
-C0077FECCF0002DE7F02FC81A25C5CA35CB3A7B600C1B61280A539457CC440>I<13FCEA
-03FF4813804813C0A24813E0A66C13C0A26C13806C1300EA00FC90C7FCA9EB7FC0EA7FFF
-A512037EB3AFB6FCA518467CC520>I<EB7FC0B5FCA512037EB293387FFFF0A593380FF8
-004C5AEE3FC04C5A4B48C7FCED03FC4B5A4B5AED3FE0ED7F804BC8FCECC1FE14C7ECCFFF
-02DF7F91B57E82A202FD7F02F07F4A7F4A6C7E153F6F7E6F7F83816F7F6F7F6F7F83167F
-707E83B66CB512FCA536457DC43C>107 D<EB7FC0B5FCA512037EB3B3B3A3B61280A519
-457CC420>I<90287FC003FF80EB07FFB5011F01F0013F13E0037F6D90B57E92B56C4880
-913DC1FC1FFE03F83FFC913DC3E00FFF07C01FFE00039026C7C00790398F800FFF6CD9CF
-00EC9E0002DE6D01BC7F02FC03F81580A24A5D4A5DA34A5DB3A7B600C1B60083B6FCA558
-2D7CAC5F>I<903A7FC003FF80B5011F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF
-00039026C7C0077F6CEBCF0002DE7F02FC81A25C5CA35CB3A7B600C1B61280A5392D7CAC
-40>I<EC1FFE49B512E0010714F8011F14FE903A7FF807FF809026FFE0017F4890398000
-7FE04890C76C7E48486E7E000F8249140F001F82A2003F824980007F1780A400FF17C0AA
-007F1780A46C6C4A1300A2001F5EA26C6C4A5A00075E6D143F6C6D495AC69039E001FFC0
-90267FF8075B6DB6C7FC010F14FC010114E09026001FFEC8FC322F7DAD39>I<90397FC0
-1FFCB590B512C002C314F002CF14FC9139DFF03FFF9126FF800F138000039026FE000313
-C06C496D13E002F015F04A7FEF7FF8A218FC173F18FEA3EF1FFFAB18FE173FA318FC177F
-18F817FF6E15F06E4913E06E4913C06E4913806E6C4813009238E07FFE02EFB55A02E314
-F002E01480DB1FF8C7FC92C9FCADB612C0A538407DAC40>I<90397F803FC0B5EBFFF002
-8313F8028713FC91388FE7FE91389F8FFF0003EB9E0F6C13BCA214F8A29138F007FEED03
-FC9138E001F892C7FCA35CB3A5B612C0A5282D7DAC2F>114 D<90391FFE078090B512DF
-000314FF5A380FF803381FE000D83F80133F127F90C7121FA248140FA27FA201E090C7FC
-13F8EBFFC06C13FEECFFC06C14F015FC6C806C806C1580000115C07E011F14E01301D900
-0713F014000078147F00F8143F151F6C140FA37E6C15E0151F6D14C06D133F01F0EB7F80
-9039FC03FF0090B55A00FC5CD8F83F13F0D8F00790C7FC242F7CAD2D>I<EB01F0A51303
-A41307A2130FA2131FA2133F137F13FF1203000F90B512C0B7FCA4C601F0C7FCB3A3ED01
-F0AA017FEB03E014F81507D93FFC13C090391FFE1F806DB512006D5B01015B9038003FF0
-24407EBE2D>I<D93FE0EC7FC0B549B5FCA50003EC00076C81B3A85EA35E6C5DA26E013D
-7F017F02F9EBFF8090393FFC03F16DB512E16D14C1010314019026003FFC91C7FC392E7C
-AC40>I<007FB590387FFFF8A5C601F890380FF8006D6CEB07E0013F4A5A6D6C131F6E49
-5A6D6D48C7FC6DEBC0FE6DEBC1FC6DEBE1F8EDF3F06DEBFFE0806E5B6E5B93C8FC6E7F6E
-7F6E7FA24A7F4A7F4A7FEDBFFEEC3F1F91387E0FFF02FE8049486C7F49486C7F49487E49
-486C7F4A8049486D7E49C76C7ED9FF80131FB500F090B512FEA5372C7EAB3C>120
-D<007FB5398007FFFCA5000101F0C7EA7F806CEE3E006E147E017F157C8017FC013F5D6E
-1301011F5D6E13036D5DED80076D5DEDC00F6D5D15E0161F6D92C7FC6F5A6D143EEDF87E
-027F137CEDFCFC023F5B15FF6E5BA36E5BA26E5BA26E5BA26E90C8FCA26E5AA2157CA215
-FC5D1401000F5C383FC003D87FE05B1407D8FFF05B140F5D141F4AC9FC387FE07E495A38
-3F87F8EBFFF06C5B00071380D801FCCAFC36407EAB3C>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fc cmbx8 8 20
-/Fc 20 119 df<91383FFCF00103B5FC130F90383FF01F9038FF803F4813005B12034913
-1F150FA7B7FCA43903FC000FB3A4263FFFC0B5FCA4282E7FAD2D>13
-D<14E01301EB07C0EB0F80EB1F00133E137E5B5B1201485AA2485AA2485AA2121F5B123F
-A290C7FC5AA512FEAF127FA57E7FA2121F7F120FA26C7EA26C7EA26C7E12007F137E133E
-7FEB0F80EB07C0EB01E01300134378B120>40 D<12E07E127C7E7E6C7E7F6C7E12037F6C
-7EA26C7EA2137EA2137F7F1480A2131F14C0A5EB0FE0AFEB1FC0A51480133FA214005B13
-7EA25BA2485AA2485A5B1207485A5B48C7FC123E5A12F05A13437CB120>I<B712E016FE
-707E17E00001D9800013F8EE1FFCEE07FE707E7013807013C0EF7FE0173F18F0A2171F18
-F8A318FCAA18F8A4EF3FF0A218E0177FEFFFC018805E04071300EE1FFCEEFFF8B85A17C0
-4CC7FC16E0362E7DAD3E>68 D<B690380FFFFEA4000101809038001F00B3AC5F6C6D143E
-A2017F157E6E147C013F5D6D6C1303D90FFCEB0FF0903A07FF807FE06D90B51280010092
-C7FC023F13FC020313C0372F7DAD3E>85 D<007FB548B512E0A4C6903AE0000FE0006D6C
-5C6E495A6D6C49C7FC011F5C6D6C137E6E5B6DEB81F86D13836DEBC7F0EDE7E06DEBFFC0
-6E5B8093C8FC6E5A140F6E7E826E7F5C4A7F4A7F82EC3F3F91387E1FFC02FE7F4A6C7E49
-487E49486C7F0107814A6C7F49487E49486D7E013F8149C76C7E017E141F496E7EB5D8F0
-01B512FCA4362E7DAD3D>88 D<EB7FF80003B5FC000F14C0391FE01FF09038F007F86E7E
-A26E7EEA0FE0EA07C0C7FCA214FF133F48B5FC000713C1381FFC01EA3FE0EA7FC0EAFF80
-1300A3140313806C6C487E263FF03F13F8381FFFFE0007EBF87FC6EBC01F251E7E9D28>
-97 D<EB0FFE90387FFFC048B512F03907FC07F8380FF00FEA1FE0123F13C0007FEB07F0
-90388003E091C7FC12FFA8127F7FA26C6C133CA26C6C137C6C6C13F83907FE03F00001B5
-12E06C6C138090380FFC001E1E7D9D24>99 D<ED0FC0EC03FFA4EC003FABEB0FF8EB7FFF
-48B6FC3807FC07380FF001391FE0007F003F143F5B127F5BA212FFA9127F7F123F157F6C
-6C13FF380FF0032607FC0F13FC0001B512BF6CEBFE3FEB1FF0262E7DAD2D>I<EB0FFC90
-387FFF8048B512E03907FC0FF0390FF003F8391FE001FC1400484813FE007F147E5B157F
-12FFA290B6FCA30180C7FCA3127F7FA2003F140F6C7E6C6C131F6C6C137E3903FE01FC6C
-B512F86C6C13E001071300201E7E9D25>I<ED07C090391FF81FF090B5EA7FF8000314FD
-3907F81FF3380FE007001F14F99039C003F8F0003FECFC00A6001F5CEBE007000F5C3907
-F81FE090B55A4891C7FCEB1FF8001EC9FC121FA27F90B512C06C14F815FF6C158016C048
-15E0123F48C7EA3FF000FE140F4814071503A36C1407007FEC0FE06C6CEB1FC0D81FF0EB
-FF800007B5EAFE00000114F8D8001F1380252D7E9E29>103 D<EA03F012FFA4120FAB91
-3803FFF0A4913800FC00EC03F84A5AEC0FC0EC3F804AC7FC14FCEBF1F8EBF7FCEBFFFE80
-A2497F9038F87FC0496C7E496C7E6E7EA26E7E6E7E6E7E6E138026FFFE0313FCA4262E7D
-AD2B>107 D<EA03F012FFA4120FB3B3B5FCA4102E7CAD17>I<2707E00FF8EB1FF000FFD9
-7FFEEBFFFC01E1B5008313FF9028E7E07FCFC01380903BEF803FDF007F260FFE0013FC03
-1FEC3FC0495C495CA2495CB0B53B01FFFE03FFFCA43E1E7C9D45>I<3907E01FF000FFEB
-7FFC01E1B5FCD9E7E013809038EF807F260FFE0013C049133FA25BA25BB0B53803FFFCA4
-261E7C9D2D>I<EB07FE90387FFFE048B512F83903FC03FC3907F000FE4848137F4848EB
-3F80003F15C049131F007F15E0A200FF15F0A8007F15E0A26D133F003F15C0001F15806D
-137F6C6CEBFF003903FC03FC6CB55A6C6C13E0D907FEC7FC241E7E9D29>I<3807E07E39
-FFE1FF8001E313E0EBE78F9038EF1FF0EA0FFE13FCA29038F80FE0EC07C091C7FC5BAFB5
-7EA41C1E7D9D22>114 D<3801FF8E000713FE121FEA3F00007C137E0078133E00F8131E
-A27EB490C7FC13F0EBFF806C13E06C13F86C13FE7E00037FD8003F13801300143F00F013
-1F140F7EA26CEB1F007E38FF807EEBFFFC00FB13F000E01380191E7D9D20>I<133CA413
-7CA313FCA2120112031207001FB5FCB6FCA3D803FCC7FCAEEC03C0A61407D801FE1380EB
-FF0F6CEBFF00EB3FFCEB0FF01A2A7FA920>I<B5EB3FFCA4D80FF8EB07C0000715806D13
-0F000315006D5B0001141E6D133E6C143CEC807C017F1378ECC0F8013F5B14E1011F5B14
-F3010F5B14FF6D5BA26D90C7FCA26D5AA26D5AA21478261E7E9D2B>118
-D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fd cmr8 8 42
-/Fd 42 127 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07
-4913FE485A00039138FC018049017CC7FCAAB712FCA22703E0007CC7FCB3A6486C13FE3A
-7FFF0FFFF0A22B2F7FAE29>11 D<14FF010713E090381F80F090383E003849137C4913FC
-485A1203491378153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFF
-E0A2232F7FAE27>I<ECFFC0010713FC90381F807C90383E00FC5B5B485A0003147C5BAA
-B612FCA23903E0007CB3A6486C13FE3A7FFF0FFFE0A2232F7FAE27>I<13031307130E13
-1C1338137013F0EA01E013C01203EA0780A2EA0F00A2121EA35AA45AA512F8A25AAB7EA2
-1278A57EA47EA37EA2EA0780A2EA03C0120113E0EA00F013701338131C130E1307130310
-437AB11B>40 D<12C07E12707E7E7E120FEA0780120313C0EA01E0A2EA00F0A21378A313
-3CA4131EA5131FA2130FAB131FA2131EA5133CA41378A313F0A2EA01E0A2EA03C0138012
-07EA0F00120E5A5A5A5A5A10437CB11B>I<123C127EB4FCA21380A2127F123D1201A312
-031300A25A1206120E5A5A5A126009157A8714>44 D<B512C0A412047F9018>I<123C12
-7E12FFA4127E123C08087A8714>I<15C0140114031580A214071500A25C140EA2141E14
-1CA2143C143814781470A214F05CA213015CA213035C130791C7FCA25B130EA2131E131C
-A2133C1338A21378137013F05BA212015BA212035BA2120790C8FC5A120EA2121E121CA2
-123C1238A212781270A212F05AA21A437CB123>I<130C133C137CEA03FC12FFEAFC7C12
-00B3B113FE387FFFFEA2172C7AAB23>49 D<EB7F803801FFF0380780FC380E003F48EB1F
-8048EB0FC05A0060EB07E012F000FC14F07E1403A3007C1307C7FCA215E0140F15C0141F
-1580EC3F00147E147C5C495A495A495A495A011EC7FC5B5B4913305B485A4848136048C7
-FC000E14E0001FB5FC5A4814C0B6FCA21C2C7DAB23>I<DA1FF013C09138FFFE01903903
-F00F8390390F8001E3013FC71277017C143F4848141F4848140F48481407A24848140312
-1F491401123F90C8FC481500A300FE1600AB127F17C0A27E7F001F15016D1580120F6C6C
-1403EE07006C6C14066C6C140ED8007C5C013F147890390F8001E0903903F00FC0902600
-FFFEC7FCEC1FF02A2F7CAD33>67 D<B612F815FF3A03F8001FE00001EC03F0ED00F8167E
-82EE1F80160F17C0EE07E0A2EE03F0A217F81601A317FCAA17F8A3EE03F0A217E0160717
-C0160FEE1F80EE3F00167E5EED03F00003EC1FE0B7128003F8C7FC2E2D7DAC36>I<B712
-FEA23903F800010001EC003E828282A282A3178016011518A293C7FCA31538157815F890
-B5FCA2EBF800157815381518A21760A392C712C0A4160117801603A21607160F163F0003
-913801FF00B8FCA22B2D7EAC30>I<DA1FF013C09138FFFE01903903F00F8390390F8001
-E3013FC71277017C143F4848141F4848140F48481407A248481403121F491401123F90C8
-FC481500A300FE1600A992381FFFFEA2007F9138001FE0EE0FC0A27E7F121F7F120F6C7E
-A26C7E6C6C141FEA007C013F143FD90F8013F3903903F007C10100B51200DA1FF813002F
-2F7CAD37>71 D<D8FFF8903803FFFC7F00019138003FC06DEC0F006D1406EBBF80A2EB9F
-C0EB8FE0138780EB83F8138180EB80FE147E147FEC3F80EC1FC0140F15E0EC07F0140315
-F8EC01FC140015FE157FED3F86151F16C6ED0FE6150716F6ED03FE1501A21500167E163E
-A2486C141ED80FF0140EB5FC16062E2D7DAC35>78 D<B539F003FFFCA2D803FCC7EA3FC0
-6C48EC0F001606B3AB160E0000150C7F161C017C1418017E14386D5C6D146090390F8001
-E0903907E00380902601F80FC7FC9038007FFCEC0FF02E2E7DAC35>85
-D<13FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801
-FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F
-83C7FC390FFF03F83901FC01E01F207D9E23>97 D<EA07C012FFA2120F1207AC14FE9038
-C7FF809038CF03E09038DC01F09038F8007C49137E49133E497F1680A2150F16C0A9ED1F
-80A216005D6D133E6D5B01B05B9038BC01F090380E07E0390607FF80260001FCC7FC222F
-7EAD27>I<EB1FE0EB7FFC3801F01E3803E0073907C01F80EA0F80EA1F005A003EEB0F00
-007E90C7FCA2127C12FCA9127EA215C07E6C130101801380380FC0033907E007003801F0
-3E38007FF8EB1FC01A207E9E1F>I<15F8141FA214011400ACEB0FE0EB7FF83801F81E38
-03E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13017EEB80
-03000F13073903E00EFC3A01F03CFFC038007FF090391FC0F800222F7EAD27>I<EB1F80
-EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3B6
-FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F03C
-38007FF8EB1FC01A207E9E1F>I<EB03F0EB0FFCEB3E1EEB7C3F13F8EA01F0A23803E00C
-1400AAB512E0A23803E000B3A6487E387FFF80A2182F7FAE16>I<013F13F89038FFC3FE
-3903E1FF1E3807807C000F140C391F003E00A2003E7FA76C133EA26C6C5A00071378380F
-E1F0380CFFC0D81C3FC7FC90C8FCA3121E121F380FFFF814FF6C14C04814F0391E0007F8
-48130048147C12F848143CA46C147C007C14F86CEB01F06CEB03E03907E01F803901FFFE
-0038003FF01F2D7E9D23>I<EA07C012FFA2120F1207AC14FE9038C3FF809038C703E090
-38DE01F013F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2222E7EAD27>I<EA0780EA
-0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA07C012FFA2120F1207B3A5EA0FE0EAFFFCA20E2E
-7EAD14>I<EA07C012FFA2120F1207ADEC1FFEA2EC0FF0EC07C05D020EC7FC5C5C5C5CEB
-C3C013C7EBCFE0EBDFF013F9EBF0F8497EEBC07E143E80816E7E14076E7E816E7E486C48
-7E3AFFFE07FF80A2212E7EAD25>107 D<EA07C012FFA2120F1207B3B3A3EA0FE0EAFFFE
-A20F2E7EAD14>I<2607C07FEB07F03BFFC3FFC03FFC903AC783F0783F3C0FCE01F8E01F
-803B07DC00F9C00F01F8D9FF8013C04990387F000749137EA249137CB2486C01FEEB0FE0
-3CFFFE0FFFE0FFFEA2371E7E9D3C>I<3807C0FE39FFC3FF809038C703E0390FDE01F0EA
-07F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2221E7E9D27>I<EB1FE0EB7FF83801
-F03E3803C00F3907800780390F0003C04814E0003EEB01F0A248EB00F8A300FC14FCA900
-7C14F8A26CEB01F0A26CEB03E0A2390F8007C03907C00F803901F03E0038007FF8EB1FE0
-1E207E9E23>I<3807C0FE39FFC7FF809038CF03E0390FDC01F03907F800FC49137E4913
-3E49133FED1F80A3ED0FC0A8151F1680A2ED3F00A26D137E6D137C5D9038FC01F09038CE
-07E09038C7FF80D9C1FCC7FC01C0C8FCA9487EEAFFFEA2222B7E9D27>I<90380FE01890
-387FF8383801F81C3903E00E783807C007390F8003F8001F1301EA3F00A2007E1300A212
-FE5AA8127EA36C13017EEB8003380FC0073803E00E3801F03C38007FF0EB1FC090C7FCA9
-4A7E91381FFFC0A2222B7E9D25>I<380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF0
-1EEBE000A45BB0487EB5FCA2181E7E9D1C>I<3801FE183807FFB8381E01F8EA3C004813
-78481338A21418A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138
-C0007E143EA26C131EA27EA26C133CA26C137838FF01F038E3FFC000C0130017207E9E1C
->I<1360A413E0A312011203A21207121FB512F0A23803E000AF1418A714383801F03014
-703800F860EB3FE0EB0F80152A7FA81B>I<D807C013F800FF131FA2000F130100071300
-B21401A314033803E007EC0EFC3A01F81CFFC038007FF890391FE0F800221F7E9D27>I<
-3AFFFC01FFC0A23A0FE0007E000007147C15380003143015706C6C1360A26C6C5BA39038
-7C0180A26D48C7FCA2EB3F07EB1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D5A22
-1E7F9C25>I<3BFFFC3FFE07FFA23B0FE003F001F801C09038E000F00007010114E08126
-03E00314C0A2913807F8012701F006781380A29039F80E7C030000D90C3C1300A290397C
-181E06A2151F6D486C5AA2168C90391F600798A216D890390FC003F0A36D486C5AA36DC7
-5A301E7F9C33>I<3AFFFC07FF80A23A0FF003FC000003EB01F0000114C06D485A000091
-C7FCEB7C06EB3E0E6D5A14B8EB0FB0EB07E013036D7E497E1307EB067C497EEB1C1F0138
-7FEB700F496C7E6E7ED803C07F00076D7E391FE003FC3AFFF007FFC0A2221D7F9C25>I<
-3AFFFC01FFC0A23A0FE0007E000007147C1538000314306D137000011460A26C6C5BA2EB
-FC01017C5BEB7E03013E90C7FCA2EB1F06A2148EEB0F8CA2EB07D8A2EB03F0A36D5AA26D
-5AA2495AA2130391C8FC1278EAFC06A25B131CEA7838EA7070EA3FE0EA0F80222B7F9C25
->I<38078008380FE01C381FF838383FFFF038707FE038E01FC03840078016077AAC23>
-126 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fe cmbx10 14.4 11
-/Fe 11 115 df<932601FFFCEC03C0047FD9FFC013070307B600F8130F033F03FE131F92
-B8EA803F0203EFC0FF020FDAF00113F1023F49C7EA3FFB4A01F00207B5FC49B500C08049
-91C9FC4949824901F88249498249498249498290B5488292CAFC4885485B86485B481A7F
-A24849183FA3485B1B1FA25AA24A95C7FCA3B5FCAE7EA280A2F30FC07EA36C7FA21B1F6C
-6D1980A26C1A3F6C7F1C006C6D606C6E17FEA26D6D4C5A6D6D4C5A6D6D16076D6D4C5A6D
-01FE4C5A6D6D4C5A6D02C0EDFF806D6C01F8020390C7FC6E01FFEC1FFE020F02F0EBFFF8
-020391B65A020017C0033F93C8FC030715FCDB007F14E0040101FCC9FC525478D263>67
-D<BA12C019FEF1FFC01AF81AFE747ED8000701F8C7000F14E0060080071F13FC07077F07
-017F7380747F081F7F8886747F747FA2747FA288861D80A2871DC0A31DE0A4871DF0AF1D
-E063A41DC0A398B51280A31D0062646264505BA2505B505B505B505B4FB5C7FC4F5B070F
-5B077F5B0607B512E0BC128098C8FC1AF81AE04FC9FC19C05C527CD169>I<B912FCF0FF
-E019FEF1FFC01AF01AFCD8000701F8C7003F13FF060380060080073F7F737F737F87737F
-A2737FA388A899C8FCA263616361634F5B4F5B96B55A060391C9FC063F5B92B812F81AC0
-97CAFC19FC19FF9226F8000180DD003F13E0060F7F727F727F86727FA27280A2737FA587
-A587A575EB0780F50FC0A28773151FA2736D148075133FB800C06DEC807F739138C1FF00
-0701ECFFFE735D083F5C080714E0CE001F138062537CD167>82 D<91383FFFC00107B512
-FC011FECFF80017F15E090B77E48D9E0077F48D9800013FE486DEB3FFF82486D81707F82
-84A2707F6C5BA26C5BC648C7FC90C8FCA44BB5FC4AB6FC143F49B7FC130F013FEBFE0390
-B512E0000314004813FC4813F0485B485B5C4890C7FCA2B5FC5BA35EA27F6C5D5E6E497F
-6C6D017E13FE6C6D4848EBFFF86C9026FC0FF814FC6C90B5487E0001EDC03F6C6CEC800F
-011F9026FE000313F8010101E090C8FC3E387CB643>97 D<913803FFF0023FEBFF8091B6
-12E0010315F8010F81499038C01FFE903A7FFE0007FF4948491380485B48494913C05C5A
-485BA2485B7013805A70130048ED01FC91CAFCA3B5FCAD7E80A27EA2EF07E06C7F170F6C
-6D15C06C161F6E15806C6D143F6C6DEC7F006C6D14FE903A7FFF8003FC6D9038F01FF801
-0F90B55A6D5D01011580D9003F49C7FC020313E033387BB63D>99
-D<943801FFC00407B5FCA6EE001F1707B3A3913803FFC0023F13FC49B6FC010715C74915
-F7013FD9E03FB5FC49EB0007D9FFFC130148496D7E484980484980484980A25A5C5AA25A
-91C8FCA3B5FCAD7EA46C7FA27EA26C6D5CA26C6D5C6C5E6C6D49B5FC6C6D4914F0D97FFE
-010FECFFC0903A3FFF807FEF6D90B512CF0107158F6DECFE0FD9007F13F00207018049C7
-FC42547BD24C>I<913803FFE0023F13FE91B612C0010381010F15F84901C07F903A7FFE
-001FFE49486D7E48496D138048496D13C0484915E048814A15F048815C48EE7FF8A25A91
-C8FC18FC173FB5FCA391B7FCA418F891CAFCA57EA3807EA218786C6D15FC17016C7F6CEE
-03F86C6D14076E15F06C6DEC1FE06C6C6C143F6D6C6CEBFFC06DD9F0071300010790B55A
-010115F86D6C14E0021F1480020001F8C7FC36387CB63F>I<ED0FFF92B512C0020714F0
-021F14F8027F14FC9139FFFC1FFE49EBF03F4901C013FF49495A491300495AA2495AA201
-7FEC3FFE4AEB1FFCEE0FF8EE07F093C7FCADB712F0A626007FFCC8FCB3B3A5007FB6FCA6
-30547CD32A>I<137F3801FFC0487F487F487FA2487FA76C5BA26C5B6C5B6C5B6C6CC7FC
-90C8FCABEB1FF8B5FCA612017EB3B3A4B612F0A61C547BD326>105
-D<D93FF8EB1FFEB591B512E0030314F8030F804B8092393FE07FFF92267F001F7F000314
-FCC6D9F9F86D7FECFBE014FF4B6D7F5D92C7FCA35CA35CB3ABB6D8FC07B612E0A643367B
-B54C>110 D<90393FF001FFB5010F13E04B13F84B7F4B7F9238FF1FFFECF1FC00039026
-F3F03F1380C6EBF7E015C0ECFF80A215007013005C705AEE03F84A90C8FCA45CB3A9B612
-FEA631367CB539>114 D E
-%EndDVIPSBitmapFont
+%%BeginProcSet: texps.pro 0 0
+%!
+TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2
+index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll
+exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0
+ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{
+pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get
+div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type
+/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end
+definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup
+sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll
+mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[
+exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if}
+forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def
 end
+
+%%EndProcSet
+%%BeginFont: CMSY6
+%!PS-AdobeFont-1.1: CMSY6 1.0
+%%CreationDate: 1991 Aug 15 07:21:34
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMSY6) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle -14.035 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMSY6 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 13 /circlecopyrt put
+readonly def
+/FontBBox{-4 -948 1329 786}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052F09F9C8ADE9D907C058B87E9B6964
+7D53359E51216774A4EAA1E2B58EC3176BD1184A633B951372B4198D4E8C5EF4
+A213ACB58AA0A658908035BF2ED8531779838A960DFE2B27EA49C37156989C85
+E21B3ABF72E39A89232CD9F4237FC80C9E64E8425AA3BEF7DED60B122A52922A
+221A37D9A807DD01161779DDE7D5FC1B2109839E5B52DFB7605D7BA557CC35D6
+49F6EB651B83771034BA0C39DB8D426A24543EF4529E2D939125B5157482688E
+9045C2242F4AFA4C489D975C029177CD6497EACD181FF151A45F521A4C4043C2
+1F3E76EF5B3291A941583E27DFC68B9211105827590393ABFB8AA4D1623D1761
+6AC0DF1D3154B0277BE821712BE7B33385E7A4105E8F3370F981B8FE9E3CF3E0
+007B8C9F2D934F24D591C330487DDF179CECEC5258C47E4B32538F948AB00673
+F9D549C971B0822056B339600FC1E3A5E51844CC8A75B857F15E7276260ED115
+C5FD550F53CE5583743B50B0F9B7C4F836DEF7499F439A6EBE9BF559D2EE0571
+CE54AEC461D354A32E69F39DD0C017BD6576F1E9500DC0328E8AF6EAB528FD7B
+85132A2A9995EB211FCE849216BF6D663AD649AE92DA953C4D520AB9A22D27B5
+6C34121FD688F9E17FE39B939D8DCED9EDDE5AF6DD7DC2297F2A3E1287E5AF45
+0306EDBA3C843FB8234D0DDEC7595CDE6657E499324DA260BACAE9D6DB126FD9
+AAA7368F7164F6BBBBE11EFFFB65660DA0961A97D51ADAF2136A085FDC16C199
+72BC2CA210B330C03F4252A275FEAADC95CFBC79C3B7285C4C7B5C9665909A56
+4176C37DCB569C8EED1B59C58B5EBD3ADD31010DCFD59411FC2020E238A07B83
+2439DEB653AFF1CF197533724E45EDA9810B6793E27943CF51484A5BC7DC61C5
+E97F71E04BB623E0BC9C
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMR6
+%!PS-AdobeFont-1.1: CMR6 1.0
+%%CreationDate: 1991 Aug 20 16:39:02
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMR6) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle 0 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMR6 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 44 /comma put
+dup 45 /hyphen put
+dup 46 /period put
+dup 48 /zero put
+dup 49 /one put
+dup 50 /two put
+dup 51 /three put
+dup 53 /five put
+dup 54 /six put
+dup 55 /seven put
+dup 57 /nine put
+dup 65 /A put
+dup 66 /B put
+dup 67 /C put
+dup 68 /D put
+dup 69 /E put
+dup 70 /F put
+dup 71 /G put
+dup 73 /I put
+dup 77 /M put
+dup 78 /N put
+dup 80 /P put
+dup 82 /R put
+dup 83 /S put
+dup 85 /U put
+dup 97 /a put
+dup 98 /b put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 102 /f put
+dup 103 /g put
+dup 104 /h put
+dup 105 /i put
+dup 107 /k put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 118 /v put
+dup 119 /w put
+dup 120 /x put
+dup 121 /y put
+readonly def
+/FontBBox{-20 -250 1193 750}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5CF4E9D2405B169CD5365D6ECED5D768D66D6C
+68618B8C482B341F8CA38E9BB9BAFCFAAD9C2F3FD033B62690986ED43D9C9361
+3645B82392D5CAE11A7CB49D7E2E82DCD485CBA17D1AFFF95F4224CF7ECEE45C
+BFB7C8C77C22A01C345078D28D3ECBF804CDC2FE5025FA0D05CCC5EFC0C4F87E
+CBED13DDDF8F34E404F471C6DD2E43331D73E89BBC71E7BF889F6293793FEF5A
+C9DD3792F032E37A364C70914843F7AA314413D022AE3238730B420A7E9D0CF5
+D0E24F501451F9CDECE10AF7E14FF15C4F12F3FCA47DD9CD3C7AEA8D1551017D
+23131C09ED104C052054520268A4FA3C6338BA6CF14C3DE3BAF2EA35296EE3D8
+D6496277E11DFF6076FE64C8A8C3419FA774473D63223FFA41CBAE609C3D976B
+93DFB4079ADC7C4EF07303F93808DDA9F651F61BCCF79555059A44CBAF84A711
+6D98083CEF58230D54AD486C74C4A257FC703ACF918219D0A597A5F680B606E4
+EF94ADF8BF91A5096A806DB64EC96636A98397D22A74932EB7346A9C4B5EE953
+CB3C80AA634BFC28AA938C704BDA8DC4D13551CCFE2B2784BE8BF54502EBA9AF
+D49B79237B9C56310550BC30E9108BB06EAC755D6AA4E688EFE2A0AAB17F20FE
+00CD0BFF1B9CB6BDA0FA3A29A3117388B6686657A150CE6421FD5D420F4F7FB5
+B0DAA1BA19D638676E9CF159AC7325EF17B9F74E082BEF75E07BB563C96C0A3E
+6D4DF600BB73729BC4A5B134928F1370B9F07C587F79388B1D9AC62BFB1566DD
+CCBD1F58ABBF1F53AD21E3BFF25EEEB046F66A924E5F431EBD7228050BE2DF43
+0B9B538DAAD511EED97630CD9A9C05CC49DC251325A93EA842C6D07B44BE620F
+08E66B611F54314B0177E299304F2294F8DEDE9914736944F125A50B5007373E
+588AD80D9983CE7824DA30CEE5DC3114D69D7ACEC0758D8201805B82925EF3C9
+ADF568FD0365E58DB79935BFE98055726F1762241007E17F406CDD104D4E1411
+DF62D3DBEA32CC435DCB9E14DE94BAB3FB3F9DEB3C783C5F804CF18434722517
+08FF8A116CB58B1EB14C96C3579F076465F1A0B16A17F202BB9F0EAB24E3341A
+B9D190CFCD066D48D6FF74818E39E5416FD2EA43416A83D7A8146D29079FE553
+034B2B18F8AD3B08F0433CD5DA8B55D64AF3777102466712795437BFF7FC2D62
+E3C866B5D7D2DD03EB2D1CA1ABCC798AAE0DB6FE1B2EBE5409CFC4B4D55976A9
+1E1721CDDFAE166D30248F2BAE9D70F9ECFAB6E8FF213ACC090D70D5D7F82CDA
+89B29898E7362757C4E0EDE8B5C8F6196CB82BFAB5D0FF74960FB4893E8AEB7A
+F507D0C799B529637B9A864CE72232BDDF56BB4B79AFA17C795D554657B08574
+8A82B0DF5DCD67704445F3A4F0FCB07A61C6A4BEB1D913CC2F002640DCF4BFBD
+5F5CA89463202676525148E9ABDBAE2F6A04243412A1E0C84D6133E1F9DFDD4F
+6B230FB77FA127E4C3B7D364D568EEF37F00C9F15A485A30027B39C2A876A3FD
+7C9CFCB86931C4CEC15243353349BAA2B13B5D2B9800979D2C2924C0DBAD52E4
+2AFDBFA13CA2254B2DDE4F3BA5D2EA7AAA9E7CB3E0C3662413AEA74E8876FAD7
+FC5B991A56374AD47A585AB15F7DC08B103E4FF1ACE3939DD0B1B14F9EB7AEAA
+0DD0C98F1CC80888F11DDA518E1D56E8A29970E1CBBC452019B053E46BF8290C
+4E5BF7586B3A78934C7362085F323962F44EF5CB26617FC6789B32F8CC062E08
+C261845C8E83E2052A019434045746AB684008D39E0F63C90DEC50A147534B66
+3B28171B4A46F8EF649E7F34234AA592492BC326777A018FDF486DAB0E3093C8
+410BF60DA1B847BBA84143F8F36BE2B2239BE6A21F45BBEB9B7F48BA7B30B2AE
+F6AC4EE16918E72C4B66707C41F9C5DCE7E8897EA217CAF231BCB32139B4C1FC
+0CF91C1E23A6B91E7FC6DD138CD17724890CB0D958304DAABD04488EABCF1B93
+64E5E521354499289B4F6803CC5829D95E0060A68F031B3BA78690490F87D293
+69403417E953DDC218715B15DB94D068F6B5E558AC708E3D5F68548A4A20C630
+E6D41D95FFE0973B3672897AD9D68795E6D5429F3EB992A63D0A21E0B0C9F666
+845491E1C2083F8250481390666B516AFBB231AB398CA9984014B22B1BD3DDB2
+BEF02C269973C5B24166FA22E7B1C3EB2BC5CD52967C683CF4118C05FB2EBCAC
+1A2924E4560F1DC1E8D5893F04D37178F5AAF223BD7CD71C9DE8A98CB0703C3D
+79E1FD0986657243F635E28723E47E33EF58A058480779FE7175E03687363B69
+8C0C72A46FD66F46E1BCB233C3136204D72151EDA5294585B9CB90E1ABCBC2DA
+4D4D89CA5757B9DCB54FF3BAAF659A0CBD085B21178568802DE8797820E709D1
+D64B2C40D417EED85C73E285D011495EDED9896BB75DE2839D948E87BB5A0905
+875AC4520C2063CEE82BCCA71679E4CCBC5B37C87FFB191BF1A16C2D30C6A67C
+AC748679CB5D0C81C8204A6AB3DCAADE753457F8CB5A86F8A09FB21CDABEED26
+CBFB0188427465DB057C834B345E592D99BACDFF3691F14505E31F5CF9217393
+34466ED27FB3FBA3CD8FC145797A466CB7107190EEC5F7C299373882EFDB5282
+60B61E8A8F296A1652E9EC65A3D6ACE0E051F69723D55708D538D3EF38F76214
+3688BDD25AC02C4BA71784A5D6DC38ADE9FF918ABC4CB6128D2270705506BC73
+0A9FFD15041BE89D01056022AE4CE59F84AC318C59BC9F89FDED0BC884476211
+1A010F089039A96CC2097FF3E3A05F0593930911DFC91A5435701D2EEE24EBFC
+1B41423AA46E933E7103B7CDE75527372A7718C0B2CF412DC980E703D75B4024
+46C1C9CF31639F050855F59896EE105A297DEE56F1DFF0448BFC7F0E438BA379
+3495FEE6E537DBDEC034CC92241E75E192F9D1187BECB52D3EFC455EF08A2A77
+4F6A9CDE92366DDD31424C51CCDEAEBA1744FA290031C78B1D5BC0CA032D6C03
+8E1E8F6DB08E2A365D6B4068D2E09A685C1515CD434C8CB9FA214F5EE59E1570
+9B921B854CBB772361B44332A50FF6D333D4F2DF3D2FE1A2FCF10B104E773FE2
+74031361FE14AD205905940A959AB1D922E79C7F7778E49008E3291DAECD5DE8
+F0BFCC6D3588A4B491CD5CA01F40B40584365E6E256E97038A1E475A9E15C248
+8AED89788B6EBA9AD2BFD77CD289A4DAD565EB7CBFF27FB058EF663946350356
+A559E88646D7CF219D36B819A3767946881948847C3CFEFE2E63CBD6345B08F1
+1A1F6706FF01A88DEE060753FF9EFA850048A42993EB97179CC1A32D0593A30A
+4D57B55E5C854BA7BD8EC91169FB93BD883FCAB74B1B823BF9D950B60127C21F
+1578D0CF1A4AF4C23DAA436DCEA07D0A98F16CE9292BD0F7A205A4C9E0A9DFCE
+73C95829AB8BA819C0B9DE0011B6F00B6021D8909C8D3F7B5E287997ECBF9A65
+6819F0781D8C6AAA5735B640567B2400BF586EA6A3494FBAA878C666940ED153
+A16460D7F941A4CF58C89A0885016FE90991846F8045A04C9E3CB09398206D17
+57696D9696964BF63027C3588B9BDD8DF631D301B1C39FC6CC2D95871793CF29
+1A605D8A5F963094EE70AB48769E30A2F729B072918BC09F4E78640023C57F2E
+5801814C8367AF3C692825638D9DE5A1CCDDAF813EC126C81D903F5F75429DEB
+D503DF197DF6D34AA7A2AA2538640D1F8A8E775BABD36C230EA38B5844AC6F52
+D122FBCE58BE92CEAB9E8BD6C9CB81DA2E4687F9A316029198AA3205825EE224
+DECEB03DBB1BD358DBE6FCE1B2791FCEBDBB67A212DD025B370456DB6C4FFB8E
+32CE8AECF3641974BFDCBF7EEF2D87325AF97064F7A7D3C39AAA690A9C3EA1AF
+AA2FE83E0B370FE4618684C26589ECBA8F007062A0557DC8EF82E3178D09CEC7
+A78BAA5DEDFEC57E4B5E02FA7EC4333BB6A81A9B8F8A716C9F052D030007C732
+C6FB4482D9B03032B34572282AE622B6BBD37A71DB6A3CC735C28BE41C035A31
+A78921B604B2A3FD1CFC328A58AAC7FD58676D833E5D7B9389ED583F98E6F484
+0CD11BDFD3B74DAB616BFCE375D7465E1E7E9C348F0178DF88E0D95815CE0406
+684EFFA473FB6A3FC3691FF6BA37919013B45BC41799161395B06FB507B6B3B3
+399A2AA51F2D9E6D4BC4A9031D2CAC4B28C336C28550D59A59DCCF7AD400FF99
+38405B356380B744C9446BE5275B8A29A81A7C5313732BD057937D29255EA86B
+765B2045898F968B55980B347168E385FBDA3C28095772194C0012A4C4BF5DF7
+E212FB3C50052F275FC13CF314B2CA4381ABD15DCE8D0C9D63755C1ECCB7B3A2
+C5DCA0F1E33E079D608C59037BE10C6AB019C6EED3FAED25B56E3D7A2C00A256
+53F54897B02075BBD7D0BB082D273FBD5EF64E315D07BA01E170AD2308392C46
+A2569016E198FB162F3B6038BEF7F6F6ACF964D5938993C3FD7B7173C5008D56
+365A335593CF8AF084AA04A07705A101AC347B15A5DBD59401EB63CD13E889F6
+BBA625BEE85BF5391FF6CCD7E5A008316EE25E3F698478BA04B58BB2EC6A23EF
+ADFEC29EB8D645F09CD0458E28EF5997445F256E79A0A8B0D9763FF42564156C
+ACBABB93F33F9F290DFE4FA278494B7344728143388240EFFEDAD9BA871AC319
+60DB7A10AE78520A685678499F62FEEC4DC2D5F86FF75B712EC4A79D47BFB049
+FAA541C074CE614BC683451CA17496F20533B96D9FD3AF451D319D43F579BE6C
+63B70AEE94630EEB079EDF34B545FFB5C4016DE3A52908C71C9CE034ADB4ED74
+C3AB97406C24E1A2F3A5AD1053F49D7BB0C2C20915E8B47AE706395C800B3410
+7FB5390B4DC55ABC69109155BABE19041A0A593A99AB3D06F54CEBB5AAEFFA2F
+DFD0626C633185798F2F726F272CD53419526DED0DD0DAD140441D9F0150DA25
+7CCF66CFEEE2C8E0A57D3629C0A9083D5C1DCDC0C8044AF5F633CF37F8DB91EC
+83740A75CAB170860B143058D67B8866CD2E1AE98AC764619C8FF8ECDDAA8FA5
+25A8F0B50CB89CDEF84C44ED2839258760332094EA90E9A4DB5042FCE3C869C3
+A0C8BFAED6A56E0B7E55AA99ECECAEF05CD367D52909FF0D7AEBA2550B01311A
+D674439A347A5B72CDB8401BF3A2F87E1C47B79E11BBD42DF21AD6CE872D8195
+ACDE87C5C3229794F31C82CB2E57F40C6E0FA704C44B80DCE7E064CE5E9E0CDC
+2149944C5B15C0D75E8FC14E1EB183077E5A96BF43CF30BA64EE12F87841E688
+50F3BE27F132560AA76E68B72343C1A4A6323601ADDA47EC240F5499D8D69164
+38A8CAF303DD66A568D487263A650E47E3323F12E91AF2A5D4B7BCF8CE2A7E27
+58904F2CF9E7FB1AD8FD6682A2193DAA8E371F73B001B8F3B2E6EBAB3EB92677
+61DB29CEF08BC40AB2AD5A8A9EEFF739818C7A46281A828FCFEEF32AEEEB66CF
+E4AF5719BFA8CEAC41B5F1F70D47E96F099B2EB9DD9E38BDAD236DC7770B496D
+4A0539849EFB5E94E1A08195F0C0855FE73BF6AD1D9AD97EE222AE43E9E50E23
+25BE593D849699692606A7593334D34673523C5226C3B2925539FECB7B71BD95
+F60606A5A62D1167140B25E089AA03914F22874C3420816EE4AE4F6D8FBE2EFD
+71F09431E411F459C2BA217D8CAABABB363A7F7FD477C63318C6577BE1CECC09
+ABE0514622610A66592FE034B44C721F6FF8004B2CF14663D1F3C66BEA9EAC02
+403DD70EB0048FF9A795C0417AFD0A6E2082CC7345B458718D73BAC0B7AA3241
+B09135AA86C35C20D856604D9AA0E5D1A411D0FE9B6056204D482028DC6C1F99
+CAE6BC4EE1EEFF3A2D44A5D89907ED416D7493BA30C9C3240537120925F62CAD
+B0BA5CD29B2C2D18A0CEFD62123A56466FEAB0C2CC96E64D100A70AC1104DF0E
+553F72E932EEE6934BBCD6136A1B1A8DBEFD84D13306C90D4EB094A680EE1736
+56EF3400B79A4A1F74999E9931509E9504C9A92635C047491EB5F9E2250E545B
+D179141FCD485C2FF766D3F6F1A5490171AD4A5FFD602FF6A36D83C401445C07
+DC106A669E7BBC8E142C20E5FB0A38B5ABCCE8F46DD7267BDDFB751C38D326EE
+98E72B9C2264A63D002532026FE8CD61CB54B8009D25C4A25A4AFB2A46856BDC
+EC6604F63E16C4D0118CBF13ACDCD27891F652A8D9E4A0E3CD8E93FA86F584A4
+814E8986757DA8F1547C2CA6F0AE0FF86B4C3D885DE3C8CF9785E8A84B900908
+7A1E1C361FDF42CE58936B9220AA3B079B37DEAF3424AD0B1B61510F1792623B
+FFC8BC9FAC38469ED59CD520E191DA2C8780D28C7A5E20C456CCE46D176115C0
+FBCE348C8469759744A69666435DFD66CB378976FDEADDD2824F8EB4F5B4CB0D
+CDBDD8987428086DFA2D0FACE9895A83E4CDA336534E8A4368BA2E1CB88B8D74
+7D62387D389CEEB6EED466019FAC5334493C4BBB5E7D57704518AE380DC02335
+9F4D83C9CBD165B4CD20D435F8C637136A591D12A55F809021A5FFBA45AA8CA3
+64185CB5221F0EE4D26B124393D159282F93309EED52DFE6F8071049555E99E1
+C6717678EFBECCAEE7FBC5DC8FEDE888F738C56E4221FFF1E098C21E9EE60BED
+362C6CF63EC65354DEECBEE583898E1EBE1EDC8B21001CAA2675A4354A55DB04
+ABED88D49290C97B67F7843C15566689E11E8F4E3ECE99F772BD7DDC0E4162CD
+A4F66BE34CC51EB02739F1E283E703F955B2388F368D1A1106A507B996330E10
+C120FCCBE09649BAC6975079D8A43A76E8F9BBF1687916FE20C628E6F8D05AD6
+89FF1AE9A229BF2691BC68314EE1F0FE0C7FA4355FA2850A51E28D5FCD9D4B03
+55AD479F16DA5B0EF577E9782059C0737ACCFEF3CB6E3776A1D283B2BA82B1C3
+3DEFB4DD57D577B194CA242F41C4DB0AED395C67BADA209E1A7FB96C1801F3F4
+486D5CAE277BF622BE8EAF78A733C42B6B2AF7BD869B484A3397A5B96AF2F160
+BF215C2D05A3ACC9AD7C044E1C8BDB1037BA3BC093152A2552BF7DBADF1C599E
+506291A8DF282F9EB736C8688F7CF8211E2023ED63C37B6E8A66D8A750180C3F
+E8CDF6130C7A8A1A8B78F9E7B730BC416F77B64FD4588D17DE7BE107305E1381
+AB625DAF36F2A23E2CDEE4B39DF1392ED96C0377A6ECCCED11440A8BAA69EBE4
+88DEB5CEA0201EBDE4B74DC34EF09B72D8DA7A0C49663F0BBA63FE9F2D7B6F48
+BE05C3BD729795E0C64E40F96E77DF68432F3EC588C647DAFB5B7A682736E2AF
+5B214F1A74CE3B1F09095A32EF01A8BB85DA3FC93A1E8F824BCD4BE5A47F58C3
+4B8ECB57A9632A7C41914442CAF93DADAD498721520723FD391D2A9169DFAA01
+6BDA71D0F066599764914D48AAD62EB8F3DB1DF5FC7BEC14D26BD68A179A267B
+12E087FD5EFF4C7AD3783E0110B262B90F8F83194AE8C3EA86195F8882DFF8C1
+BB61A4800A426CB7D2E7B1B6C75C66672ABFF0ED2E93AC70A5582DA425269E66
+A393DB43E45967CCCC91F885798C76F31628787A55520F44BCC3F3DC2FDEDE00
+E3FE15B69A21432B20004C2D460DD8203872DCF3F1898E51DA2AC9B049F89EFB
+2427B8CA921997FA7F091C8FCF4CCFB26241B19B7C4556B8CBFD34BE3F88EE23
+1CE71A4CCD522170C16DB22BAE9A116124D7F758B6717E5176369E435CD6E74D
+92889BEB97EA0A18280A1B5CC8ABFD94CDBD56A56E8C3E93AE28306591F967D9
+5DD34B73FEEC7E97A1E9FD57708B3EAFF527BE842092D193055443A08A881507
+E7FEE154FF632E3CC0915C73888F7CCA4AEED837166607E8E05EC776F6878EE8
+EFC7652F5F47A6B5B5417ED9B49EE57F0A61BBB301ACF50EE569F4AD1E158A03
+F3BF12E0EDCB80AFB442E36DEB7307D45C0AC40928FBC5C4551818EB1A216B83
+5B6F4DA29C9F49117AC9723B775DD9B92358FE03E5382D82CF549145A1D69E14
+9551EDCD6BFE42AB784E585B87368B16043A6CC0E700929131C1030A05AF74B3
+0B5A7E117A3D57EEA07238880F202EA0DEF418CA058EA0FF74F9B16C242EE4D8
+4BA8FEAF24F61F5797D38D2CD95C19D1D4F214E8A21A54EB5221E23057419E24
+25199F729B609E582D8EC3026F9F32446FE280D0EBDB4183C5967E3662E79E20
+30402D53FB7445070D9DEB9456D6B515F838908FE5456A9FFC43AC6C6A083691
+AA13E5A00D31C1D74EF62F6F8F9980811BF4FDB360120E0DA69F69F464BBE06B
+514B1D22D20A924FD6EDD6CFD2D4B7BF406A722F98B1B73C9859F34A41862500
+2530158232C1FD056656C2348F942FF5119FF015346997E569AFCB91400F7E6D
+00E741FACC0C7D0401BFB7358347860272C7B010C6906886D4799167DAC504DC
+D29EDD804A32E81B0AE4D96B71E78418277316873E73E848E1ED0B87FE94B9C0
+135A050578F9433889A14C99ABD7EDBE850ECEE39F50EFEAE52E568812708F87
+3892A2BBCDE6F37D644D853C249E3F29FAF100389B5B6255EF55B3F981D5E15D
+24010A059F2E0C54C91025FFD21DE48F371DDF046025218DEBB5774990BB8997
+07BAFADEE942F386EE90DE40B36A975A5B52D10C83B2A8D1D89EA69EA8C43134
+6949F08B39D757B0942896C972B82E88F7671D01F74FB2B6EB4FCCC7AEB9D5FF
+C37A247ECBE08E7FC9CF710529AD5169DF88E58D8CFF70FF8AFD0C41D74A8DAC
+6BF0CFF3B2B094BF1EB49C261C60530DF9942A7DA271023F8D83E4B97693B1FA
+A594D91F8198EB83E25C7FB88A079E062C283AAF083214F473EEC8C18DDDB986
+52B2EEC249FE95816424D0259CCF420488327D3CE5D8050CFC2BBC7708B2D9DC
+87172BF17CD944D54DB241FFF0B41226DDA03649DA24846B1D251DBBC53D6BA3
+C9BB6FFE2A27CA2BF80FB383FEACF0987DCE180CC34AE03BCBF66F67FED65C04
+C3B4E4FEFC8974D01AF8EC6B90B2E878CDD25AD0C877B649BA5B894A35A3DC9F
+9634E09FE31AC8BBC94A4FD9AC59F3DA4C5B705EF39824BB86C664E9CF7BC951
+27D9AD6BE0C49055DA50735CE1BDF4B9354AAE664758498B3A8DCF6C0428769E
+D9B97D501E6F2662B17E646DF54599E0857FB44CFBF666F3274C6040B4F7443B
+346B0EB617DE39B5C6972C81A70F64A7E2C2DAB930F5CE41F7F37BE70470DE75
+E3440860F166332E4811B8C82EC6FBC0447E2515870A6856717B12E62CA0D194
+BE027D93A83900344D757CC1803A4BE4C891D9B459A38C98FA95FA7001BB1544
+03DF1B6DE5A438F6AFC5C532FB90E6CB0746F41960E03ED9C1CF6B31937FC168
+B7DFFFC7F7F56218D048CC957F7E94516A840D07EAC3D20B2800E92786D2F3E9
+B29F454BBCA6C2F7B4080A78BDCF79F3F642F2146CA6ED55CE8E29F66E3AF594
+F83944381F8552993CFEC41C68AD72C104271D46C44638728A472CA05197A758
+318E4A8F26586357D342ACE8FE82B5A01C67070F14285577681658D185A2D5FA
+7F491F1E39ADE4E1F55DE3320053C19ED60A839E05CBC908CEB514273D90D7BE
+F4142197DB833F970827140DAB4F15E6345727C58B072BF86313DDFB7409C4A5
+412FF66710FC15684AE71A5F8ED4E44856BD5C0B00DE984B373C6449BB45C705
+1D9BFEFA89DB27A4AC9D052A74B26EF44494F3B8B142E08C9A674447E5686F96
+6852F577E7F7FD7CFF4AC98D5FFD42AA9A61DEBCB437B3894ED3D474C56D2191
+3B86F65CC7AD813C8F7F94EAE2EE7D5F92D7FE14AFB7232A80CF8DB50686070D
+22E670ECC7D773EBC441E328CA3C3568613F4B445C9501D94485146E506B8634
+ED87D6F7C8654857451E754E177B1ADD5698E03CCE082211F80E1D9BB1229DB5
+926FE754B04D03A1D05C2E9001A30DC08CC2AC247E5270406225AB8E8F7A5D0B
+82484E7A96202BC474A2A888DC8FD799F9AFDD0AAA644044C68805EC456EAFB1
+2E7F9A6C6831048843390C9B83BA7A97C940D920EEF594D2513ECD80752E9FE3
+BDA056603BB7708ABF801D23D7CFCC5D6285F7F5C98C86D79E8BE1AA56FA6612
+F24E3590A854D7DEED90B548BB067782BAF899C5591A6563B04FAC965E1720E5
+302DF72E406C158567D25D504507CCDF28361038E0753A5F07682C64B497D5DC
+3E09DB3FA1765F4E76AF2CFE65299BE00D188570CD2DB339DCAE92E8CEB48542
+4056E6E4D857D4569F6F251E3125F45B24D32475912457223130710F8910054D
+AB36776493EA611835FA4BF01E8E3CEFA4674D41B007D7395AC45F285CB8A83A
+CAD4534F7E9E62CB28B388526F7D062BC329312C64F115B88C82EECE1F458C86
+4C87E974049824A463EF0A8665F662824F55B0670C9CF6CFA1B843B7DCC69DAF
+F6C5C6BAAD131247C0326A9D1749210C61C11312A5D8F5F098EFC17137230879
+D97EC6D4E851682B7B8A1242DFD71B1D55372175BEF6B1C72407EF88E0919ABB
+7915A480A40ADD9326086E0572CB589A2FD9FD69A4A3E7FF074374F4713DA9E9
+18CC6B7C889209D4EE03E7EBD6E5A4691C3F9430EBB2537F0890A035270FFFD0
+AAAA279112919DF2B9E80DBC5E2EEF67168019A32F081A30460F04FE62BCD86B
+59A0D4FB43517F51B65E0B31AE79D0FF3BFAC2466B3C529E7DED25E230195F6F
+B202D8C63EAEE78FC3E82F14E06D4B7BF7F561F4CAFABC49E9BB84D378A7DE3B
+00990F11BBB437FA763034402965075535030B58193471050B6C30EC2A8CDBDE
+702D25384DC35F53D65B9A6FE03E0844F2146D3B2A9D5582B26C30706FEE030C
+C770BD911E0793F05712EBC7ABF483E1A303D1ACAA2C846ADC6BCB7984D5097F
+72FDA0A45FEABEA1C9C916DBFBAE5D19048A80810C9787730DD9427873F82CC5
+F5664855C0A4F201F50EE359E6823246C956E548EA23E83B4FF3F56F38C8CBB9
+7FE3AC5A05124CA379C6C86B09AF83E275403DB42AF22B6D47898F037346BBDF
+63ED4FCE9A07403D087180EA77C179EA70FF24D6DCD6BB8CB12961721C6D9C05
+891430AEA510745DE8693127EA3A5EFCE92414F8DBC35F961675B266B869ECA9
+0DE1530D1C35B576EE7F40E052DDE2D36A850133CD094B7B64A29AF62C7C2CB9
+FA6BB064B3A6D79D4B06EF54CD5FD1167D0E2EF7EA79541812C4E7AF0F6885C3
+427084AE3027E2648D8D465648CEB9B0D46B60E43675FAD2FD3F6DDA78752122
+061A7FCCB2BB2A14503CC5A2D63F3F540E37D19DFC7A758BADE5E87FF4D245AF
+4908D72432095692F1B82BEC2AADA9AFF87B570C0367914222F501753F6B8101
+A85B634C19FEEE9A926068E1AE665C2041ED42972E28CB1764957DB04E2097C6
+AA814D263158D312C63F9AEDB2E9C28B40F88EACB602A0EDF91A29A98FF932BF
+48613D0DE7F7E78ED3AFA6F0C415942F8EDD5749F40058F220813E9680BA010D
+6D3AB12742408B78E595C9FB1254EF8556ABCB23ABA6E983A84EA817E93B0D85
+F4CFF27E07FB245B27ABC09D039D139DBA8BC2F8E8A5ED1901947D1B693B9643
+F191EE88F7DEAC0A1B1F6ACDA466B6E1345E21E347C00321AF74CAE1D5406378
+DC092F1E234B642B260C713A7EF27EBF82E430D863366EFBA1A04E228CD412C9
+F9ACF4C31D3439FEF5BE1E8B0AD53CAA2FE5888592B78386ED44B6AABC1E4CA8
+68415A2864C584BA590E39BBCDEAC8F082028F046470886893865890E999E4F2
+5509DF776DF6D2E4BB7C9BDD2C64F6F01C345924DC95F23B24D2BFDE87809511
+4F491BFD46BEACC2BF32592AC0FCC3BC874956E0E72783693BB1B9AA763F6C7B
+8124DECDDBA4C51E9915BD6460318F990E93439DE180AFCB0E08F9494C7794FF
+719F1851157A337FE24248B80FAB31CC68AD7668838795FC6899AE73FF084F24
+4543A42FADF3607FE2E2E593770559B63FE9341688150791B5BDC9F1C13FBE52
+73E6A8F3C74F1503CAABF8884C83E5087DAE968B0342F6D7FFCFC373EBF6E43D
+3974DD991595EEB5B55D83657EE4A5E014C1E9B3467A28F4113DCBD412F09A90
+C215A4167A161B17A9F28EBF03A7D2E52C260194302ABE0A7E047B15A4A904A5
+F15784ABB6B69DEA9C6662C3FB033BED4EDDD4B8AE1FD3E3FB00B5877225FCE5
+BF33E2A798EDC490614F92310B4993912751E0459FCAF3718F51601A35EB9FC2
+EDF95C3631A68A7B752BC0729F8D0E61DE0D06044D321262D81E6A381520FEB3
+E4B8E50D82D84AD08018D936E0FB3CC4DC6069
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMTT8
+%!PS-AdobeFont-1.1: CMTT8 1.0
+%%CreationDate: 1991 Aug 20 16:46:05
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMTT8) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle 0 def
+/isFixedPitch true def
+end readonly def
+/FontName /CMTT8 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 33 /exclam put
+dup 35 /numbersign put
+dup 36 /dollar put
+dup 37 /percent put
+dup 38 /ampersand put
+dup 40 /parenleft put
+dup 42 /asterisk put
+dup 43 /plus put
+dup 45 /hyphen put
+dup 46 /period put
+dup 47 /slash put
+dup 50 /two put
+dup 51 /three put
+dup 60 /less put
+dup 61 /equal put
+dup 62 /greater put
+dup 63 /question put
+dup 64 /at put
+dup 65 /A put
+dup 66 /B put
+dup 67 /C put
+dup 71 /G put
+dup 72 /H put
+dup 73 /I put
+dup 76 /L put
+dup 77 /M put
+dup 79 /O put
+dup 80 /P put
+dup 81 /Q put
+dup 82 /R put
+dup 83 /S put
+dup 85 /U put
+dup 88 /X put
+dup 89 /Y put
+dup 90 /Z put
+dup 94 /asciicircum put
+dup 95 /underscore put
+dup 97 /a put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 102 /f put
+dup 103 /g put
+dup 104 /h put
+dup 105 /i put
+dup 106 /j put
+dup 107 /k put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 113 /q put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 118 /v put
+dup 119 /w put
+dup 120 /x put
+dup 123 /braceleft put
+dup 125 /braceright put
+dup 126 /asciitilde put
+readonly def
+/FontBBox{-5 -232 545 699}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5F0187316F83DDE3E2D27FCDF6C5CE4F95B6EE
+3317BD91B7921F3039DD35FEA387D5CFB6C6E9DC84C178F3432994FC7FAC6E5A
+ED41A1E2EBA350178FBFEB45944511731BA827167DDAC238FC69A5486B995477
+C469E2E27493B0B711DF8E267D3D5613B450011921685147114106C9472580BD
+F531022F6DF5432B2A4EBC51A8032C7F9689B6FA942D849B29709631613DA68D
+4DF7B6F059A19304F40A3C3580CE3B51D79D42984194D4F178801720892FB6E7
+61FF43C63F9256B5E9F4227B1378222BAAD4D52C77462DF01892220E11129C16
+6C9E45BB9F01ED7C1AD5D8B4D72BE0E12969AFEA90FEF170603CDB91CB243173
+B19A56084D10293B80A35275F41BF78A054DDC98F4A1FFF592463D944960FB31
+6BE5F03960F9B1F213CBCC7FD448657FE388F10104D42B0715FC9571CC60CF23
+C72560CBB8835A0CA208FE06676B3B48B093CB7FB2C0C53AF17EC5B372A9771B
+BFD52FFB7062B4FE0106A01A2A1A1DD4EF5C8C7623EC9324A2CB3B402FCC1FCE
+52BFC8662F8A39D5F1B41C97E7CE34E16AC28A1E94007AEA7D4C519399F1B7A9
+48FA7DDB671067244F09C29F95DD60668223F45BBDA8B1C452E930A9F3F341C5
+351D59EA87462FFB30277D3B24E2104D4AAB873BB2B16DA5B23BEE25BE2C8128
+C4CF2F4F438A4E520CD864F3EAFB5363753B82978F6FD664A14E5D6F3A929348
+5839EA752FD635619C4FABF1E1454510BD9D6B538A343BE748AE05B47F917367
+1BA5EDB15F1BDBE806E51B294257D7087334165419A6520462D794D670A1D6E1
+3BB03BF689391D056D55AD660D15A386E6D222C9572BDC4DC8A46EEC75124BB5
+F0E8978FD6031A90E4768CCBF62A5ED8C8087FD66D2033011947634878BDC0AB
+6501DA7E6D96E227068E993DBB0072F037CA41101E19F8FDDB46DD34CB3B0749
+5410293E3008FA73A6197B2E3BDC593A7FBE007CAFAB124C808AE2859E1E27B3
+02DECB8781E533F023F0A752B8EC1310E28908EF443CF44DA789A615DB76B1BF
+463F16077F7E05208BB95299132F8137640A8301B9E8057C97B07644B1170F35
+1206A18C75C2EF9B8EB3A23AEA8AE38066C32878DDE27D424E53B5254B3708D2
+C3750210C4A1EEEAE38350EA0F980D0297066910FA2EE797995D3A886D5708F3
+ADD7DB6427B1FB9E6002CE7FCA26808F50CA01564DCD7EC1732CB99D9EAE32AE
+DDD50DD878A849484DC3AE168AACC456E011BFC668524A88A37CF10225DD780B
+CAE018038E62585FDB13CAE6CE4FB067021B41F37A16F15F5C9C87DE63E218D5
+4B1EEEC40A8A73323DB866B30CE8415B995555CBA8EEF3D631D40360406E71D4
+19E5262DF1656DDBC683DB5AA5973062D84A784E75187C2C565089294A3963AD
+AF257AD1DADCAD1B6D3587B2426613120A1DF4A5156FAA65C9B2089389CB5E1F
+2355D1D95B55C4D4663B9318DE9CEF31ABD540F396980C1BF7EB635C0E7541B0
+AEFA274C376B7732F7A196B931A2D5EC585A567A95D6051D04A0E511987E3550
+F201450F2CEA6F0766FB214315D7320E50458EA84542979F17B1E46513FD7EF2
+6BDE25058BEFE40C1F97BF975439F149E5D00F2C0E282BAC28278AD8AD46A0E5
+829FC3B8D27792BB1856FCC681DFDD0EBF4AC6C49967855DE59799DA44A86EF9
+5EE262C07D91009AC542205D095B1F99758C7A386C977B0E49C2FCBE68739A83
+327A11940EDEDCD1233232DA90F39EF6B590756A74B5422A0BBD9CA583D7F249
+98B74752EB51CC70719B7B115BDE8AD532395FA730E6CE753D56690F6D0F0B1D
+C3013990334225FEE17A4D8F0EABA11E042F7827FE1A27A130B614D60B476123
+73F198B917958382B2D73449B892F4D192D1CDD1FE8C70B2A46B358415225A04
+ED1A9184983B76001A63F46CD56CCE48D5A5F33183F35949082B2765415BC0B7
+E7A34384D3985E064D29310DF3D085FFFEA83E437701B56F4103E48675C1291A
+511285A85EAFA3A69CFE5D0F0213430AFD12049746DCEB3A2FF6ADA7D917F158
+189FEEB95577B5D8A7B85A5A31375A7FE1067FFFA70F4594E3EE425BCA2E2BC4
+95B23DAE1CD424917AF01F5640CB6B758268CDE667DD4FCDF847D817CA9098BC
+B6E67FDD3C12A0392F63CA2A9272A78ED483F9F3BA9A32E30BB3F50E90509FB1
+2CE28975B20F3B18D7FE2CED4562088DECE21843AFE38603C511774433C52958
+0CC685B4C5497CE6C4A40169BFF636DD22ED7A3618748DEE08CF6A2E28221D09
+7F61092DC9911B101B335979559F1C5F3315B954A533862648A882EFE054DFAD
+1520C9359D64751F894C036ACCA779092AE50AA630D906D57A0E72009F47DDEF
+6B27F4575F09DDAABCFA09FA614D23B4FED547DE8C590F0780A8B3F2BFB7A8D9
+F60773E1C75C861B0E66C2A62CE09D7E0F40DFA0E09A28CF5989FF59B686A9AB
+380ED44F61E286C3427E7E5EB1E3AE824785F027ADC45E741687B9F06690DFD9
+2ED58796B544D797EA260DE35455C3D85C5B2EF43C07E8E8F1553380A404F7A3
+8D2D11C7690F7195EBE649E1A6AA2A89313FA54CDF906FB920278852D4CCC566
+1E4C5B250D880321DB061F5AE069DCD28C7AF449CA265048A70CF3BD4C9B4F32
+9DC83E5D2E95C281396460DD529BB40C87EDCE512A443777168DD90583490C7C
+CEA97E6DDA0A3A6DC65AE1BDC977EC425F0C054F6503F5F704426CED87A69F8F
+E03BD90788B19BF05122A6E43AB1EC16209062A16790D1D560239CCD3B08BC9A
+23C2CBEEDF42DED6EDC61C3F672AAE0C18BE563951C948266953B7EA5208B5C3
+56287DEDE6DD29658A98583FA150DB7C60C3C050B3E77DD7CE63D0EAC970AC3C
+60C1055ACCF3125B211F63EF9EA3D1F499E691D3C72E5B58154329ABE46DBD02
+0EE4D2A7520F471661D118868CFA2C636C94A65EA28FBF3810FB211F9C4BCBB8
+B768F7929B7B76BCD39D33BACCD27091876C62EE2FDB416459F6E773A5A9D463
+4A7A4D98F595E67F738E136EE94697E9DEEBB36E72818CC034B53C19C3D4B2C9
+DA5A126A32C728987D04DA86FFE88A2DB7224E5C15ACE12F22CCE260F3CF2438
+5D4DA6D4417E9889A5074131E7ED5EA22DB32265E318BB6A82C8A9D13A74B698
+649F49142487F511181980C73F50E0793A206FB82CBA2AB150D542B9C23A4725
+CBC16FE5FC4B10233044E126EFB2F4A6BB66FC0AD2F091F3B83B3634BF1760F4
+E1CD587F8A717449D031A4A63FC52054E3503294A3516E914A223D30676DDB29
+9E9ECDD61CC4F04D0DFC05FEBB09EBD5B09991B0729E6A3BA4D5265AF30366BD
+E997A7A200367EFA2BEA748A8E04337EFF2F5488A2AF5E9D6F43EA80638F9A03
+09A2D304E2EE9CD9DC06D22332CE2F59783537D2C7FB40482A14E95E914209C8
+632049C99288266CA8B7E773F8A9D8E48E887E9E85B55B6D3D561882D2E8E43A
+01D03FF7750707CCC3C144E72E9074616F213C335CDF67A036E159F0D584AF46
+91FAC76CA4E85C9B78F941943F5C7323640FCA279F9323D104EF2C12A49743F2
+06B6B033B72819743158CA8A58118FF2D526629E1E150D314BA188F74458B4A5
+D90B8073954AFCC4FF41D41CEBF0AEE88B336B6DF70F9E89F4ABA7B302121F6D
+9766F1C05813EDDD99347C05D1F8CC8412520971EEB622A904260758B60635E8
+CACE856DD8E6725AC2FED7C3917B25954A684E1663C4E04FAB20D76DCE40DF6D
+D8507A20B08424A09A11F16273FAA3E71DCD916E1080320E5B789A84CDD89192
+7C10EE0649063AF47EBD90B94B861DB814C4BEC3CCB5705C64BCF3F83CD112CC
+946664EBDF1C4715ACF9905A58BE3DB3E11DB62135A9066A8BB946C2ECD5AA5F
+C39ACE2DD1956EA3F34F08F4AFE400BA0495D5DFF65C22C567897BCD44FC5114
+AE412CB13C73AFBEB9C5B70C9CFD73CB0BA868BFA1F57F9CC3CF97894397C479
+CC5254D95B432082D99853E23A0A410C6D63CC1B1978C1C099119C8D7D75FF67
+D3F34267A6D3778137601E9213D2C89BD9C407E2790DA06524497C647676BAD8
+FA32017CC9CF8A5CEB9F6A48F7434907564EDA3253B0B9F2078909E799BB5405
+B1C5A5B7689A700F7F47F206955905F595360E5D0DE91EF67174E0A526CE88A0
+54456829B844B3B84BBF796394B7EAEA0FCA50A2D0C033DC9C83CF7309A2B704
+8B00AE855DD2E52808316CF7BA9A5A2AA3DD52B653DF351F930AF19AB934B110
+D5D77F98848623F60E887CFA5B2A9E680E19236DCC37F99730C925213761B28E
+0A91C64A264785AB662889F658D0F7532DCEAF433983F931B0DC80F361DB3EF8
+5F8FF33FF46707841F793C2C3C6FF8F536F46FB3F42DE22E06E3DEA9541CEFE2
+5F57B0CB09216EB395D24BB826F8F1F0022F5EAA69472980FC7DF810EFE21D0C
+7EB290DA21A756D47F57DD921319B753B0859C203D5CA16E32FA91408245ABB6
+D5607EE50F3C9562B88A1037689CCDAEE0B9D6D40DF31D4703F06D2BC534793C
+7E1B77A735C9A2B66DC218C61852F5EDDF4D062E3804A7F28180551AC7F971D6
+EC2E5AA95EFFC329D74AE31698B78A12EC7248382ECDC0D9BF8A42A096668C88
+2A122CCD5B2C65160DB0ACC8468B072AB62428AF823380A8EEF92177DE627A89
+DA3A03EF836A48A810303EE4EB92E6736321B3B0A3BA9F8165621C110C08F365
+F8E76C1EBE0574600BD7BE1436CEAB10315FA769346776640A6A616731F23E3F
+3562C60FC75250328FCEF70CD2F9E3CF844703138DADFBB484C605238A7DEE1F
+2362A11144DFB5E5B7361B5460708C6361927A2C8687DE73DFCFE9373F7364EF
+8241A2A37789AFD6F47FA009C1A3A963A747FBFC8E1A1D592B8C8A405513A626
+2D5A3970051276506A46265F86A28D6E29D41BB36BA611AFBB8A713D19543F87
+B2BA98F715F9670C8ADCD0B59EC7CA1C45AC4436900AAC9406570E56A1DB48EB
+188166913D42068227E6853437E7971BABBD26DBBF07298035C13597E48D639B
+BB66C9CF42859A0AA59E395F5689B2CA25A990C43ABC26C3E9B176C011399447
+BC5C8707593B18088E9BF8C58FFE9204ACFB19B9CFEDC4B0CBA60D7DC25A6EFB
+346CDB2E20B20C907E5610E3C61B403996E5FBE45CBDCE19721043D72E97471A
+CEDA59D92692713F1F7AF0FB1B9140A995545AAA0FEFBAABCC40684BE0DCBF83
+68FDCB70D9D2546A428009C1F9CEF99EF720D12C5299A5856A33EDAAEE1266E6
+66892932D9C30D5DAD7D90E0F0617C412EFC68494A700741BEB8FD37F7EFBBF5
+1A901C4903930C9757BAE9938EB964A39C3C4833632CBEBE93C5C07FDC2A4E78
+27E6852F3DB34302BCAAD6626B10BAD1790F5735AAF3C236FAE3E1E8FFDCBEA5
+FAE064B08DF7B68F033CE4D3521FD41437AFA4F18F603791D8434E630E6598D1
+D25A011EA99A2D4C4E47A0D0ED4FD01E12B810D376775856608E34D8C9DF3724
+48D919BCDB09DA820FBDBD163A9FF76CDD61DB100ECFB7BC5DD08C5018D9F9C4
+035484764850BDBE3E688EF0B58EA6D93D2EDB5EA70CEE815F9B119E12CB60FD
+01CFAEBAD1256FCDAC96D767FF075C85F1DC6C5252350062498C62607AA63F5B
+BA376EEA8F422CA1C72D2CA837FC2829AD8BDD914C7233572C1E512B45F4FB54
+61036B5B8014780E2560AEBE548EBF9EF5D383A3BCC809558E9F337F462378F2
+5425ED071B51CFFD95B2952ACE7FBFDCF4686FE856195DBD8A8300FC75F66C63
+DCFDA5BE7F835C844FAA446D014782F298342E9B2691E2199C835ED83AD79B2B
+516D9439E14208869AFABE62AFD868BDC493D3B856FD2E696FDC08FD0DA551A3
+D9E44F69A559609F4478F0C1CD443D7628A712EC34E5536441E7F529ACDE8168
+652B8CF1FFBEEFD5E91CD2DEE43797C525E01A74A31B82AAC5354037272B1AF4
+15FDFB761B2D02ED81E6F7DE82EB6F74B0F73A26612461630BE9143A24769625
+86CC5C0BE34E568F30249EA4980E8E457D3B7454B44AD72EC70222E7FB87C1CA
+BADEBE17086CA0C898E3F6EE059C1C63C67F5B4967F11AFF115CD7DC27E541E2
+E75FB60A76E0572AB1B16E4AAB9AFC4D5935EC936862F0A08222423480014F0E
+14AD4669F306AAB1B841C374B5A910C4752CA79AB1B3F3E1017851AD2A9CEDC0
+150672A866C941A105FA02375AD1CE54F9CED00C7792513EA2681DFB6397924F
+9310550C0C6BF77ABD3979FC524B73D6E6A14D3AD3FF187B61BD33B4B5347288
+69FEC56DC2D8C1F8AFF28D1DFA9907CA6CCBBE34D12EE9B14E1550F8041564A5
+C9E0C292290028C162CFDBF0473CA11622C3FEBF42D94DB41A181EE51C09AD6D
+B7838DA1D2F6D98D99E4A8E3EBD89C6AD70DC364C25CCEC718FA499E7EEC73E0
+434369A669EE979621F74FECE955E3501A52AB14E5FCC3C3A8EC140308311BF4
+D8AF8AAAA59CD7F52A7EAD94AD8433635A1423DDA2187CE0EC35CFEC0FFC74C4
+D095AC9A7DBF182616078E954B3AD580CE8AF901CF4D5EA3217B1E734F37DDD5
+67E32CA4A59E9DED87439007F576D64CBBE99D7ABF2D12A9D63F7339E88D3A79
+90A7BC9A722CA7A5418451ADC14F6480363C00AEE363A556DBF48CCDAE30F9EF
+8933620080B9B24F2FDDC1EB267544F65679F0EEC21693141A947B4B981E29E4
+8C1FCF6F71EDC7C5D86B5CA21103F335C1D03F99EB5A9D7FC348B8A65092E72D
+F49BBB7853213A06C15B01D3FF5BE94041B709737865C4C34ED4124801CC3D5C
+4E719494AE482CF2786B3DA85B4BB747811C865535BC76ED597B71B0D2A896F9
+E2EDEE96974352A3735F892CAF48FBD944A1E39C319C4E69C8CCB0147F643CFC
+6F8C72E312E65C20B8DD5F623F0A0AB667D65C4EE5EBECA2B2E6827ACE502C85
+78421A1731FC792BE5BDFE9B90C631838E299A72A19EA564487DE3B28218AE11
+F30FF509AB7F223387E7AF6B3E1162F1A377D8A64D0FD439844DE8264621FA8D
+1FE268EAB4FAD31C60F4EAC668A1E44E81D86177721E8968EE05A677ED7E8507
+61E34154EA7A27CD27696D3B34D932CA2DE65687DC7A2969BD8A46E30471533F
+E3129C347095832C69FB6FF380CEF6608821A57381CC551B771E33D969815EC6
+A7DF385DD3B50F26E025797BD7808F6ED254AE3A5AB0664AE1E6DF308A1F7549
+2AABA4EF4A228E4A932E87296999ED42080AE1C260A356407DAC03A3D7F09D8C
+6EB3175950EBB743E02119A7ED867012680F8065CAF41E0864E1E7591D635478
+FF4AE2B7B2D25F45568AEEB57B0CC0C86C49EC91F8C84515CDC449E57BBDBEA5
+07CACD01599A368E7D55DF58A8260A89288EFDF87E15065CE6161EFF495A1FA2
+D37A9265AAA63464A101C98E8F38E866C61E57ED511DA8D5A0B95E366967FBDC
+8DAEE09396B6C542C024F543013D619AF7471F9E25BB0003A0B7F01E10813CF8
+8FF216FF04CFF8BB1047D7DA09EC94A5E46C22592AD501E2C4D77539D75549F3
+37039C3AB64281310CDB07CDB1573B2BA0A3F9512C6AC2A411FEDB4972A63ED0
+81C9669D6F1DC786FF0C5E3AEB5B836A80A0A1069164933717672BA201B91A90
+D79568FA3C87C974C6932B33CCCEB6C25ABF0E42B39CE100E5B0EB7FD3A5AD09
+1AC044731B1DA133BFF68C493894A5DDA8EA37A968CA059D90DAF8F5B4677CA0
+96C72D48270959FD2468E84D0D0D40A62FAAF309FB1C81013ACF51ED861A8567
+9C49CE9F79C85C04DD7DA6FF28CCCF42055C0C978065B8AF44C95E9184591B28
+EBE5DB4DCD92960E0C6086A08FAB63CA8002192CA28D70ABE02AB7E20EF11A8E
+05A1F274C64C66D9CE63990EAA71B2FF4EF315B45B8E0528E05C9185DEEE215D
+B49619D301BBC66D3DFB8BA1E5FFD7F66FFB003EFC8F472BF46CFE5DADFBB943
+3A3B57F94C54532E87613AD8B6CF52929A42A449D16AA40DE362558DE9F329E0
+DD09B5498BDE842FB14924BCE20FFB13B0FD393B6BDB427E46B8E2E0A0F70CD7
+B93F43018602E5F74BA11EF2A8DB031D6FE1B3EA2ABB165FC550BC233C442648
+B7E78BD68150EFCEB92DD47660781F4A39A74DB35922F5C935DBA398FD7AB77B
+8E7A230E1E81950C308FDC2A6CA5E17151E6119B4CD058237DC50DF812D8AA1E
+15BE5E0E0844AA5239B84CFAF9381DDEEEB5E3C99E6108C805407E30E3FCB96E
+5DE662A5F576C486779D10E5E4E37FF9B06237C527D4523EDD5AA03EB863ED41
+457E46D1A9DA0E26E79D834FB435470DBE0DB3C3EC0F639DA999F7D2E3E217CD
+81386991DE2CDCA721DE046F7CE6C9ED03CCF87E4D980DABE15A291D6CD3C158
+6468FD891FE00470075ED3312411786898226794107BBD4648F046138F5405A7
+11751B3DE6523FE715FAE02FBE24112BFC3F2F6D129B25B3B7B9312D4482B178
+C466C10BA1989CF1BCE66BB4B42A6BA268AC494FBDC6FAEAA7A72ED1C48F405C
+C00C5E70C917916407395C7D9180A95389E5384B8F4FC41CC982A2DB8436A143
+3CE48A4D32CCF6AE8A042451AA10366D08E99C90707BF8A60B6688949D0335DB
+782756592DB158E823CB7E8F4DF6C3DB1DD098A1DDFC34053ED49094119E95FF
+FEBD589E647D64B43EDDA638B83EAF462C781E2AC2B981D6085B280303339094
+F9AEEC637E45329D66F36A07683E567CC97D9BB8DE891F73FF16FC4B923054BF
+479E7AE19528733D6E2337DD1D4E75376CA9E843D547BA28C2D4BD182B807AC0
+3988A0A1905F9FF0D22B4CED5A0028298D31D570631C1892FCF87D6620A55D50
+24B679D50FC1DEDF84E4AD00AE2521D78213B85C364B16ED6F8BD012B6382DF3
+DB3077178D82F7F81D308E33D9767C18F7ADF0B93DD3C6D616902C5AEE775FDA
+FCA928094A5BD1A5224E3FD1E45F59F3EF30F086DD81FB7546632117818804FC
+70ACC6F6872C2B3E8CA29AA87FE9D9C1A8CAC1EA995F4A237889262511A368B1
+338146CF75B01838C71627D6339EE498B4EBE4AE8F86978F77632CA59188A2CD
+96C633F2B84F30097CDDFE6D2FF2FAA9CB82C1AC881FCFE16548CCC60CE89398
+1D91443E6BA76EA6ABF5154EB647D3CE510B938F725D8C6EAB3C293877DF86C8
+4C830C8379461728446AE23D445E4AFF5BE84DB94BDDF1477DD60E94C27DF754
+C46DDCD8E2B6B5EB9B928E75AEA6A6B6A8EA1991BD12E870C8CCC4383FFE1219
+0257A7D8A14C6C8059C24974B6FD1B452E13082DE064724C1B5822962E0063D6
+8D86CF3673BBA76F8C0446A7501938B1C5838A205F13041A96CA27AB6F4F4004
+9F3ADC11B0C01C1949019B60FD93CA0F3CD86126CA3BEA16C556D763C7476A38
+A75771A8524BCF508A4938D51E951F4E1E5DA5E4C67F13991BE3ED13321B96E8
+C1B60673892D0F091EA3931B6B08615FC6A0C5E75BDACED9F41A5EAEA45E50BA
+46298852E262486D80AB0AE3EE18040B997C85F5C9737C5A4F08A5376244C259
+AC7FA36C0B88D25C647D11F8F9F578D8633482CFA582065F2B2231B562003001
+FA81BFC8B67B161313A421D1D9CC3817DCB5B81E625BDAD0C438F49A29945525
+25BEEAB86A926C12503749FBF30D945EE450E9213F950F4DA5AC62C732522958
+DE00E60A9DAE074D4093C381259E91164865186099DC045BC43C9CD4B88630C9
+15A8BA9A89395393922DA7EE582ECB3A3DA5CD4421EF0EEE4C57032570E74271
+546DF3F774F3D3C6EB243464928FF3E7E1EA35659FF7AB0D48050FC8841B2AAF
+ED403649BE27A32F9819F9CB3CE1100A7185B29A4239C4C461BE76B9DDAB4332
+357F55AAD0021264D5625A0ABEFAE29F95819579563CB61D5BAD81A20AC5C47C
+BCA1DCCF82A96E7D1C8672440E28F7AFD9C34FF7EB4C4531ADED742923019A61
+AF6D10354BDACC9F82BC31BC88C189E549014ECCC0ED8527686AF33817114267
+D8356689E20B37B1B6F4EF9A6B9ABF3E19A818A8E4D8D232F305D3B63CC9DF28
+CAB9A53358515D788A9A8818443D506969AA199FF9CB11439BF1E5916CB5A3B6
+520DF9EA1AD8E52871453CD628F5489FFC23A324FA5DD9FF0E2B29C9FCD67EE8
+9A93783162E5B6B0A191CA871B940D68E486DB3843AB56164541407BEB01C8B6
+D1E0313F2A38208018BC661D778AF6AD9B3F15F74A66E041E171143A0A08EA84
+7BA7D2C6ADC207145183EBC2FEC692750C32DAA588954701AD45E0FE7701CFAC
+7AB2635C35BE0ADF227E4FE982D562AFD137835024A5438EE46B96171E184533
+3A736021B4F0A24EEDAE8972A1D10F9AB149726AE541BAD42E9BC4AB0F219D14
+04752DC2C501E8A155CFF3407316FAA2E163E745432EA99CDFC4393583035730
+17522395BCBF2C2FC3C2A319DF4A88A7EF1EB25F21A39222C3929F95D4616654
+8418333C33AF322DFC03C623484E9AF520FD0B8C8BFBFFA4CC83CE4FE08CA55E
+D3BCE8588C940761F4F5E6310434D82D0E88F034E6BEB3AB968FFFDBD942B547
+D89BB2F136C4CC3FA867A9E2C691D2EE9DD38E59BC3022359DCDEA3140D6C7B8
+60FC65621FFC2B6E0EFAE7AAA0A503FA397946C3C43EAB5E0443FA6E8BBBEC7C
+852654FB6C4D05D290A4CB4B3F9BE2133CEF24B9162E8BA3DC6413C075853083
+110CD2942134248583560479B679089B1015D47424F19129EE822D691655AD9B
+4A8772DEADA5130AB6AE36F669A5946E941E5C2457FC781605A1D69A6F253959
+0E9D1B6914D931DFE4B798E73810F45FFCF7AA128EFE7A528F18555D0F81C646
+4F2895B47492BD862C78EB9D641D15B5C98D6983B6E8163D32F7BDF63160D288
+E7A027FF60F64F023FB0E27DFE7C841313B2C49C5FDA2F218BF5C9F154BD7F46
+412FAAE274AA38B3B30E18344B3A8E542B5CAB6DE7E4AF502EE67826B872C41A
+C440DFCF3AE553DC00538FD7F09F0E21EE52651117EB15BB598E57375DB52A2D
+C5187DB0E2AE60309853E356644E4DC45D349226CAA239CD9F1A4EFAED21CBAC
+EE7DC0197AAD1C694D62A9F29D0A5CB1FFD7CCFD9771199EFB09725621826291
+FF7F72D472EADE5D3FE0C0FD4541FC8E158862D98757F8B80BBECAA1F8299D0A
+2E6AA28DAFF9E3F6458CD78114136F46E6B1B0BF68BAC2120710B857998B6F22
+826C61AA95CA9476B606971A7AD550D9901AB38019FA14A4792EE0AC0BDB0F5E
+010B78EF50C96CE03621F21CBF1AD96BEE428EED181BAC0FF4CEBCB416B08150
+735D906055DEBF4A57E77791AC8F018FFE1BCBDB83BCEB4F0105CCCAE44486F4
+BCAC2E6B895353AE411D09949885846EC7444F2850FB419A60BEBE8247F9C3A2
+80D52A8BF246EE65140EFAE795E6C178B9481024251DA564DAE2B6D54753BC06
+4A555858CDF013C36E13F1AD8A581CD9A2DA31BE5C5EB8BC820AB1FA3B94F5F5
+F742AA198E393A1DDD9638BCDC7462C5DC5E0B25A8F9C3408A65B3043BCB1768
+9429E48319CBD5DA8C8A35D50D0923B3B148DA9BFA7C904CEE07F724D3A51CFD
+81B5027FF761E0B45E36570ABC0AD515AFA28E80702B594D2C382CA8AEDD1850
+5CB6F371315BCC0D15AE6D12FD189271C7BD527B1498081CB701474468BC57E5
+BC89A342D7CB23E2D74DFC5EECF14D2C7E802A79D7D0E5BA393C36ECEB6BC569
+70A6B935B0B3C70738A906C0414DDF189DFD5E6667EB44C5FACF64483C37E059
+46B04D17EC2CBC1583620F8FDE5D556E6E12281F41747FF6C18FC6507B33C23D
+09C02BEA195CC0F37D2EBAFFC4FFEC5B83499EC6326F4737704531253BD41425
+FD3280BA73FA63DB463271F0813A522F5A583BF3B0A8C41462B0B829815F59CE
+87A9E152C6545811F80EF3144CDD217ADCFEF1F7AF2B9D1C06802524510EE62F
+EA407213422E1300455AC19E27E157A3F596BF639D8342D339D22B21E38F2177
+EDD19B91FF90AC8A8C2D17182D7E2732CF2E291E555914224C40E7E3170DD617
+9B158044C66A407D4C85225A1CF27BF027EFCA6E171A057270F402E7884723EE
+558CAB4248BAF8BA8E4ED73DE39E7300C91368F4FE4E0C5CB77FDC05F0CD1205
+C3FE450F7EFE1BA4BCF850BF7CC13123AB85CC0F912548B31C41F3772139D731
+2C1026DC05049D887503C8BD76DEFAF0E29D1F9EEA53659D58964B4CCD1C4352
+910FE7D1DCD4C3F71C21C4CAB7D223037E4089287F6A10CAB1C80EAAFE13CA0D
+716D136B1248836A1A81AED1847FEFC8CC60E4F8B2BFD896A9730A16CE788D8F
+EB1BCBDCC2728FA05247B77A7DC18F757DDFA5EE99A80508C9F800F65AF63E18
+097509AA25EF35209B70DF4E09E48E39E93ECDFCACFC99267D45C62FB0A15494
+3AB2F5F92143E0CE824F2306E45B2288B1CA09DDFEEC59075C5C86E7ABE33516
+40295A65887490F33FEA0FE29FC7580690C6EC5A9D1AEC45098F0479AE2A89F5
+556CFD965CEA61549B89C146C6679DD30B22CB26B2964CD4D1167F3D369474A1
+6FE362422CB61BDE9654CBACEF423196B24329280C4E762AFDD18012E6BCD9DF
+8F59E9D57CB4015ECC2B56CF845C11076F5264C222CBE7B0F8FE263165367997
+896C9E9429A402493E160ADF94AA07BE64ECB39B4DA9A1D20E9F29BA9EF770D0
+9AB9050E63D734D018EB6E43E31E523320ABBA1DA1DBB01DE90EC6263A6E7401
+82A4F6E1AA68D06553D5717525368C2D5617158B18D70188F9B649DA61D4C000
+D22AFA6A6B8D1B049FBF486B65F99BD9BA572E7D8D66F4D2DDE3F79132E6E4DE
+20322D9165C4D4774D80E66A3A164E3CFD097CEB2C378076AA09DC214BC7C071
+3C3628A56716B6D84B250993F51759652415E01B51C324F5C0741472001C16C7
+FE5135FCFEE4FE310C74D4B3750A7D37E330833941E11D2D5E8A81BB1FBB77A1
+1523B65A1DEA473D4A61801B29D0AAE08F47B6F2BC9AEB22A7CF88AD5D34598B
+66B0B96364759457E7063DD99C2D2A10B0B880C75FE4F8DBDD8E3460A872028A
+80CB692CF959E6D403C89BE1112380DDCFEF833822BE22A7648A17D9314AB0CA
+BAAEDD4D8B87AA5DF53D0D76EED1A98E4DBC74A2BCDD30EA21025F4964F0B7A0
+427808C00AB3E3D7F19DD5F3FE6D3165E87639851DC114D3863F113D7131E273
+AA0241A49C96455F33F4311FA40149F2BD989C30D55DD8279DAA97B29ABF9A57
+7EE8B583AEE63619C997E17CC528B43FF24DFF6020F34B1D7298A410892ACC34
+82FB6CB27A9135FE84D477243DAE69B0B12A22EC93226EC8F0BF314BE64FBA5D
+1139A9E8F5206ED1EF38DC1B085AA70D9AC6BD3023DA76B133B3A78A093FFCC7
+6DF10CA4B1381E5C5126E7818D27EA2580C4024A4FF89B8BE33FB535C3011818
+BFFBE6B0A6862198AF5DC7E84A1C77746109DDF855814D03CF752FA3137E3CA4
+C058183DAEA56FAA877BD919970CCC0B2F9BF3A18A5F2D3488A0AC447A199317
+09C8F891025269A56CDEA73505D0E795B1868BA3E99FE12FA5DB16226D221B20
+74D17A17E1891D4492BEBD57B0AA319B43A9A8C9F3822242F4E8049BA7982282
+EA10B1C19B4EE1B1E54145A6801A86189EA642F7C22D85A6661D7CA42D625B55
+98FB688C535EFA0B5F44CD2DB8FBC26163EB87BE08E365D95F674F3021248A71
+6A53787895CAA015D74E7CE6E5AE73F2010128259EE56CBC8C313EED283F7EF7
+B644EA2679D81C7859FDEFE87085D3C62CAA2408A3D5C4E2E99C6E4BADA3768B
+E4494F072E9F0A5308BB75850A78FC8CE0609A2AB385CCFB3CA076BAE2BCDBC1
+44345CD924C74625BC9371258C648569883DF67ED83F8AD3FB7B1096CDDD7EBA
+25E0102006C31DCD4D55EFFD4D37B05D881359DCF28E83E4AB1245D3529C7482
+576B26AF0DD75C3A82B5A8F3528EE862CF722C896FA9319A2B813443A535BFE0
+D3B0A2811475A434266395BDFB39207EFF7EA5B6CD9E014D93CAAA22840C0A75
+C8FF9A175D2046CE7F49C4EC8E5572BCC7D7CE7E186DEA70315D674364638E60
+F355ECD080C64D3D301E77A578CA8EEF3EDB0610FE61ED541EFC97536EC0639F
+D406FE774CC5708435F5AFCEBFB0563F7C4D7543869E85451FB3DE01C83AB60A
+120A920DF83AB10EF7AF5F2A4CAC36E119CA59C62C9E58BB725A9464040738DF
+70AA3A62DAAD8E24F6F617EA27E1DBE52B327912FAAFAFE05E7D4CF19F65BD7F
+1033202FF5C0C72C4425F7C32AD0A464BBA1D084538A70D52545DF67396CDFC3
+33A915D87A0260B3AE4CAD4F53AC36ABB222256D85B742D00458B4ECE95631E0
+8F21A496DB102D3A2A0CA7BED0789984056D0F34B7674EFC66AE40B7B444B5EA
+C7CB62A0B1FBE33915522A0845CBE5523D949D4332B5E71AC7B1C177863DCD5F
+93C8C6DEE528EAD00114651DB6644C2146E4A7B0DA91E8FDC6968A99B3D516F3
+0D7CB48A037F3359487385807AF606AED4B1C98F4122AA3534AAFB9D9E37799C
+4157601B15AEFEC90F360A7EA2A741460AF365C9CC06C14C1B863CF02EBB5781
+BF4A27590BB7674AA770862D021207A2183239928C5B33C39D1704E87FA51303
+2A05A597F231044724DC06DB237ADE5FA528CC4FF749B880B91147DB9AFF2202
+85A8E2D72CFDD806DE99B5FBA42F6A042906B40369FB6587F2EFB1141334FEF6
+E8A2B5C813A96F76D4ADBB8BC75D5390F610B18420E4E5B029AB7FB265D776D4
+7A3742B1E6815286AA295EDFD64FE22980A97339EAA6A4A2330893949F3BFB2C
+06F658621EEE6F0C010EE8228DA49712A701DE1DF1870BEAB73A7E3AF4DD86D8
+702E39EB7B88F112019DE6F98AD2EEE53115E7ED8B008400C13EA30813F21486
+EB77B0803F4184E071A836ECD0252C6C9F6BC7DA1164570212B87A15473F6FE8
+8530F01CA2653D19BF85E149B68A2DC307682C23A1AD246CF6FFF0548BBE472C
+C0E08847B3062B4CB03F54EEE42AFA6779D67EC0B9908F72CCEF290418B00EC2
+2794619A951D4513DEABD376D80B71669B683D8BAFF3A86487F8F83B77379CE0
+C1356F16DBE8468B05B5A4DD8A8A3FAE67
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMBX10
+%!PS-AdobeFont-1.1: CMBX10 1.00B
+%%CreationDate: 1992 Feb 19 19:54:06
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.00B) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMBX10) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Bold) readonly def
+/ItalicAngle 0 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMBX10 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 11 /ff put
+dup 12 /fi put
+dup 65 /A put
+dup 66 /B put
+dup 67 /C put
+dup 68 /D put
+dup 69 /E put
+dup 70 /F put
+dup 71 /G put
+dup 72 /H put
+dup 73 /I put
+dup 77 /M put
+dup 80 /P put
+dup 82 /R put
+dup 83 /S put
+dup 85 /U put
+dup 97 /a put
+dup 98 /b put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 102 /f put
+dup 103 /g put
+dup 104 /h put
+dup 105 /i put
+dup 107 /k put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 120 /x put
+dup 121 /y put
+readonly def
+/FontBBox{-301 -250 1164 946}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5F00F963068B8B731A88D7740B0DDAED1B3F82
+7DB9DFB4372D3935C286E39EE7AC9FB6A9B5CE4D2FAE1BC0E55AE02BFC464378
+77B9F65C23E3BAB41EFAE344DDC9AB1B3CCBC0618290D83DC756F9D5BEFECB18
+2DB0E39997F264D408BD076F65A50E7E94C9C88D849AB2E92005CFA316ACCD91
+FF524AAD7262B10351C50EBAD08FB4CD55D2E369F6E836C82C591606E1E5C73F
+DE3FA3CAD272C67C6CBF43B66FE4B8677DAFEEA19288428D07FEB1F4001BAA68
+7AAD6DDBE432714E799CFA49D8A1A128F32E8B280524BC8041F1E64ECE4053C4
+9F0AEC699A75B827002E9F95826DB3F643338F858011008E338A899020962176
+CF66A62E3AEF046D91C88C87DEB03CE6CCDF4FB651990F0E86D17409F121773D
+6877DF0085DFB269A3C07AA6660419BD0F0EF3C53DA2318BA1860AB34E28BAC6
+E82DDB1C43E5203AC9DF9277098F2E42C0F7BD03C6D90B629DE97730245B8E8E
+8903B9225098079C55A37E4E59AE2A9E36B6349FA2C09BB1F5F4433E4EEFC75E
+3F9830EB085E7E6FBE2666AC5A398C2DF228062ACF9FCA5656390A15837C4A99
+EC3740D873CFEF2E248B44CA134693A782594DD0692B4DBF1F16C4CDECA692C4
+0E44FDBEF704101118BC53575BF22731E7F7717934AD715AC33B5D3679B784C9
+4046E6CD3C0AD80ED1F65626B14E33CFDA6EB2825DC444FA6209615BC08173FF
+1805BDFCCA4B11F50D6BD483FD8639F9E8D0245B463D65A0F12C26C8A8EE2910
+757696C3F13144D8EA5649816AAD61A949C3A723ABB585990593F20A35CD6B7E
+0FA0AD8551CEE41F61924DC36A464A10A1B14C33FAFB04862E30C66C1BC55665
+6D07D93B8C0D596E109EE2B1AAB479F7FAA35279ADB468A624BE26D527BFF5ED
+E067598E1B8B78188FA4BCFB0B51692D07B0BEBB930C6F0997B437E2C51B876B
+61A563A2673932C2045833FAA35DB22ADE12102335D5DC734AE3AC5EEE6658D7
+92EB62131E1DFBA441F53EFF9021D9D4C491F26BE8F54C61165CAD778CE8695C
+EEAF70E3B20C64D4C2B34A084B5770BAB2A974E898F62BFE90F132A37E2DCA4F
+43E13DB13C94DFA8ECE2B7374827AE168634FA007F8981ADA046CED3448BF453
+FCD9A4F194FA648F9FC0971734BB69CB75348A88CC361FF06E984C86AF0EA429
+DAA5808CCE3583664AEFE0C59EDA04A147FB51227A5AB0C13942323E9B3733DD
+3EE7DF7F774DE5D0D0980DA8C0192983F1E3EF18481EAF1EFEDA0068BCBDB28A
+7FC7D9191EFFC574588DEC1E180341DC959F8EF56ED5B19F50AA82A4653649B7
+CDCA11A1FF27AFA7FF189A7E8A7C099AEEE0CAF3E121798B2721ABE8808D20A4
+AB6E704C0C376BD242C4966325D4C939669E28B55BC335405C400A9983B89EBB
+B13D8C5F3A148E38E9ABD86D0171C927F1051266CBBD5C5D12522AF7CC17918F
+410BABDD5FDD279338E8B17434DBF20B8E06B58D9E13B731E3C07E4CC350C431
+CE2034CB23828A19AE93124011BF053A3C5705D9BEF6D95205FB8360391C84B3
+7C6D719C0FB459A312AAC3C4256EAB293B6DC729CC5070524D1BDA41091E8B42
+2B6C4A092995AFB40CCF35730350CBA197F3D5BC5BB83CEDDBC6FBDE23A885CE
+61D416B3A6CEC46474A0F42D5B923A61832262F234001DBCED9A7A00F5511F3D
+C2178422A46CA5494AA8C37F51C40339CF9392A7098DF8596EA97C440989CA06
+EEEB5025B29EBF6038EFDDFD6F70989D63440E9C14E2A1040FAF427EB41259E3
+FF3BA255BD4C04BAAC47326181EC7CA1FFB32CBCAB92B1F8CDE6ED0DD3FE6D5F
+EE14B739FC25BB13CD94A0C0DD7CEDD886AAC62248C64B8439064D1038886DB3
+187F017A79318B69963296B4812128EACEFBAAE983646E021F24BDAA2B78E8FE
+2BCD5BFB302103D7DD28668DA7A60C446A27BFF8D6C66F4FBC61D271B91F0470
+16F567DABCD1E8B04CFBEF602BD9CE44B724B3EB8D30CE573EBB13BAA047F947
+90B24F2E49C20E2474EE9D019565E6FF25BDB3F74DF05BB9E148E1C5883A9EA1
+53AD3833A612643316CB420AF3DB29F008BA36A2EF00D25D9AA606862E0B96B4
+A1AA4BAAFF8999589849411F07E2D77946CBCB5FDBD2B0B19717997CBFD658D7
+04F62F79ED661F4D7DC87B9D27F976C7A2CCE456408703083D0044AC4063789B
+6A407EA9CBED9C091E4FB511833EAF520213B0378623279402EA99B58929D292
+143E0E986592AE731097872378122A70DED836C1AB5C759F84FE2E907BE8897A
+940785D5F56F46DE7BDDFE353A61B5B3BC8322A831069214BEBFEED880C0B57E
+C099D813172E3F5531BAEDD24718CABE1B6C49BC24FDE597F38485737E059D67
+86C01213000714E31BB813F06C4EA57CC02A36D3BFED9D7C24C1A1A1D785F4C4
+2F163CFE73F5E6E201C561683862D5E4C2CF8C641EE2117AD65BCE5D8E0888EE
+236E65992789D9ECBF747198CFCF157261E8162604442575C8FC216686094848
+2EFBDD209F84EB7FC0C1D32CE26594009D1736486C59DEC211122EC08996E8AF
+7BD09800A67DCCF0DE30FA91A02B867D675A53E03030215141BE90D4A367FD72
+D44CE7E9601E354522B5D106BCF6F4F7494699CBF5BE9424ABBB27B97BFC1D94
+6336428BAC4F7ECD6A97EAFA546B191C9148777FADBBD726291CACE5E3CD536C
+193B2CD36D73D749646E2694562A742A2B5FFAEF4F25641C0708E9CB543D4C3A
+D9BF517C8B1CB1AC5FF0AC934A5F863B48F49AD02640A5A5168ABDBBD0843ACF
+1D45AF2615AB109F2B20A9216C98D2E10EBB8A20B96FA2E88F471839222D2713
+DDCE0898C3740D27093A1A5CD0E766D5A4D1F64E598B08586102D2E7818AC532
+26357753573416B46DAFC8FF3ECEA87F7698B7E28D3A9D834447FEA89F1E8626
+459B4D8C4EC9EDACEFEF2B3828368BABBD24B2EFCE5F5AB64DC6E5D604BB3D4D
+A5A531E15E586C2C9D2B2E1E6E9C384573F613B6CB2EAEAA987DAD1D97C6A67A
+E1F8599FDDD51C1E0313A3FC8A3DEE990240415044F3E9140F729A2D9EFB116E
+1EABFCFEE5D3E35951B0B3BA72AFAC855CC38B081E0F37A594AC1B893D857362
+CA79723689F4485DC6104D42CAF10014E54403EACC7D6FF7984B92112D64E614
+E4ABD1847DFA29C193BAA452AF268906710001A965D09D61F7B0E1C17B8677BF
+AAAFDA334A797DB064E2D6619B78A52A53CE7EBF4DCAB73DAA9BDD11882AAE56
+EB7183571BD90FAFEC8994A220907482F15C0B427DD8C7D19AAB9B9E2DC8D383
+56D2B1913828EE5A6D7E2525095E7F88D75F53F50681A3CFF4552F071A2FA66E
+DF5D720C350A22B88953BB78935A1077F862960845888E475A6AFCB44432D221
+59D3E6F6B29DA905DB620E4A591FA2E484431304FA591656214CCC6A5B9B81A4
+18B73683D6B29E475A55910C74BC7BA5B69C29EAD6FFCC2F7E3075F77FD0F3EE
+AF907A3492643FDE9BFEE4B37213636F95C7D1CCC31E6091719A29CAC5AC310E
+6714F7E01F2874348FAFC1319C5682500C984C196084477C8902CE6885CCC0BB
+3032574229AA3BDC6D87820A8AC7F188E2E4697F97B759EC7588786DF0EEE4A0
+ED96E45742241A963A73990909652694E69D051D5D73B1EDED01B36FDD5548BD
+1CB45F2C58D83CEF62B589A27F560F7D5F0D00BB085D4A29198DA348DA836897
+4B372D47F8E243EAA64B7C07CBB2C891AD658359FBF6A3805200A82926961D06
+97F53B24512519F6381FC3C0BD6C06E1B79FFE742C7E96835F293CBC795A2B7E
+F74A3FFC97711A379028D717328F564EFC744474B5B665FD2F77C3B946F272F2
+F380E617B9CB01527451701E3D84FE0577AA148F9879BF64373D39B081A8244F
+F1C0791DF8BFB0E37840ABED4DA873648F8E37D5AA523A6521551FA262396CFD
+03948DB6C3CC69F92E53713547A86A8FC725C151BC421DC0B268D4CA49CBA972
+AF2C0B146AD29C903D0915891167FCB8647EB2B5CF9C326AF276F633392022FF
+F4D48A4AEEE8480FBD99AED1B9983A9789CB7B9F0FDF68E2980642808A4CA6E6
+3F58D8A32A49C3ABEA36465F058FB7EADBF4B5E390C0482B81A151BDF17C324C
+7EDC9268126AAD4E0B75B626FF0CE8FE8103EDE6AB1C9C5976D2C308ABD0FE5A
+F4290F893F3532C2F2D6F8AF7D88595859031807E7A7EFB79115CDA7AC1A3BBE
+F151135BFE012872D75C1AD3B738FD8377E2FF25C610D463F46630F9288F1A4A
+224638C110D73302CA98D973011F561BCC890087BA0AAC381AB725ECBF902B3F
+109318F854D56E8E40EE825B828259981FAC0980027D7A874B6B2D77BA4A21BA
+DB443AADA891C5EAC059DCF0D6276CC7C23D1CE0104F1FBD10CD49C73AC3721D
+DF358EA83D599CED87B42BB55F83623B78E1A2A15FF089BA5500773A0AA2A36D
+020F8272EEFE118BE67EC135107EB89FE8ED17C27B8C8EAE93D496A1187D5D59
+507DB228CF7E723A21B36130EF8CF41C289206AB7B3418E5751CC7DD4B20D0B9
+EEA3BB37EA52622AE47B9D6D2B8999178AE01DC21CF1410B3D460352659D5FED
+E07B07461D71B0172E31D31E386CC73501A817409A8A2417EBF6CEEEF26A9A9E
+261990AACA42378302E471C83746724FF16749583DD4E0864717C7DEDEEEF1A7
+051D9D2DC642EB952C2E8A2DAE2FCB0D40CC86C58DD69A26AE12DF2E3F6E3E80
+6F356C4837B9EFDC535431A0CF7D9A8F2D400EA4FAF682C9CF292B5E493AAD07
+B66002C7F1434E5DEB03E6367E5AA549AB1517D0D0461D7A54009F1B76A175EC
+48728A51FB53F136A562C680CB7CD2AFF19C57F6D9E98108C7248CBFF6B12111
+7D860715BDEA90FF7749C0484B276801A06A28F10FB43C96C02813C56B8CEF28
+D0F854045313D422C3214F72A668758EEC05D14FF8E8028665612BFF7F863FD8
+D24381E05BCBF7E62C2CDCEA208C5CB2DE777189008AAB0C9C852273C91D3DF2
+47F27FE8EE1BAB0C6D558736FE1219F4EBBEC5BA57EDE3623A7701761D966B6C
+70B54BC6A98D982BE761BC5B03DFC8F863080C51F49AB6CD434D8E662421BA75
+7F44275723AC782F76EF1EE56D2E3BAEB2B42AC4255C89116DB694986857832C
+EA9AC219445CE19EF472999F5981E231A012BD95D1E8DC206AC8508B23E0A40C
+2FF90E4A3AA64B6642FC67E35A61474EE2CB5B92075A8D4CDEB1E77CF0CE9074
+59D4CC48B769261C338E6CAC537B413503F12BF22C1688CF914DCE5111C1ADE0
+7E54B732891411FA9F9C96413D9C5E2EAF7656159CB4B67C5C98DF2C49E4CE55
+8C354F46A7BB37BEB9EF9083427510AED4C599E1189DC483DBB0D41CBBB1681B
+467BD8385E25434FBC7B109A65AB059A17DC1C09A98DD598E149A3782B16BF9E
+C38DDA8E3B2CE11D15121FCEC1C0C8DE4CB9FB31BB79590DCE07B1F7BF999844
+F64E43920725180BD5C234C898FB937FD7A73F9FF121943516AA1BF32FFF6BBB
+0939EC24CAC3E35B00FC74C513B7417EC3281E30729DEB6FFB1A4EB2D27FB411
+4F235D4AE3355ADA7022D5CEDF6D4E8B58F7DA83D74DCDDA8DDF62A1DC791276
+9AD995ECFADC7B8FFA486938D362417D91F967ED33DEB0BB9FE3CE014F0A3381
+F19F21245FF63AE2F4B054190FF07B9865E27C5A7B2F845FF8F2051451B5C139
+2A64BADBB0642DC195A630E60915EE593DBBD949898DB77D01F00DDCFD46258B
+170799D67413C60E224FA13A40589EC4E83E6A205269C414709C832123D5CE6B
+466B7AC96E6C004E956C8FE45FC2EB1436F6886D3D8C8758B633D4F923AFFAE4
+456B78F514F06D159865718BFCEA50EFA6B2427C4D910CF94A0A1E1B4E681E8A
+B04526B8A26C81C84882F3CA82AA6AA918A5B650A7B2D984F63241BBFC7FC4AA
+B66EC337AAEB3FB2B9BBE21F869F163B70C9A606806F2AA087752722DCD3996E
+83D8A84F3C426F22E28AAA9BE7B7A6FCF9E35D83ADD68124E185704DB19B5814
+300314D885634EC4144D0F40F966A68C54057E62BCCFFA6BAE055A9459B5727F
+5BD5EF17E1E57B178BDB71BDE4D1CE32538AF8E34C35EB730A141A2FF7065EC7
+888F264CFDC33381145073FAA4CEE61CD7B1B5D05F5B8D66F2CB1D310264325E
+12469774B1349BA0DEA910FA6B10DEB3870162A252CFDBA30062D3CD970B53A1
+FA60AC96F0C91FF297B8D2247A4CD0639793E9EE96C249AC5ED1D356AD9DE548
+F0BA2CF1D009A5D26227C0BAF46D473E4DB43E635D3FFC142E7E7E5B7BCFC279
+C693A75E9F9326B1DEC5F8F9A6591CFF5B1D416B21D39BDB3E7866985685E4F4
+6E81512D64E3FF3CC3EADE6A3ABC8860EC1C6F57ACB5436B744FE3B87E19172D
+4E04B39AB7D4EEFC46BBA1FB8C725E08394AA78CAEB110151D405ADD73294997
+B494715CBC8FAD279F384B2651D977592824BBB053517155875FD377E02C67F7
+2C6DB8214CDA4259522FD96249E968131F198FDE65207D993D319324ACCD3496
+1112E84E309312396F405FA410C35C54D5880CEE0EA703A79CA6B141977077BA
+53DE939AA1AB8141A2143FE22A2E843F59208A61954F8413914A376E5F8B2988
+DEDA23CC0821FF29ABEF5123E2AEBBAA58ED975F4E617676BA152D13C6DE7FFC
+8D6D91B6F6FD6D1323A58E55AB05147829721FF633EADB94674038BE9D91E149
+5E1E995819756BDFB3D49F4C8BB82066646B6F6AC6F4C6C36666AF487216ECB8
+2E9F857B548422A5E6999658DDF7E3E006C60DA897AB8BAB3C1626E117AB48AC
+DB47F631B4D20E1DADB776ACB9B8FF37149CB392C561CB7232D9695DF87720F2
+75FBB2FF11D84B698631E75B40DEA03A5FA20BA7DE23C19BC699DC03DC0CECB0
+7CA55FE59B57CE5BF4AF9AA199F1C1FE489358454F2B467168B7A67B958DB736
+7089B0236B120E910D4ABEB482DA536527F89D54C2D2E3E1B9AC27BB11F6E7F6
+C5F649E839251083189993DD72C9A0CDBB1696D456660666AE2B6849CF6458D6
+5CD028D7548460F53D570AC00F76E058D112BD595A346530118591DD7A3B806B
+10726CAB360F7AA1DC2F39E565919818E593F806CB35D78A60A1DA6DE4E1DE91
+4A97CAA0876D73AB8E112FEE624563B2EFE5DE00EBBA9DCE9AD3B3D9EBEB5A17
+912EECD7F4AAB721F2C580451FADBF4CE114E6B025507AD7FDEC1A50583885DD
+EFC60872236CCFD4DD7CA1225D491B6A1528ED20214740CD51B9BB4432979EF9
+CEE142303226BC8FD2F39A304836C45DC5DFB4A507C7AA63ABDB0AED0AC0E5CD
+72F5FDA0F0F344A0ED6B5426CDCC3AD43728F12CB790E400D7A3696036DFB35C
+01B43BC077881798D39CEA3D493FBCDD31782B707E8BA3AD4144B61A495594E6
+9BFC27F3672C84D5C989AC530785A8E8B65975FC60BE99D8EFFF604E84402320
+9D9B6C5D1C522CB3D3860993F210E75DCDBE564DBB76DC0E7E1E3B953BAE1912
+9FB37763AB32317C8B70380531811304EFACF482DC089223794EECEA292F5AE5
+28E68D248059E3C52E32D7BF356D4DF6383791D9564B7EAF6C8F8981AF3258A7
+13FDB9E0EED9EF9557536CD4B51D01AD06C29534793670A56E920E27E6FFC4F7
+7187E86724AD81D920FC6C7DA8BFDA1E7E6EC715B86D2098F1DA824B86EC0EC3
+F30D41A53C3EB4AC2436A98DDE15C84D2EE92363C3DADF098D4772D587250A6C
+CBA058062AF6ED244A3F62EEC0D55E33E73D9398822F78E6A82DB7F143EF9451
+D6EA019100F8B7D9F48A04F400BD0A119EF6882A3AB2305BB698BAAD4143FDE2
+CA17BA31187FFE046BD524ED38C612C111F8C5EE0B0DD2C78BB029D299531FA0
+6E689C12085C64F0237AA7DD50ACD43D648C1FB893F811B49662D6EB5417D713
+3711DF874BF56ABED857B3E57E044600ABBBA0789E18791A565938D22AFE6B74
+709497B58B544238E93F339EE87F978E274FC3E34BF181F363A2E68E9453E722
+D4C0BCCBF68E185CC80D9FF0DDDCFB23A07E27DE63CFADB9CC6B817637F929C5
+26E3E4CBB0D9ADE0F5425C4489BA1B6ABC00F95BBF31137ECB0DA2CC13DFA8B5
+D1107BED920C8FC1021D9A205A5A18E50CE348B3E225F8BD003E877CC4F19518
+26C4B789B2EFC830DFB0C37824D4E08710D66CDA577CF214CC2A5CCDBA5F2F6A
+1CAA6EAF7ED6EDE948395BE9BF35679C870D9AE357A14F5C9FFF6B4CCB0FEFD3
+1FC5A39963DED92072FD8466E99C8ED39DA0BFC95E02684527F824F1515A0C25
+B2225454C1D4EAA93D136E6154FDEDBFBD3158E03A3BCD6DBA1CE3A4CA6EDAFF
+190854E54F95506330CED979655CE299DAE6E452F47DB46CA707404359717DEF
+824A58E00B18DD9544A6AE5C71A7668444BF58E4459D70DCD858519EE0954B96
+89994425DE1C589E8ABDD0BDC620C4B6480B88A4036821F36E01D8D227D38101
+559C1F7D8AA4444F99A581489750B0C8F49842F2B30C5C8CBA63342D80C7FAD3
+DFAA487FFB7B687517392EB1F8EC000177CC362C41C74ED549A130EAAB1DC63F
+3C2A7FDAFE54A88EC34E12A31B2F737DCB571E6A41BDAB7F748FCAD29B09CDFD
+6E05411A6B9FF58ACF4D043C80D9AD358FA3CCB3B055A7E706035BF758B6BBA6
+F0A17E9199399E087F610FC47FC34F7D85757F60B072A70E71625A2618B2EEA2
+7ADB10AD2F7ACEE2FBC62108C310CF5F888A630A6602A72671A90864285C5055
+E6B4CE87C4BFE5DAAF0BA3482E82E43A642599D6D7AEC3BDCA5B08DCE0B8F6DA
+80D667E0F3278C1DA4C9595B2B9BF54A34A1583FE784BE77F0AA68B84469131A
+EFFA2D07E453CD95274C676BBAF5DECE37E8C8867A825CDC389EEAC1DB19ACB0
+46C9DE0CA047261D2C716BC8492B67C0F11F5E8D81D41CD7404D5A721815E45A
+D975CA2ACAE72A9D28F4A0805DE62FDF8CA197EAF84C4805AB023E560582732B
+EA2C7CA388E6E014F2902240BFD92971C517DD77CB50140A0064DC656B57DB6D
+F3E2FFBA815B7D25AE897D1BB216EA81AE4D805A128088FE2C1EE89E8B7DAD49
+6C685C90FDA11A6CDD218E70F29CC2BC73E4DA9635A2E8DF4E6DBBE711CE4EC1
+3EA2515CFDF9863E61495FF691CC4F7D8B454CFAEA25D519E0162A16A7A4E66F
+683723A7166890CD82A9B6CF3141047B710D11969A4B3FA88D2903C38EAC7CDF
+34731A84A9444B3C78D0A55D103528C6A1D881373BB3DCB62909642960DB3052
+02DADEDC87279C43F093A456FA555C06375C087F4B3F925B3000166615D13BB8
+632BB9D486704794755E60E881748A8A9270DE48163AE68FC06BB8C10E9A6C79
+4AE5BB01AB176F2E1B906C36FD451CF2C3EEF8E0B4BFF22EE2410B5617775567
+7E6A4AA65B2694D06EA0B744C5B84F67C0B1FDD782090CC04E4DBEFD7FF5C4B4
+90D77580C624E5FFB419C361FCAD3D0517263BF4CE5B2E5433F43DE272B173E0
+2750467042044471932696A0E10A472A67F9123B0B26518E5A827E0F5107901F
+3B6282947294F5D8398DF13D9FCE3A11A91FB989F931A367DB0F36C775D3FAC6
+45C70263226BB02201E0975382097F2C8F60F396C64DC8FCA851118B24349EAC
+9C1E1F9BCC5B736C18DC45521B61352A2AE120D3B9744DDD81FE76A3EEEAE8A9
+53636CFB1900167CB21880E722D516725A011669FEEDED819753B5EE7C30F3BB
+0FF7822CA48AE2C55E6135672988C94D7B84E92C99067D97AE68E31DF1052E7B
+D879B1339F3D4FDC48B845D8D1D23526E4AAFA6C0DE7997EE1076C8722328C52
+F2F801F0DB9DD243630078C62D6BAC2F725D85E6FC97CC61E1B87A8E2450A0EC
+EFC2FB89D4997195DDA282114955403A4EE7B9C4E0A37DD2A4E994ED3039A73B
+5D3CE6008CC86088A1D7590F70BCD8101A37C8E98D410803C1AC36C815EBDF4A
+3E4FDCB4CDE84D43C422FADE645B3D70D51DBECB5456C017D9202CDEDC54BCF2
+AFC541D0A29C1988549850E11B9F248B9FEA1D076A9129AE6868800316559DAA
+68DBD9D6BD12E8A6A60DC85043CADF74D0E5A2316A7106A2D7F5EDE4928CF873
+3A3F793818549D6701F9E6D82E62BE5ECB4A50D233756FA3F32B38C3B022BC14
+AA4590C99769599F3ED95E1FB6C681A01D8E1FFC2876A6ACE2AA8C6EA982BD47
+04CD2AFA239E645281892995958494BF2CC5FDCBECD3AC7B72AF52584299E6F3
+27F409B7DC0307BF4C9F11BC280507E8F320681C7EB4B7E3956D387CC181ED84
+66E286216900C6DCBA24A6B684C7945DD8CE980C66C1CC5FFFEC14CF2AA2B4C3
+8281ACBD78ABE1EA431458C5F73D100A43BC4C74C4BFA8B5C0FD732D78859ED5
+3FFAFA16CD4447BA7CEEF8ADA934AB62824D85D3BADE26A474F6C2096A77A289
+01BE53356ABE54A78CF1A30EE47BC5C3ADE777C8108FC164FEFD7A5A63518D14
+DC8676560D62083AA50D7E4D83B81EA7DDDB1473A8F4B350C77D70D0CC4203DA
+C0AB4958C7B9821EF0714364EF2DD1DDE2FCAE7CEAEA203EDBA3F93CD5B8B35A
+D8D5AA2281387F82C04FB653AA329DEFECD72254000A30FFACA9A23CFA6E9B3F
+669732D9DECEA6E025F0AEAC902AB785B6C36AD5E1BFE474BDFA4FE0F8701BD5
+87A87AF692F607ABCCDBF45C7D801A977F425F379E6E4A745594B2DD3F90BEB1
+C669B3FDFC7D78399F8C5E0FFCA3118A486BA8720034AAA6CAF7348E04D6E7AD
+A27BAEA87632B7B5A6CD8F3E443A43BBC47F7B7AEEBAF4A14B5C02C471F72FB3
+1E133097D10E6A4ACE1E1C7172CDFC4F65E95A7B71BD0121E1C03CB92865BB2C
+5FD0C7DEFDDAA35943B8D4370FC8EF4C67CE0D94B2C8A6044614625B610359BC
+DC65B29EA1267D6283375F64EEBAC282A2415A9CD48F16D9557BE5E71D9A2824
+3A85668D9F89B165CA147E25FA33AA9713A3337777AE76BC8F6E816CDA5F3107
+898D34A23EA13653E161F3F6F8185F1DA2B0A104130B663AF775B333394637B1
+010784D6E18AEA9F738A41B6E9AF1FA70098A32414D431E391B75FF2D4C05260
+4BF53AA61537978DBE814ECAAE7DC49C705538A3CD883A1F5A54F3FF78FE39A6
+1FE40E8E38D9AC7C7D4665CA341CD0FCE194DD5363A597B349D1B2B0C1F7ACD7
+D58ACA50FB33585996554585EDAFDC55EFAB2CA1DB6D64075FA49BE540CBEF4F
+AE5DA55DC54B2B41E25621478D4AFCAB32D35FD8941528226CE6F5B646A616D1
+B2A42A8F814F83D486B96366B6551535143E06C25C68BC5AC2EC5E45ECC6B9FB
+090DD8A40395C770760D0DAD3810E6D7BDB4FD42B2FE15F97DFEA924389F459B
+71FC2C3ACC8D0E5B20E51F31438BB1B6411DCBA203188EDF46A4A433
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMBX8
+%!PS-AdobeFont-1.1: CMBX8 1.0
+%%CreationDate: 1991 Aug 20 16:36:07
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMBX8) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Bold) readonly def
+/ItalicAngle 0 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMBX8 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 13 /fl put
+dup 40 /parenleft put
+dup 41 /parenright put
+dup 68 /D put
+dup 85 /U put
+dup 88 /X put
+dup 97 /a put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 103 /g put
+dup 107 /k put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 118 /v put
+readonly def
+/FontBBox{-59 -250 1235 750}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5F05C11F9A72F5DA508C30BC4BF52C8B1EC5FB
+7F9DDDD0964A6D59193A389D490DAA6F6ACD02CF71C06802F3AE5A001F2B3A6D
+EEB60E9DD26DBCE1D29C825A9BEFE3A6572E70DC7B60344C3E0C9C77ABE1804C
+7ED61C544F0B4A3D6C7662DE8575C07BED3F6DBA7D64A9C8613AA152B74A140E
+AAD9B66E0FAEED6AF9D1820F361C1269A5E90519A3E6D40782E06778C0AFAA30
+E8CEAB87054C4D156C1B14B4E8471D78648FDAC70A3B8ED474FA356393A77420
+4211F60E397D2FEFC6A8D91A80C84EB9E38E663249FB91D5C8A5CBA68BA04272
+5D5D42497E1CF5CA1E62EC2B139F5CD4D6318EBBA7AE28614D2D88709C2A3762
+611524B8A1FFC7B0FCBAF77AD8159C354F4887DB1A27781DE0A4BA7DF2CE2025
+D9278CED48584E8E6BDF30BFD24284BA1DF828B637BF84A02908BBCED67372C9
+EF44711BC2B1DA343C8D9D27A9745525C774F5D639B7AEC197CEEDD06FD27923
+35ED0D402AEEB51134665A47847429D91CF419CA9B09DC905F610F8DFC54E606
+ADCDA19D5CC68A7BC7108EC9236C64205B23CE68B9BC38EF3E5BF9E0E6ADF404
+7365C8D0436609438C82EEB2F356F79186DDF6C1C797D3C278108B1767D15178
+C4C3E8ADC2482BAB9536AE8419E5CF3EE1B6E53BDCE2A83E2E485F496A562C10
+B3F5A131BB19D1E5414C86C5F995521076340536E10613E42779FA15EFDB451F
+53495CE8EFF239E4EC442E1439594549D45F5276F93D496C9AC712D762D0B702
+E894290BA028837304AFDDD8BAA6564E9DC307A14A7A206550FADDC7784DE3BF
+3390188BBCDDD929C82B1D7B529553BA75ACF5B385D31EE3902D96B2B5DDFFF1
+9F0F90FD791E54128C1717F313486896868A34FAFF22E23CEF046D02C147B147
+C5129E21B6A4D0235C6987001CD70C578B2E1221AEEC83116144C66FC8A390D4
+83F72487347A5FFFEDFEDE690DE6778BA82BBD976A48798F33EDCFBE08095B85
+A0ADC3447CE01E563CBA1B2384D9CEF3C2ABA1ED9C47FBBA5E59479B7F07C4E4
+870CD0F97A78A47E865E6A6A3B7CF7C54E8D80DD98A1433CEFB3E3B5EFF67992
+1788C44C04490B1715FC88FFA7732A16A20FD23927FC3AEB81F1DE5A761A8270
+9FD8D8F4F68BA0FB8DAB4818B3B454B5A7B864AA7041CCAD8579E4C8C57774C9
+E2672491D9DA6C13A69B3CD5F2B5F726CDC8E69A713245E7792A413BF0C31C8E
+211FB7ACA96B9F1DFE53FBBB45E19A0F4F3523E875041659DE233850F1AA60EA
+14B0D5BE09E41E1700EF68FDB99F60B07D89B7EE47E90D14C857AA1AACD8DC62
+0461A08E1FF6EECA003B3A853B6E75317AC141146A6C65BFA7268007E139D9C7
+ED3DD944888331A595B78D1B0705B75F29554A99425A33772B8D493632697CDB
+A9C3585E8575ACE0A83F088B04BCD02731CA1C3EC7367FE60C8670A33040E160
+7D88225AC0929A213CD719E5DE3094A2583DFC59080B032C2207DAC7279CEE40
+6C79124ADC76F81C99348BBBA1F463919E60D65AA7A2D47F9C60C5D951FDFF70
+62F711A8F1FDCD8A755FF94B13862ED6286A7A24716B5E7EF799C127BC446533
+2D251123FD43939D6F101A72B75503F5FECD3116089C69BFEF653251707D8CA5
+18E214F175BD81448B657CE4B0E428DF641CD62DB4703241E7A07257DCC82579
+5B67BBD28702BDE8F705CA9B27522EB727F3D2EC6A853B8912C5EB0494BABF61
+61B79B132E7BE0FE80FB52F82681F7B3F59A9679930600AA912C213D60FC571B
+48D6348132C0D9FCC66375CC2A146DAA30901BBD400BD01DD873C3A1DB05130D
+9DD9E04B964023F0C01C9496EEE01526F7DBCBB4DBD567C2CBDC5BB6E780A747
+BF4D7FB6B227BA2351A4FA4509F28148F1B28CC73658CBC5B8CCA0CB34382AE2
+6B72C6D5001338D1A5A91FEA28AA539208097797D4ADA26A6DFE97A8E7069912
+68129C9129E9B6BA40CCAF95F6F1A76535F2530C03239B927F4B90DD4D9FD6B6
+4B9570EA4BEE21B15C25BFB2C42BD4B93911790E17A1FAA9D4843FD519F2B573
+1DAD07942EA30F97DD15C0CD5F51189F248964977B0CECDA01E9747B35BC30F9
+85A88AD77145CAEF05856AB7F8E27CE4FBC269B493C8B907255B27C9004B72BD
+56D93848AA456D5DAF2912ADC65BA79D2F6EB7B5CE17849EC0BB2999E9BFFD69
+27D9749EE8CA9AB64AB1BFAAD6E328160D82DB759EB8C79FB63333AD2D0825FB
+6D6CE77608F71E9086B8AA2759C3FA235F236814B85ED648AF740A5DB4B8F34D
+E0548BE8CFE4B747B05160C698312C91E21F4BC6C5D016CA79D6468BC9A42DAE
+E298467593E2FBC6793F6C1B66DE0F70FC0F0B5E2F3666DB2BA7AFC1F639B273
+6CAD24DD1CD7C5ECA2B33698009F29EEECE97E52AB92ED5FCCE12F8A17821A23
+109316588AE645DB82CFA3D20D0BA7D83270DD17755D39AA391B49E9E2C4263D
+07FD503E1B21034D9971164AA80679A67577B9D17BB30C2E68D544E9F9E52ACE
+7318A141C3ECEC36E78A7A32B00A630DA61A14104B881CDE11E5CC967A4F50D8
+84B11B3D0B6AC6B17D95139044D14F1A8452D4E876675E47E4274BA805226F88
+0A8921F91341C7FDA4714F790A63DFBB316934EBBB9D947EBB021359CBD79C11
+EFCCB67C2D871D24E1617D8C8877D5AFF847A2164FE7A317EEB7459934EE50D9
+682D84592C6D265D2E486593C8F97C1B4B1B1F2841A6A6B20EAF18DC3005A6D4
+61AACC2DEBB2F3E21F308201E90DBCD8E91F3E7104A2C987324797D52383BA34
+66292E7D3A3F414328A9952E49A085437A00AAC3F2B2B3D1401C80B3A55350C3
+DCD55E23DC095AECAF505733A602E2D7E632014B393A7675B19324690DA682D5
+A9E4C7533D708632B5C7F886D681CD958623B760B692B59F6AFB4FF7327254FB
+AD45A9BFD2B86BF576DE1B857238C10B0A60C55EE1BD2E6B23068E354E369E5A
+43D909432F01D3EEF018C87DCE07EC838DCB5D4F1BFA43C87B88363C7574EA75
+0B8C4662CE67059710052A99FB8C59F9A64873E066FAFE5AB6E39AC9E96BBE84
+D6BF072D60DDEC69091DA00EB450570D2D41E5BDF25BA605C906D71230769024
+99A0B1B89ABBBE5EF9A1566F489353F5BB933DAD776FB2419A0EEFA1D3E09CF6
+36B3E534B1F997B86EDE70AE21DCA966A74F0CA292706879F57CFABC2D36B9E2
+A66222FF70B41DA4E80CC87D2E0836EE48C4EDBE3E00DC0A61768F36F46BB15B
+63BE40981C80EAE3457DF22DD5381AB27123DDE774167D39F52B5E04BCBFED56
+D2AE111EF58EDCABDC35FA218472A8EE5FE2D92A346A3BD83E757838EF1D33E7
+0D4CB4774E13115CEAF77069DDBF1EEAC7F8DE102E9F88530ECD9885C8FFF78E
+289EDE509A3AA90906AB6216C88A44EFEC69F29DC2182601F9E6B8E211451012
+75869E10ACA6BF24D090DE7272F50325A84E2559DE77E14CD4FA5B9697B7054E
+9B0EA281B158C8E3E8D5861A9CF983615095F83F766DD92856E982E732F4D989
+60D5586E89218E40DC21F24E8C106BF35FF4C042A120E21D09BD389B3D6D957B
+5B68B758F70899FD22C4C7EEB67AEE7082BF286D5A08F5BC0B55D09613731E93
+AD01B02FA93832DF8E5FF7F15B2A25066CC497FC74BEC590EE442CE96CD10BC1
+69837CB924BD3D6CF5133298C6EFA43E194A7EBD970D93AFC5F21E48A2F005F2
+FA9BD18D8CC3493AC92AF5B80DED65CFF97417BD39CE02D7F04015BF6B87F873
+6297B9BFDC598380A462DB29028E3AF8568E33103D23D8DF87B70E3E6E6C88CD
+A6100596CE4B54D21D10EEFCD9C55B4F354BA75E2DF83061CE3AB08B52C6719D
+B2A601C72B9EEB4029CCBBA09589687353DFF4CDD000627A6E278CA16168B18C
+2470D1EE98959962C8D09DF2BBD7F9DBF925159B5036435A2AFFA895325311E2
+67CD2FDF6E8837DFA80FD49827989F62C798F09DE4CAEC4C1C5ABD4F44A5D687
+42066409CEE7D70A8D03E119FC3B0B416961D48B096402A5E05F12C169D09CCA
+449C8F337C553DFD075A61421643434A85D3E4FBDD8A4898A28523D9BAAD89A2
+407FE142489B2CAA4A6F9F3DF4B65A5AF8F604ADA3BC0B12F06390199B072535
+C2F3E3A1181AC4C7B482748D252BB2DF8DCC0EF128A40366E7F5F28AEF18944A
+D7D732CFD01BBB6237DB50904BE8DE727683B2EDE86A47F8BA7D2F9B225F3C18
+88C26DCCE222ACC87DA6F714DF90E9EA0FDF82C20075C0BBE647CE245186F3D5
+FCD2EEFD695309FF9B6F186C8729AAB72AC012915E824E1B159647511B35F585
+3D9B14F58621B09E7C41483372D75C1D2E9019BA212B6345E56C279E5D9BD852
+FF009390D1ABDE89A4833713D8ED115FA95D0A4CBDF75AA4D13A106CC3CB120C
+28B65473465236BA6E9C94F35276FB6EDA06715912836326E4C1329ECEF1B9FD
+F1F8105DD1BA2D126C4C55B3F73F1BBA4F3200B22264AE9A927EFE84D0BBC66E
+889A9AC9C590A396C82534FA204EFE22B5207908B99FE27D53F735126EB8A01E
+C1A29C1DDC19DCE99C94F89FCB0923E8D3AF48D9315B2BF4A17E98F2224B1616
+DEF1DC0B615F737D946F8830C474536F64917D1238E374C3D77B101F6F088D9B
+09C6BE45EA2F2D1E85EE4521AA53ADECC150BB31A4EFDB7B4F221EF7CE2C6746
+63778794ABF6131F7A4165E154FF3BA1BBCA13BE1C971F77E1C3A1C5A599E9C6
+799FC88B482D1356D4F20FD98B1D2B5FCB19A19454F95062D359D7B3520EA793
+1BEB5E79C549847F8E9C0B47F12F0DC1231B1295683D18BDFF636CBE1DEB31BD
+AA65E8B3E2E3B01CC99ADE954EA784CB987D3D6EDAA5849A870D21BD01972E19
+A8422FFE663636AF0A25F2DE3134293FB78A2E67A3688ED794536FD10277C022
+20BA19F17A05E3C5331D5B96015935699F4F0BE6E27DFA02A794A7BBFAE38C89
+944484CD701F805B70D33EA785114B8B8BA6B3BBEFC91696FEA9B9AB3A5A1894
+1A6C32A5A727F6D1989912F3452C33D10B49E3DCE9BC18BFC60AA57904D97042
+CDB02BB20A9ECFD1A387B7AC86E90B5D0C8311086373CDE82A9B5F5CA5A73834
+E62E3675ED5E24EA04C7DB5015896E00DB5B6097BE07E6F8F00A35BB80A1FB6C
+DAB3CFBDAAA517E2A63EA322B2BE56BC1FCCA14216671B27454606EC045A32D0
+B3108E0B112AF1ED1CFDA1B67C270F5756567D948798C099ABEAE7A6A04BA4A1
+A83122D8BFD934B3F9115CAD48C153C9A29DE035FC85BDEB816AB3B04DCA09DD
+1DA3D1F854AC203107C66466F0261C33007E7AC824CE3EE77DA729EFEA225C47
+C6AF01D45C0B1722A8661C3F5CCF865EEB5333BB39BC7444A363C4DE53BC8D56
+066DBCC68A96AAA64C00AD08772B0209B66F00986788378763DEF5A3E8CBBEEA
+0EE6554DADF6AE73C3A027E8FA95D78FC367CD9755B8BF0C5CBB1850D0DC2668
+4740A6F5C35A09C850E13EA42F83B1FCCEEEBC1CDBC869D376C81D97B9F1B605
+388A190CF8F796DFA121B8EDE0134D42A8986CDB6DBBE3888FB5CF42DD2D6B02
+B5B3D3A82EBA1F0029
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMR8
+%!PS-AdobeFont-1.1: CMR8 1.0
+%%CreationDate: 1991 Aug 20 16:39:40
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMR8) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle 0 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMR8 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 11 /ff put
+dup 12 /fi put
+dup 13 /fl put
+dup 40 /parenleft put
+dup 41 /parenright put
+dup 44 /comma put
+dup 45 /hyphen put
+dup 46 /period put
+dup 47 /slash put
+dup 49 /one put
+dup 50 /two put
+dup 67 /C put
+dup 68 /D put
+dup 69 /E put
+dup 71 /G put
+dup 78 /N put
+dup 85 /U put
+dup 97 /a put
+dup 98 /b put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 102 /f put
+dup 103 /g put
+dup 104 /h put
+dup 105 /i put
+dup 107 /k put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 113 /q put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 118 /v put
+dup 119 /w put
+dup 120 /x put
+dup 121 /y put
+dup 126 /tilde put
+readonly def
+/FontBBox{-36 -250 1070 750}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5CF4E9D2405B169CD5365D6ECED5D768D66D6C
+68618B8C482B341F8CA38E9BB9BAFCFAAD9C2F3FD033B62690986ED43D9C9361
+3645B82392D5CAE11A7CB49D7E2E82DCD485CBA1772CE422BB1D7283AD675B65
+48A7EA0069A883EC1DAA3E1F9ECE7586D6CF0A128CD557C7E5D7AA3EA97EBAD3
+9619D1BFCF4A6D64768741EDEA0A5B0EFBBF347CDCBE2E03D756967A16B613DB
+0FC45FA2A3312E0C46A5FD0466AB097C58FFEEC40601B8395E52775D0AFCD7DB
+8AB317333110531E5C44A4CB4B5ACD571A1A60960B15E450948A5EEA14DD330F
+EA209265DB8E1A1FC80DCD3860323FD26C113B041A88C88A21655878680A4466
+FA10403D24BB97152A49B842C180E4D258C9D48F21D057782D90623116830BA3
+9902B3C5F2F2DD01433B0D7099C07DBDE268D0FFED5169BCD03D48B2F058AD62
+D8678C626DC7A3F352152C99BA963EF95F8AD11DB8B0D351210A17E4C2C55AD8
+9EB64172935D3C20A398F3EEEEC31551966A7438EF3FEE422C6D4E05337620D5
+ACC7B52BED984BFAAD36EF9D20748B05D07BE4414A63975125D272FAD83F76E6
+10FFF8363014BE526D580873C5A42B70FA911EC7B86905F13AFE55EB0273F582
+83158793B8CC296B8DE1DCCF1250FD57CB0E035C7EDA3B0092ED940D37A05493
+2EC54E09B984FCA4AB7D2EA182BCF1263AA244B07EC0EA901C077A059F709F30
+4384CB5FA748F2054FAD9A7A43D4EA427918BD414F766531136B60C3477C6632
+BEFE3897B58C19276A301926C2AEF2756B367319772C9B201C49B4D935A8267B
+041D6F1783B6AEA4DAC4F5B3507D7032AA640AAB12E343A4E9BDCF419C04A721
+3888B25AF4E293AACED9A6BDC78E61DA1C424C6503CC1885F762BFC796733DE9
+AB6BF5E38D819DAB1562DECC6E6F542F9779E2EAFB16903EEDB2138F37F22CA0
+69CFD3ADA1EEDF70596D2D8C0F82BCE623594932068AB28DB6A6811D16DBE1ED
+F496EBFE5C67A99A9DB90E2A604D5EA99A84F330FA30063FF88DB12AD6B230FE
+FD369E8407D0968F60DBBFD54292CA1A05875D1924C861859F55725D479924F5
+493F6F766F0006CC8063CB4F40D4A97379E3F7D5DE1DF8D6B8DAF796BAF20005
+4A291D8AECAB748BF3877FF32265FD40C047E954CA5176CC9208311B1AC4D27A
+258E5CE7C0FC38E8495385F17A0AB4E6D1992CD95130277E89B325DF1C38D5D5
+3F64AAEBABB72E05A7AFFC442E24F7647C43CFD6033F0C06634B105E00658E8D
+07B425F413FE8FEBFED224C00EDFF223E7FF32A012AA613D33FA3F899FA41FC2
+6015140AECAD0383B4E76D8FA5C34C62BB3F73049C1FD09BB47AE03ED8A8630A
+AAF498897DD58D8A4D0AACA53A35977DEBE827EEC1F29A790920964A82DC87BD
+15BAD40B6D60802CBFD4A2EC69D822C800EE3D632864C64ECB10A80299970F69
+17FACC4DFB492E57B23AA747E8735C5002E0E887F92D2F66850416367BAE660C
+8FD2266F60DA6252A62BED9FBD183F9CD5585D35A205E2606F348F4692BF711A
+A82E86531E4CCFBF6609C225A55326CDFC300083A3B8B7FB1101854F3AA82277
+AF2E56DEDF352F3E77B9FDD572E889A7B126F38A4D7F8ACBD602A2BCEFF97E78
+7B5B031059319C73B9F76F16D35C17641F8ABD0AC201A2870E784730B2476508
+45B0DE3AC797B403EEF416B0BE5F34F1DC876019DB7F6EFC1547FF1BD817D976
+5656C851E86EFCB97DBBD49FB6BD76A78FB4FFF3D4EEA1FD1E064903903C3052
+82835AEB01BF0DEF704C29BB8A03A8DE4F2EC07D8AA8D5AFF6D4F3329A8E5A76
+05E89517DBDD95DAE202DC845E97207FC5548BEA9AD8C38A78F156ECF3A70AB4
+91FCF1B91B727B198E5F3BEF20010B8ED26E96B6447F69192A04FE2FD3126BFB
+984ED808F107A3B1DE7774F0B3E3DB38C5835AD5FAD0F8CD061EDA10728DC794
+BDC243CBF68B5E1EBDBA1600931C625070155243DE79745849E487277FCA3DF3
+0BBFC149AF46E96202947944487B5DDE8E1FC1703F81538A6020EC89E332115C
+E5DBA7EB6CF5AE1B5CCFF4655F06333076384494738E730F0EAC5A00B8413C05
+15C01A8D78D1ECC2D2258E2D4140428945165A59C883B67B600436CD5B1E7CC7
+2DAD551B7D668B87E6565E0D382429397CC8EA507B4F3DF40C60E84DEE076D42
+DFAC2FC2E9BF28AB017C29E0A950417377EEBB8C8F307F96ACC5126F9D19D5CC
+62FDEA276D4D646EE024110E62015499DE242442AFA8C2C8CA6E4126F2858680
+F440EC8F58466FE876EDF0E9D4C7B9592AB23EF5444FA95E026F7E8FF8025B48
+7D9083922E158A721EEAED385270C6B29CB4D50B8FC407AF40C5F5D957B2E4CD
+E43484C388D25E64AD67EF75932CADAA6A87AD31DD7AC61AF9837CBC5E43433B
+5E0B5B1129794538B25DF83FFB82837A45DF19385C15D20FDE3CC5F314D97F05
+7CD23994B9770C36235C5F7699B14C48A37D961766519D9F8EE3A70BDCBC6AAF
+0342403AB2E843FC4024E40CB5900F7E570C4DA2A5E838D5A0B75595DF2B8ACE
+6309D58D5C1B09618282A5B1F1FC6CF71F277BA6A6093DCB3B0CCD854C724BE6
+8AE23433C5A56C6203153BFBCD4776EFC1108C13342345C24A8196BC312A3630
+8F91BF9B041CB590120D4C8777A12DADC80573D419990430278F58D223DDFFBB
+4109661B1E57A964841550C6A58D739C729124540F2B3260B115A15E1495A4FE
+409094D70EFABD3992DAFBAF3B1CDF714C33EC6843ECE874EF9A4C2479A9969B
+32A6B95E82BB0E73A3AB037183A5B190C1F99BCF5E9A8B154F120FF51B52945F
+B42DEB8223E37D0D368A0077069510E326356E8592AF1CD3D12DFFBF84CFB123
+2BA7C7584A9CB397F040104A7F3AF70BD29780F9C836F5521D51E0C08A2D77A7
+38D8B1B9EA9377CBF9E0AC2E71C0C7DB75C8F10BE551D3CD64D41B7239549B2E
+9EF2D221E5A0141BF12C3634812D05CD81F01074CFB35687FE76BA122374FC4B
+F0654A02E6F299B005F4473FC1030A05AF50ACEFB15E6C629871FAC24B53A264
+5CA17B0D4A42E047315761EB02C4CB7EF4B2D0B1242CE2E67D1B62FD99CD47F1
+E6C144B6819944C9ADD16D97E590B5BA5A1CECD85CD8A66FF002AF6C1DFB110F
+BE4988CD53F97612047E3FEE1214817B188BBFFCF00A97485D4260E12FE68C27
+E03E42C9921008C24B78BE865C55EDE7B7F9E25D5E6734E4DD45336B807CE24C
+224BDF0BC21479ACB57E7DF4CC115298C4AA0F3D67E8EC50DEBC59C86A00FBBE
+C65FD4684BBB57C3AB0C57FF5693BE81FC118B40344600CF4DA1610B2589036A
+3AD412889977FA8D1433B616409DF38A8B82D0CF473C2D870885437FEAF125DA
+18A003B3706A1FDA2542CEC3A02F49260DDB0D5E20A515C0C8A96D668FDE0785
+F450173006E30B5409812211F81025B9A933F9B44952AAFB5D69D31270BA29B8
+DCB1C183AE74C3D0C48F0B59C61AD0C3B308621E63A322F259B4E3E763CA8D3D
+E280C27B463309989296A884EAE4603BCACF21957EDE23260B6927318908D248
+EE8E3C77BDECA95260901E13C5B5D5BEF2E0C391D3D725ECB675512D1544F3FD
+A128D5E47000B2DF2F0D49FF77331716C44833DBD565F25ED5577FBC909040D8
+CE1575A1A85A307F58820538AA4484B80D8A9043C49D145AE9EABCE5C6B45FB2
+DE5399440E264DF18CC9CBBCDFB1EFCBC61FB339D9F66D3ADE1898FFFC448743
+9328ABEA62DA73B7BF495C8CA7A9F0B6AB7DE17D63445909806152C2333D57CC
+D61296D9E8F56851CE6C335D242C53D97D02C5ACCC70792D196F12551E7FE0F5
+7405BDA1B94620086E14CA498151EC184005996F69AF873BD435F653611D550E
+970F88DBC10E814EC1CDB108891A1FCA836E8635D65E165445A30489B8A85463
+59FAF1ABF818D4425979F800C705A1A78EC5FA411C03003064D779555AEC75FB
+8C9EA656E19417F8AAAAC61CD0343388679A07F38C2B0993D021BD8FFB49C92D
+9D45A58556BF5AE337AA76D1CF229CFF14D89EA9CA756BDAE37563FB27A246C1
+0AA58966C65B6309F2306902CA90BCA265238B79FFEFCD1D9D73122E12F024B3
+687A69C3CAD4895F7C0BE7237C8F3B6B90E99365FDA4172E2BE2C6C3B89A6BE2
+A72905F52658D1A797F45B918B9E8F9DB949625C76BA70F615B8000B38E33ED0
+45234BB909DE7CA5CAC433253DABBBC85CCECF70B5E57FD7ED50E4C17712FDD3
+6943F034A47B66C116D8A229747AB29F7609BB289513E57CFDB53CB9F64FD46E
+522625C48F7928AC40A4AF9F2FE8578B32B71E650D118C0BBEEB5A453C0D5B9C
+7A85821359158EFFE77488468D02095C13E2193C37007CF7BA69AC1498948150
+57B697A10D2E7636D39EB760C8825CF066463C9327D54666EA9A133D766BAB41
+033AEC2EF577C27124D43B4F1B403037E4D3977D36B6EE77E7DEC5EFEAB66153
+8E02C767995E1B65C6C3900B0625E05B30720554CB66296A673DA3D6222E2DB4
+26FE3DC0CE1204F67328DFB647E673005F69D412C1FC32F24190B7C2E06D6584
+D64CCCA34DBB210A38FD94D03CB1C0320597AED024EDE20FD479C89CA56EE17F
+D3A213BCF5FA8FEE9C9362F2DF55C68DDE73F6C8F794957EED0F6B2DD1F7BCD4
+4A3908333C7DB4A2786FA78DC2E4B8B16DC7CF61BEFE12914992652B3AC9320C
+39ADB78E00717F3C56C0FD6C834D156B6D4391FA539C2AD4851C855AD2A40BDF
+8B479FB348CE56839128FEB0A88FEA411CF488C959AF2D03B9A9ECF2A38369BF
+A0C898A0D69875B1C13EE48D071F20AFAEBDB09C5BD325F9EB2DE64C0423D354
+4B17058FC82CC0BD6518AA179609D866C712EEF7958AAE3FDA22ACFF9D939CA9
+FD2BEEC408F16B526903BD5CC3831BF4D7F55A1B6D7E0BCAF1D5ECA4617BA698
+EC18A62BF0DD66ACE6DE648B3E270D031CED116B6817A2159134197B3D88DDEE
+9D57BD478FFFB018D24FC3098B5821775ABB6476CD2BAC2693297B76B12B4D25
+D1F1608EBF965619E62C6E52D93FA52824340524193CE4202D7307C76AF5A258
+FF6CE0AEF6FBE5795F1302A7300F74C4218222F1EE0C9D4C57168A5C1B65867F
+4C3A18CA3409C052F6B639736B20DA21CFF058C8B579ECD5E8AFAE20329B74DC
+F8B81BE1DA33C2F4F66A3B393AF83E808D86AF49BED141156C71FB4BFAFEE8FD
+5DB0D18F32409F035BC5791E2D68A3419E25F2CA07C4B5840042C1641336CB3A
+99482001A4AD383754E09533CBBF56911ADDFD49A0625A40095372CE23CD0CBF
+30A7433A0C98EABA19B78DD7677609900F6924180EBA0BDD4E7095498DA18610
+33A0D1C336BCAF26B18138D6CEF9B23ABA3D54818C08726DF0AC1684A1A6E183
+A97F06219DD414D64D1EA84438844F1D2C5BFA061C7ED503EA63E2D5D38C2700
+92EAE8C698D0B3A298288CE15406223895DC7FDECCB9E02144EF27F452AEFB33
+B86CF15D5327B079CDF2C9D41837457FEAD7FDAEDD6573A20E7C4BBE2FB2C493
+7C5D15430C7E3BF9FC4BC25CBBEFB7BC96496BC6C9AA030449B0B8EDDABE0F8D
+FB6E9CBC51F7FC28B5DCBE502D4B773A0736B5016E9B0CB2F0A3E6F5F40F3F1F
+1C119B89C3CB5A294A54DA36245F1BED8C231B08FA6DF3D18E2A989B6E01A44F
+067361DE404A33C847395584B5DEB00555BEA31C216C21EB481970DCD7466292
+A605ECC2999E3961B95E02B3033EFCE2DD08A59AA0C39EBD1ED69264C5856050
+62F23793D6CFD17BA93CA4AF0B67F8FC6CA8708D5B8AD87526977A86C4F8A0B3
+CA104172E1419B66A0C3478D7C2E1DD7C887396EE00D8CF64A0954556CA12FB5
+06BB9DA386BF5ED9544CA66B6F79D611DE87706BA65CFC2FB97772538FDB929B
+CAAF81F1EDA8DA486D3B6D4E30400940950B25F227545A88D4F9855EC9C04727
+CF5C54297C3085F2F9F0527EAECB549277CD0853177C442343629D6AEF311AFD
+8E0F81107495340A20D206441FCABC0E58A3DE47580E3F2C63818F9EC0C07A7C
+FA63DD74DF7AF66D46AD23886C713D0EB7AAA682DF72DA0CFD9063489A6E1B54
+34DE64546E1A61F00F1B7ED0D147AB48864D085C50FB5C9B69599D9234FBAA5E
+7AA25D466C0C878635ECD52868AC82AF488105E3323222E7928AEA11E24CD5BE
+905195072DF90D2A4B2F875B5B334775E859BDBA1523337EC60ACFEEA5B466C8
+4C1819DD53F3F63954949BA2BDFAB43699C5860DA2B542CDB48C99EB3DE2AC0E
+1B69AAC433AC0CF2389A529768C56B1B945A2AE0A4134FF778AAC525F632EF1D
+685BEC8F8930158C502AC8F6FDA3FE39AC2D2EE6BD00EF6B083672886E82D121
+B74885FBF48E6F12CC5D063FF0FB941F916257E5153473E3A7DA9A0F2B183A67
+678DC31A2B62E3241FA8F930A53F79DB88D6F53AFCE6EBD24EE22903BF59C17C
+B36DA49DD50A959A916BE48990534A82814EF1835B235F33E20A82892C8370E1
+55DE7434136ADB948463CA8480C9B8004FE51B025672BCF3B50E1B3170AE776F
+86E3B81A4D64A59596C397B248AA7DB1C63113446EC7CC319B7CB5C4583848A3
+E1D7A161D00F8C33E38AE4CDBE16A2D03B5956EFD11305C91A9E2D558CD0CF5A
+29BFABACA34B3822D0520E69A03950E608AE76067D8F4A4E5548E4E6773E726B
+37C352CA410740313B4734806FCFF5B5C5798BC3D0DD4184713CC4667AE07CAD
+D1B0000AB134C156D11316BD87695C383A00F281DD797549F75A208C3E596A4B
+8EFC3CBC7798832B72BC74986B2ECF2715899B32181978870F502E1E56732AAE
+79FFC3290E2F7E69327A429355A9CB2B6D5F70E98F94D82C8F4B4A581D58DB00
+D3F5811978BC4AD970C525429839A99E92AE16CD83CC81377497DDF1045D7A2E
+E225371928FA5F77CA680C4CEBA217BAD84CABD9BB68B8C6F8B44C26B6CDA3F2
+7442CDD941D6ADEB041AFD84B7327BC153FFE695E2A6EB3960FF21B9604136D7
+6AA16E075135F5FE571229C34102E0BAFBA0A8E854272E7B5CB7668E825A9257
+E1A71DBCC669C5CDF9BD69296A65E083644E8E3C0FEF5C225590403E30BABF5D
+2A20D0ABC6A11A9A388F267444B6960EA39EFF8ACD46B6BFADCBB1A75A5A7DC3
+3A78B903600647E637C29B43024408E8A64D56E6A0DB6E80E6C5125A7BB1972A
+AE82435C9DD330F815676DDFA0E9078A1F2582AAB6457EC40FE777E007C195C6
+8B7AE97A9D83585233B3BA932CF736BCA54DD9F0F2E96174E259E108ACD05FDD
+0717DDC04605D5DFBA0A26E0BEAD8B971DD48A494AE48A0D9F412ABF47A7466D
+E95B766609FB6929A55EDBDDB33C2F9EE57AC3240909B44B3EACFF8138E30126
+75901B1C04ADE99F2917C9021FC54195C8DC88E0E864EF4135D74538B4731BE0
+B8EC7EC672CE963F8E92D23AD7D78F28F8CBB2551C1E5807ED35EC720A3DEEA3
+0F10FBB4D5C90F1A53043F41B8A5418E84CFEA4DE0A3A06BD24DE67A7F9E5951
+C5858DA19F525454FAD318866825514B30F3CC5F9E4932E9767E3C01379DE9C3
+B8ED4FBF9426B22A7099BD90E2342E2EC431058AC3F8819C29A3BBF892D3B300
+B4D38F8CF6DCB7E60DEAF01AF41FC87A175280C07B61D3948EFFD123C781D8C6
+100DD08998D2D9B62A6B0C119CD7C65F59FBB319BB8DE030566CAE36645FAF1F
+A1F3C9B14799F4A527D45BC851F27ED5CEE5C86916CBCD3AFDA3089E2942B5B2
+FBCA6AA36AB0661D539A165D6B8BE40DD445382D4EF87C1EC7CF66D31A57E8AF
+3158876B4458D06899CE461F2E09EAC2086E95B02661EE17D349D3A2CA503589
+119E2DE92BB0AEF7C819E7E49D8B40E1F5AC042E3C6574D2972DBC50A96EA57A
+7A36D6081406720078015E428161719D14E986D5AB8052CADDC9F5DFA163FCCF
+208F36F5CC390D21A2996EDA8136D36EC04227C8884FDCD4378FD64AE8DD8AE8
+960FC00FF4FD7BB839978C85FB92F8ADF1EFA66CCF223A1097D5F10F33550A3C
+35488FC9F6B5A3D9325E228CA6FDC9D70CE739CEA33CD2B53D26C6C71FC9A6CC
+FC6372C82A89ADD70D26ECC576F0DCFABD1CCA3F6C85C3D5EEDF2D7B99B341B2
+38076A3BC5D4E7B5BA4D2D0BCA028484DB7DD0503159B3189EAF1075163CC1A4
+311AB0CD2741E6F8E5F1DCDC7FA2356B5BD9E5C7675014EFE0F4DBB1EDDE68D0
+B4E7F651FC65BACAE0CBFC8D59920645C9AAE3F0E3768583663432A5DBCFD7ED
+79F27A5570EAD899810C197373A5DBB7C0B58C2B9123C63B949626F6C326460C
+A83B401EBB9D5A62931BE6E4300BD706520907616F05746FEC30FD8FD42E5067
+5DA5D298E25D0070A11471D10014176FDFDBD80951EDA999EF299E0316F8E37F
+56091F787CFC5B0A05BF7C1185017CE1C6224D84D440CA5D63D1E6BADEF68B17
+9071DB6D63A56C257476A624BD0FB0CD0F6BDBC1492F1AB978746B06C4AC558A
+7DEC2E3DDDA09E0EAF0CBDE93BDD0E7D539F089F572945BAADFD778304B7010E
+D088C0464D3E8CD26BA814B35D29832749059DC6D1DC1333B4F02B8FBA646167
+31184FFFC7535B66AB6B81E88334149E744EE1CF42EA82DC0DC891EE1939F7A7
+8C2C4044690DB8EA7C7FF0E0399E1C72B13EDAABC0B939D903556A3CC1A0C228
+4F8577520A8B89D8C80C2A62F598A85B330BB4C5A0307BB7CFCC379B38C08406
+80574755A5DB13E8D899E79D2E13AA39967091B8FE9B9215B217468B8D7A9194
+49FC1BE8273113132305A78B14DA281CF31EAA2822ABF3D665BE33EA96293CF4
+EC7A222A25B599513F403EFBCC972074B9A49917614B81363E3674007F39907C
+78FA7BAE8E1ADFDB81C28F8A27564EE505CD126EA32D7C0B176754BDCA993B17
+2979E4A018E9501481ECCEAF5A145DEA5382AE896FE8EC7B80DD33CD053B8144
+F2BB0548F1B1E489C7953ADA4CEB33CA011AE4BF71B90CBA3C5F719527B059E0
+77E9848CE582712A4654854150F6C739CE5240C4DAA239C85B18D1902D310220
+D10AE3FA1149FC58EB2B936E480749B4BBEB1A9FDB65AC4043EE72A48AF07B51
+AB7F5C3437B00E93E4888DD5F660A210EA954007231C255397328618CA971A3E
+A268C9633D58C1C5B228D155D8F061BD0F9A9390C618E280B6EA8F083D445A3F
+EF5701B4F769E1CEE1BE6DB102CE66933DF57F8D39A7DABC0AC3F19968C83019
+01B25061EDFD2E29AC7FC1AEE896F51FDFFFC0F3B9ED1F5EBB00FA8BD1C86AEC
+CF33BF5D39563FC2C131359A5C669B5056D1B06518AA58E6A18FD999B3197281
+C653E88BDDEC41C5DEB802D4BC1C2D5858178F7730C03C2465C49DDA3CB887C9
+0A04D7C525F93320C8CC3C492326DFB99A55EC7BC860B0BD8FEA308960D4D3BF
+A82C5EF341C8D2DEEB5133B7E4F39B4E0759DFD8BA214A1EED1CCD89D3F4566A
+C15A16632F567924C83321AA092F59353A34551FBA8151DB35A12373F488FB53
+F7A1D1C8E3BC571569B2D945A164868E61344BA82B1CD2DF9196EC6B44954E09
+03F2FB3DEC44B955FB6D59B099826ECDF9EBCC79A99CB52F14DAF8E74CE5341B
+BF2D86819AFC83800BCA6B9B40DC2D8D5C3F1A94945E3134BEEE8D132141E3D6
+075684753B8AD71F3D2685384EED24D9982B7DFB09851BA1C50C0823F951BC53
+2E039CF72CA42AC8FA3D58FC7E633AF9030296382A65803C6CC8E28A6D84373B
+94E47E8DC6406253BFF53396F303C1CA04BF3AF22AE7151F7627173FB87655D6
+F9C15D36D4D8DC074CA7D9004DBE10E9C23AC662E47A1859A0A9408BB5F426DB
+68A4943C0630090E1639B16A9E289C929F31246787ADF5F061DA7BFA1CC2BE23
+65DFCCB6FAF92BF5016B104080FE0877ABB26653361FB4B684898CF0C0448AB5
+FBDCA703D4CDBCA85B9539538461CAEDF25AF85E09328D183202EF479E046C84
+02CEDC8B29A19766AD4ADBC39AF94DBB465DB7251A250B8313A9FC70D0394BFE
+7C87882DD6E75459AC6DD1DE1B6CEF7DEE035EBA072A177FA4E4D11217DFB0A5
+9D4D08679D615034BAF2B3C92FE65C01D5BEC90FCDAAAEB0842113902F83DC6E
+D212A45BA748C6FB3108AAFC3EB912A8C59451088B8E972ECF2739204306C9D9
+D5C2E35AEEBBD7805F000EAE98E259291D6B759BC5123D4541292FC9B9393A4D
+7215D02871452FB02DE816D615B59C4822B5A335C3A61E63F794C025CFF2BAE8
+B41CB92E669C8D95250C3FC45A05478B2D6B7E01D6315E222E22509CEF3275E4
+4435345DB53CFACFFF69DE98E913F53C6CDD0B34E38279C0E7DDD774EC949F2A
+28410AA4E109CC284A5A1D2172218299FDF3E9
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+TeXDict begin 39139632 55387786 1000 600 600 (dired-ref.dvi)
+@start /Fa 242[61 13[{}1 49.8132 /CMSY6 rf /Fb 134[32
+32 43 32 34 24 24 24 1[34 30 34 50 18 32 1[18 34 30 19
+27 34 27 34 30 11[45 1[34 44 1[41 1[45 54 3[22 1[47 39
+41 46 43 42 45 7[30 1[30 30 30 1[30 30 30 30 1[18 21
+18 44[{}48 49.8132 /CMR6 rf /Fc 129[35 35 1[35 2[35 35
+35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
+35 35 1[35 1[35 35 3[35 35 35 2[35 1[35 35 35 35 35 1[35
+35 2[35 35 35 3[35 35 35 35 35 35 35 35 8[35 35 2[35
+35 35 1[35 35 1[35 1[35 35 35 35 1[35 33[{}63 66.4176
+/CMTT8 rf /Fd 134[60 60 2[64 45 45 47 1[64 57 64 95 32
+60 1[32 64 57 35 53 64 51 64 56 11[88 1[64 86 1[78 2[109
+3[43 90 90 72 75 88 83 81 87 52[64 67 11[{}37 99.6264
+/CMBX10 rf /Fe 137[43 1[32 32 34 2[41 45 68 23 43 3[41
+1[37 45 36 1[40 8[61 2[62 16[62 26[32 32 26[45 13[{}20
+66.4176 /CMBX8 rf /Ff 129[35 4[37 37 51 37 39 27 28 28
+37 39 35 39 59 20 37 1[20 39 35 22 31 39 31 39 35 11[53
+6[53 6[55 1[48 54 51 16[35 35 1[35 20 24 20 2[27 27 26[39
+39 41 11[{}42 66.4176 /CMR8 rf /Fg 141[57 3[76 4[38 2[42
+63 76 61 1[67 14[103 13[105 99 67[{}11 119.552 /CMBX10
+rf end
 %%EndProlog
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
 %%PaperSize: A4
-
+ end
 %%EndSetup
 %%Page: 1 1
-1 0 bop -91 -364 a Fe(Dired)47 b(Reference)f(Card)-12
--256 y Fd(\(based)25 b(on)f(Dired)f(in)h(GNU)f(Emacs)g(21.x\))-152
--176 y(Commands)f(mark)n(ed)h(with)h Fc(\(D)n(X\))f Fd(require)g
-(dired-x)-450 19 y Fb(En)m(tering)37 b(and)g(Exiting)h(Dired)-450
-175 y Fd(run)23 b(dired)1244 b Fa(C-x)36 b(d)-450 254
-y Fd(dired)23 b(the)i(directory)f(of)f(the)i(\014le)f(y)n(ou)g(are)g
-(editing)150 b Fa(C-x)36 b(C-j)g Fc(\(D)n(X\))-450 334
-y Fd(quit)24 b(dired)1226 b Fa(q)-450 527 y Fb(Motion)38
-b(Commands)-450 683 y Fd(mo)n(v)n(e)23 b(up)h(to)g(previous)g(line)769
-b Fa(p)-450 763 y Fd(mo)n(v)n(e)23 b(do)n(wn)i(to)f(next)h(line)806
-b Fa(n)-450 842 y Fd(mo)n(v)n(e)23 b(up)h(to)g(previous)g(directory)g
-(line)469 b Fa(<)-450 922 y Fd(mo)n(v)n(e)23 b(do)n(wn)i(to)f(next)h
-(directory)f(line)506 b Fa(>)-450 1002 y Fd(mo)n(v)n(e)23
-b(to)i(next)f(mark)n(ed)f(\014le)762 b Fa(M-})-450 1082
-y Fd(mo)n(v)n(e)23 b(to)i(previous)e(mark)n(ed)g(\014le)640
-b Fa(M-{)-450 1161 y Fd(mo)n(v)n(e)23 b(up)h(to)g(previous)g(sub)r
-(directory)495 b Fa(M-C-p)-450 1241 y Fd(mo)n(v)n(e)23
-b(do)n(wn)i(to)f(next)h(sub)r(directory)532 b Fa(M-C-n)-450
-1321 y Fd(mo)n(v)n(e)23 b(to)i(paren)n(t)f(directory)764
-b Fa(^)-450 1400 y Fd(mo)n(v)n(e)23 b(to)i(\014rst)e(c)n(hild)h(sub)r
-(directory)561 b Fa(M-C-d)-450 1591 y Fb(Mouse)38 b(Commands)-450
-1747 y Fd(visit)23 b(\014le)1144 b Fa(Mouse_Button_2)-450
-1827 y Fd(p)r(opup)25 b(men)n(u)879 b Fa(Control-Mouse_Button_3)-450
-2018 y Fb(Immediate)37 b(Actions)h(on)g(Files)-450 2174
-y Fd(visit)23 b(curren)n(t)h(\014le)1040 b Fa(f)-450
-2254 y Fd(view)24 b(curren)n(t)g(\014le)1032 b Fa(v)-450
-2333 y Fd(visit)23 b(curren)n(t)h(\014le)g(in)f(other)i(windo)n(w)516
-b Fa(o)-450 2413 y Fd(visit)23 b(curren)n(t)h(\014le)g(in)f(other)i
-(frame)573 b Fa(w)-450 2493 y Fd(displa)n(y)24 b(curren)n(t)g(\014le)
-955 b Fa(C-u)36 b(o)-450 2573 y Fd(create)25 b(a)f(new)g(sub)r
-(directory)734 b Fa(+)-450 2652 y Fd(compare)23 b(\014le)h(at)g(p)r
-(oin)n(t)h(with)e(the)i(one)f(at)g(mark)206 b Fa(=)-450
-2843 y Fb(Marking)38 b(and)f(Unmarking)i(Files)-450 2999
-y Fd(mark)22 b(a)i(\014le)g(or)f(sub)r(directory)h(for)f(later)h
-(commands)81 b Fa(m)-450 3079 y Fd(unmark)23 b(a)h(\014le)f(or)h(all)f
-(\014les)g(of)h(a)f(sub)r(directory)248 b Fa(u)-450 3159
-y Fd(unmark)23 b(all)g(mark)n(ed)g(\014les)g(in)h(a)f(bu\013er)460
-b Fa(M-delete)-450 3238 y Fd(mark)22 b(\014les)i(with)g(a)f(giv)n(en)i
-(extension)515 b Fa(*)36 b(.)-450 3318 y Fd(mark)22 b(all)h
-(directories)932 b Fa(*)36 b(/)-450 3398 y Fd(mark)22
-b(all)h(symlinks)981 b Fa(*)36 b(@)-450 3477 y Fd(mark)22
-b(all)h(executables)901 b Fa(*)36 b(*)-450 3557 y Fd(in)n(v)n(ert)24
-b(marking)1074 b Fa(*)36 b(t)-450 3637 y Fd(mark)22 b(all)h(\014les)h
-(in)f(the)i(curren)n(t)f(sub)r(dir)464 b Fa(*)36 b(s)-450
-3717 y Fd(mark)22 b(\014le)i(names)f(matc)n(hing)h(a)g(regular)f
-(expression)96 b Fa(*)36 b(\045)-450 3796 y Fd(c)n(hange)25
-b(the)g(marks)d(to)i(a)g(di\013eren)n(t)g(c)n(haracter)259
-b Fa(*)36 b(c)-450 3876 y Fd(mark)22 b(\014les)i(for)f(whic)n(h)h
-(Elisp)e(expression)i(returns)g(t)108 b Fa(*)36 b(\()f
-Fc(\(D)n(X\))-450 4071 y Fb(Getting)i(Help)-450 4227
-y Fd(dired)23 b(help)1221 b Fa(h)-450 4306 y Fd(dired)23
-b(summary)f(\(short)i(help\))g(and)g(error)f(log)253
-b Fa(?)1866 -364 y Fb(Commands)38 b(on)h(Files)e(Mark)m(ed)h(or)g(Sp)s
-(eci\014ed)1866 -269 y(b)m(y)g(the)f(Pre\014x)1866 -152
-y Fd(cop)n(y)25 b(\014le\(s\))1193 b Fa(C)1866 -72 y
-Fd(rename)23 b(a)h(\014le)g(or)f(mo)n(v)n(e)g(\014les)h(to)g(another)h
-(directory)79 b Fa(R)1866 7 y Fd(c)n(hange)25 b(o)n(wnership)f(of)f
-(\014le\(s\))713 b Fa(O)1866 87 y Fd(c)n(hange)25 b(the)g(group)f(of)f
-(the)i(\014le\(s\))601 b Fa(G)1866 167 y Fd(c)n(hange)25
-b(mo)r(de)e(of)h(\014le\(s\))854 b Fa(M)1866 247 y Fd(prin)n(t)24
-b(\014le\(s\))1183 b Fa(P)1866 326 y Fd(con)n(v)n(ert)25
-b(\014lename\(s\))f(to)g(lo)n(w)n(er)g(case)524 b Fa(\045)36
-b(l)1866 406 y Fd(con)n(v)n(ert)25 b(\014lename\(s\))f(to)g(upp)r(er)g
-(case)507 b Fa(\045)36 b(u)1866 486 y Fd(delete)25 b(mark)n(ed)e(\(as)h
-(opp)r(osed)h(to)f(\015agged\))i(\014les)217 b Fa(X)1866
-565 y Fd(uuenco)r(de)26 b(or)d(uudeco)r(de)j(\014le\(s\))648
-b Fa(U)1866 645 y Fd(compress)23 b(or)g(uncompress)g(\014le\(s\))588
-b Fa(Z)1866 725 y Fd(run)23 b(info)h(on)g(\014le)1073
-b Fa(I)36 b Fc(\(D)n(X\))1866 804 y Fd(mak)n(e)23 b(sym)n(b)r(olic)g
-(link\(s\))855 b Fa(S)1866 884 y Fd(mak)n(e)23 b(relativ)n(e)h(sym)n(b)
-r(olic)f(links)658 b Fa(Y)1866 964 y Fd(mak)n(e)23 b(hard)h(link\(s\))
-983 b Fa(H)1866 1044 y Fd(searc)n(h)24 b(\014les)g(for)f(a)g(regular)h
-(expression)452 b Fa(A)1866 1123 y Fd(query)24 b(replace)g(regular)g
-(expression)539 b Fa(Q)1866 1203 y Fd(b)n(yte-compile)24
-b(\014les)996 b Fa(B)1866 1283 y Fd(load)24 b(\014les)1259
-b Fa(L)1866 1362 y Fd(shell)23 b(command)g(on)h(\014le\(s\))777
-b Fa(!)1866 1508 y Fb(Flagging)38 b(Files)g(for)g(Deletion)1866
-1609 y Fc(Unmark)26 b(commands)e(remo)n(v)n(e)h(delete)j(\015ags)1866
-1705 y Fd(\015ag)c(\014le)g(for)f(deletion)933 b Fa(d)1866
-1785 y Fd(bac)n(kup)25 b(and)f(remo)n(v)n(e)f(deletion)i(\015ag)533
-b Fa(delete)1866 1864 y Fd(\015ag)24 b(all)f(bac)n(kup)i(\014les)f
-(\(\014le)g(names)f(ending)h(in)g(~\))185 b Fa(~)1866
-1944 y Fd(\015ag)24 b(all)f(auto-sa)n(v)n(e)i(\014les)869
-b Fa(#)1866 2024 y Fd(\015ag)24 b(v)l(arious)g(in)n(termediate)g
-(\014les)627 b Fa(&)1866 2103 y Fd(\015ag)21 b(n)n(umeric)d(bac)n(kups)
-j(\(ending)h(in)d(.~1~,)i(.~2~,)f(etc.\))72 b Fa(.)1866
-2183 y Fd(execute)26 b(the)e(deletions)h(requested)g(\(\015agged)g
-(\014les\))134 b Fa(x)1866 2263 y Fd(\015ag)24 b(\014les)g(matc)n(hing)
-g(a)f(regular)h(expression)333 b Fa(\045)36 b(d)1866
-2405 y Fb(Mo)s(difying)i(the)f(Dired)g(Bu\013er)1866
-2522 y Fd(insert)23 b(a)h(sub)r(directory)h(in)n(to)f(this)f(bu\013er)
-408 b Fa(i)1866 2602 y Fd(remo)n(v)n(e)23 b(mark)n(ed)g(\014les)h(from)
-d(the)k(listing)419 b Fa(k)1866 2681 y Fd(remo)n(v)n(e)23
-b(a)h(sub)r(dir)f(listing)823 b Fa(C-u)36 b(k)1866 2761
-y Fd(re-read)23 b(all)g(directories)h(\(retains)g(all)f(marks\))279
-b Fa(g)1866 2841 y Fd(toggle)25 b(sorting)e(of)h(curren)n(t)g(sub)r
-(dir)f(b)n(y)h(name/date)113 b Fa(s)1866 2920 y Fd(edit)24
-b(ls)f(switc)n(hes)1065 b Fa(C-u)36 b(s)1866 3000 y Fd(reco)n(v)n(er)24
-b(marks,)e(hidden)i(lines,)f(and)h(suc)n(h)375 b Fa(C-_)1866
-3080 y Fd(hide)24 b(all)f(sub)r(directories)853 b Fa(M-$)1866
-3160 y Fd(hide)24 b(or)f(unhide)i(sub)r(directory)675
-b Fa($)1866 3302 y Fb(Regular)37 b(Expression)i(Commands)1866
-3419 y Fd(mark)22 b(\014lenames)i(matc)n(hing)f(a)h(regular)f
-(expression)120 b Fa(\045)36 b(m)1866 3498 y Fd(cop)n(y)25
-b(mark)n(ed)e(\014les)g(b)n(y)h(regexp)674 b Fa(\045)36
-b(C)1866 3578 y Fd(rename)23 b(mark)n(ed)g(\014les)h(b)n(y)g(regexp)591
-b Fa(\045)36 b(R)1866 3658 y Fd(hardlink)1273 b Fa(\045)36
-b(H)1866 3737 y Fd(symlink)1289 b Fa(\045)36 b(S)1866
-3817 y Fd(symlink,)22 b(with)h(relativ)n(e)h(paths)668
-b Fa(\045)36 b(Y)1866 3897 y Fd(mark)22 b(for)h(deletion)998
-b Fa(\045)36 b(d)1866 4030 y Fb(Dired)h(and)g(Find)1866
-4147 y Fd(dired)23 b(\014le\(s\))i(whose)f(name)f(matc)n(hes)h(a)g
-(pattern)39 b Fa(M-x)d(find-name-dired)1866 4227 y Fd(dired)23
-b(\014le\(s\))i(that)g(con)n(tain)g(pattern)365 b Fa(M-x)36
-b(find-grep-dired)1866 4306 y Fd(dired)23 b(\014le\(s\))i(based)f(on)g
-Fa(find)h Fd(output)347 b Fa(M-x)36 b(find-dired)1590
-5603 y Fd(1)p eop
+TeXDict begin 1 0 bop -91 -364 a Fg(Dired)47 b(Reference)f(Card)-12
+-256 y Ff(\(based)25 b(on)f(Dired)f(in)h(GNU)f(Emacs)h(21.x\))-152
+-176 y(Commands)g(mark)n(ed)g(with)g Fe(\(D)n(X\))f Ff(require)g
+(dired-x)-450 31 y Fd(En)m(tering)37 b(and)g(Exiting)h(Dired)-450
+196 y Ff(run)23 b(dired)1244 b Fc(C-x)36 b(d)-450 276
+y Ff(dired)23 b(the)i(directory)f(of)f(the)i(\014le)f(y)n(ou)g(are)g
+(editing)150 b Fc(C-x)36 b(C-j)g Fe(\(D)n(X\))-450 356
+y Ff(quit)24 b(dired)1226 b Fc(q)-450 561 y Fd(Motion)38
+b(Commands)-450 726 y Ff(mo)n(v)n(e)24 b(up)g(to)g(previous)g(line)769
+b Fc(p)-450 806 y Ff(mo)n(v)n(e)24 b(do)n(wn)h(to)f(next)h(line)806
+b Fc(n)-450 886 y Ff(mo)n(v)n(e)24 b(up)g(to)g(previous)g(directory)g
+(line)469 b Fc(<)-450 965 y Ff(mo)n(v)n(e)24 b(do)n(wn)h(to)f(next)h
+(directory)f(line)506 b Fc(>)-450 1045 y Ff(mo)n(v)n(e)24
+b(to)h(next)f(mark)n(ed)g(\014le)762 b Fc(M-})-450 1125
+y Ff(mo)n(v)n(e)24 b(to)h(previous)e(mark)n(ed)h(\014le)640
+b Fc(M-{)-450 1204 y Ff(mo)n(v)n(e)24 b(up)g(to)g(previous)g(sub)r
+(directory)495 b Fc(M-C-p)-450 1284 y Ff(mo)n(v)n(e)24
+b(do)n(wn)h(to)f(next)h(sub)r(directory)532 b Fc(M-C-n)-450
+1364 y Ff(mo)n(v)n(e)24 b(to)h(paren)n(t)f(directory)764
+b Fc(^)-450 1444 y Ff(mo)n(v)n(e)24 b(to)h(\014rst)e(c)n(hild)h(sub)r
+(directory)561 b Fc(M-C-d)-450 1647 y Fd(Mouse)38 b(Commands)-450
+1812 y Ff(visit)23 b(\014le)1144 b Fc(Mouse_Button_2)-450
+1892 y Ff(p)r(opup)25 b(men)n(u)880 b Fc(Control-Mouse_Button_3)-450
+2095 y Fd(Immediate)37 b(Actions)h(on)g(Files)-450 2260
+y Ff(visit)23 b(curren)n(t)h(\014le)1040 b Fc(f)-450
+2340 y Ff(view)24 b(curren)n(t)g(\014le)1032 b Fc(v)-450
+2420 y Ff(visit)23 b(curren)n(t)h(\014le)g(in)f(other)i(windo)n(w)516
+b Fc(o)-450 2500 y Ff(visit)23 b(curren)n(t)h(\014le)g(in)f(other)i
+(frame)574 b Fc(w)-450 2579 y Ff(displa)n(y)24 b(curren)n(t)g(\014le)
+955 b Fc(C-u)36 b(o)-450 2659 y Ff(create)25 b(a)f(new)g(sub)r
+(directory)734 b Fc(+)-450 2739 y Ff(compare)24 b(\014le)g(at)g(p)r
+(oin)n(t)h(with)e(the)i(one)f(at)g(mark)207 b Fc(=)-450
+2942 y Fd(Marking)38 b(and)f(Unmarking)i(Files)-450 3107
+y Ff(mark)23 b(a)h(\014le)g(or)f(sub)r(directory)h(for)f(later)h
+(commands)83 b Fc(m)-450 3187 y Ff(unmark)24 b(a)g(\014le)f(or)h(all)f
+(\014les)g(of)h(a)f(sub)r(directory)248 b Fc(u)-450 3267
+y Ff(unmark)24 b(all)f(mark)n(ed)h(\014les)f(in)h(a)f(bu\013er)460
+b Fc(M-delete)-450 3346 y Ff(mark)23 b(\014les)h(with)g(a)f(giv)n(en)i
+(extension)515 b Fc(*)36 b(.)-450 3426 y Ff(mark)23 b(all)g
+(directories)932 b Fc(*)36 b(/)-450 3506 y Ff(mark)23
+b(all)g(symlinks)982 b Fc(*)36 b(@)-450 3585 y Ff(mark)23
+b(all)g(executables)901 b Fc(*)36 b(*)-450 3665 y Ff(in)n(v)n(ert)24
+b(marking)1075 b Fc(*)36 b(t)-450 3745 y Ff(mark)23 b(all)g(\014les)h
+(in)f(the)i(curren)n(t)f(sub)r(dir)464 b Fc(*)36 b(s)-450
+3825 y Ff(mark)23 b(\014le)h(names)g(matc)n(hing)h(a)f(regular)f
+(expression)96 b Fc(*)36 b(\045)-450 3904 y Ff(c)n(hange)25
+b(the)g(marks)e(to)h(a)g(di\013eren)n(t)g(c)n(haracter)259
+b Fc(*)36 b(c)-450 3984 y Ff(mark)23 b(\014les)h(for)f(whic)n(h)h
+(Elisp)e(expression)i(returns)g(t)108 b Fc(*)36 b(\()f
+Fe(\(D)n(X\))-450 4191 y Fd(Mo)s(difying)j(the)f(Dired)g(Bu\013er)-450
+4356 y Ff(insert)23 b(a)h(sub)r(directory)h(in)n(to)f(this)f(bu\013er)
+408 b Fc(i)-450 4436 y Ff(remo)n(v)n(e)24 b(mark)n(ed)g(\014les)g(from)
+e(the)j(listing)419 b Fc(k)-450 4516 y Ff(remo)n(v)n(e)24
+b(a)g(sub)r(dir)f(listing)823 b Fc(C-u)36 b(k)-450 4595
+y Ff(re-read)23 b(all)g(directories)h(\(retains)g(all)f(marks\))280
+b Fc(g)-450 4675 y Ff(toggle)25 b(sorting)e(of)h(curren)n(t)g(sub)r
+(dir)f(b)n(y)h(name/date)114 b Fc(s)-450 4755 y Ff(edit)24
+b(ls)f(switc)n(hes)1065 b Fc(C-u)36 b(s)-450 4835 y Ff(reco)n(v)n(er)24
+b(marks,)f(hidden)h(lines,)f(and)h(suc)n(h)375 b Fc(C-_)-450
+4914 y Ff(hide)24 b(all)f(sub)r(directories)853 b Fc(M-$)-450
+4994 y Ff(hide)24 b(or)f(unhide)i(sub)r(directory)675
+b Fc($)1866 -364 y Fd(Commands)38 b(on)h(Files)e(Mark)m(ed)h(or)g(Sp)s
+(eci\014ed)1866 -269 y(b)m(y)g(the)f(Pre\014x)1866 -103
+y Ff(cop)n(y)25 b(\014le\(s\))1193 b Fc(C)1866 -24 y
+Ff(rename)24 b(a)g(\014le)g(or)f(mo)n(v)n(e)h(\014les)g(to)g(another)h
+(directory)79 b Fc(R)1866 56 y Ff(c)n(hange)25 b(o)n(wnership)f(of)f
+(\014le\(s\))713 b Fc(O)1866 136 y Ff(c)n(hange)25 b(the)g(group)f(of)f
+(the)i(\014le\(s\))601 b Fc(G)1866 216 y Ff(c)n(hange)25
+b(mo)r(de)f(of)g(\014le\(s\))854 b Fc(M)1866 295 y Ff(prin)n(t)24
+b(\014le\(s\))1183 b Fc(P)1866 375 y Ff(con)n(v)n(ert)25
+b(\014lename\(s\))g(to)f(lo)n(w)n(er)g(case)524 b Fc(\045)36
+b(l)1866 455 y Ff(con)n(v)n(ert)25 b(\014lename\(s\))g(to)f(upp)r(er)g
+(case)507 b Fc(\045)36 b(u)1866 534 y Ff(delete)25 b(mark)n(ed)f(\(as)g
+(opp)r(osed)h(to)f(\015agged\))i(\014les)217 b Fc(X)1866
+614 y Ff(uuenco)r(de)26 b(or)d(uudeco)r(de)j(\014le\(s\))648
+b Fc(U)1866 694 y Ff(compress)24 b(or)f(uncompress)h(\014le\(s\))588
+b Fc(Z)1866 773 y Ff(run)23 b(info)h(on)g(\014le)1073
+b Fc(I)36 b Fe(\(D)n(X\))1866 853 y Ff(mak)n(e)24 b(sym)n(b)r(olic)g
+(link\(s\))855 b Fc(S)1866 933 y Ff(mak)n(e)24 b(relativ)n(e)g(sym)n(b)
+r(olic)g(links)658 b Fc(Y)1866 1013 y Ff(mak)n(e)24 b(hard)g(link\(s\))
+983 b Fc(H)1866 1092 y Ff(searc)n(h)24 b(\014les)g(for)f(a)g(regular)h
+(expression)452 b Fc(A)1866 1172 y Ff(query)24 b(replace)g(regular)g
+(expression)539 b Fc(Q)1866 1252 y Ff(b)n(yte-compile)25
+b(\014les)996 b Fc(B)1866 1331 y Ff(load)24 b(\014les)1259
+b Fc(L)1866 1411 y Ff(shell)23 b(command)i(on)f(\014le\(s\))777
+b Fc(!)1866 1618 y Fd(Flagging)38 b(Files)g(for)g(Deletion)1866
+1755 y Fe(Unmark)27 b(commands)f(remo)n(v)n(e)g(delete)i(\015ags)1866
+1863 y Ff(\015ag)c(\014le)g(for)f(deletion)933 b Fc(d)1866
+1943 y Ff(bac)n(kup)25 b(and)f(remo)n(v)n(e)g(deletion)h(\015ag)533
+b Fc(delete)1866 2022 y Ff(\015ag)24 b(all)f(bac)n(kup)i(\014les)f
+(\(\014le)g(names)g(ending)g(in)g(~\))185 b Fc(~)1866
+2102 y Ff(\015ag)24 b(all)f(auto-sa)n(v)n(e)i(\014les)869
+b Fc(#)1866 2182 y Ff(\015ag)24 b(v)l(arious)g(in)n(termediate)h
+(\014les)627 b Fc(&)1866 2262 y Ff(\015ag)21 b(n)n(umeric)e(bac)n(kups)
+i(\(ending)h(in)d(.~1~,)i(.~2~,)f(etc.\))72 b Fc(.)1866
+2341 y Ff(execute)26 b(the)e(deletions)h(requested)g(\(\015agged)g
+(\014les\))134 b Fc(x)1866 2421 y Ff(\015ag)24 b(\014les)g(matc)n(hing)
+h(a)e(regular)h(expression)333 b Fc(\045)36 b(d)1866
+2624 y Fd(Regular)h(Expression)i(Commands)1866 2790 y
+Ff(mark)23 b(\014lenames)i(matc)n(hing)f(a)g(regular)f(expression)120
+b Fc(\045)36 b(m)1866 2869 y Ff(cop)n(y)25 b(mark)n(ed)f(\014les)f(b)n
+(y)h(regexp)674 b Fc(\045)36 b(C)1866 2949 y Ff(rename)24
+b(mark)n(ed)g(\014les)g(b)n(y)g(regexp)591 b Fc(\045)36
+b(R)1866 3029 y Ff(hardlink)1273 b Fc(\045)36 b(H)1866
+3108 y Ff(symlink)1290 b Fc(\045)36 b(S)1866 3188 y Ff(symlink,)23
+b(with)g(relativ)n(e)h(paths)668 b Fc(\045)36 b(Y)1866
+3268 y Ff(mark)23 b(for)g(deletion)998 b Fc(\045)36 b(d)1866
+3462 y Fd(Dired)h(and)g(Find)1866 3627 y Ff(dired)23
+b(\014le\(s\))i(whose)f(name)g(matc)n(hes)h(a)f(pattern)39
+b Fc(M-x)d(find-name-dired)1866 3707 y Ff(dired)23 b(\014le\(s\))i
+(that)g(con)n(tain)g(pattern)365 b Fc(M-x)36 b(find-grep-dired)1866
+3787 y Ff(dired)23 b(\014le\(s\))i(based)f(on)g Fc(find)h
+Ff(output)347 b Fc(M-x)36 b(find-dired)1866 3994 y Fd(Getting)h(Help)
+1866 4159 y Ff(dired)23 b(help)1221 b Fc(h)1866 4239
+y Ff(dired)23 b(summary)h(\(short)g(help\))g(and)g(error)f(log)253
+b Fc(?)2219 4484 y Fb(Cop)n(yrigh)n(t)2522 4482 y(c)2505
+4484 y Fa(\015)21 b Fb(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5
+b(oundation,)20 b(Inc.)2302 4547 y(designed)h(b)n(y)f(Stephen)g
+(Gildea,)g(Ma)n(y)i(2006)g(v0.1)2299 4611 y(for)f(GNU)f(Emacs)i(v)n
+(ersion)f(19)h(on)e(Unix)g(systems)2128 4675 y(Up)r(dated)f(for)j
+(Dired)e(in)f(Ma)n(y)j(2000)h(b)n(y)e(Evgen)n(y)g(Roubinc)n(h)n(tein)
+1866 4767 y(P)n(ermission)d(is)g(gran)n(ted)h(to)g(mak)n(e)g(and)f
+(distribute)f(copies)h(of)h(this)f(card)g(pro)n(vided)g(the)1866
+4831 y(cop)n(yrigh)n(t)k(notice)e(and)h(this)f(p)r(ermission)g(notice)h
+(are)g(preserv)n(ed)h(on)e(all)h(copies.)1866 4923 y(F)-5
+b(or)17 b(copies)g(of)g(the)g(GNU)f(Emacs)h(man)n(ual,)g(write)f(to)h
+(the)g(F)-5 b(ree)17 b(Soft)n(w)n(are)i(F)-5 b(oundation,)1866
+4987 y(Inc.,)20 b(51)h(F)-5 b(ranklin)20 b(Street,)h(Fifth)f(Flo)r(or,)
+g(Boston,)i(MA)f(02110-1301,)j(USA.)p eop end
 %%Trailer
-end
+
 userdict /end-hook known{end-hook}if
 %%EOF
--- a/etc/dired-ref.tex	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/dired-ref.tex	Sun Apr 22 11:42:03 2007 +0000
@@ -95,7 +95,7 @@
   \def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
 \else                           %2 or 3 columns uses prereduced size
   \hsize 3.4in
-  \vsize 7.95in
+  \vsize 9.2in
   \hoffset -.75in
   \voffset -.745in
   \font\titlefont=cmbx10 \scaledmag2
@@ -243,6 +243,8 @@
 % commands fit on a page in two-column format
 \def\dx{{\bf (DX)}}
 
+\nopagenumbers
+
 %**end of header
 
 
@@ -326,10 +328,17 @@
 \key{change the marks to a different character}{* c}
 \key{mark files for which Elisp expression returns t}{* ( \dx}
 
-\section{Getting Help}
+\section{Modifying the Dired Buffer}
 
-\key{dired help}{h}
-\key{dired summary (short help) and error log}{?}
+\key{insert a subdirectory into this buffer}{i}
+\key{remove marked files from the listing}{k}
+\key{remove a subdir listing}{C-u k}
+\key{re-read all directories (retains all marks)}{g}
+\key{toggle sorting of current subdir by name/date}{s}
+\key{edit ls switches}{C-u s}
+\key{recover marks, hidden lines, and such}{C-_}
+\key{hide all subdirectories}{M-\$}
+\key{hide or unhide subdirectory}{\$}
 
 \section{Commands on Files Marked or Specified by the Prefix}
 
@@ -365,18 +374,6 @@
 \key{execute the deletions requested (flagged files)}{x}
 \key{flag files matching a regular expression}{\% d}
 
-\section{Modifying the Dired Buffer}
-
-\key{insert a subdirectory into this buffer}{i}
-\key{remove marked files from the listing}{k}
-\key{remove a subdir listing}{C-u k}
-\key{re-read all directories (retains all marks)}{g}
-\key{toggle sorting of current subdir by name/date}{s}
-\key{edit ls switches}{C-u s}
-\key{recover marks, hidden lines, and such}{C-_}
-\key{hide all subdirectories}{M-\$}
-\key{hide or unhide subdirectory}{\$}
-
 \section{Regular Expression Commands}
 
 \key{mark filenames matching a regular expression}{\% m}
@@ -392,7 +389,12 @@
 \metax{dired file(s) that contain pattern}{M-x find-grep-dired}
 \metax{dired file(s) based on \kbd{find} output}{M-x find-dired}
 
-%\copyrightnotice
+\section{Getting Help}
+
+\key{dired help}{h}
+\key{dired summary (short help) and error log}{?}
+
+\copyrightnotice
 
 \bye
 
--- a/etc/echo.msg	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/echo.msg	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,6 @@
+The Free Software Foundation claims no copyright on this file, taken
+from a posting to the public newsgroup net.sources.
+
 Path: mit-amt!mit-eddie!think!harvard!seismo!gatech!akgua!whuxlm!whuxl!houxm!ihnp4!stolaf!umn-cs!herndon
 From: herndon@umn-cs.UUCP
 Newsgroups: net.sources
--- a/etc/fr-drdref.ps	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/fr-drdref.ps	Sun Apr 22 11:42:03 2007 +0000
@@ -1,15 +1,17 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.86d Copyright 1999 Radical Eye Software
+%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software
 %%Title: fr-drdref.dvi
-%%Pages: 2
+%%Pages: 1
 %%PageOrder: Ascend
-%%BoundingBox: 0 0 596 842
+%%BoundingBox: 0 0 595 842
+%%DocumentFonts: CMBX10 CMR8 CMBX8 CMTT8 CMR6 CMSY6
+%%DocumentPaperSizes: a4
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips -o fr-drdref.ps fr-drdref.dvi
-%DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2002.02.12:1308
-%%BeginProcSet: texc.pro
+%DVIPSCommandLine: dvips fr-drdref.dvi
+%DVIPSParameters: dpi=600
+%DVIPSSource:  TeX output 2007.02.26:1930
+%%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
 N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72
@@ -28,22 +30,10 @@
 definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get
 }B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub}
 B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr
-1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3
-1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx
-0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx
-sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{
-rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp
-gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B
-/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{
-/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{
-A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy
-get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse}
-ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp
-fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17
-{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add
-chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{
-1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop}
-forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn
+1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S
+/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy
+setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask
+restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn
 /BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put
 }if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{
 bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A
@@ -67,760 +57,1941 @@
 rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
 
 %%EndProcSet
-TeXDict begin 39158280 55380996 1000 600 600 (fr-drdref.dvi)
-@start
-%DVIPSBitmapFont: Fa cmsy6 6 1
-/Fa 1 14 df<EC0FFE91B512E0010314F890390FF803FE90391F80003F017EC7EA0FC001
-F8EC03E048486E7ED803C0EC007848488148C97E000E160E001E160F48EE078000381603
-007817C000701601A300F017E0481600A76C1601007017C0A30078160300381780003C16
-076CEE0F00000E160E000F161E6C6C5D6C6C5DD801F04A5A6C6C4A5A017EEC0FC0D91F80
-013FC7FC90390FF803FE0103B512F8010014E0DA0FFEC8FC332F7CA33D>13
-D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fb cmr6 6 56
-/Fb 56 123 df<12E07E7E127C7E7EEA0780EA03C0EA01E0EA00400B0A79A21E>18
-D<13E012011203EA07C0EA0F80EA1F00123C5A5A12400B0A74A21E>I<EA07C013F0EA00
-F8137C133C137C13F8EAFFF013800E09787E1B>24 D<127812FCA212FEA2127E1206A312
-0CA2121C121812301260124007107AA212>39 D<127812FCA212FEA2127E1206A3120CA2
-121C121812301260124007107A8512>44 D<EAFFFEA30F037E8B15>I<127812FCA41278
-06067A8512>I<13FF000313C0380781E0380F00F0001E137848133CA248131EA400F813
-1FAD0078131EA2007C133E003C133CA26C13786C13F0380781E03803FFC0C6130018227D
-A01E>48 D<13E01201120712FF12F91201B3A7487EB512C0A212217AA01E>I<EA01FC38
-07FF80381C0FC0383003E0386001F0EB00F812F86C13FCA2147C1278003013FCC7FC14F8
-A2EB01F0EB03E014C0EB0780EB0F00131E13385B5B3801C00CEA0380380600185A5A383F
-FFF85AB512F0A216217CA01E>I<13FF000313C0380F03E0381C00F014F8003E13FC147C
-A2001E13FC120CC712F8A2EB01F0EB03E0EB0FC03801FF00A2380003E0EB00F01478147C
-143E143F1230127812FCA2143E48137E0060137C003813F8381E03F0380FFFC000011300
-18227DA01E>I<00101330381E01F0381FFFE014C01480EBFE00EA1BF00018C7FCA513FE
-381BFF80381F03C0381C01E0381800F014F8C71278A2147CA21230127812F8A214784813
-F8006013F0387001E01238381E07803807FF00EA01F816227CA01E>53
-D<EB0FC0EB7FF03801F0383803C0183807803C380F007C121E001C1338003C1300A2127C
-1278EB7FC038F9FFE038FB80F038FE0038143C48131EA248131FA41278A36C131EA2001C
-133C001E13386C1370380781E03801FFC038007F0018227DA01E>I<1230123C003FB5FC
-A24813FE14FC3860001C143814704813E014C0EA0001EB0380EB07001306130E5BA25BA2
-1378A35BA41201A76C5A18237CA11E>I<13FE3803FFC0380781E0380E0070481378003C
-133848133CA200F8131EA3141FA40078133FA26C137F121C380F01DF3807FF9F3803FE1E
-C7FCA2143E143C001C1338003E13781470003C13E0381801C0381C0780380FFE00EA03F8
-18227DA01E>57 D<1438A2147CA314FEA2497E149FA29038030F80A201067F1407010E7F
-EB0C03A2496C7EA201387FEB3000A249137C90387FFFFC90B57E9038C0003EA248487FA2
-0003158090C7120F5A16C0D81F8014E0D8FFE0EB7FFEA227247DA32D>65
-D<49B41320010FEBC06090393F80F0E09038FC0019D801F0130D48481307484813034848
-130148C7FC481400123E127E1660127C12FC1600A7007C1560127EA2123E003F15C07E6C
-6CEB01806C7E6C6CEB03006C6C1306D800FC131C90383F807890380FFFE0010190C7FC23
-247CA22B>67 D<B67E15F0390FC001F80007EB007E151FED0F80ED07C0ED03E0ED01F0A2
-16F81500A216FCA816F8A2150116F0A2ED03E0ED07C0ED0F80ED1F00153E000FEB01FCB6
-12F0158026227CA12E>I<B612FEA2390FC0007E0007141F818181A39138060180A392C7
-FC140E141EEBFFFEA2EBC01E140E1406A216C0A291C7FCED0180A31503A21507150F000F
-EC7F00B7FCA222227CA129>I<B612FCA23807C000153E151E150E1506A31503140CA215
-00A2141C143CEBFFFCA2EBC03C141C140CA491C7FCA77FB5FCA220227CA127>I<02FF13
-10010FEBE03090393F80787090397C001CF0D801F0130648481303484813014848130048
-C8FC1670123E127E1630127C12FC1600A592B5FCA2007CEC03F0007E1401A2123E7EA26C
-7E6C7E6C7ED801F81303D8007EEB077090393FC03E3090390FFFF8100100EBC00028247C
-A22F>I<EAFFFEA2EA0FE0EA07C0B3AAEA0FE0EAFFFEA20F227CA116>73
-D<3801FFFEA2380007E01303B3A4123012FCA3130700F813C038700F8038381F00EA1FFC
-EA07F017237CA11F>I<D8FFC0EC0FFC6D141F00071680D806F01437A301781467A26D14
-C7A26DEB0187A26DEB0307A39038078006A2903803C00CA2903801E018A3903800F030A2
-EC7860A2EC3CC0A2EC1F80A2120F391F800F00D8FFF0ECFFFC14062E227CA136>77
-D<D8FFC0EB7FF87FD807F0EB0FC0ED07806DEB0300EA06FC137E7FA2EB1F80EB0FC0EB07
-E0130314F0EB01F8EB00FC147EA2143FEC1F83EC0FC3EC07E3A2EC03F3EC01FB6EB4FC81
-A28181000F80487ED8FFF07F8125227CA12D>I<B6FC15E0390FC003F80007EB00FC153E
-153F811680A516005D153E15FCEC03F890B512E092C7FC01C0C8FCAC487EEAFFFEA22122
-7CA129>80 D<B512FCECFF80390FC007E00007EB01F8EC007C157E153E153FA4153E157E
-157C4A5AEC07E090B5128092C7FC9038C00FC0EC03E06E7E811400A381A3160615FEA248
-6CEB7E0ED8FFFEEB3F1CED1FF8C8EA03E027237CA12C>82 D<EBFF01000713C3380F01F7
-381C003F00307F00707F00607F12E080A36C90C7FC1278127EEA3FC0EA1FFE380FFFE06C
-13F8C67FEB07FEEB007FEC0F801407EC03C0A200C01301A46C14806C13036CEB07006C13
-0E38EF803C38C3FFF038807FC01A247CA222>I<007FB612F0A2397C00F8010070EC0070
-A20060153000E01538A2481518A4C71400B3497E90387FFFF0A225227DA12B>I<D8FFFE
-EB7FF8A2D80FE0EB0FC06C48EB0780ED0300B3A35D6C6C1306A20001140E6D5B6C6C5B01
-7C5B90381F01E0903807FF80D901FEC7FC25237CA12D>I<D8FFFC903803FF80A2D80FE0
-903800FC000007157000031560A26C6C5CA26D130100005D6D1303017C91C7FC137E013E
-1306A26D5BA26D6C5AA2ECC03801071330ECE0700103136014F001015BA2903800F980A2
-14FF6EC8FCA2143EA2141CA229237EA12D>I<EA01FCEA0FFF381E0780486C7E383E01E0
-130080121CC7FC130113FF1207EA1FC0EA3F00127CA24814C0A31301387C0370393E0E79
-80391FFC3F003807F01E1A187D961E>97 D<120FB4FCA2121F7EA9EB07F0EB3FFCEB703F
-9038C00F8090388007C0EB000315E0140115F0A715E0140315C09038800780390EC00F00
-EB703E380C3FFC380007E01C247DA222>I<137F3803FFE03807C0F0380F0078001E13F8
-5AA2007C13700078130012F8A7127C1418123C6C13306C13603807C0E03803FF8038007E
-0015187D961B>I<140F14FFA2141F80A913FF000313CF3807C0FF380F003F001E7F487F
-127C127812F8A71278127C123C003E5B6CEB3F80390FC1EFF03803FF8F3900FE0F001C24
-7DA222>I<13FC3803FF80380F83C0381F01E0383E00F0123C127C14785AA2B512F8A200
-F8C7FCA4127C14187E001E1338001F1370380781E03803FF8038007E0015187D961B>I<
-EB0F80EB7FC0EBF1E0EA01E3EA03C3EBC1C038078000A9EAFFFEA2EA0780B1EA7FFCA213
-247EA313>I<3801F83F3907FEFF80381E07E3391C038300383801C000787FA500385B6C
-485AEA1E07D83FFEC7FCEA31F80030C8FC1238A2383FFF806C13F06C7F487F3838007E48
-130E48130F80A36C5B0070130E003C133C001F13F83807FFE0C690C7FC19227D951E>I<
-120FB4FCA2121F7EA9EB07F0EB1FFCEB703EEBC01E497EA21300AE39FFF0FFF0A21C237D
-A222>I<120C123FA4120CC7FCA7120FB4FCA2121F7EB0EAFFE0A20B237DA212>I<133013
-FCA413301300A7133CEA03FCA2EA007C133CB3A4127012F81378A2EA70F0EA3FE0EA0F80
-0E2E81A213>I<120FB4FCA2121F7EB3ABEAFFF0A20C237DA212>108
-D<3A0F07F007F03AFF1FFC1FFC9039703E703E3A1FC01EC01E6C486C487EA201001300AE
-3BFFF0FFF0FFF0A22C167D9532>I<380F07F038FF1FFCEB703E381FC01E6C487EA21300
-AE39FFF0FFF0A21C167D9522>I<137E3803FFC0380781E0380F00F0001E137848133CA2
-48131EA200F8131FA70078131E007C133E003C133C003E137C6C13F8380F81F03803FFC0
-C6130018187D961E>I<380F07F038FF3FFCEB703F391FC00F80390F8007C01300EC03E0
-A2EC01F0A7EC03E0A2EC07C0018013809038C01F00EB703EEB3FFCEB07E090C8FCA7EAFF
-F0A21C207D9522>I<EB7E033803FF873807C0E7380F8037381E001F123E487FA25AA712
-7CA26C5B001E5B001F5B3807C1EF3803FF8F3800FE0F1300A7ECFFF0A21C207D9520>I<
-380E0F8038FE3FC0EB73E0EA1EC3120FEB81C0EB800090C7FCADEAFFF8A213167D9518>
-I<3807F080EA1FFFEA380FEA700312E01301A212F06CC7FCEA7FC0EA3FF8EA1FFEEA07FF
-38001F80EB07C0EAC003130112E0A200F01380130338FC0F00EACFFEEA83F812187D9618
->I<487EA41203A21207A2120F123FB51280A238078000AA14C0A63803C180EBE300EA01
-FEEA007C12207E9E18>I<000F130FB413FFA2001F131F6C7FAD5CA26CEB3F809038C0EF
-F03803FF8F3900FE0F001C177D9522>I<39FFE01FF0A2391F800F80000FEB0700000713
-06A26C6C5AA26C6C5AA26C6C5AA2EBF870EB7860EB7CE0EB3CC0133F6D5AA26DC7FCA213
-061C167E9420>I<3AFFE1FF83FEA23A1F003E00F86C013C13F0023E13E02607806E13C0
-A2EC6F012603C0C713801581D801E1EB8300148315C33900F301C6A201FF13EE90387E00
-EC15FC013C1378A30118133027167E942B>I<397FE07FE0A2390FC03F000007133C3803
-E0386C6C5A6C6C5AEB7DC0EB3F806DC7FC7F497EEB3BC0EB71E0EBE0F03801C078380380
-7C00077F001F133F39FFC07FF0A21C157E9420>I<39FFE01FF0A2391F800F80000FEB07
-0000071306EBC00E0003130CEBE01C00011318EBF0380000133013F8EB7860A26D5AA2EB
-1F80A26DC7FCA21306A25BA25B12F85B13701360EA61C0EA3F806CC8FC1C207E9420>I<
-387FFFF8A2387C01F0387003E0EA600738E00FC038C01F801400133EC65A5B3801F018EA
-03E0EA07C0000F1338EA1F80383F0030003E1370387C01F0B5FCA215157D941B>I
-E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fc cmtt8 8 63
-/Fc 63 127 df<123812FEB3A8127C1200A7123812FEA51238072A72A923>33
-D<EB3C0F90387E1F80A6EBFE3F01FC1300A2007FB512F8B612FCA4003F14F83901F87E00
-AA003FB512F8B612FCA46C14F83903F0FC00EA07F1EBE1F8A63803C0F01E297EA823>35
-D<130E131FA4EB7FC03803FFF04813FC001F7F487FD87FDF1380EB1F1F00FEEB0FC012FC
-00F8131FA312FCEC0F8000FEEB0700007F90C7FCEA3FDF13FF000F13C06C13F0000113FC
-6C6C7EEB1FFFEC7F80141F15C0007C130F00FE1307A400FC130FA2007EEB1F80007F133F
-9038DFFF006CB45A6C5B00075B6C13E038007F80011FC7FCA5130E1A347CAD23>I<000F
-EB01C0391F8003E0383FC007EA7FE0140FD8F9F013C0141F00F01480A2143F150000F95B
-147EEA7FE014FE6C485AEA1F80EA0F0100005B13035CA213075C130F5CA2131F5C133F91
-C7FCA25B137E9038FE03C09038FC07E0EC0FF00001EB1FF813F8EC3E7C12039038F03C3C
-120713E0A2000FEB3E7C13C0001FEB1FF81380EC0FF0000FEB07E039070003C01E347EAD
-23>I<137CEA01FE487E487FA2EBCFC0EA0F87A21303A31307A290380FCFF8EC9FFC139F
-13BF3907FF0FF801FE138013FCA29038F81F00EA0FF0381FE01E383FF03E13F8007F5BEA
-7E7C00FC1378EB3EF812F86D5AA290380FE03C1307EAFC0F90381FF07C387E3FFC007FB5
-12FC393FFE7FF8EBFC3F390FF01FE03907E007C01E2B7EA923>I<EB0380EB0FC0131FEB
-3F80EBFF005BEA01F81203485A485A5B485AA248C7FCA2123E127EA2127CA212FCA25AA8
-7EA2127CA2127EA2123E123FA26C7EA26C7E7F6C7E6C7E1201EA00FE7FEB3F80EB1FC013
-0FEB0380123476AD23>40 D<131EA2131F131EA30070EB0380007C130F00FEEB1FC0397F
-9E7F8090B5FC001FEBFE00000713F8000113E038007F803801FFE0000713F8001F13FE00
-7FEBFF80EB9E7F39FE1E1FC0007CEB0F8000701303000090C7FCA3131F131EA21A1D7CA2
-23>42 D<EB0780497EAB007FB512F8B612FCA46C14F839000FC000AB6D5A1E1E7EA223>
-I<007FB51280B612C0A46C14801A067C9623>45 D<123E127FEAFF80A5EA7F00123E0909
-738823>I<EC0380EC07C0140FA2141F1580143F15005C147EA214FE5C13015C13035C13
-075CA2130F5C131F5C133F91C7FCA25B137E13FE5B12015BA212035B12075B120F5B121F
-5BA2123F90C8FC5A127E12FE5AA25A12781A347CAD23>I<EB7FC03803FFF04813FC001F
-7F48EBFF80EA7F80397E003FC000FEEB0FE04813076CEB03F0A31401127C1238C7FC1403
-A2EC07E0A2EC0FC0141FEC3F80150014FE1301EB03F8495A495AEB3FC0495A01FEC7FC48
-5A485AD80FF013E0391FE001F0EA3F8048B5FCB6FCA36C14E01C2A7DA923>50
-D<EB7FC03801FFF0000713FC487F487F393FE07F809038801FC0140F1407A3EA0E00C712
-0FA2EC1F80143F903801FF00EB7FFE495A5C806DB4FC9038007F80EC1FC0EC0FE01407EC
-03F0A21401A2127C12FE1403A2EC07E048130F6CEB1FC0387FC07F6CB512806C14006C13
-FC00035B38007FC01C2B7DA923>I<EC0380EC0FC0141F143F14FF491380903807FE0049
-5A495AEB7FE0495A4890C7FCEA07FE485AEA1FF0EA7FE0485A90C8FCA213C06C7EEA1FF0
-EA0FFC6C7EEA01FF6C13C06D7EEB1FF86D7E6D7E903801FF806D13C0143F141F140FEC03
-801A247CA523>60 D<007FB512F8B612FCA4003F14F8C9FCA6003FB512F8B612FCA46C14
-F81E127E9C23>I<127012FC7E7E13C06C7EEA1FF86C7E6C7E3801FF806C7FEB3FE0EB1F
-F86D7EEB03FE903801FF806D13C0143FA214FF491380903803FE00EB0FFC495AEB3FE0EB
-FFC0485BD807FEC7FC485A485AEA7FE0485A90C8FC5A5A12701A247CA523>I<3801FFC0
-000713F8001F13FE487F48148039FF007FC048130F1407A2140F007C131F0038EB7F80C7
-12FF01031300EB07FCEB0FF0495A5C495AA291C7FCA6133E90C8FCA7131C137FA5131C1A
-297CA823>I<EB07F0EB1FFCEB7FFE48B5FC4814803907FC1FC0380FE0079038C0FFE0EA
-1F83485AEA3E0FD87E1F13F0007C138FEB3F0738783E0338F87C01A212F0EB7800A5EB7C
-0112F8A239783E03E0387C3F0790381F8FC0007E13FFD83E0F1380D83F071300381F83FE
-390FC0F9E09038E007F03807FC0F6CB5FC6C14C06C6C138090381FFE00EB07F81C297DA8
-23>I<EB0FC0A2497EA4EB3CF0A5EB7CF8A3EB7878EBF87CA548487EA40003133F497EA2
-90B5FCA2481480A3EBC00F000F14C0EB8007A3397FF03FF800FF14FCA3007F14F81E2A7E
-A923>I<B512F014FE80158015C0390F800FE01407EC03F01401A5140315E01407EC1FC0
-90B5128015005C8015C09038800FE01407EC03F0140115F81400A5140115F01403EC0FE0
-B6FC15C01580150014FC1D297EA823>I<90380FE0E090383FF9F0EBFFFD4813FF5A3807
-FC3F380FF00F381FC007A2383F80031300481301127EA2007CEB00E000FC1400A25AA97E
-A2127C007E14E0EC01F0127F7EEB8003EA1FC0EC07E0380FF00F3907FC1FC06CB512806C
-14006C5BEB3FF8EB0FE01C2B7DA923>I<90381FC1C090387FF3E090B5FC12035AEBF83F
-380FE01F381FC00F1380003F13071300007E1303A3007CEB01C000FC90C7FCA25AA6EC7F
-F815FCA27E15F8007CEB03E0127E1407A27EEB800F121FEBC01FEA0FE03807F87F90B5FC
-7EC613FB90387FF1C090381FC0001E2B7EA923>71 D<397FF00FFE39FFF81FFFA3397FF0
-0FFE390F8001F0AC90B5FCA5EB8001AE397FF00FFE39FFF81FFFA3397FF00FFE20297FA8
-23>I<B512FEA538007C00B3ADB512FEA517297AA823>I<EA7FFEB5FCA36C5AEA07C0B3A6
-157CA7007FB512FCB6FCA36C14F81E297EA823>76 D<39FF8001FFA26D5AA3391EE00778
-A3EBF00FEB700EA2EB781EA2EB381CEB3C3CA2EB1C38EB1E78A2EB0E70A3EB07E0A3EB03
-C0A290C7FCA939FFC003FFA520297FA823>I<3803FFF0000F13FC487F487FA2397F807F
-80387E001F007C130FA200FC14C0481307B3A46C130FA2007C1480A2007E131F387F807F
-6CB51200A26C5B6C5B000313F01A2B7CA923>79 D<B512F014FE80158015C0390F801FE0
-EC07F01403140115F81400A5140115F014031407EC1FE090B512C0158015005C14F00180
-C7FCABEAFFF87FA35B1D297EA823>I<3803FFF0000F13FC487F487FA2397F807F80387E
-001F007C130FA200FC14C0481307B3A3131F148700FC138F397C0FCF80A2387E07FFEA7F
-876CB51200A26C5B6C5B1203C7FC147EA280A2EC1F80A2140F1A337CA923>I<387FFFC0
-B512F88014FF7E390F807F80EC1FC0140F6E7E1403A514074A5A141FEC7F8090B5C7FCA2
-14FC8080EB807F6E7E141F140FA61587ED8F80A215CFD87FF013DF39FFF807FF1600806C
-486C5AC812F8212A7FA823>I<9038FF83800003EBE3C04813FF121F5AEA7FC0EB003F00
-FE131F48130FA25A1407A26CEB038091C7FC127E127FEA3FF06CB4FC6C13F06C13FC0001
-7F39001FFF80010113C0EB001FEC0FE01407EC03F0A20070130112F8A36C1303A26CEB07
-E06C130F9038E03FC090B5FC15005C00F15B38703FE01C2B7DA923>I<39FFF81FFFA539
-0F8001F0B3A7EBC003A2000714E0EBE007EBF00F000314C0EBFC3F6CB512806C14006D5A
-EB1FF8EB07E0202A7FA823>85 D<397FF07FF0EBF8FFA3EBF07F3907E03F000003133EEB
-F07E0001137CEBF8FC00005B13FDEB7DF0137F6D5AA26D5AA26D5AA280131F80133F8013
-7DEB7CF813F8147CEA01F0801203497E12079038C00F80120F397FE03FF8D8FFF013FCA3
-D87FE013F81E297EA823>88 D<397FF00FFE39FFF81FFFA3397FF00FFE3907C003E0EBE0
-07000314C013F00001130F01F813800000131F01FC1300137C143E133E147EEB1F7CA26D
-5AA26D5AA25C1303ACEB1FFC497EA36D5A20297FA823>I<003FB512E04814F0A4397C00
-07E0140FEC1FC01580143F0038EB7F00C7127E14FE495A5C1303495A5C130F495A5C133F
-49C7FC137E13FE485A5B1203485A4913E0000FEB01F0EA1FC01380123FEA7F00127EB6FC
-A46C14E01C297DA823>I<133013FCEA03FF000F13C0003F13F0B512FC1387EAFE0138F8
-007C00601318160A7AA823>94 D<007FB51280B612C0A46C14801A067C7E23>I<3803FF
-80000F13E04813F8487F80EB80FFEC3F80381F001FC7FC140F14FF137F0003B5FC120F5A
-387FF00F130012FCA25A141F7E6C133F387F81FF90B512FC6C14FE7E000713C73901FE01
-FC1F1D7D9C23>97 D<EB3FF0EBFFFC000313FF5A5A381FE07FEA3F80387F003E007E90C7
-FCA25AA25AA57EA2007E1307007FEB0F80141FEA3FC0391FF07F006CB5FC6C5B6C5BC613
-F0EB3FC0191D7B9C23>99 D<ECFF8015C0A41407A7EB7F873801FFE74813F7000F13FF5A
-13E0383F803F387F001F007E130FA2481307A25AA56C130FA2127E141F007F133F383F80
-7FEBE0FF6CB512FE7E000313F76C13C738007F031F297EA823>I<EB3FC0EBFFF800037F
-4813FF481480381FF07F393F801FC0EB000F007E130715E05AB6FCA415C000F8C8FC7EA2
-007EEB01C0007FEB03E0383F800713E0391FF81FC06CB5FC6C14800001EBFE006C6C5AEB
-1FE01B1D7D9C23>I<147F903801FFC0010713E05B5BEB3FCF140F90383E07C091C7FCA4
-007FB51280B612C0A36C1480D8003EC7FCB3383FFFFE487FA36C5B1B297EA823>I<EC01
-F090383F07FC9038FFDFFE000313FF5A48147E381FE1FE9038807E18393F003F00A2003E
-7FA4003F5BA2381F807EEBE1FE6CB45A485B5C001E13C0013FC7FC90C8FC121F1340380F
-FFFCECFF804814C04814F0397E0007F8007C130048147CA248143CA36C147C6C14FC007F
-EB03F8EBE01F6CB512F0000F14C06C14800001EBFE0038003FF01F2E7E9D23>I<B47E7F
-A41207A7EBC1FCEBC7FF01DF138090B512C0A29038FE0FE0EBF807EBF00313E0A313C0AD
-39FFFE1FFF5CA38020297FA823>I<133813FEA5133890C7FCA6EA7FFC487EA3127FEA00
-3EB3387FFFFEB6FCA36C13FE182A7AA923>I<14E0EB03F8A5EB00E01400A63803FFF048
-13F8A37EC7FCB3AB13011238387C03F012FEEB0FE0B5FC14C06C13006C5AEA0FF815397D
-A923>I<EA7F80487EA3127F1203A7ECFFFC13C1A313C0EC3F00147E5CEBC1F8EBC3F0EB
-C7E0EBCFC0EBDFE0EBFFF0A2EBFCF8497EEBF07EEBE03E497E1580EC0FC01407EC03E039
-7FFE0FFFB55AA36C487E20297FA823>I<EA7FFEB5FCA37EEA001FB3AD007FB512C0B612
-E0A36C14C01B297CA823>I<397E1F01F039FF7FC7FC9038FFEFFE14FF6C80390FE1FE1F
-EBC1FC01C07FEB80F8A2EB00F0AE3A7FE3FE3FE026FFF3FF13F0A3267FE3FE13E0241D81
-9C23>I<38FF81FCEBC7FF01DF138090B512C0A23907FE0FE0EBF807EBF00313E0A313C0
-AD39FFFE1FFF5CA380201D7F9C23>I<133F3801FFE0487F487F487F381FC0FE383F807F
-383E001F007E1480007C130F00FC14C0481307A66C130FA2007C1480007E131F6CEB3F00
-6D5A381FE1FE6CB45A6C5B6C5B6C5BD8003FC7FC1A1D7C9C23>I<38FF81FCEBC7FF01DF
-13C090B512E015F03907FE0FF8EBF8039038F001FCEBE000A249137EA2153EA5157E7F15
-FC7F14019038F803F89038FE0FF090B5FC15E001DF138001CF1300EBC3F801C0C7FCAAEA
-FFFEA51F2C7F9C23>I<90383FC1C09038FFF3E0000313FB4813FF5A381FF07F383FC01F
-387F000F127E14075A14035AA57E1407127E140F007F131FEA3F80381FE07F90B5FC1207
-6C13FB6C13E338003F83EB0003AAEC7FFF91B51280A36E1300212C7E9C23>I<397FF00F
-E039FFF87FF8ECFFFC13FB6CB5FCC613F8ECC078EC800091C7FC5BA25BA35BAA387FFFFC
-B57EA36C5B1E1D7E9C23>I<3801FF9C000F13FE5A127FA2EAFF0000FC137E48133EA26C
-131C6C1300EA7FF0383FFF80000F13E06C13F838007FFCEB01FEEB007F0070133F00F813
-1F7E143F7E38FF80FFEBFFFE14FC14F814F000701380181D7B9C23>I<137013F8A7007F
-B51280B612C0A36C1480D800F8C7FCACEC01C0EC03E0A3EBFC07140F9038FE1FC0EB7FFF
-158090383FFE00EB0FFCEB07F01B257EA423>I<39FF807FC001C013E0A400071303B014
-07140FEBE03F90B6FC7EA2C613F3EB3FC1201D7F9C23>I<39FFF03FFCA5390F8007C000
-071480A2EBC00F00031400A26D5A0001131EA2EBF03E0000133CA2EBF87CEB7878A2EB7C
-F8EB3CF0A2133F6D5AA36D5A6D5A1E1D7E9C23>I<397FF00FFE39FFF81FFFA3397FF00F
-FE001FC712F86C14F0A57F390783E1E0EB87F1A3EB8FF90003EB79C013CFA2EBDF7BA2EB
-DE3B00011480EBFE3FA2EBFC1FA23900F80F00201D7F9C23>I<397FF07FF039FFF8FFF8
-A3397FF07FF03903E03E003801F03C3800F87CEB78F8EB7CF0EB3FE0131F6D5A5C130749
-7E497E133DEB3CF0EB7878EBF07C0001133C497E3803C01F397FF03FF839FFF87FFCA339
-7FF03FF81E1D7E9C23>I<EC1FE0ECFFF05B130715E090380FF00014C05CAE131F137FD8
-7FFFC7FC485A5BA27F6C7EC66C7E131F130FAE8014F0903807FFE015F013017FEC1FE01C
-347DAD23>123 D<EA7FC0EAFFF87F13FF7EC66C7E131F130FAE8014F0903807FFE06D13
-F07FA25B4913E090380FF00014C05CAE131F137FD87FFFC7FCB5FC13FC5BEA7FC01C347D
-AD23>125 D<3803C038380FF07C381FF8FCEA3FFF4813F8B512F038FC7FE038F83FC038
-700F0016097AA823>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fd cmbx10 12 33
-/Fd 33 121 df<ED1FFF0203B512E0021F14F8027F80903A01FFF803FE499038C0007F01
-0F90390001FF80D91FFC497F4A5B495A495AA201FF4A7F4A6D5BA3705B7090C7FC705A94
-C8FCA693387FFFE0B9FCA5C601E0C7FCB3B0007F9026FFC07FEBFFC0A53A467EC540>12
-D<92381FFF800203B5EAF3E0021F14FF147F903901FFF80149EBC00390390FFE0007495A
-5C495A495AA201FF804A7F82ACB9FCA5C601E0C7FCB3B0007F9026FFC07FEBFFC0A53A46
-7EC540>I<EA0F80EA3FC0487E7F487EA27F7F7F6C13806C13C07E000713E0000113F038
-007FF8EB1FFCEB07F8EB01F0EB0070161375C539>18 D<EB07C0EB0FF0EB1FF8133FEB7F
-FCA213FF5A5A4813F84813F014E0481380383FFE00EA7FF8EAFFE0EA7F80003EC7FC1238
-161369C539>I<EA07E0EA1FF8487E487E7FB5FC1480A214C0A37EA27EEA1FFBEA07E3EA
-000313071480A2130F1400A25B131E133E5B5BA2EA03F0485A485A485A90C7FC120C1223
-78C420>39 D<EE0FC04C7EA24C7EA34C7EA24C7EA24B7FA34B7FA24B80A34B8016CF031F
-80168F1687033F801603037F80157E8203FE804B7E0201814B137FA20203814B7F020782
-4B7FA2020F824B7F021F824B7F023F82A292C77E4AB77EA291B87EA3D901FCC87F4A157F
-0103835C840107844A81010F844A81A2011F844A81013F84496C81B600C0010FB612FCA5
-4E457CC457>65 D<DCFFFC141C031FD9FFC0137C4AB600F813FC0207EDFE01021FEDFF03
-027FD9F00113C749B5C7EA3FEF4901F8EC0FFF010F01E01403490180804990C9FC494816
-7F4948163F4849161F4849160F5C48180748491603A2485B19015A91CAFC19005AA34918
-00A212FFAC127FA27F1A7CA27EA2806C19FC1AF86C7F19016C7F6CF003F0806C6DEE07E0
-6C6DEE0FC06D6C161F6D6CEE3F806D6DED7F006D01E0EC01FE010301F8EC07FC6D01FFEC
-1FF86D6C9039F801FFE0021F90B65A020793C7FC020115FCDA001F14E0030049C8FC4646
-7AC453>67 D<B97E18F818FF19E019F8D8001F90C7000F13FE05007F061F7F06077F7213
-F084727F737E737E737EA2731380A27313C0A21BE085A21BF0A51BF8A285A961A21BF0A4
-1BE0A2611BC0A2611B801B00614F5A62197F4F5A06035B4E5B061F5B95B5C7FC050F5BBA
-12F819E0198006FCC8FC18804D447CC358>I<BA12E0A419F0D8001F903880000F170018
-3F181F180F1807180319F81801A31800A3EE01F0197CA419001603A31607160F163F92B5
-FCA5ED803F160F16071603A31601A693C9FCAEB712FCA53E437CC248>70
-D<B712FCA5D8001F0180C9FCB3B1F003E0A4180719C0A4180FA3181FA2F03F80A2187F18
-FF5F5F170F173F4CB5FCBA1200A53B447CC345>76 D<B600C0051FB512F06F5FA26F5FA2
-D8001FF380006F17F7A2DABFFCEE01E7A2DA9FFEEE03C7A2DA8FFFEE0787A202876DED0F
-07A302836D151EA202816D153CA202806D1578A26F6C15F0A36F6CEC01E0A26F6CEC03C0
-A26F6CEC0780A26F6DEB0F00A36F6D131EA26F6D5BA26F6D5BA2706C5BA2706C485AA370
-6C485AA2706C485AA270018FC7FCA27013DEA37013FCA2705BA2715AA2715A497EB600F0
-043FB612F0715AA2715A71C7FC64447CC36D>I<923803FFE0037F13FF0203B612E0021F
-15FC027F9038007FFF902601FFF8010F13C04901C001017F010F496D13F84948C8EA3FFC
-49486F7E49486F7E01FF8448496F7F4A81488548496F7FA248496F7FA2488591CA127F48
-85A348854983A400FF1A80AD007F1A006D5FA36C61A26E16FF6C61A36C6D4B5BA26C6D4B
-5B6C616E5D6C6D4B5B6C6D4B5B6D6C4B90C7FC6D6C4B5A6D6D4A5A6D01E001035B010301
-F8010F13E06D01FF017F5B6D6C90B6C8FC021F15FC020715F0DA007F91C9FC030713F049
-467AC456>79 D<1303497E497E497EEB7FF8497E487F487F481480391FF87FE0393FF03F
-F0397FC00FF839FF8007FC38FE0001007CEB00F800301430002014101E1173C439>94
-D<903801FFF8011FEBFF80017F14E090B612F8489038807FFC3A03FE001FFE486CEB07FF
-486E7F0280806F7FA36F7F6C90C7FCA26C5AEA00F890C8FCA2150F021FB5FC0103B6FC13
-1F017F13C03901FFFC004813E0000F13804890C7FC485A5B485AA2485AA45DA26C6C5BED
-07BF6C6C010F13FC6CB490391F3FFFE06C9026C0FE1F13F06CEBFFFC6CECF007C66CD9E0
-0113E0010790C9FC342F7DAD38>97 D<EB7FC0B5FCA512037EB1ED1FFC92B512C002C314
-F002CF14FC9139DFF01FFF9126FF800713809126FE000113C04A6D13E002F015F04A147F
-18F8173F18FCA2EF1FFEA318FFAB18FEA3173F18FCA218F8177F6E15F06EECFFE06E4913
-C06E49138091263F800F1300903AFE1FE03FFE496CB55AD9F80314F049C61480C8D81FF8
-C7FC38467DC440>I<EC3FFE49B512E0010F14F8013F8090397FF807FE9039FFE001FF48
-4948138048018014C048495A485A121FA2485A6F1380A2007F6E130049EB007C93C7FC12
-FFAC127F7FA2123FEE03E06C7E16076C6C15C06C150F6C6DEB1F806C6DEB3F006C01F013
-FE90397FFE03FC6DB55A010F5C010314C09026003FFCC7FC2B2F7CAD33>I<EFFF804BB5
-FCA5ED000782B1EC1FFC49B51283010F14E3013F14F390267FFC07B5FC9038FFF0004801
-C0133F48497F4890C77E484880121F5B123FA2127F5BA312FFAB127FA36C7EA2121F7F00
-0F5D6C6C5C5E6C6D90B512C06CD9E00114FF39007FF80F6DB512E7010F14C70103140790
-26003FF0EBFC0038467CC440>I<EC1FFE49B512C0010714F0011F14FC90397FFC0FFE90
-3AFFE003FF804849C613C0485B4890C7EA7FE048ED3FF0485AEE1FF8485AA2007F150F49
-15FCA212FFA390B7FCA317F801F8C9FCA5127FA27FA2003F1638177C6C6C15FCA26C6CEC
-01F86C6D13036CED07F06C6DEB0FE06C01F0EB3FC0903A3FFE01FF806DB5EAFE0001075C
-010014F0020F90C7FC2E2F7DAD35>I<902601FFF013FF010FD9FE031380013FD9FF8F13
-C090B812E048D9C07F13BF489039001FF83F4848EB0FFC4848EB07FE001F9238FF1FC049
-6DEB0F8094C7FC003F82A7001F93C7FCA26D5B000F5D6C6C495A6C6C495A6C9038C07FF0
-4890B55A1680D8078F49C8FC018113F0D80F80CAFCA47F7F13F890B612E016FEEEFFC06C
-16F0836C826C82831207481780D81FF8C77ED83FE014074848020113C000FF8149157FA5
-6D15FF007F17806D5C6C6C4A1300D81FFCEC0FFE6CB4EC3FFC6C9039E001FFF8000190B6
-12E06C6C1580010F02FCC7FCD9007F138033427DAC39>103 D<EB7FC0B5FCA512037EB1
-923803FF80031F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF9126C7C0077FECCF00
-02DE7F02FC81A25C5CA35CB3A7B600C1B61280A539457CC440>I<13FCEA03FF48138048
-13C0A24813E0A66C13C0A26C13806C1300EA00FC90C7FCA9EB7FC0EA7FFFA512037EB3AF
-B6FCA518467CC520>I<EB7FC0B5FCA512037EB3B3B3A3B61280A519457CC420>108
-D<90287FC003FF80EB07FFB5011F01F0013F13E0037F6D90B57E92B56C4880913DC1FC1F
-FE03F83FFC913DC3E00FFF07C01FFE00039026C7C00790398F800FFF6CD9CF00EC9E0002
-DE6D01BC7F02FC03F81580A24A5D4A5DA34A5DB3A7B600C1B60083B6FCA5582D7CAC5F>
-I<903A7FC003FF80B5011F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF00039026C7
-C0077F6CEBCF0002DE7F02FC81A25C5CA35CB3A7B600C1B61280A5392D7CAC40>I<EC1F
-FE49B512E0010714F8011F14FE903A7FF807FF809026FFE0017F48903980007FE04890C7
-6C7E48486E7E000F8249140F001F82A2003F824980007F1780A400FF17C0AA007F1780A4
-6C6C4A1300A2001F5EA26C6C4A5A00075E6D143F6C6D495AC69039E001FFC090267FF807
-5B6DB6C7FC010F14FC010114E09026001FFEC8FC322F7DAD39>I<90397FC01FFCB590B5
-12C002C314F002CF14FC9139DFF03FFF9126FF800F138000039026FE000313C06C496D13
-E002F015F04A7FEF7FF8A218FC173F18FEA3EF1FFFAB18FE173FA318FC177F18F817FF6E
-15F06E4913E06E4913C06E4913806E6C4813009238E07FFE02EFB55A02E314F002E01480
-DB1FF8C7FC92C9FCADB612C0A538407DAC40>I<DA3FF8130F902601FFFE5B010F6D6C5A
-013F6E5A90397FFC0FF0903AFFF003F8FF489038E000F94849137F48497F4890C7FC4881
-5B003F815B127F82A25B12FFAB6C7EA3123F6D5C121F5E6C6C5CA26C6D5B6C6D48B5FC6C
-6D5A6C9038F81FEF013FB512CF010F148F0103EBFE0F9038007FF091C7FCAD0307B512FE
-A537407CAC3C>I<90397F803FC0B5EBFFF0028313F8028713FC91388FE7FE91389F8FFF
-0003EB9E0F6C13BCA214F8A29138F007FEED03FC9138E001F892C7FCA35CB3A5B612C0A5
-282D7DAC2F>I<90391FFE078090B512DF000314FF5A380FF803381FE000D83F80133F12
-7F90C7121FA248140FA27FA201E090C7FC13F8EBFFC06C13FEECFFC06C14F015FC6C806C
-806C1580000115C07E011F14E01301D9000713F014000078147F00F8143F151F6C140FA3
-7E6C15E0151F6D14C06D133F01F0EB7F809039FC03FF0090B55A00FC5CD8F83F13F0D8F0
-0790C7FC242F7CAD2D>I<EB01F0A51303A41307A2130FA2131FA2133F137F13FF120300
-0F90B512C0B7FCA4C601F0C7FCB3A3ED01F0AA017FEB03E014F81507D93FFC13C090391F
-FE1F806DB512006D5B01015B9038003FF024407EBE2D>I<D93FE0EC7FC0B549B5FCA500
-03EC00076C81B3A85EA35E6C5DA26E013D7F017F02F9EBFF8090393FFC03F16DB512E16D
-14C1010314019026003FFC91C7FC392E7CAC40>I<B690380FFFF8A5000301E001001300
-6C167C6E14FC6C5E801601017F5D6E1303013F5D6E1307011F5D6E130F6D5DED801F6D92
-C7FC15C05E6D143EEDE07E6D147CEDF0FC6D5C15F9027F5B15FF6E5BA36E5BA26E5BA26E
-90C8FCA26E5AA26E5AA26E5A352C7DAB3C>I<007FB590387FFFF8A5C601F890380FF800
-6D6CEB07E0013F4A5A6D6C131F6E495A6D6D48C7FC6DEBC0FE6DEBC1FC6DEBE1F8EDF3F0
-6DEBFFE0806E5B6E5B93C8FC6E7F6E7F6E7FA24A7F4A7F4A7FEDBFFEEC3F1F91387E0FFF
-02FE8049486C7F49486C7F49487E49486C7F4A8049486D7E49C76C7ED9FF80131FB500F0
-90B512FEA5372C7EAB3C>120 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fe cmbx8 8 26
-/Fe 26 121 df<91383FFCF00103B5FC130F90383FF01F9038FF803F4813005B12034913
-1F150FA7B7FCA43903FC000FB3A4263FFFC0B5FCA4282E7FAD2D>13
-D<132013F8EA01FCEA03FE1207120FEA1FFCEA3FF8EA7FF0EAFFC01300127C12600F0D6F
-AE29>19 D<14E01301EB07C0EB0F80EB1F00133E137E5B5B1201485AA2485AA2485AA212
-1F5B123FA290C7FC5AA512FEAF127FA57E7FA2121F7F120FA26C7EA26C7EA26C7E12007F
-137E133E7FEB0F80EB07C0EB01E01300134378B120>40 D<12E07E127C7E7E6C7E7F6C7E
-12037F6C7EA26C7EA2137EA2137F7F1480A2131F14C0A5EB0FE0AFEB1FC0A51480133FA2
-14005B137EA25BA2485AA2485A5B1207485A5B48C7FC123E5A12F05A13437CB120>I<B5
-12F8A715077F921B>45 D<B712E016FE707E17E00001D9800013F8EE1FFCEE07FE707E70
-13807013C0EF7FE0173F18F0A2171F18F8A318FCAA18F8A4EF3FF0A218E0177FEFFFC018
-805E04071300EE1FFCEEFFF8B85A17C04CC7FC16E0362E7DAD3E>68
-D<B612C0A400010180C8FCB3A5EE03C0A416071780A2160FA2161FA2163F167FED01FF03
-0F1300B8FCA42A2E7DAD31>76 D<007FB548B512E0A4C6903AE0000FE0006D6C5C6E495A
-6D6C49C7FC011F5C6D6C137E6E5B6DEB81F86D13836DEBC7F0EDE7E06DEBFFC06E5B8093
-C8FC6E5A140F6E7E826E7F5C4A7F4A7F82EC3F3F91387E1FFC02FE7F4A6C7E49487E4948
-6C7F0107814A6C7F49487E49486D7E013F8149C76C7E017E141F496E7EB5D8F001B512FC
-A4362E7DAD3D>88 D<13301378EA01FE487E481380001F13E0383FCFF038FF03FCEAFE01
-3878007800201310160B77AD29>94 D<EB7FF80003B5FC000F14C0391FE01FF09038F007
-F86E7EA26E7EEA0FE0EA07C0C7FCA214FF133F48B5FC000713C1381FFC01EA3FE0EA7FC0
-EAFF801300A3140313806C6C487E263FF03F13F8381FFFFE0007EBF87FC6EBC01F251E7E
-9D28>97 D<EB0FFE90387FFFC048B512F03907FC07F8380FF00FEA1FE0123F13C0007FEB
-07F090388003E091C7FC12FFA8127F7FA26C6C133CA26C6C137C6C6C13F83907FE03F000
-01B512E06C6C138090380FFC001E1E7D9D24>99 D<ED0FC0EC03FFA4EC003FABEB0FF8EB
-7FFF48B6FC3807FC07380FF001391FE0007F003F143F5B127F5BA212FFA9127F7F123F15
-7F6C6C13FF380FF0032607FC0F13FC0001B512BF6CEBFE3FEB1FF0262E7DAD2D>I<EB0F
-FC90387FFF8048B512E03907FC0FF0390FF003F8391FE001FC1400484813FE007F147E5B
-157F12FFA290B6FCA30180C7FCA3127F7FA2003F140F6C7E6C6C131F6C6C137E3903FE01
-FC6CB512F86C6C13E001071300201E7E9D25>I<ED07C090391FF81FF090B5EA7FF80003
-14FD3907F81FF3380FE007001F14F99039C003F8F0003FECFC00A6001F5CEBE007000F5C
-3907F81FE090B55A4891C7FCEB1FF8001EC9FC121FA27F90B512C06C14F815FF6C158016
-C04815E0123F48C7EA3FF000FE140F4814071503A36C1407007FEC0FE06C6CEB1FC0D81F
-F0EBFF800007B5EAFE00000114F8D8001F1380252D7E9E29>103
-D<EA07C0EA0FE0EA1FF0EA3FF8A5EA1FF0EA0FE0EA07C0C7FCA6EA03F012FFA4120FB3A3
-B5FCA4102F7CAE17>105 D<EA03F012FFA4120FB3B3B5FCA4102E7CAD17>108
-D<2707E00FF8EB1FF000FFD97FFEEBFFFC01E1B5008313FF9028E7E07FCFC01380903BEF
-803FDF007F260FFE0013FC031FEC3FC0495C495CA2495CB0B53B01FFFE03FFFCA43E1E7C
-9D45>I<3907E01FF000FFEB7FFC01E1B5FCD9E7E013809038EF807F260FFE0013C04913
-3FA25BA25BB0B53803FFFCA4261E7C9D2D>I<EB07FE90387FFFE048B512F83903FC03FC
-3907F000FE4848137F4848EB3F80003F15C049131F007F15E0A200FF15F0A8007F15E0A2
-6D133F003F15C0001F15806D137F6C6CEBFF003903FC03FC6CB55A6C6C13E0D907FEC7FC
-241E7E9D29>I<3903F03FE039FFF1FFFC01F713FFD9FFC013809039FE007FC0D80FFCEB
-3FE049EB1FF05BED0FF8A216FC1507A8ED0FF8A3ED1FF07F6DEB3FE06DEB7FC09039FF81
-FF809039F7FFFE0001F113F89038F07FC091C8FCA9B5FCA4262B7D9D2D>I<90390FF003
-C090387FFE0748B512873907FE07CF390FF803FF48487E48487E157F4848133FA3485AA8
-7F127FA26C6C137F15FF6C7E380FF8033807FC0F0001B512BF39007FFE3FEB1FF090C7FC
-A9913803FFFCA4262B7D9D2B>I<3807E07E39FFE1FF8001E313E0EBE78F9038EF1FF0EA
-0FFE13FCA29038F80FE0EC07C091C7FC5BAFB57EA41C1E7D9D22>I<3801FF8E000713FE
-121FEA3F00007C137E0078133E00F8131EA27EB490C7FC13F0EBFF806C13E06C13F86C13
-FE7E00037FD8003F13801300143F00F0131F140F7EA26CEB1F007E38FF807EEBFFFC00FB
-13F000E01380191E7D9D20>I<133CA4137CA313FCA2120112031207001FB5FCB6FCA3D8
-03FCC7FCAEEC03C0A61407D801FE1380EBFF0F6CEBFF00EB3FFCEB0FF01A2A7FA920>I<
-D803F0EB0FC000FFEB03FFA4000FEB003FB1157FA215FF00075BD9F80713FC6CB512BFC6
-EBFE3FEB3FF0261E7C9D2D>I<D8FFFEEBFFF8A4D803FCEB7E006C6C5B6D485A6CEB81F0
-90387FC3E090383FE7C090381FEF806DB4C7FC6D5A6D5A6D7E80497F497F497FEB1F9FEC
-0FF090383E07F8496C7E496C7ED801F07F48486C138026FFF80113FCA4261E7E9D2B>
-120 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Ff cmr8 8 48
-/Ff 48 127 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07
-4913FE485A00039138FC018049017CC7FCAAB712FCA22703E0007CC7FCB3A6486C13FE3A
-7FFF0FFFF0A22B2F7FAE29>11 D<14FF010713E090381F80F090383E003849137C4913FC
-485A1203491378153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFF
-E0A2232F7FAE27>I<ECFFC0010713FC90381F807C90383E00FC5B5B485A0003147C5BAA
-B612FCA23903E0007CB3A6486C13FE3A7FFF0FFFE0A2232F7FAE27>I<91397F800FF090
-3A03FFE07FFE903A1FC079F80F903B3E001FE003804990393FC007C04990387F800F4848
-1400A24848017EEB0780033EEB030094C7FCA7EF07C0B9FCA23B03E0003E000F1707B3A5
-486C017FEB0FE03C7FFF07FFF0FFFEA2372F7FAE3B>I<EA07C012FFA2120F1207B3A5EA
-0FE0EAFFFCA20E1E7E9D14>16 D<127012F87EA2127E7EEA0F801207EA03C0EA01E0EA00
-7013200C0C78AD23>18 D<13E0EA01F01203A2EA07E0EA0FC0EA1F00121E5A5A12E01240
-0C0C72AD23>I<123C127EB4FCA21380A2127F123D1201A312031300A25A1206120E5A5A
-5A126009157AAD14>39 D<13031307130E131C1338137013F0EA01E013C01203EA0780A2
-EA0F00A2121EA35AA45AA512F8A25AAB7EA21278A57EA47EA37EA2EA0780A2EA03C01201
-13E0EA00F013701338131C130E1307130310437AB11B>I<12C07E12707E7E7E120FEA07
-80120313C0EA01E0A2EA00F0A21378A3133CA4131EA5131FA2130FAB131FA2131EA5133C
-A41378A313F0A2EA01E0A2EA03C013801207EA0F00120E5A5A5A5A5A10437CB11B>I<12
-3C127EB4FCA21380A2127F123D1201A312031300A25A1206120E5A5A5A126009157A8714
->44 D<B512C0A412047F9018>I<123C127E12FFA4127E123C08087A8714>I<15C0140114
-031580A214071500A25C140EA2141E141CA2143C143814781470A214F05CA213015CA213
-035C130791C7FCA25B130EA2131E131CA2133C1338A21378137013F05BA212015BA21203
-5BA2120790C8FC5A120EA2121E121CA2123C1238A212781270A212F05AA21A437CB123>
-I<130C133C137CEA03FC12FFEAFC7C1200B3B113FE387FFFFEA2172C7AAB23>49
-D<EB7F803801FFF0380780FC380E003F48EB1F8048EB0FC05A0060EB07E012F000FC14F0
-7E1403A3007C1307C7FCA215E0140F15C0141F1580EC3F00147E147C5C495A495A495A49
-5A011EC7FC5B5B4913305B485A4848136048C7FC000E14E0001FB5FC5A4814C0B6FCA21C
-2C7DAB23>I<B612F815FF3A03F8001FE00001EC03F0ED00F8167E82EE1F80160F17C0EE
-07E0A2EE03F0A217F81601A317FCAA17F8A3EE03F0A217E0160717C0160FEE1F80EE3F00
-167E5EED03F00003EC1FE0B7128003F8C7FC2E2D7DAC36>68 D<B712FEA23903F8000100
-01EC003E828282A282A3178016011518A293C7FCA31538157815F890B5FCA2EBF8001578
-15381518A21760A392C712C0A4160117801603A21607160F163F0003913801FF00B8FCA2
-2B2D7EAC30>I<DA1FF013C09138FFFE01903903F00F8390390F8001E3013FC71277017C
-143F4848141F4848140F48481407A248481403121F491401123F90C8FC481500A300FE16
-00A992381FFFFEA2007F9138001FE0EE0FC0A27E7F121F7F120F6C7EA26C7E6C6C141FEA
-007C013F143FD90F8013F3903903F007C10100B51200DA1FF813002F2F7CAD37>71
-D<B512F8A2D803FCC8FC6C5AB3A7160CA41618A41638A2167816F81501ED07F00003141F
-B7FCA2262D7EAC2C>76 D<D8FFF8903803FFFC7F00019138003FC06DEC0F006D1406EBBF
-80A2EB9FC0EB8FE0138780EB83F8138180EB80FE147E147FEC3F80EC1FC0140F15E0EC07
-F0140315F8EC01FC140015FE157FED3F86151F16C6ED0FE6150716F6ED03FE1501A21500
-167E163EA2486C141ED80FF0140EB5FC16062E2D7DAC35>78 D<B539F003FFFCA2D803FC
-C7EA3FC06C48EC0F001606B3AB160E0000150C7F161C017C1418017E14386D5C6D146090
-390F8001E0903907E00380902601F80FC7FC9038007FFCEC0FF02E2E7DAC35>85
-D<13C0487E487E487EEA0F3CEA1E1E487E3870038038E001C0EAC000120A78AD23>94
-D<12035A120E5A5A123012701260A212E05AA312DEB4FC1380A2127FA2EA3F00121E0915
-7BAD14>96 D<13FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07
-FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007F
-EBEF8C391F83C7FC390FFF03F83901FC01E01F207D9E23>I<EA07C012FFA2120F1207AC
-14FE9038C7FF809038CF03E09038DC01F09038F8007C49137E49133E497F1680A2150F16
-C0A9ED1F80A216005D6D133E6D5B01B05B9038BC01F090380E07E0390607FF80260001FC
-C7FC222F7EAD27>I<EB1FE0EB7FFC3801F01E3803E0073907C01F80EA0F80EA1F005A00
-3EEB0F00007E90C7FCA2127C12FCA9127EA215C07E6C130101801380380FC0033907E007
-003801F03E38007FF8EB1FC01A207E9E1F>I<15F8141FA214011400ACEB0FE0EB7FF838
-01F81E3803E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13
-017EEB8003000F13073903E00EFC3A01F03CFFC038007FF090391FC0F800222F7EAD27>
-I<EB1F80EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C
-12FCA3B6FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F
-3801F03C38007FF8EB1FC01A207E9E1F>I<EB03F0EB0FFCEB3E1EEB7C3F13F8EA01F0A2
-3803E00C1400AAB512E0A23803E000B3A6487E387FFF80A2182F7FAE16>I<013F13F890
-38FFC3FE3903E1FF1E3807807C000F140C391F003E00A2003E7FA76C133EA26C6C5A0007
-1378380FE1F0380CFFC0D81C3FC7FC90C8FCA3121E121F380FFFF814FF6C14C04814F039
-1E0007F848130048147C12F848143CA46C147C007C14F86CEB01F06CEB03E03907E01F80
-3901FFFE0038003FF01F2D7E9D23>I<EA07C012FFA2120F1207AC14FE9038C3FF809038
-C703E09038DE01F013F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2222E7EAD27>I<
-EA0780EA0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA07C012FFA2120F1207B3A5EA0FE0EAFF
-FCA20E2E7EAD14>I<130FEB1F80EB3FC0A4EB1F80EB0F0090C7FCA8EB07C013FFA2130F
-1307B3AD1230127838FC0F80A21400485AEA783EEA3FF8EA07E0123C83AD16>I<EA07C0
-12FFA2120F1207B3B3A3EA0FE0EAFFFEA20F2E7EAD14>108 D<2607C07FEB07F03BFFC3
-FFC03FFC903AC783F0783F3C0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C0499038
-7F000749137EA249137CB2486C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>I<3807
-C0FE39FFC3FF809038C703E0390FDE01F0EA07F8496C7EA25BA25BB2486C487E3AFFFE1F
-FFC0A2221E7E9D27>I<EB1FE0EB7FF83801F03E3803C00F3907800780390F0003C04814
-E0003EEB01F0A248EB00F8A300FC14FCA9007C14F8A26CEB01F0A26CEB03E0A2390F8007
-C03907C00F803901F03E0038007FF8EB1FE01E207E9E23>I<3807C0FE39FFC7FF809038
-CF03E0390FDC01F03907F800FC49137E49133E49133FED1F80A3ED0FC0A8151F1680A2ED
-3F00A26D137E6D137C5D9038FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8FCA948
-7EEAFFFEA2222B7E9D27>I<90380FE01890387FF8383801F81C3903E00E783807C00739
-0F8003F8001F1301EA3F00A2007E1300A212FE5AA8127EA36C13017EEB8003380FC00738
-03E00E3801F03C38007FF0EB1FC090C7FCA94A7E91381FFFC0A2222B7E9D25>I<380781
-F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2181E7E9D1C>
-I<3801FE183807FFB8381E01F8EA3C00481378481338A21418A27E7EB41300EA7FF06CB4
-FC6C13C06C13F0000113F838001FFC130138C0007E143EA26C131EA27EA26C133CA26C13
-7838FF01F038E3FFC000C0130017207E9E1C>I<1360A413E0A312011203A21207121FB5
-12F0A23803E000AF1418A714383801F03014703800F860EB3FE0EB0F80152A7FA81B>I<
-D807C013F800FF131FA2000F130100071300B21401A314033803E007EC0EFC3A01F81CFF
-C038007FF890391FE0F800221F7E9D27>I<3AFFFC01FFC0A23A0FE0007E000007147C15
-380003143015706C6C1360A26C6C5BA390387C0180A26D48C7FCA2EB3F07EB1F06A2EB0F
-8CA214DCEB07D8A2EB03F0A36D5AA26D5A221E7F9C25>I<3AFFFC07FF80A23A0FF003FC
-000003EB01F0000114C06D485A000091C7FCEB7C06EB3E0E6D5A14B8EB0FB0EB07E01303
-6D7E497E1307EB067C497EEB1C1F01387FEB700F496C7E6E7ED803C07F00076D7E391FE0
-03FC3AFFF007FFC0A2221D7F9C25>120 D<3AFFFC01FFC0A23A0FE0007E000007147C15
-38000314306D137000011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FCA2EB1F06A2
-148EEB0F8CA2EB07D8A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EAFC06A25B13
-1CEA7838EA7070EA3FE0EA0F80222B7F9C25>I<38078008380FE01C381FF838383FFFF0
-38707FE038E01FC03840078016077AAC23>126 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fg cmbx10 14.4 12
-/Fg 12 117 df<14FC497E497E4913804913C05B5B5BA290B5FC5A4814804814004813FC
-14F0485B4813804848C7FCEAFFF8EA7FE0EA3F80003EC8FC12181A1764D345>19
-D<932601FFFCEC03C0047FD9FFC013070307B600F8130F033F03FE131F92B8EA803F0203
-EFC0FF020FDAF00113F1023F49C7EA3FFB4A01F00207B5FC49B500C0804991C9FC494982
-4901F88249498249498249498290B5488292CAFC4885485B86485B481A7FA24849183FA3
-485B1B1FA25AA24A95C7FCA3B5FCAE7EA280A2F30FC07EA36C7FA21B1F6C6D1980A26C1A
-3F6C7F1C006C6D606C6E17FEA26D6D4C5A6D6D4C5A6D6D16076D6D4C5A6D01FE4C5A6D6D
-4C5A6D02C0EDFF806D6C01F8020390C7FC6E01FFEC1FFE020F02F0EBFFF8020391B65A02
-0017C0033F93C8FC030715FCDB007F14E0040101FCC9FC525478D263>67
-D<BA12C019FEF1FFC01AF81AFE747ED8000701F8C7000F14E0060080071F13FC07077F07
-017F7380747F081F7F8886747F747FA2747FA288861D80A2871DC0A31DE0A4871DF0AF1D
-E063A41DC0A398B51280A31D0062646264505BA2505B505B505B505B4FB5C7FC4F5B070F
-5B077F5B0607B512E0BC128098C8FC1AF81AE04FC9FC19C05C527CD169>I<91383FFFC0
-0107B512FC011FECFF80017F15E090B77E48D9E0077F48D9800013FE486DEB3FFF82486D
-81707F8284A2707F6C5BA26C5BC648C7FC90C8FCA44BB5FC4AB6FC143F49B7FC130F013F
-EBFE0390B512E0000314004813FC4813F0485B485B5C4890C7FCA2B5FC5BA35EA27F6C5D
-5E6E497F6C6D017E13FE6C6D4848EBFFF86C9026FC0FF814FC6C90B5487E0001EDC03F6C
-6CEC800F011F9026FE000313F8010101E090C8FC3E387CB643>97
-D<913803FFF0023FEBFF8091B612E0010315F8010F81499038C01FFE903A7FFE0007FF49
-48491380485B48494913C05C5A485BA2485B7013805A70130048ED01FC91CAFCA3B5FCAD
-7E80A27EA2EF07E06C7F170F6C6D15C06C161F6E15806C6D143F6C6DEC7F006C6D14FE90
-3A7FFF8003FC6D9038F01FF8010F90B55A6D5D01011580D9003F49C7FC020313E033387B
-B63D>99 D<943801FFC00407B5FCA6EE001F1707B3A3913803FFC0023F13FC49B6FC0107
-15C74915F7013FD9E03FB5FC49EB0007D9FFFC130148496D7E484980484980484980A25A
-5C5AA25A91C8FCA3B5FCAD7EA46C7FA27EA26C6D5CA26C6D5C6C5E6C6D49B5FC6C6D4914
-F0D97FFE010FECFFC0903A3FFF807FEF6D90B512CF0107158F6DECFE0FD9007F13F00207
-018049C7FC42547BD24C>I<913803FFE0023F13FE91B612C0010381010F15F84901C07F
-903A7FFE001FFE49486D7E48496D138048496D13C0484915E048814A15F048815C48EE7F
-F8A25A91C8FC18FC173FB5FCA391B7FCA418F891CAFCA57EA3807EA218786C6D15FC1701
-6C7F6CEE03F86C6D14076E15F06C6DEC1FE06C6C6C143F6D6C6CEBFFC06DD9F007130001
-0790B55A010115F86D6C14E0021F1480020001F8C7FC36387CB63F>I<ED0FFF92B512C0
-020714F0021F14F8027F14FC9139FFFC1FFE49EBF03F4901C013FF49495A491300495AA2
-495AA2017FEC3FFE4AEB1FFCEE0FF8EE07F093C7FCADB712F0A626007FFCC8FCB3B3A500
-7FB6FCA630547CD32A>I<137F3801FFC0487F487F487FA2487FA76C5BA26C5B6C5B6C5B
-6C6CC7FC90C8FCABEB1FF8B5FCA612017EB3B3A4B612F0A61C547BD326>105
-D<D93FF8EB1FFEB591B512E0030314F8030F804B8092393FE07FFF92267F001F7F000314
-FCC6D9F9F86D7FECFBE014FF4B6D7F5D92C7FCA35CA35CB3ABB6D8FC07B612E0A643367B
-B54C>110 D<90393FF001FFB5010F13E04B13F84B7F4B7F9238FF1FFFECF1FC00039026
-F3F03F1380C6EBF7E015C0ECFF80A215007013005C705AEE03F84A90C8FCA45CB3A9B612
-FEA631367CB539>114 D<143FA65CA45CA25BA35B5BA25B5B5B90B5FC5A000F91B5FCB8
-FCA5D8003F90C8FCB3A8EE07E0AB6DEC0FC01580161F6D01C01380163F6D9038F07F006D
-EBFFFE6D5C6D6C5B021F13E0020313802B4D7ECB35>116 D E
-%EndDVIPSBitmapFont
+%%BeginProcSet: texps.pro 0 0
+%!
+TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2
+index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll
+exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0
+ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{
+pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get
+div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type
+/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end
+definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup
+sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll
+mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[
+exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if}
+forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def
 end
+
+%%EndProcSet
+%%BeginFont: CMSY6
+%!PS-AdobeFont-1.1: CMSY6 1.0
+%%CreationDate: 1991 Aug 15 07:21:34
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMSY6) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle -14.035 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMSY6 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 13 /circlecopyrt put
+readonly def
+/FontBBox{-4 -948 1329 786}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052F09F9C8ADE9D907C058B87E9B6964
+7D53359E51216774A4EAA1E2B58EC3176BD1184A633B951372B4198D4E8C5EF4
+A213ACB58AA0A658908035BF2ED8531779838A960DFE2B27EA49C37156989C85
+E21B3ABF72E39A89232CD9F4237FC80C9E64E8425AA3BEF7DED60B122A52922A
+221A37D9A807DD01161779DDE7D5FC1B2109839E5B52DFB7605D7BA557CC35D6
+49F6EB651B83771034BA0C39DB8D426A24543EF4529E2D939125B5157482688E
+9045C2242F4AFA4C489D975C029177CD6497EACD181FF151A45F521A4C4043C2
+1F3E76EF5B3291A941583E27DFC68B9211105827590393ABFB8AA4D1623D1761
+6AC0DF1D3154B0277BE821712BE7B33385E7A4105E8F3370F981B8FE9E3CF3E0
+007B8C9F2D934F24D591C330487DDF179CECEC5258C47E4B32538F948AB00673
+F9D549C971B0822056B339600FC1E3A5E51844CC8A75B857F15E7276260ED115
+C5FD550F53CE5583743B50B0F9B7C4F836DEF7499F439A6EBE9BF559D2EE0571
+CE54AEC461D354A32E69F39DD0C017BD6576F1E9500DC0328E8AF6EAB528FD7B
+85132A2A9995EB211FCE849216BF6D663AD649AE92DA953C4D520AB9A22D27B5
+6C34121FD688F9E17FE39B939D8DCED9EDDE5AF6DD7DC2297F2A3E1287E5AF45
+0306EDBA3C843FB8234D0DDEC7595CDE6657E499324DA260BACAE9D6DB126FD9
+AAA7368F7164F6BBBBE11EFFFB65660DA0961A97D51ADAF2136A085FDC16C199
+72BC2CA210B330C03F4252A275FEAADC95CFBC79C3B7285C4C7B5C9665909A56
+4176C37DCB569C8EED1B59C58B5EBD3ADD31010DCFD59411FC2020E238A07B83
+2439DEB653AFF1CF197533724E45EDA9810B6793E27943CF51484A5BC7DC61C5
+E97F71E04BB623E0BC9C
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMR6
+%!PS-AdobeFont-1.1: CMR6 1.0
+%%CreationDate: 1991 Aug 20 16:39:02
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMR6) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle 0 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMR6 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 18 /grave put
+dup 19 /acute put
+dup 24 /cedilla put
+dup 39 /quoteright put
+dup 44 /comma put
+dup 45 /hyphen put
+dup 46 /period put
+dup 48 /zero put
+dup 49 /one put
+dup 50 /two put
+dup 51 /three put
+dup 53 /five put
+dup 54 /six put
+dup 55 /seven put
+dup 57 /nine put
+dup 65 /A put
+dup 66 /B put
+dup 67 /C put
+dup 68 /D put
+dup 69 /E put
+dup 70 /F put
+dup 71 /G put
+dup 73 /I put
+dup 74 /J put
+dup 77 /M put
+dup 78 /N put
+dup 80 /P put
+dup 82 /R put
+dup 83 /S put
+dup 84 /T put
+dup 85 /U put
+dup 86 /V put
+dup 97 /a put
+dup 98 /b put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 102 /f put
+dup 103 /g put
+dup 104 /h put
+dup 105 /i put
+dup 106 /j put
+dup 107 /k put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 113 /q put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 118 /v put
+dup 119 /w put
+dup 120 /x put
+dup 121 /y put
+dup 122 /z put
+readonly def
+/FontBBox{-20 -250 1193 750}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5CF4E9D2405B169CD5365D6ECED5D768D66D6C
+68618B8C482B341F8CA38E9BB9BAFCFAAD9C2F3FD033B62690986ED43D9C9361
+3645B82392D5CAE11A7CB49D7E2E82DCD485CBA17D1AFFF95F4224CF7ECEE45C
+BFB7C8C77C22A01C345078D28D3ECBF804CDC2FE5025FA0D05CCC5EFC0C4F87E
+CBED13DDDF8F34E404F471C6DD2E43331D73E89BBC71E7BF889F6293793FEF5A
+C9DD3792F032E37A364C70914843F7AA314413D022AE3238730B420A7E9D0CF5
+D0E24F501451F9CDECE10AF7E14FF15C4F12F3FCA47DD9CD3C7AEA8D1551017D
+23131C09ED104C052054520268A4FA3C6338BA6CF14C3DE3BAF2EA35296EE3D8
+D6496277E11DFF6076FE64C8A8C3419FA774473D63223FFA41CBAE609C3D976B
+93DFB4079ADC7C4EF07303F93808DDA9F651F61BCCF79555059A44CBAF84A711
+6D98083CEF58230D54AD486C74C4A257FC703ACF918219D0A597A5F680B606E4
+EF94ADF8BF91A5096A806DB64EC96636A98397D22A74932EB7346A9C4B5EE953
+CB3C80AA634BFC28AA938C704BDA8DC4D13551CCFE2B2784BE8BF54502EBA9AF
+D49B79237B9C56310550BC30E9108BB06EAC755D6AA4E688EFE2A0AAB17F20FE
+00CD0BFF1B9CB6BDA0FA3A29A3117388B6686657A150CE6421FD5D420F4F7FB5
+B0DAA1BA19D638676E9CF159AC7325EF17B9F74E082BEF75E07BB563C96C0A3E
+6D4DF600BB73729BC4A5B134928F1370B9F07C587F79388B1D9AC62BFB1566DD
+CCBD1F58ABBF1F53AD21E3BFF25EEEB046F66A924E5F431EBD7228050BE2DF43
+0B9B538DAAD511EED97630CD9A9C05CC49DC251325A93EA842C6D07B44BE620F
+08E66B611F54314B0177E299304F2294F8DEDE9914736944F125A50B5007373E
+588AD80D9983CE7824DA30CEE5DC3114D69D7ACEC0758D8201805B82925EF21B
+85440C6929315A6C6EF7A0CD27AA4D99B257B6A24F3031A6E96251A095375ED8
+45B575654F34C33F0F852229008F345EDC1DF3B33D1A52049DD3B92CA9C132CD
+1CD7C4378567D942D72926A9DDE2808B62DC83F0287194820CEADBD472FC66CA
+F1B9270283676B576557384BF6195EBBCFB7D3E82E8BF06308B4AE88AAD99598
+01BD7AAAE4586DD21BA132B52EF629CE9AB1CD1A7607571F859045D01F916FC9
+332205A8CA697F9E45D813551525DFD3B2058CD190E3B835B23C1192231AE9F9
+1B9DCCE94EF4D7F75AF6AD5963CECCD32D43C2D09193F7B4CE73B3DB8ACB8F7A
+A81AAF067F25E80D411CD0B03E8A4DCD1388F46B8A5A7E6314525799B28BDE2D
+4D772865E8FB6FFF94B87EBC3E6F24617AC6056E723E0796ACF2872733B2631E
+9F2CE949C38C7A1A245B12FACD83AC8377DFABA3CF6E3E1FDEDBAA18756FF6DB
+C3DE478A63A5984892BB296534844EDAD80AE3C505E09DD735780FC47BF88AAB
+6F2C692DCF7B26DD1A0CDC12D4B1E6D9B526D732F668FF02A4FE0019ACEBE631
+DEA8D2A4B42BD0D533311942F61954EA929AFFC2F533131F6E457702DD578AEA
+62C1D9C0CFA19C7615573E28240531CF9A0CFE024F782D8BB90A7E427DB26B9B
+8932E947F5BAE092F36CB1177B1CE552B0E4038F507943797BEC490E140F201D
+4FA40F4B2BDD95AE14F66517C2D5E7E97F3685F7AC2BEAC86C53758807859504
+25176DFE30A4023632772B8C9E29044D5D20EB456371318A048BBA633A30A6E9
+CC019BB796D8D049E288814DE1C6116BE98C7D0DABEDFD01EF19E3792347C7F9
+90E99A74886016D7F70C2E0052781718CBCDBF372E8A0C056B4B006DEB7B0099
+F543AF4467E14DFBF0FC0C5B88F94D5DC0E8A8411D697CC2D9F7E672B4827C74
+E5E9748CBA1E71E9217D08A1937D409CB6523C7838038BF23A3CBF1BB94A679A
+6A846A4B9ACA3E5097D5F55299990F0C3594899CD70ECD14F34C9BB41197A02F
+F9A942CAA23E2470B85F9EEC9CD8F798A164F20A909FB1F6844CA55D2E1BFBD5
+6E7AB9D9CB4154A7E8B798A44F6C229A511AEB7F67910C1AD3D4DD9276B0A260
+004FF84E8E8476BB5103E9AC6214C486483F866DC7CA10701F0E82C037E756FD
+110DAFA6B274B5FD776CBFCA77F819C79EB5CB075374DD2D4DC0A5F05F445658
+7F0CA887E39D6D95EBD16211B404DDF8DB59D4E9CDCB326A4F64E2C5E03AAF38
+FE870BB8198786A4258880E0EA6F7F63CBC50645EE1B56B18BB1C45C23F2F9AC
+4F73A223EA8A5A598E3871E94FCE31ECDDC8A88D8B0961B152E5A397866F830F
+3CF9D980D8AF56A13B14C72C66BB58ED026CA28B42CB822012BF3EC89469407E
+1B7FD909357AAE1B4E00B00C19CCF80E402BCEBCE5415490A6FBC971B142F71C
+D749F1325341538CCA282EB257772B2242D68C5C7974C2C4363BC0D5BC84867D
+47ADD5A9BF6CED9FBCAFF6EC18B2955EC2C193F07813B2259148DFA7F6E2E485
+DBDBEBCA9269E56B9A0666E61FC72EBD841D4DB78DF285281BB76974BEECF5EB
+37DBC31E5D90F534B831B22E387D05D79346B6E4772EA55C1ABB8A9AAE3D2A5C
+7EE7545827A8579F71A32AEDE4E53468325462C203C7E9CB9618321EEF3F518F
+1613A0B5D9F0B3EB70E6E3B10E88D3451D1BD30050618DCC1F29A79C26BC1318
+A09D90ED81634CCD2E9256DC418EDC8A8DEA0AD46C297145C5EF499ED28A9D5F
+3BDC74DD8EA59B76B6AEF17EC33FA2DCDE5421A3E2AEBA5B2AE728B05DF73B45
+DD5E987688AE467431437FAF77341F2B25D9AD451864EA14B54BB90C7E2A98D2
+0903D4CE71721124460AA8BF2F3D902B3315957548328D464892C3F7FF1DF0E3
+EFFF92128D4211289AFE3389F10B72F4EA72DD9E760680A1B035C3007500EBD5
+8FFCCE6B742261CB4BE1DA1756418CE73126521FF8667A9698EF83510CD6AE4B
+8FBAFC10238E8BE5654069992E4C414B86091679F0A5F26D357107DFD581E990
+87E2F6F692B9B38ADC04C83ED9336D3F28F5B366D0435D88A5F328D25C8D3D29
+175AE184A850982BFAC3963E5A42026CDC20D687A98627D10B1FC23D50B719B3
+E1C6A99771DEA39715D2F0C050EE67A4235D26577A050F498A992348392DE9D1
+70489F2136E5E338500F6D883EFDC5F59B72C7889021B6A1EB673F94B33E2119
+1D7CC415218BA4826E366E5FAE7086CB6BA3ADC6B29896F9C9F6ECABD60821AD
+2550F8F0B7E06B2E0CDBA056175066D1F894C60EEF42979440A641EF050790CD
+14DE82ECEDF433876D65DA2E1A3EF1AFD0C5D0C918AD85C28A643CD58BB8DE12
+884FE854F9E5608D5A6C634DFB93E3C6D72425A67747DB966E89A02DF174E679
+919470D3F629B6B99F20AB65973315CDC9643E68424E9946824D3E214030C67F
+1A7E459A0C22D22698FCEB6D52F37C1805C8BAEB312C1FA754384087AA752FDB
+116342685A6B0C66828451A78D12DB21835361264E43B449468A61D60457D3ED
+D124475F7A3F05D3858E050C1811F9598A3B1BBDCEA2D3B93F9A87D5BCA44307
+020A02727FA4A72B10D96FE21E5033B9C76765DE27AF1512D4FDF737B3DB729F
+94169ADB1C0E07B6EC361D7A0B709637C382C3409E01F5AF9110731BA2865FA9
+41273C6CB4058CA6F0C08C04DA937D9C07894EA65ED914D08C76621A975D0B99
+9987B7D356D6254F4EDCC3850DC28850EC79ADEEA1730A95A51008298B187C41
+621A3B18B4FF4B0B90671D326FF20AC79B02B826EE424B1C9B3552BC2A7BCC94
+DC2A3CCD97AFD212AF1046B86494A564B9BF6FC5CBB3855A4FCD10C399C0C2CC
+A859CD24B9FBB8400DE84273A56CF8352CE67A5B39CEBD7246E663A08303E83A
+14241479C0309B0D470D66C4F08C2321312186FEEBD5CB80BF1A623EE006BD6E
+658FDAA4FAAED51A0486FA34E28556EAFF784DF972B92BA42ABEB69FA9917C58
+0E0E1145503859FC0206BB738F57D1AA4E8C101A5493372E39ECACBA3C96E428
+A89BF1DB741284ECC41A49F2FEE2280588F67EFFD97C1F30104E4596324B5C13
+8A52819943C925352470783A00BCE74F2813CEFA94B75D29994ED535978D2A12
+7C89AF6CA16DD8D26962B1E3464E073192B8DDBFA13D445D84A106A5B8FD3C15
+F9FA35B6B5CB58A6F507745FC0CAFBF824219674E9910A4E6C853534933069A3
+A9B43A3839F3E7071536EDF4F00EDAC28A59EFD86802C21B39EA5C31F6534BB2
+9EB210CC9FA2AD177BB1C01C51A711F2848B089851D5873BB72C38688FBD22EA
+7C3771560645DD8216A26A2A00AC05C3ADC58241D932A2E7C4AFB74C4F241FFF
+EA7766CE6B1BFFC093818DCB26E57730406689797F38762896FE03D84453CF1E
+5ED11EF98A5677523A01EE4FADF8E6A87DEB684477D71948710AB5DB30DE1E4D
+76D66C74DAD470955C276A6B6BFF6613594454AFEF5ED712EECCBEC3A3278C96
+54B24FD2F16607D18BE8ED4F0B35675CCE0A5DB08CF3C392C17E891D244251FA
+61563E91BF029AB5DB30787F6BDB56C8E72857B3A3F73C16F8CBC86B05D2EE7C
+E4C2AD1A440C56193C36A31CFF1C5C3EB1B3EAC8D051BC4B3605A0A8689627B1
+1BFBD29BAFF55F2C85EF1E00D167DB8E7D7585BC83297AADFCD91A156E9D2E61
+38967A50749362FDCA4C1186C7C72DFBBD4575A37E51B6A858DC159960E487A0
+F8FAE74E35E287DAC0AD3F149EA24EEE769E9479101429F6093CB1F417DA65D7
+3DA9E13839475D764B98F646C9B48E367CDF21E137069026FAEB3BB697272EAD
+098289D24348074F177731A736506C048CD6EA33FB85145BD95D1EBD7EB52DBB
+C6E6DDE5EF8EA2BA33216135638FFC53551B89D35C15DE97F6AA91D83BA493BB
+DC91FC80F60587359038255BC33111AE0A5E7D577F7A05C63B13128A214C85D6
+F7FD7DA077310E22BB40F43E2288E38BEC27DEAF7FABFAFA03D507AE4B9BF4A4
+81394F81BBEF2B374B4318A465631A7E5692BE1E0FB24A05979D661F94AD3F3D
+95C53C88650CF4BFE316BC48FC15B078A14D2D6F56C5D6661CADD82A0CA5B3B7
+C0038BF7F05E621B6B6E9C7E74283CC4A9F41276A4C8C4B159880F80EE5F412C
+175192167F0BD87D90AC9EDEDC0DE742312939633AA47F233A2293A984E26EAB
+051F77F18BF6D660DD9A8788F78EA563D1B947B6233E3C3D9FD520B905C10B2D
+2A5F7A627C4EC400AFD9B750751FABE5864C4437F0C0026ADEA28AF1476FE62D
+7DB423FEE234BE6FB792178146C9F0BF133316548542746C03B25B2E78C45561
+4565C772DD83BF994339BD39C7E88C57DACD11ACA9FA8D5D31AE9EEEDE15CBEA
+D8C734116E0AA946AB76CC44C3C6AFFBA5BF5B1F7F3589F89EB8E206D09A621A
+E67E68BA1D617519D49E6CFA3699F27C75C3378FB9BDE01F31775583E71A23FF
+1C9BB76954635E46228F2B255C9E5112A0D1730CC1101AA8F2ADE8AFEAD934B0
+DBC063D917CFCC70E9929A50CFEEDC9A4D482F6C57CCC97300B2205FE27E51C3
+B92A11EDB7CE41F09B86B6BFDDD51EE0B30DA0B73E43872F8C14442B2B96F52E
+1F0A717E8148952CFF00497EE8A495E1113E26B33A66B1E50B71C7DA3FC652CC
+1F756BA352FF6DED439924792DA16DA6DE9AE785A57E10A7B25422FE3BF44BA1
+5DEFC6A7B533274B4D93E57E68DA5DE125ECC49C68D2E19872E0EB14DDCDF3BC
+3680D9BC0EC07DF69BF60B48449FE08A4FA39962570475D0E45FA78872A98F21
+19925097835E69DC649A5220599E77A1209BA8B4C54DE1724D0220518BD93A95
+07A1F90CA79F97946FD351866D1C5DE9093C474AF5752F0FF40155A8D9389635
+AD515F7FE0A6E579EA5A00DA70C0964FFE64F1C0279A0E2AAAEDCF56499B48F7
+5B8106360843297280EFA171D232DBE5F33097960BFEA1324B895AE31DBAD69B
+C0C189588476479A9CF2E3C38DF2FC7A00ABD56C02CEA444B48552FCD94F1039
+F5EFAB8EB94ADF4146B992BFAE91AA72DD118E6ACB08DB6C1809ACA82DD1E1B6
+8C2F8C36A3EBACB14F13E0EEA9C2E96C6DB71CFB171CE1A72AD3A6A675F578F2
+A093A80B916FC74119A169C29B4FDBE5007CE11613166F7D65CD0C1C42EA499B
+60B4DDEF12B952BF3D9B6F6BD735618F5043F87E040A21CDE7839F58264BD058
+E609D9C2F480C1BAFB9FF9F4C5CA23F5890B7BA58EBCC02A5FD4A8DE47692B53
+4BCA8A2DE0EB379B5D22F7395299AA54E61EEA4CA54FDD3B9D9C4B727BA2632D
+CED3942387A3B30075BC3641E3FE6C793A1C6511EF79DD3217931C7E06631FA8
+936828278F1E6894FE8600F5F01EB4AE50F01EE69DE340C1B72F57E6C977A91A
+FAD2BBCD5FD0BC12AC5A404750874941CFB9354BAC5718C65AA793A13325F44C
+A09F1CBAA8A8C081EC7495A965A366687AA2B5FCA1A09D09EB9B9B21F5A6F828
+111F023932EC8A55C8C381F44D29C5A13C3AEBB9889A1EB96A90BAE1B83B4CF7
+A12BEDA0A0F22BFFE9F16BC4051C40CE81A88B33C954CB7AC64A7C9DE7B29F36
+4B57DD9D3490927BBBCA649DA16C56E2C00D42ECDBCA91975F11704605ABF9AA
+099CD2767DFB36C16A2784456F9CCDC0D0A940B35C3E1FFBDB47C04F73774086
+63DCCA9AA7555D952211A687114BF2F6CBBFF8F0E791E349FD359A3BECE71E5E
+CB1BC5EACF49A44E8768AED7858982C1693943DE6E3599CDAFAF3932CF1AAE2B
+0E50840D217B0276A3227D7C78FCD7F9CF9963CA2D06FB83E3918AA25F3EFC11
+ADE8A9F508F7F980D05DF5FF6743056C0CA95CB37257E8197A538713826D7EBA
+0391D9DFA4BA33CE5D5FF2FD88F18DA7B6FE01A796DFCF3700E6794F7128791E
+82A9E71E70E3699739D96228AB338D1B4CEDC95627203311956700D216891ED1
+C24A909E323EFF2D289D0F36A8E9F915DE3413784D63604E2B2B8435FEBCCD19
+E66A8C21E4883D2EA16FA2C851A7CB55FB52B6F1E768399754AFA160425F40D4
+C5E7A2F473D68D02B214DD73BBE3AE3AED9999D99B1C4F9E80F1017E56D2FA2C
+9B008CC70B175943E39DA05FF35D6D98944319C1769D05DEAC0A1FAC7FD15361
+6C645638542630C3F51AB474616D1ABB113FE30B0A19C75952E63F6A6C66A777
+0C24C643FA00A89A7B87A516E7964620992E692DCB7CAC3A9C33A3135223B7FA
+E8D2B15C490C7F85939C567BAD5B89B042E165B3027AE73F3EF551717C295107
+DFF783B63C8810347A615830E25DA5DC3AD34173C543F9D0D70650B3D60713D8
+686DD99437F8CF01BDDFCD12DC21A7840A32D80BE8040C1A92476156CAAB28F2
+6898BB63A4E4A1FEA0DE3584ECF4A0E5F17884C1EAF9449E709CF4D740863E91
+86D4DE3CADD661DEF2D3F774A6D5012D8FA517CB55E8EA2A532A06BB66C3600C
+460B0D7ABD9C4364FC05234FC0F2B086C661224BF0FFE94CA13267A79482BBCA
+30F0CECC5A11493BCE4F3A051F5784E29770491BA1970E6AE53F1116271D9E62
+F24B8B0FF1FFA1B7B195B5052690907A1BA7D03C1561DF34918B711F4D223865
+DF1DDF64FD2F662A88B5F37A05F07A88A66DA2A0DFA6FD8850C7FAE9AAB65E51
+69FA8018D40BB0CB3BD5205EA9083E4E871E0FA4FB6EC9DF796CFA4A28B48C7E
+086188265B8F0598B5326A72E968776895343B4C6EBE931C02594B9B857AAA16
+0F5FE0B660F47B32E75EB1B6EE7764831AF3E424D69563D6264E7F8796A513F5
+DB640C8F138D523C3AA9A9DFC3FBB971004B556D76FE41D3BCF644EE472BCBFE
+33D3B74A906E8307EEB6EF88899EC614E69C69032EDF90BBA8DB56F6CBCDD52E
+6D518B34E4A8B65527C589C5B3CDB7D4028EFEC7DC19A97B5D096A52408FAE4E
+04FE33C215F20AF30A01CB47100FFE020ADD1F4C751105811632B5AE02B9C6C9
+C54303AA9E610D854454E7D1699F51DDC5C347D74900EBFC2F4D39A2AC4545AD
+1BB8973D14F210327845F46EFBB45F900657F075F4F63FD072C7D8D0C11FE939
+4D7CEE776A6E8170B9CD20083FE78AA6154C10299967244F7F0F9ACE4758323B
+7941ABBE3ADF933515628603A7E3E0C8A26D62603E2622D95F4CA67EBAC96C28
+F56F4C895CC9C77C51678B537C620AC33A19C05753A5A378AE65F727EC486E57
+5EACB5A6DFED74F254A997A807AD138CD967133769C3087F78E1BFD00F6522A0
+8F9D0CFBA244633D94A36B0F4973345D75F92671D30CE33E48055B7E2DB3C5DB
+297B1B7AB6FB99EF948E3C78CB5FE43B2355BC181FC8FE50B7F9CC8076203497
+261907E87CB5C9B46D36B6A319F06294556D42CFC04CF446B9B1E3361CB8FF80
+C60D46F478586A2CB9BA8D8C7D7FF4FDEDD2FCFF429CAA3E82EE481BB11BE8D0
+75A577B008FA11777B7122F994A9094907C991D22519947658A5CA5522F2E439
+F692B2FF173021CC69583F940033FBDE1441E7E410FF77281FF662A96FA63335
+2FDB1642F5337575BB71300D99974C5E072794330FB597C45B5FD2B7A50D1092
+ADFFD7F4D8BEB6D0094173A74D8716AEC82E6BD3F54D1EE81853CA4CE449F70F
+EAF892F11B2B10078653E3E976AC5023CD9E8720CE64DC0B27B178CA93A87D36
+922CE12E7C0015137F802CB9DE57B56E2EBA8F815D33AA59FFC0908EE6CA39AB
+A198650075BA9C6D4071D4FD79357FDC5241F57A134FA3A91116E31F9170FFF0
+4474241517507B5B4AC37F60EFF14052AA126018A04FE5ACE5E0206EC88C2682
+9C5956F8640EF2A02F3934D0817C871DB8BB264B7AD133E18CA746E4AFA86603
+B1D0E26D7C01291A399C8CC5EDB836CAEEF5725A8B609179BFD4A886142ED4FF
+D23E51ACC050AE1A1832CAD1FAEC9610A272A79BB061C65351AA7470CA158888
+808C2CAD232184A8CE7275D0F914EE68A719BF4334970C5804331F3BF0F54E6F
+48CD90E445B2506E105F2332E0CCAFA5A6E24451CC86B5646B8BD899BBEAA77F
+DD0BDD3A796F2E348E9D8BFA9CA64C25F22C3F2FEA901CEAEC7CBCFF2C05A4A4
+D592F254E4404D8296A157A0D09C92FE2D9D172522F6899AFFB4B8DD2F0BE8CC
+CB6D1CE4DD8943CE1B67C609CB760B9D018FEEBEF38F786783A7772A74A0AA3F
+187D6F59513108589A5F65F52556F8C82A25ADFB4621940D74D3734E0B584480
+18FF5EF6C37936D65848F46155C57D5E91125E1755BFF945FFE3D6DBB8C9C7E7
+03EBE3A2A20CE540B22B95A8AE42F5894E3E87C608BE88AE694239F3889B54BC
+78A8A95088F4F2954305FAD3F184D479692BE150C7D668AAABB1DCE5DF4ED431
+D326133CEC3B40374204939000EF2E953D105F3EEF4DD5224C11D4EC886070AB
+CC22764AB2CFB27D7B8A2CEAB9EDBEC665B1C280B2E312D4159478FE2F7EA864
+653E35B06760348EE14141610DCB40C50B1F264475B9D0E872E1EB9B02302333
+B1C46AEDB1DC916578247FC0D01524009CBDCA1BDA4CF1A3BBDE122A2433566A
+8D675D015014D243708F282C9B5DE77A0B8B3C95616B5B514A3753DA818295AF
+7AC048312BC6C4EC63F7DDA88B3A6D0921435F6DF3C24F422C300F4E69A224E1
+F30275A8D3288A3E60D620CB64FB7B3A61A01017567240E804FDFE093FE2D99F
+B95A7B91E5E6A789816862106C5AF37EC7C2F32C9CA3A2326C71F96165C5757B
+70034273B7AA33A959340FAD21898D6951A326B30454D6F651D9CEA3AFC74D2F
+D4BC67B9CDEEE61326125D4FA4A1A0F409A634D0047ADE6AB4F39C1EF3A7FEC8
+15F1EFCFF7DCF1D8AEB833F7F7DB3C4AE8EB3B2E4A52133DD8073AFAAAB19480
+D77EB2C65B16FE9D1422D36F254EA7743A09C1C5ADB1D25773520954FCFB293B
+24CEAB37A6E5C8E5665E09C9DFE1F38C519C49CF65CAA8A97E9A1C7305236799
+6641EEE3303FE28678C16C9FAE9117C4AA29F0CEDA89A9C96D112653E0DF43B8
+E5970068D0EB2DA40BEA84A67CCC568090759C8E58754959AD1813F1EFAC456E
+138FBB10907EDC7390A0ACE7DBC720E59EF5FBA41BF0A796D2BABD297C2A3349
+5F81EF1753925B85C5364F64DFF3E7F445846C210EAB32015F9813936DA4C3F1
+6504DB1022392AE3C91723CF0E14349E90D9A8D0EE85AC2F13E38C83B3307286
+66671C80E869F88538D1BD024734D11D05128366C71EA45572AA9A38870BA66E
+39A9FE1E0AFE9A64C5AB84F6D9739843949B23EC8C322F0F36DC8ABF39D3A91D
+9F8775180B16185BB23C1622C8ED6F3FD369C4C98FDE12EC9FA2A595E411FE4A
+F673680B2D3DCAF39DA49F08E72D73248DBE9E7263F18FA96D4848965876BD7B
+45555FF0DE9C495A698695429FBBE060E928E9EC051807E4A079FD16033F8622
+D46FB1870D1C05CC5775D67EAEA1AD6EB9375835A255FE69500C0C638F3051A8
+82662402AB9032575B4E4304ACDC286CF07511DBE3387AB41D45777158E2159C
+F160FA968C48145E35F520464D444036B9129968392BFDAD86784885BC7BB0EF
+885BC94758B2316F4BE7F7FFDDA910EBC2C6D184BC4073DE43FF69ACBE5E06F8
+79D5B80561B76AC8C614C65D4D95CBEE246B3FC5EC73D71D8C06D1EBFC83EED4
+4276F41FCA8C9558DF499EA41CF3D605D70BC6EBD366D1B42FE7947067EEDE6B
+93093E81E288C9DC6C67825378EE6993CE61CF1DF9695D3D23F89A76FC8E78C6
+AD481A7AB09F5DC59F7FD0685EA60B47A04384F536E05FB02388F6F94BAF656B
+B6EECB5EBA3FC10D50FFBDDC04E41ED4749FFB7CCAA6EEDDAD5720AE43D005B1
+B517AE20886CEF2B3CFA1A0AB2F42E6CA21B98FE9D971C2BCD8531A232A3C618
+AE92E3FEDEEE9CA214E4BD2AC55E3D09EFF2F83D709F4205D77BDD60A6137DF8
+AF15DA5BDB4E179801E398A9487E265F910C1400A9EDD96A79E87F100F41AEE4
+5501DD30F1DABBE8129E03C49F34509E039BF9FF33027A7DE0151F0C6D1D6763
+BA3253AFB8C6EB952DD29971DA58DFECED4952D66139FE2CD9EE6AACAD552C8C
+FE9222BE9924BAEAEE3A4697AF0CA6750F0A3E78EB9D3C30D0C7B28AFA8560D6
+FDD44499B606474AE0FFA2321C9A811886B560D8076363BFA89E7E4953FE49B0
+E310E989E5B2CD312E6677B43033319E2C672559FDB3BDAA87213282BF7D002A
+3253C607122E33229A895E37A57D0C5EABFD56F67D97B6491CDE12F8192674CE
+294ED9D67C1453598DD9EA9A39A8B4D59EB31446336A89C99E00364866987BA8
+E020434BA059FB185511A24F568CF9EA2FD892FBB97B7E717B90D6D473865731
+516880BD58AF581575B84DB2E53141C1ADE845DB4D5198927877EEF6343F6982
+A644AEDBFB54AC043A6C7824C5A0B95E5DA08297E1220535AC94290BBADB9E68
+D6419787135784ED0442627AD5DBDDE15CB4DD39A6DFA879A6394BB2F1E48D98
+8257B7877AF61CD99471799B798D80A32F1E716181F57BAB600D5E4208172049
+F62CF7548192828ECCAA3005105341D85BD2C5E125403B9A445E6F9A34A12CA4
+566FC725245A914556C4E21AE0F0DD637FFCCADD3424D7F60AE417D0F5C08E5C
+BF539432E111FC4B41F0BDF7936A40C5747DF6309BE843BDC19FF23C920606D3
+0EB2660B4783212FAE51A2951A172549A267E606D4F4316ACA08BD7B4AE22EF8
+51384F6A6DC006049AEACE4700CCD6D3D2799684A4D9744346F9930DA3731806
+7092B1BA0EFE643D6C12C32323E85BEBA3BADAE1BCCC35D7E1970C0BF0C3F43D
+4D1857C4DC06FA17C1A2688E0D0D2CD065D368B528F5E8C25B10C3E66FA50AC3
+E25138B4A7312E076CC158E71AF675A0BCC84A7D29AD10FB2F4F1D64E9FF4B60
+1A8E51D097CA8F7ADE80CCDD559413812C76C8F78CF3DA09BEAB26745EC2B66B
+725FD65B4C57740EB32A07222D4C09D4EF516E05541064AB13E7F1DD7E8B8FDE
+4F8A68D888BF273B1913A5C4828454B02B35FC28079C1D004511990053E894D9
+C73609795A0C8EB9C5EC23CAD88BB51F336E5FB3A660922876CC5A65C769850F
+B32FEDF7CEC076451AEE18731EF3E20418A257EB7E5284A0CF60010CF4202140
+EE7570AF23EA836FE0F181D92BEB73788C5641F6ABA737B44B880A6BE7642DFC
+BBE6A01FBABEB6E6193C54FB789EB08154889C157E423C88CEC386FFFE6238C3
+9605F1CFC9414E90AA02553CC202C006B15923BFBBD057483BC8151397163192
+6764C00C52CB18BE39CC4250D4F27095F80A669B50618EDD4ADCF1BB717A2927
+E4F79DFAA8612BB8366C405E98F8880122D3F40B5972A10918DE869B1E62F60E
+DC5C98649127FDDE91D2DE4C79796171AAFB9557AB0B9248737D63A0D16E4D6E
+E1FCF08786A454BD5934D35030A9C07D526899DB2CAE0EECAD0B6F551337370F
+C19FD193F596F9ABDA76296A6BAE23C05F70AF4C08452C918217CCD7526850C7
+B9A343AF14F576EDD9503354F263A7F61A52F4B733F8A90ABD958B3EA1C5B19C
+6F6FC46EE0179E38CDB51303C66944EA4CCEBFE2664F430033E43C53B5E29471
+DC4E1525896EA7CC48760CED4E27DF51A4363FE23623D369579D3269ED830C63
+A7C9B6B75B8B28BE16527B2639251EE97B65952C43F7A86E0E5DC24137DE6E28
+38C9CFE78FCE3DD20660CC31DB0100EF7E1AD06BD4EB50D3E70FB57B39DD737E
+D281BA957FDD01758B80AD83A7EFC2796EB5DC795F923E85D50647AE61FB9C10
+74D74E4921B08CDEF6185A2901DE7A401808B820B84E66BD8B21C3775B272FDB
+4F6620BC74451F7E619FF7BB48835E2F426B76E446B4279DFFFCE66A29561B55
+1B4B4ECA6074BD019737D80B8D6735998F60DEAF045EC2353E5FB9EB2887C42F
+D73B7B5F9532D0098B1148B85DA089F2939FF02C9E97AA25217D7ECC2869148D
+8A4C43D6EC227766D21CF84F1C5C23EAF57017751A2C3713FC49F64F54E4FA90
+404EF49ABE7457480440F98048D6A8D339D0E84D2BD95F1B0FE3902BE12B78ED
+E7D22706BB67C280170B7BAD52E4E2E671EFE8110DDB0135460E6239BA38046E
+8CCD8CEFE40CA95F8EF3E05164A8B7C0677FA2D40F609F3030EA28ECFB3C9B3C
+8D4ABB320849FA87A4F3C3FFAD063019BAA6EBF37642B2DFBC08A5F995636E20
+E166B409D0E728F316FA79A8C1A1A90102E57FE83DC4DE3DEAFE3BB244629EC0
+347DBA5D11DB99E72BFF743A8A5E81347A9F77C020BC9452723915398F72022F
+B92DFE6B72F8A0B4913E05C0CB80E952AE7940534E3E52F4EC1DCFAF6B80616F
+1D22448D8001392A6A6C9B107AE99EF29E8024878F845811DB2A95F55BFA70A5
+A3E92F47986F02958AAE10141956C75F5B3BDFEA31623CBFD937CFE222EA16ED
+2F47D5861B1888C6B5FF68D590A2A7F9C86BF13727CDB0A59B9D8BB778114793
+165646DDF760C5A1860D06CA493D52C52ABCE6EB3D1B56F0CE1B92BC30B9DF48
+78FF9791C41CDF4601B06EACFE80682B88E8F26BDF5E65C29F8C158DFB79AC9F
+A23EBDC8B1A10B60C2C6BF4133E25032B07B559E91A121C63FD0139F2A1382D7
+D723B727E00CC36762EB9A6616D83C76BB3141ED19F69F0DF9D1D222E7A97039
+F9F5282F6FAC08C7CA5F243E5621F8B3B7124F1829A81A43294ACDFA8171B413
+147D910EBCD820DA2486A7B38596476FA8106B68C69FA2C2B98DBD577D308602
+D9161CA4AF3239831B8253839CDDC8E9E1C2EFDCEED2A96C868BA097706BA465
+38B2332BD60ED8D8889E570DB488BFF23EB1A54E34587CD276AEF66E89B1888A
+85F0D1ED88A6E21EF0ED805F629108E4BD0AD51451DA19D4049071F875409023
+9B826C6F66BC40544B2A559936F8C3E2728E70A4CF42DD2D41
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMTT8
+%!PS-AdobeFont-1.1: CMTT8 1.0
+%%CreationDate: 1991 Aug 20 16:46:05
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMTT8) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle 0 def
+/isFixedPitch true def
+end readonly def
+/FontName /CMTT8 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 33 /exclam put
+dup 35 /numbersign put
+dup 36 /dollar put
+dup 37 /percent put
+dup 38 /ampersand put
+dup 40 /parenleft put
+dup 42 /asterisk put
+dup 43 /plus put
+dup 45 /hyphen put
+dup 46 /period put
+dup 47 /slash put
+dup 50 /two put
+dup 51 /three put
+dup 60 /less put
+dup 61 /equal put
+dup 62 /greater put
+dup 63 /question put
+dup 64 /at put
+dup 65 /A put
+dup 66 /B put
+dup 67 /C put
+dup 71 /G put
+dup 72 /H put
+dup 73 /I put
+dup 76 /L put
+dup 77 /M put
+dup 79 /O put
+dup 80 /P put
+dup 81 /Q put
+dup 82 /R put
+dup 83 /S put
+dup 85 /U put
+dup 88 /X put
+dup 89 /Y put
+dup 90 /Z put
+dup 94 /asciicircum put
+dup 95 /underscore put
+dup 97 /a put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 102 /f put
+dup 103 /g put
+dup 104 /h put
+dup 105 /i put
+dup 106 /j put
+dup 107 /k put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 113 /q put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 118 /v put
+dup 119 /w put
+dup 120 /x put
+dup 123 /braceleft put
+dup 125 /braceright put
+dup 126 /asciitilde put
+readonly def
+/FontBBox{-5 -232 545 699}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5F0187316F83DDE3E2D27FCDF6C5CE4F95B6EE
+3317BD91B7921F3039DD35FEA387D5CFB6C6E9DC84C178F3432994FC7FAC6E5A
+ED41A1E2EBA350178FBFEB45944511731BA827167DDAC238FC69A5486B995477
+C469E2E27493B0B711DF8E267D3D5613B450011921685147114106C9472580BD
+F531022F6DF5432B2A4EBC51A8032C7F9689B6FA942D849B29709631613DA68D
+4DF7B6F059A19304F40A3C3580CE3B51D79D42984194D4F178801720892FB6E7
+61FF43C63F9256B5E9F4227B1378222BAAD4D52C77462DF01892220E11129C16
+6C9E45BB9F01ED7C1AD5D8B4D72BE0E12969AFEA90FEF170603CDB91CB243173
+B19A56084D10293B80A35275F41BF78A054DDC98F4A1FFF592463D944960FB31
+6BE5F03960F9B1F213CBCC7FD448657FE388F10104D42B0715FC9571CC60CF23
+C72560CBB8835A0CA208FE06676B3B48B093CB7FB2C0C53AF17EC5B372A9771B
+BFD52FFB7062B4FE0106A01A2A1A1DD4EF5C8C7623EC9324A2CB3B402FCC1FCE
+52BFC8662F8A39D5F1B41C97E7CE34E16AC28A1E94007AEA7D4C519399F1B7A9
+48FA7DDB671067244F09C29F95DD60668223F45BBDA8B1C452E930A9F3F341C5
+351D59EA87462FFB30277D3B24E2104D4AAB873BB2B16DA5B23BEE25BE2C8128
+C4CF2F4F438A4E520CD864F3EAFB5363753B82978F6FD664A14E5D6F3A929348
+5839EA752FD635619C4FABF1E1454510BD9D6B538A343BE748AE05B47F917367
+1BA5EDB15F1BDBE806E51B294257D7087334165419A6520462D794D670A1D6E1
+3BB03BF689391D056D55AD660D15A386E6D222C9572BDC4DC8A46EEC75124BB5
+F0E8978FD6031A90E4768CCBF62A5ED8C8087FD66D2033011947634878BDC0AB
+6501DA7E6D96E227068E993DBB0072F037CA41101E19F8FDDB46DD34CB3B0749
+5410293E3008FA73A6197B2E3BDC593A7FBE007CAFAB124C808AE2859E1E27B3
+02DECB8781E533F023F0A752B8EC1310E28908EF443CF44DA789A615DB76B1BF
+463F16077F7E05208BB95299132F8137640A8301B9E8057C97B07644B1170F35
+1206A18C75C2EF9B8EB3A23AEA8AE38066C32878DDE27D424E53B5254B3708D2
+C3750210C4A1EEEAE38350EA0F980D0297066910FA2EE797995D3A886D5708F3
+ADD7DB6427B1FB9E6002CE7FCA26808F50CA01564DCD7EC1732CB99D9EAE32AE
+DDD50DD878A849484DC3AE168AACC456E011BFC668524A88A37CF10225DD780B
+CAE018038E62585FDB13CAE6CE4FB067021B41F37A16F15F5C9C87DE63E218D5
+4B1EEEC40A8A73323DB866B30CE8415B995555CBA8EEF3D631D40360406E71D4
+19E5262DF1656DDBC683DB5AA5973062D84A784E75187C2C565089294A3963AD
+AF257AD1DADCAD1B6D3587B2426613120A1DF4A5156FAA65C9B2089389CB5E1F
+2355D1D95B55C4D4663B9318DE9CEF31ABD540F396980C1BF7EB635C0E7541B0
+AEFA274C376B7732F7A196B931A2D5EC585A567A95D6051D04A0E511987E3550
+F201450F2CEA6F0766FB214315D7320E50458EA84542979F17B1E46513FD7EF2
+6BDE25058BEFE40C1F97BF975439F149E5D00F2C0E282BAC28278AD8AD46A0E5
+829FC3B8D27792BB1856FCC681DFDD0EBF4AC6C49967855DE59799DA44A86EF9
+5EE262C07D91009AC542205D095B1F99758C7A386C977B0E49C2FCBE68739A83
+327A11940EDEDCD1233232DA90F39EF6B590756A74B5422A0BBD9CA583D7F249
+98B74752EB51CC70719B7B115BDE8AD532395FA730E6CE753D56690F6D0F0B1D
+C3013990334225FEE17A4D8F0EABA11E042F7827FE1A27A130B614D60B476123
+73F198B917958382B2D73449B892F4D192D1CDD1FE8C70B2A46B358415225A04
+ED1A9184983B76001A63F46CD56CCE48D5A5F33183F35949082B2765415BC0B7
+E7A34384D3985E064D29310DF3D085FFFEA83E437701B56F4103E48675C1291A
+511285A85EAFA3A69CFE5D0F0213430AFD12049746DCEB3A2FF6ADA7D917F158
+189FEEB95577B5D8A7B85A5A31375A7FE1067FFFA70F4594E3EE425BCA2E2BC4
+95B23DAE1CD424917AF01F5640CB6B758268CDE667DD4FCDF847D817CA9098BC
+B6E67FDD3C12A0392F63CA2A9272A78ED483F9F3BA9A32E30BB3F50E90509FB1
+2CE28975B20F3B18D7FE2CED4562088DECE21843AFE38603C511774433C52958
+0CC685B4C5497CE6C4A40169BFF636DD22ED7A3618748DEE08CF6A2E28221D09
+7F61092DC9911B101B335979559F1C5F3315B954A533862648A882EFE054DFAD
+1520C9359D64751F894C036ACCA779092AE50AA630D906D57A0E72009F47DDEF
+6B27F4575F09DDAABCFA09FA614D23B4FED547DE8C590F0780A8B3F2BFB7A8D9
+F60773E1C75C861B0E66C2A62CE09D7E0F40DFA0E09A28CF5989FF59B686A9AB
+380ED44F61E286C3427E7E5EB1E3AE824785F027ADC45E741687B9F06690DFD9
+2ED58796B544D797EA260DE35455C3D85C5B2EF43C07E8E8F1553380A404F7A3
+8D2D11C7690F7195EBE649E1A6AA2A89313FA54CDF906FB920278852D4CCC566
+1E4C5B250D880321DB061F5AE069DCD28C7AF449CA265048A70CF3BD4C9B4F32
+9DC83E5D2E95C281396460DD529BB40C87EDCE512A443777168DD90583490C7C
+CEA97E6DDA0A3A6DC65AE1BDC977EC425F0C054F6503F5F704426CED87A69F8F
+E03BD90788B19BF05122A6E43AB1EC16209062A16790D1D560239CCD3B08BC9A
+23C2CBEEDF42DED6EDC61C3F672AAE0C18BE563951C948266953B7EA5208B5C3
+56287DEDE6DD29658A98583FA150DB7C60C3C050B3E77DD7CE63D0EAC970AC3C
+60C1055ACCF3125B211F63EF9EA3D1F499E691D3C72E5B58154329ABE46DBD02
+0EE4D2A7520F471661D118868CFA2C636C94A65EA28FBF3810FB211F9C4BCBB8
+B768F7929B7B76BCD39D33BACCD27091876C62EE2FDB416459F6E773A5A9D463
+4A7A4D98F595E67F738E136EE94697E9DEEBB36E72818CC034B53C19C3D4B2C9
+DA5A126A32C728987D04DA86FFE88A2DB7224E5C15ACE12F22CCE260F3CF2438
+5D4DA6D4417E9889A5074131E7ED5EA22DB32265E318BB6A82C8A9D13A74B698
+649F49142487F511181980C73F50E0793A206FB82CBA2AB150D542B9C23A4725
+CBC16FE5FC4B10233044E126EFB2F4A6BB66FC0AD2F091F3B83B3634BF1760F4
+E1CD587F8A717449D031A4A63FC52054E3503294A3516E914A223D30676DDB29
+9E9ECDD61CC4F04D0DFC05FEBB09EBD5B09991B0729E6A3BA4D5265AF30366BD
+E997A7A200367EFA2BEA748A8E04337EFF2F5488A2AF5E9D6F43EA80638F9A03
+09A2D304E2EE9CD9DC06D22332CE2F59783537D2C7FB40482A14E95E914209C8
+632049C99288266CA8B7E773F8A9D8E48E887E9E85B55B6D3D561882D2E8E43A
+01D03FF7750707CCC3C144E72E9074616F213C335CDF67A036E159F0D584AF46
+91FAC76CA4E85C9B78F941943F5C7323640FCA279F9323D104EF2C12A49743F2
+06B6B033B72819743158CA8A58118FF2D526629E1E150D314BA188F74458B4A5
+D90B8073954AFCC4FF41D41CEBF0AEE88B336B6DF70F9E89F4ABA7B302121F6D
+9766F1C05813EDDD99347C05D1F8CC8412520971EEB622A904260758B60635E8
+CACE856DD8E6725AC2FED7C3917B25954A684E1663C4E04FAB20D76DCE40DF6D
+D8507A20B08424A09A11F16273FAA3E71DCD916E1080320E5B789A84CDD89192
+7C10EE0649063AF47EBD90B94B861DB814C4BEC3CCB5705C64BCF3F83CD112CC
+946664EBDF1C4715ACF9905A58BE3DB3E11DB62135A9066A8BB946C2ECD5AA5F
+C39ACE2DD1956EA3F34F08F4AFE400BA0495D5DFF65C22C567897BCD44FC5114
+AE412CB13C73AFBEB9C5B70C9CFD73CB0BA868BFA1F57F9CC3CF97894397C479
+CC5254D95B432082D99853E23A0A410C6D63CC1B1978C1C099119C8D7D75FF67
+D3F34267A6D3778137601E9213D2C89BD9C407E2790DA06524497C647676BAD8
+FA32017CC9CF8A5CEB9F6A48F7434907564EDA3253B0B9F2078909E799BB5405
+B1C5A5B7689A700F7F47F206955905F595360E5D0DE91EF67174E0A526CE88A0
+54456829B844B3B84BBF796394B7EAEA0FCA50A2D0C033DC9C83CF7309A2B704
+8B00AE855DD2E52808316CF7BA9A5A2AA3DD52B653DF351F930AF19AB934B110
+D5D77F98848623F60E887CFA5B2A9E680E19236DCC37F99730C925213761B28E
+0A91C64A264785AB662889F658D0F7532DCEAF433983F931B0DC80F361DB3EF8
+5F8FF33FF46707841F793C2C3C6FF8F536F46FB3F42DE22E06E3DEA9541CEFE2
+5F57B0CB09216EB395D24BB826F8F1F0022F5EAA69472980FC7DF810EFE21D0C
+7EB290DA21A756D47F57DD921319B753B0859C203D5CA16E32FA91408245ABB6
+D5607EE50F3C9562B88A1037689CCDAEE0B9D6D40DF31D4703F06D2BC534793C
+7E1B77A735C9A2B66DC218C61852F5EDDF4D062E3804A7F28180551AC7F971D6
+EC2E5AA95EFFC329D74AE31698B78A12EC7248382ECDC0D9BF8A42A096668C88
+2A122CCD5B2C65160DB0ACC8468B072AB62428AF823380A8EEF92177DE627A89
+DA3A03EF836A48A810303EE4EB92E6736321B3B0A3BA9F8165621C110C08F365
+F8E76C1EBE0574600BD7BE1436CEAB10315FA769346776640A6A616731F23E3F
+3562C60FC75250328FCEF70CD2F9E3CF844703138DADFBB484C605238A7DEE1F
+2362A11144DFB5E5B7361B5460708C6361927A2C8687DE73DFCFE9373F7364EF
+8241A2A37789AFD6F47FA009C1A3A963A747FBFC8E1A1D592B8C8A405513A626
+2D5A3970051276506A46265F86A28D6E29D41BB36BA611AFBB8A713D19543F87
+B2BA98F715F9670C8ADCD0B59EC7CA1C45AC4436900AAC9406570E56A1DB48EB
+188166913D42068227E6853437E7971BABBD26DBBF07298035C13597E48D639B
+BB66C9CF42859A0AA59E395F5689B2CA25A990C43ABC26C3E9B176C011399447
+BC5C8707593B18088E9BF8C58FFE9204ACFB19B9CFEDC4B0CBA60D7DC25A6EFB
+346CDB2E20B20C907E5610E3C61B403996E5FBE45CBDCE19721043D72E97471A
+CEDA59D92692713F1F7AF0FB1B9140A995545AAA0FEFBAABCC40684BE0DCBF83
+68FDCB70D9D2546A428009C1F9CEF99EF720D12C5299A5856A33EDAAEE1266E6
+66892932D9C30D5DAD7D90E0F0617C412EFC68494A700741BEB8FD37F7EFBBF5
+1A901C4903930C9757BAE9938EB964A39C3C4833632CBEBE93C5C07FDC2A4E78
+27E6852F3DB34302BCAAD6626B10BAD1790F5735AAF3C236FAE3E1E8FFDCBEA5
+FAE064B08DF7B68F033CE4D3521FD41437AFA4F18F603791D8434E630E6598D1
+D25A011EA99A2D4C4E47A0D0ED4FD01E12B810D376775856608E34D8C9DF3724
+48D919BCDB09DA820FBDBD163A9FF76CDD61DB100ECFB7BC5DD08C5018D9F9C4
+035484764850BDBE3E688EF0B58EA6D93D2EDB5EA70CEE815F9B119E12CB60FD
+01CFAEBAD1256FCDAC96D767FF075C85F1DC6C5252350062498C62607AA63F5B
+BA376EEA8F422CA1C72D2CA837FC2829AD8BDD914C7233572C1E512B45F4FB54
+61036B5B8014780E2560AEBE548EBF9EF5D383A3BCC809558E9F337F462378F2
+5425ED071B51CFFD95B2952ACE7FBFDCF4686FE856195DBD8A8300FC75F66C63
+DCFDA5BE7F835C844FAA446D014782F298342E9B2691E2199C835ED83AD79B2B
+516D9439E14208869AFABE62AFD868BDC493D3B856FD2E696FDC08FD0DA551A3
+D9E44F69A559609F4478F0C1CD443D7628A712EC34E5536441E7F529ACDE8168
+652B8CF1FFBEEFD5E91CD2DEE43797C525E01A74A31B82AAC5354037272B1AF4
+15FDFB761B2D02ED81E6F7DE82EB6F74B0F73A26612461630BE9143A24769625
+86CC5C0BE34E568F30249EA4980E8E457D3B7454B44AD72EC70222E7FB87C1CA
+BADEBE17086CA0C898E3F6EE059C1C63C67F5B4967F11AFF115CD7DC27E541E2
+E75FB60A76E0572AB1B16E4AAB9AFC4D5935EC936862F0A08222423480014F0E
+14AD4669F306AAB1B841C374B5A910C4752CA79AB1B3F3E1017851AD2A9CEDC0
+150672A866C941A105FA02375AD1CE54F9CED00C7792513EA2681DFB6397924F
+9310550C0C6BF77ABD3979FC524B73D6E6A14D3AD3FF187B61BD33B4B5347288
+69FEC56DC2D8C1F8AFF28D1DFA9907CA6CCBBE34D12EE9B14E1550F8041564A5
+C9E0C292290028C162CFDBF0473CA11622C3FEBF42D94DB41A181EE51C09AD6D
+B7838DA1D2F6D98D99E4A8E3EBD89C6AD70DC364C25CCEC718FA499E7EEC73E0
+434369A669EE979621F74FECE955E3501A52AB14E5FCC3C3A8EC140308311BF4
+D8AF8AAAA59CD7F52A7EAD94AD8433635A1423DDA2187CE0EC35CFEC0FFC74C4
+D095AC9A7DBF182616078E954B3AD580CE8AF901CF4D5EA3217B1E734F37DDD5
+67E32CA4A59E9DED87439007F576D64CBBE99D7ABF2D12A9D63F7339E88D3A79
+90A7BC9A722CA7A5418451ADC14F6480363C00AEE363A556DBF48CCDAE30F9EF
+8933620080B9B24F2FDDC1EB267544F65679F0EEC21693141A947B4B981E29E4
+8C1FCF6F71EDC7C5D86B5CA21103F335C1D03F99EB5A9D7FC348B8A65092E72D
+F49BBB7853213A06C15B01D3FF5BE94041B709737865C4C34ED4124801CC3D5C
+4E719494AE482CF2786B3DA85B4BB747811C865535BC76ED597B71B0D2A896F9
+E2EDEE96974352A3735F892CAF48FBD944A1E39C319C4E69C8CCB0147F643CFC
+6F8C72E312E65C20B8DD5F623F0A0AB667D65C4EE5EBECA2B2E6827ACE502C85
+78421A1731FC792BE5BDFE9B90C631838E299A72A19EA564487DE3B28218AE11
+F30FF509AB7F223387E7AF6B3E1162F1A377D8A64D0FD439844DE8264621FA8D
+1FE268EAB4FAD31C60F4EAC668A1E44E81D86177721E8968EE05A677ED7E8507
+61E34154EA7A27CD27696D3B34D932CA2DE65687DC7A2969BD8A46E30471533F
+E3129C347095832C69FB6FF380CEF6608821A57381CC551B771E33D969815EC6
+A7DF385DD3B50F26E025797BD7808F6ED254AE3A5AB0664AE1E6DF308A1F7549
+2AABA4EF4A228E4A932E87296999ED42080AE1C260A356407DAC03A3D7F09D8C
+6EB3175950EBB743E02119A7ED867012680F8065CAF41E0864E1E7591D635478
+FF4AE2B7B2D25F45568AEEB57B0CC0C86C49EC91F8C84515CDC449E57BBDBEA5
+07CACD01599A368E7D55DF58A8260A89288EFDF87E15065CE6161EFF495A1FA2
+D37A9265AAA63464A101C98E8F38E866C61E57ED511DA8D5A0B95E366967FBDC
+8DAEE09396B6C542C024F543013D619AF7471F9E25BB0003A0B7F01E10813CF8
+8FF216FF04CFF8BB1047D7DA09EC94A5E46C22592AD501E2C4D77539D75549F3
+37039C3AB64281310CDB07CDB1573B2BA0A3F9512C6AC2A411FEDB4972A63ED0
+81C9669D6F1DC786FF0C5E3AEB5B836A80A0A1069164933717672BA201B91A90
+D79568FA3C87C974C6932B33CCCEB6C25ABF0E42B39CE100E5B0EB7FD3A5AD09
+1AC044731B1DA133BFF68C493894A5DDA8EA37A968CA059D90DAF8F5B4677CA0
+96C72D48270959FD2468E84D0D0D40A62FAAF309FB1C81013ACF51ED861A8567
+9C49CE9F79C85C04DD7DA6FF28CCCF42055C0C978065B8AF44C95E9184591B28
+EBE5DB4DCD92960E0C6086A08FAB63CA8002192CA28D70ABE02AB7E20EF11A8E
+05A1F274C64C66D9CE63990EAA71B2FF4EF315B45B8E0528E05C9185DEEE215D
+B49619D301BBC66D3DFB8BA1E5FFD7F66FFB003EFC8F472BF46CFE5DADFBB943
+3A3B57F94C54532E87613AD8B6CF52929A42A449D16AA40DE362558DE9F329E0
+DD09B5498BDE842FB14924BCE20FFB13B0FD393B6BDB427E46B8E2E0A0F70CD7
+B93F43018602E5F74BA11EF2A8DB031D6FE1B3EA2ABB165FC550BC233C442648
+B7E78BD68150EFCEB92DD47660781F4A39A74DB35922F5C935DBA398FD7AB77B
+8E7A230E1E81950C308FDC2A6CA5E17151E6119B4CD058237DC50DF812D8AA1E
+15BE5E0E0844AA5239B84CFAF9381DDEEEB5E3C99E6108C805407E30E3FCB96E
+5DE662A5F576C486779D10E5E4E37FF9B06237C527D4523EDD5AA03EB863ED41
+457E46D1A9DA0E26E79D834FB435470DBE0DB3C3EC0F639DA999F7D2E3E217CD
+81386991DE2CDCA721DE046F7CE6C9ED03CCF87E4D980DABE15A291D6CD3C158
+6468FD891FE00470075ED3312411786898226794107BBD4648F046138F5405A7
+11751B3DE6523FE715FAE02FBE24112BFC3F2F6D129B25B3B7B9312D4482B178
+C466C10BA1989CF1BCE66BB4B42A6BA268AC494FBDC6FAEAA7A72ED1C48F405C
+C00C5E70C917916407395C7D9180A95389E5384B8F4FC41CC982A2DB8436A143
+3CE48A4D32CCF6AE8A042451AA10366D08E99C90707BF8A60B6688949D0335DB
+782756592DB158E823CB7E8F4DF6C3DB1DD098A1DDFC34053ED49094119E95FF
+FEBD589E647D64B43EDDA638B83EAF462C781E2AC2B981D6085B280303339094
+F9AEEC637E45329D66F36A07683E567CC97D9BB8DE891F73FF16FC4B923054BF
+479E7AE19528733D6E2337DD1D4E75376CA9E843D547BA28C2D4BD182B807AC0
+3988A0A1905F9FF0D22B4CED5A0028298D31D570631C1892FCF87D6620A55D50
+24B679D50FC1DEDF84E4AD00AE2521D78213B85C364B16ED6F8BD012B6382DF3
+DB3077178D82F7F81D308E33D9767C18F7ADF0B93DD3C6D616902C5AEE775FDA
+FCA928094A5BD1A5224E3FD1E45F59F3EF30F086DD81FB7546632117818804FC
+70ACC6F6872C2B3E8CA29AA87FE9D9C1A8CAC1EA995F4A237889262511A368B1
+338146CF75B01838C71627D6339EE498B4EBE4AE8F86978F77632CA59188A2CD
+96C633F2B84F30097CDDFE6D2FF2FAA9CB82C1AC881FCFE16548CCC60CE89398
+1D91443E6BA76EA6ABF5154EB647D3CE510B938F725D8C6EAB3C293877DF86C8
+4C830C8379461728446AE23D445E4AFF5BE84DB94BDDF1477DD60E94C27DF754
+C46DDCD8E2B6B5EB9B928E75AEA6A6B6A8EA1991BD12E870C8CCC4383FFE1219
+0257A7D8A14C6C8059C24974B6FD1B452E13082DE064724C1B5822962E0063D6
+8D86CF3673BBA76F8C0446A7501938B1C5838A205F13041A96CA27AB6F4F4004
+9F3ADC11B0C01C1949019B60FD93CA0F3CD86126CA3BEA16C556D763C7476A38
+A75771A8524BCF508A4938D51E951F4E1E5DA5E4C67F13991BE3ED13321B96E8
+C1B60673892D0F091EA3931B6B08615FC6A0C5E75BDACED9F41A5EAEA45E50BA
+46298852E262486D80AB0AE3EE18040B997C85F5C9737C5A4F08A5376244C259
+AC7FA36C0B88D25C647D11F8F9F578D8633482CFA582065F2B2231B562003001
+FA81BFC8B67B161313A421D1D9CC3817DCB5B81E625BDAD0C438F49A29945525
+25BEEAB86A926C12503749FBF30D945EE450E9213F950F4DA5AC62C732522958
+DE00E60A9DAE074D4093C381259E91164865186099DC045BC43C9CD4B88630C9
+15A8BA9A89395393922DA7EE582ECB3A3DA5CD4421EF0EEE4C57032570E74271
+546DF3F774F3D3C6EB243464928FF3E7E1EA35659FF7AB0D48050FC8841B2AAF
+ED403649BE27A32F9819F9CB3CE1100A7185B29A4239C4C461BE76B9DDAB4332
+357F55AAD0021264D5625A0ABEFAE29F95819579563CB61D5BAD81A20AC5C47C
+BCA1DCCF82A96E7D1C8672440E28F7AFD9C34FF7EB4C4531ADED742923019A61
+AF6D10354BDACC9F82BC31BC88C189E549014ECCC0ED8527686AF33817114267
+D8356689E20B37B1B6F4EF9A6B9ABF3E19A818A8E4D8D232F305D3B63CC9DF28
+CAB9A53358515D788A9A8818443D506969AA199FF9CB11439BF1E5916CB5A3B6
+520DF9EA1AD8E52871453CD628F5489FFC23A324FA5DD9FF0E2B29C9FCD67EE8
+9A93783162E5B6B0A191CA871B940D68E486DB3843AB56164541407BEB01C8B6
+D1E0313F2A38208018BC661D778AF6AD9B3F15F74A66E041E171143A0A08EA84
+7BA7D2C6ADC207145183EBC2FEC692750C32DAA588954701AD45E0FE7701CFAC
+7AB2635C35BE0ADF227E4FE982D562AFD137835024A5438EE46B96171E184533
+3A736021B4F0A24EEDAE8972A1D10F9AB149726AE541BAD42E9BC4AB0F219D14
+04752DC2C501E8A155CFF3407316FAA2E163E745432EA99CDFC4393583035730
+17522395BCBF2C2FC3C2A319DF4A88A7EF1EB25F21A39222C3929F95D4616654
+8418333C33AF322DFC03C623484E9AF520FD0B8C8BFBFFA4CC83CE4FE08CA55E
+D3BCE8588C940761F4F5E6310434D82D0E88F034E6BEB3AB968FFFDBD942B547
+D89BB2F136C4CC3FA867A9E2C691D2EE9DD38E59BC3022359DCDEA3140D6C7B8
+60FC65621FFC2B6E0EFAE7AAA0A503FA397946C3C43EAB5E0443FA6E8BBBEC7C
+852654FB6C4D05D290A4CB4B3F9BE2133CEF24B9162E8BA3DC6413C075853083
+110CD2942134248583560479B679089B1015D47424F19129EE822D691655AD9B
+4A8772DEADA5130AB6AE36F669A5946E941E5C2457FC781605A1D69A6F253959
+0E9D1B6914D931DFE4B798E73810F45FFCF7AA128EFE7A528F18555D0F81C646
+4F2895B47492BD862C78EB9D641D15B5C98D6983B6E8163D32F7BDF63160D288
+E7A027FF60F64F023FB0E27DFE7C841313B2C49C5FDA2F218BF5C9F154BD7F46
+412FAAE274AA38B3B30E18344B3A8E542B5CAB6DE7E4AF502EE67826B872C41A
+C440DFCF3AE553DC00538FD7F09F0E21EE52651117EB15BB598E57375DB52A2D
+C5187DB0E2AE60309853E356644E4DC45D349226CAA239CD9F1A4EFAED21CBAC
+EE7DC0197AAD1C694D62A9F29D0A5CB1FFD7CCFD9771199EFB09725621826291
+FF7F72D472EADE5D3FE0C0FD4541FC8E158862D98757F8B80BBECAA1F8299D0A
+2E6AA28DAFF9E3F6458CD78114136F46E6B1B0BF68BAC2120710B857998B6F22
+826C61AA95CA9476B606971A7AD550D9901AB38019FA14A4792EE0AC0BDB0F5E
+010B78EF50C96CE03621F21CBF1AD96BEE428EED181BAC0FF4CEBCB416B08150
+735D906055DEBF4A57E77791AC8F018FFE1BCBDB83BCEB4F0105CCCAE44486F4
+BCAC2E6B895353AE411D09949885846EC7444F2850FB419A60BEBE8247F9C3A2
+80D52A8BF246EE65140EFAE795E6C178B9481024251DA564DAE2B6D54753BC06
+4A555858CDF013C36E13F1AD8A581CD9A2DA31BE5C5EB8BC820AB1FA3B94F5F5
+F742AA198E393A1DDD9638BCDC7462C5DC5E0B25A8F9C3408A65B3043BCB1768
+9429E48319CBD5DA8C8A35D50D0923B3B148DA9BFA7C904CEE07F724D3A51CFD
+81B5027FF761E0B45E36570ABC0AD515AFA28E80702B594D2C382CA8AEDD1850
+5CB6F371315BCC0D15AE6D12FD189271C7BD527B1498081CB701474468BC57E5
+BC89A342D7CB23E2D74DFC5EECF14D2C7E802A79D7D0E5BA393C36ECEB6BC569
+70A6B935B0B3C70738A906C0414DDF189DFD5E6667EB44C5FACF64483C37E059
+46B04D17EC2CBC1583620F8FDE5D556E6E12281F41747FF6C18FC6507B33C23D
+09C02BEA195CC0F37D2EBAFFC4FFEC5B83499EC6326F4737704531253BD41425
+FD3280BA73FA63DB463271F0813A522F5A583BF3B0A8C41462B0B829815F59CE
+87A9E152C6545811F80EF3144CDD217ADCFEF1F7AF2B9D1C06802524510EE62F
+EA407213422E1300455AC19E27E157A3F596BF639D8342D339D22B21E38F2177
+EDD19B91FF90AC8A8C2D17182D7E2732CF2E291E555914224C40E7E3170DD617
+9B158044C66A407D4C85225A1CF27BF027EFCA6E171A057270F402E7884723EE
+558CAB4248BAF8BA8E4ED73DE39E7300C91368F4FE4E0C5CB77FDC05F0CD1205
+C3FE450F7EFE1BA4BCF850BF7CC13123AB85CC0F912548B31C41F3772139D731
+2C1026DC05049D887503C8BD76DEFAF0E29D1F9EEA53659D58964B4CCD1C4352
+910FE7D1DCD4C3F71C21C4CAB7D223037E4089287F6A10CAB1C80EAAFE13CA0D
+716D136B1248836A1A81AED1847FEFC8CC60E4F8B2BFD896A9730A16CE788D8F
+EB1BCBDCC2728FA05247B77A7DC18F757DDFA5EE99A80508C9F800F65AF63E18
+097509AA25EF35209B70DF4E09E48E39E93ECDFCACFC99267D45C62FB0A15494
+3AB2F5F92143E0CE824F2306E45B2288B1CA09DDFEEC59075C5C86E7ABE33516
+40295A65887490F33FEA0FE29FC7580690C6EC5A9D1AEC45098F0479AE2A89F5
+556CFD965CEA61549B89C146C6679DD30B22CB26B2964CD4D1167F3D369474A1
+6FE362422CB61BDE9654CBACEF423196B24329280C4E762AFDD18012E6BCD9DF
+8F59E9D57CB4015ECC2B56CF845C11076F5264C222CBE7B0F8FE263165367997
+896C9E9429A402493E160ADF94AA07BE64ECB39B4DA9A1D20E9F29BA9EF770D0
+9AB9050E63D734D018EB6E43E31E523320ABBA1DA1DBB01DE90EC6263A6E7401
+82A4F6E1AA68D06553D5717525368C2D5617158B18D70188F9B649DA61D4C000
+D22AFA6A6B8D1B049FBF486B65F99BD9BA572E7D8D66F4D2DDE3F79132E6E4DE
+20322D9165C4D4774D80E66A3A164E3CFD097CEB2C378076AA09DC214BC7C071
+3C3628A56716B6D84B250993F51759652415E01B51C324F5C0741472001C16C7
+FE5135FCFEE4FE310C74D4B3750A7D37E330833941E11D2D5E8A81BB1FBB77A1
+1523B65A1DEA473D4A61801B29D0AAE08F47B6F2BC9AEB22A7CF88AD5D34598B
+66B0B96364759457E7063DD99C2D2A10B0B880C75FE4F8DBDD8E3460A872028A
+80CB692CF959E6D403C89BE1112380DDCFEF833822BE22A7648A17D9314AB0CA
+BAAEDD4D8B87AA5DF53D0D76EED1A98E4DBC74A2BCDD30EA21025F4964F0B7A0
+427808C00AB3E3D7F19DD5F3FE6D3165E87639851DC114D3863F113D7131E273
+AA0241A49C96455F33F4311FA40149F2BD989C30D55DD8279DAA97B29ABF9A57
+7EE8B583AEE63619C997E17CC528B43FF24DFF6020F34B1D7298A410892ACC34
+82FB6CB27A9135FE84D477243DAE69B0B12A22EC93226EC8F0BF314BE64FBA5D
+1139A9E8F5206ED1EF38DC1B085AA70D9AC6BD3023DA76B133B3A78A093FFCC7
+6DF10CA4B1381E5C5126E7818D27EA2580C4024A4FF89B8BE33FB535C3011818
+BFFBE6B0A6862198AF5DC7E84A1C77746109DDF855814D03CF752FA3137E3CA4
+C058183DAEA56FAA877BD919970CCC0B2F9BF3A18A5F2D3488A0AC447A199317
+09C8F891025269A56CDEA73505D0E795B1868BA3E99FE12FA5DB16226D221B20
+74D17A17E1891D4492BEBD57B0AA319B43A9A8C9F3822242F4E8049BA7982282
+EA10B1C19B4EE1B1E54145A6801A86189EA642F7C22D85A6661D7CA42D625B55
+98FB688C535EFA0B5F44CD2DB8FBC26163EB87BE08E365D95F674F3021248A71
+6A53787895CAA015D74E7CE6E5AE73F2010128259EE56CBC8C313EED283F7EF7
+B644EA2679D81C7859FDEFE87085D3C62CAA2408A3D5C4E2E99C6E4BADA3768B
+E4494F072E9F0A5308BB75850A78FC8CE0609A2AB385CCFB3CA076BAE2BCDBC1
+44345CD924C74625BC9371258C648569883DF67ED83F8AD3FB7B1096CDDD7EBA
+25E0102006C31DCD4D55EFFD4D37B05D881359DCF28E83E4AB1245D3529C7482
+576B26AF0DD75C3A82B5A8F3528EE862CF722C896FA9319A2B813443A535BFE0
+D3B0A2811475A434266395BDFB39207EFF7EA5B6CD9E014D93CAAA22840C0A75
+C8FF9A175D2046CE7F49C4EC8E5572BCC7D7CE7E186DEA70315D674364638E60
+F355ECD080C64D3D301E77A578CA8EEF3EDB0610FE61ED541EFC97536EC0639F
+D406FE774CC5708435F5AFCEBFB0563F7C4D7543869E85451FB3DE01C83AB60A
+120A920DF83AB10EF7AF5F2A4CAC36E119CA59C62C9E58BB725A9464040738DF
+70AA3A62DAAD8E24F6F617EA27E1DBE52B327912FAAFAFE05E7D4CF19F65BD7F
+1033202FF5C0C72C4425F7C32AD0A464BBA1D084538A70D52545DF67396CDFC3
+33A915D87A0260B3AE4CAD4F53AC36ABB222256D85B742D00458B4ECE95631E0
+8F21A496DB102D3A2A0CA7BED0789984056D0F34B7674EFC66AE40B7B444B5EA
+C7CB62A0B1FBE33915522A0845CBE5523D949D4332B5E71AC7B1C177863DCD5F
+93C8C6DEE528EAD00114651DB6644C2146E4A7B0DA91E8FDC6968A99B3D516F3
+0D7CB48A037F3359487385807AF606AED4B1C98F4122AA3534AAFB9D9E37799C
+4157601B15AEFEC90F360A7EA2A741460AF365C9CC06C14C1B863CF02EBB5781
+BF4A27590BB7674AA770862D021207A2183239928C5B33C39D1704E87FA51303
+2A05A597F231044724DC06DB237ADE5FA528CC4FF749B880B91147DB9AFF2202
+85A8E2D72CFDD806DE99B5FBA42F6A042906B40369FB6587F2EFB1141334FEF6
+E8A2B5C813A96F76D4ADBB8BC75D5390F610B18420E4E5B029AB7FB265D776D4
+7A3742B1E6815286AA295EDFD64FE22980A97339EAA6A4A2330893949F3BFB2C
+06F658621EEE6F0C010EE8228DA49712A701DE1DF1870BEAB73A7E3AF4DD86D8
+702E39EB7B88F112019DE6F98AD2EEE53115E7ED8B008400C13EA30813F21486
+EB77B0803F4184E071A836ECD0252C6C9F6BC7DA1164570212B87A15473F6FE8
+8530F01CA2653D19BF85E149B68A2DC307682C23A1AD246CF6FFF0548BBE472C
+C0E08847B3062B4CB03F54EEE42AFA6779D67EC0B9908F72CCEF290418B00EC2
+2794619A951D4513DEABD376D80B71669B683D8BAFF3A86487F8F83B77379CE0
+C1356F16DBE8468B05B5A4DD8A8A3FAE67
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMBX10
+%!PS-AdobeFont-1.1: CMBX10 1.00B
+%%CreationDate: 1992 Feb 19 19:54:06
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.00B) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMBX10) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Bold) readonly def
+/ItalicAngle 0 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMBX10 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 12 /fi put
+dup 13 /fl put
+dup 18 /grave put
+dup 19 /acute put
+dup 39 /quoteright put
+dup 65 /A put
+dup 67 /C put
+dup 68 /D put
+dup 70 /F put
+dup 76 /L put
+dup 77 /M put
+dup 79 /O put
+dup 94 /circumflex put
+dup 97 /a put
+dup 98 /b put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 102 /f put
+dup 103 /g put
+dup 104 /h put
+dup 105 /i put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 113 /q put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 118 /v put
+dup 120 /x put
+readonly def
+/FontBBox{-301 -250 1164 946}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5F00F963068B8B731A88D7740B0DDAED1B3F82
+7DB9DFB4372D3935C286E39EE7AC9FB6A9B5CE4D2FAE1BC0E55AE02BFC464378
+77B9F65C23E3BAB41EFAE344DDC9AB1B3CCBC0618290D83DC756F9D5BEFECB18
+2DB0E39997F264D408BD076F65A50E7E94C9C88D849AB2E92005CFA316ACCD91
+FF524AAD7262B10351C50EBAD08FB4CD55D2E369F6E836C82C591606E1E5C73F
+DE3FA3CAD272C67C6CBF43B66FE4B8677DAFEEA19288428D07FEB1F4001BAA68
+7AAD6DDBE432714E799CFA49D8A1A128F32E8B280524BC8041F1E64ECE4053C4
+9F0AEC699A75B827002E9F95826DB3F643338F858011008E338A899020962176
+CF66A62E3AEF046D91C88C87DEB03CE6CCDF4FB651990F0E86D17409F121773D
+6877DF0085DFB269A3C07AA6660419BD0F0EF3C53DA2318BA1860AB34E28BAC6
+E82DDB1C43E5203AC9DF9277098F2E42C0F7BD03C6D90B629DE97730245B8E8E
+8903B9225098079C55A37E4E59AE2A9E36B6349FA2C09BB1F5F4433E4EEFC75E
+3F9830EB085E7E6FBE2666AC5A398C2DF228062ACF9FCA5656390A15837C4A99
+EC3740D873CFEF2E248B44CA134693A782594DD0692B4DBF1F16C4CDECA692C4
+0E44FDBEF704101118BC53575BF22731E7F7717934AD715AC33B5D3679B784C9
+4046E6CD3C0AD80ED1F65626B14E33CFDA6EB2825DC444FA6209615BC08173FF
+1805BDFCCA4B11F50D6BD483FD8639F9E8D0245B463D65A0F12C26C8A8EE2910
+757696C3F13144D8EA5649816AAD61A949C3A723ABB585990593F20A35CD6B7E
+0FA0AD8551CEE41F61924DC36A464A10A1B14C33FAFB04862E30C66C1BC55665
+6D07D93B8C0D596E109EE2B1AAB479F7FAA35279ADB468A624BE26D527BFF5ED
+E067598E1B8B78188FA4BCFB0B51692D07B0BEBB930C6F0997B437E2C51B876B
+61A563A2673932C2045833FAA35DB22ADE12102335D5DC734AE3AC5EEE6658D7
+92EB62131E1DFBA441F53EFF9021D9D4C491F26BE8F54C61165CAD778CE8695C
+EEAF70E3B20C64D4C2B34A084B5770BAB2A974E898F62BFE90F132A37E2DCA4F
+43E13DB13C94DFA8ECE2B7374827AE168634FA007F8981ADA046CED3448BF453
+FCD9A4F194FA648F9FC0971734BB69CB75348A88CC361FF06E984C86AF0EA429
+DAA5808CCE3583664AEFE0C59EDA04A147FB51227A5AB0C13942323E9B3733DD
+3EE7DF7F774DE5D0D0980DA8C0192983F1E3EF18481EAF1EFEDA0068BCBDB28A
+7FC7D9191EFFC574588DEC1E180341DC959F8EF56ED5B19F50AA82A4653649B7
+CDCA11A1FF27AFA7FF189A7E8A7C0E94AEEC901DDEB541604DEC0FE90FA0685A
+FDEADECE61CE2731FDDF7FCF2AEF7CC2B1EE7095F483C2597F66694FBD2AD81B
+F68FF2E378BD8357CD1B60A1CEDA2DE760A98868ACB45CCC8CC2370FE267830F
+B795058E0FB0EB3C625259C36BF9AD2EFB5C64A45797E18797CE1A2C0304CDE9
+9D88E11E878A721610EC57958C7E80A5E78226017A263288DEF5D335199E8F28
+787DF769550AD33E15342FC5E4751F8865AA66E78B8CD2388EC3618A619AD302
+5760E9F293085CB54BBBDD47C5ADC3F479E39A795541ED8CC921D1B41C9FB1CE
+57B1340BB4BFAD1329EE4EF2DE599944404B7DF94C759037CBE96073FD77DAC9
+B140B4580EF178A84D0746276D6E667E26671117EE04102304F2F599A423A687
+53CD9E2B061D02D54EF56439E33AD985A84C1CA8F6666CF7746E0DB19A79F249
+AE1F7714AE5E1D6723C5D3AF86E6ADC9F2BEA6A62C3C03A67414A99FCCCFEB42
+4EE4BE9FC8A530F06879F46889624F7D704EFCB951C1DA1613D55D61D33F6213
+F12610A6F071E79918AC289EA5A3AA9049229902B646FE14E8D19DBE673E1D7C
+76577E34ABE80ECF2F5D6E13CE0926F40AAA23EC01EA99F5CCC32D1FA8E11013
+102730BB65BC6743F348F15510601D29ECAD4659EEFC318BE1C85414883A2394
+6B8CA6AFC294778FE68559C8D182216AAD333EBF0EC6B570837069E0D9C6104E
+976A77751759A8D4C2EEA1303B6B728350843EE415D8B4BDC7CBDCD9E2D55C64
+2D01FF18630A55E8F505646B1F382384FE8C140E60F04ED9E86DB24E4B752C6E
+525E86E024A632219C1C533DBA8703DF80814AF725450D043D0D644293E70D3B
+CB5ECE08BFBE0444C3D5EAE7FCA49069B8B629CD14D78B51F893769666D1FDE0
+B3E5A9537E7296E0EE3EE6FAA0703033DE5ACF3ED11E0370F2DDE727675E7AAF
+EBDD2E5A81316445B567DE081A7A9EAAA4675990C41FD7DFD4BC99D336C943BB
+73031C74225C15F4698E5FA82A132EE19B9B31886802C6182501EC6432C93AD2
+C4902DDFAD356F9FBAD0CAA247391A9B32BE207736FD79C4CDD489F1A4F98FAA
+ECBBF11FC37861E7A2A072876E493258DD9F0102DFE6AA1C25B62C9824E65D42
+E301387324128538099538096807A5A70B2CE44C7F32C25B1E6C69E333D9CCA9
+51AC941EE59B3274FF13A0E61EDBB4894A803110AC572874B5F85AAFFC9CD694
+3EEC16F5D5E8B0A3249FE76FE8861ADF9EDF7DD9CA2C54FC5F01CA0AA1C94CF6
+E0168BE4432B048678496E8A0A1C0870C12067A21B1470F2C8AC2084FFEA2C67
+D05433570F589BAF958E9E268210CE7539BF1FABC6E0A5FFEF617E0FC0154942
+B5B14743A09D2853436120C8FAF14F7E87575F282E47742FAED463B04837EB14
+40119CAAC467715C62F9E465A38B5643FB4B6E34B8A9F0C86E8D78428C8418C4
+ECE00D82B19FA3F11CB265205782C989F5D6CEF77838FCEDF27D6D00B3C6BC7A
+8195AA7551358B3DBBE7D63F26F3F660A1197F26BA9A359C64EA219C51BF94BB
+08ED6D8BC1FA4A0C07F2B7CD30D484D3AFE2FD6A7541DF8BB2CC63D7AEE79356
+303DFFE873C237E73F6A8F064B8C002C246655200FCB5C62C2F6A1EE2827370A
+0462DE0773D4050CAA21B52D4AE613CD019AB7D5167C05EC56C401F88BC446CD
+52B473ED8C80F6E6743FF7DD1291926677465E010421CAE6E45EFDC3B5E83ECD
+F0C8AEF8EDA714D97ED1ED71602C39534F7C42260A5008B4CD2A92D039608CA7
+14ECBEBB5852EB017C5C7AB2A936B0BA9D4BE29EB48B111B5AECB1E907DC2BEC
+D08E2CFBD4438BE1FCD8D1FB7A2C795E7446B210F8C4692DFD29107D44A58B63
+CA66643018239034600B293777A53B1A8EA74EA1F0327D4E1D9000115ED9178F
+E5258FF352071FD06489C5C911B379AD4DBE7C15A11DF46D9993F80D9F5DFEEC
+D85CC3F8B8ECED7E15D1AE8D18D07052BFD9658403D6E956C249BE6E93617575
+36C9CF59D1C95C5336B9E635C6ACCEB60DAEEF076E4D9845115C420441F26115
+7C5ACC311CF30A1A2B86EDD191016E28C7BCED87B7797818E4D6A26DCA59976F
+08E0F7F8CE42CC8CFCF197C3A6A00755EB43817FE0574FBD3D5F5770F49845A0
+242F811182A45FFC2598075B4C48E7E4B24B0537EBB40D992453667D436B875C
+54BFB2FBEEF31E03539AE762BCD1961D448568CCCF3B2D9EF222ADED5741A2B7
+E57D6E5E09A354733A0A9DA31EFA86959DF6E3CC5E6E3AF6DBD3CD52AF24307B
+531E9E7561CE85658A65FBEAE0AE358DFF19A55CE42056EF89AFC3F62404D1F4
+5406002450FF5759059F1A7E555A7EBC99BE89DD5CD4E95918D43D572BF72F62
+7309EE47ED0EA71326E9DF2942A23C07444FB09C1C16A2BE2627AFC8F83D535C
+53F165E80AF1EE97C551A1A619C0DB440511730273C2C4760C2F5A146E889C96
+AF2EE5CF1112DFA0D139186A2FD65C79468B8DA9C84FE4C0CADD6E9DD82791AF
+15E6AE0091CD2E58AB3C2178168D0AE9E80E8FA95F2815A747AD2B5570EBF7E9
+833D4761D17233C2CE02CAB64D1D7E49CA9076F753FF6278CEC08B8950C6B546
+A9DA2A27509EB3A77FFBEB78D360216E99FF9C37C6979DC2DB404842080874B6
+C8D3C77A50BAF3C00D156BFCA21682FBB8C45A014BC0F9CEF5098ECFA736D01A
+C279B88A194449D964625BCED9E2CF2BC40A857ADA5D95B2EA3D000F0112653D
+2056A88D5621B85CEA7A573C004A996F77800894A32850E4536DF75327ABC0CE
+65F5AD6AFC8AE9E82296B6E795A0EB61776F07C38DA7A3E3E5EFC29694A03B28
+19182F03178847F3059F996BE5DBFD4C819D80B1575454D234F599787C856EC6
+A054356CD4DA09D46A542E90177F33EFE4EA17E5A2B54AFEE4E075D67D49959E
+2D0F8A8FADA6DB2908E9B753F40789138E31FFD04F5415E492A397738719CDEF
+BFA5B8F1919440A1256FE5554752F4B77C47E96F4CAD3DCA4B99E0D6C0B339A0
+04B58D399B27B709028E6A3F20D129D9C437E3E34E608B6B5748729EE15747C2
+E800EEBB09741E3ADC1FC1379FF077897F18123E8CBA5C450437CBF6C73C647B
+0F9E402478C3CA3BA683130E82C375E5C3F2FD4FAB53837544DE92B3C8206462
+630471AF0C33A8260B5DB013F78B3A8D3D0CC501AAAD9743B09B1BE57BD8D624
+6F6E27B5D678A673AA5001A375545D2B35F01DDFCA6F50F2A8E584F832777CAC
+CDD2ECE0B77C6905ED235E18F44606851EDB11D9C72E0F5BB813A149DDAAF6A9
+9C1CCACC107F7748FAD8ABAFBDF7DD183DA8424ECF8C2C7A16F3B56860ECC570
+86334306B17A3C57D543335A8127D5F795F2908F633AAF517F9FD14CBD2B996E
+D4F9FF06C14E03EE6106ECB4B6712707D1FD39640E10C8785A85C0DC13EB91BB
+9AD7BAF17060C14EB6E66BA2BB676EF7AD3FC20DD06F6F36AB02B0EAF391F4C9
+B6B47833031B5979CF19144D3EA7463C9D2D62AC231320B37E5FA12D7E080999
+BDCE3082EDFA16947D33B2D2FDF1103DC3DFAEB1B56495AE58569EEB60E5F492
+2A35D36349FB1C6614ED813BF7D5C8151D74BD8E122CE59F3A8C225271D57B37
+E4442FE3F0A7E5985F56409CFB53986AEA0F79B1EBF6587DF00479CBBD9EE56B
+DE157F215B03BA2D0DBEBF93A9464F7F7442FD5AC3861AE5FDC4B2C4CC8526F9
+5BAF472C6E90092824613486ED40AD61C4B0FAAB6928A13FE8A96296C01FD078
+738712D491E10D0475C786F2504DBCE4835943756BF469EC96A793423295CB71
+FA0D052652CD5321096DC7FCE70DEC61ADD97CB5F5CE65D7299168589B3ABCA4
+164552AE6AD1671F98D0A046D9487CC6EFDD3B13B6F885087D5883CC5280906E
+FB6C61384D0B577BC83427DCD6916E84AA004B141F9BE9872E6098C37C9F691A
+9BC4E26F00B82E3BBD02B25900B09D51633D5EDFBA3E54C219D7256A5D4B22BA
+F669ADAA5382D67EFC23FF8852841D06B3515C55D75D338A41EE936DCC6ED6EA
+BA12256DB834D37D500A358A0741AC21D33928794968A6125CAF20B0C8FE22A8
+64498B942263D72F52D9975FD8DF8CA848A3BCFE4591BE071FF9BCB791742DD2
+E99AAA19E924E616CABEC27CC8BCE9084653CFB08CDFED2C219345B7A2B7BE7E
+B329F79DDF4AEEE17064AE84CEEFB417E6C8F3C5D2C486C77CD28F89F40FE817
+9842CB14802B4FEB44E23D66863BAF870D9DDCD95EFCAAD73C133B4086F1467B
+AF6791D7DC378380E154239959CD2EA471D58B66FF02184326585CDF1F736CA6
+3D1B95E16BB5455CBC9523C3701289D6FA6881453C9DCC21525308B8602D2603
+F90958823AE84D54B91E018C3763C1BF3AA0BA978DC520A0ECFE6420AEAA5DE2
+C8DD7CAB9BC659DF502F0BCD44807C518B5EA67F26D48A88F21916CF0660BFC0
+912B6BDBC062A909B0C66DEE438ACFB753204D6769A798EC6EE98666847FEF4C
+D9FF64C0C95C279ECE58F1AA879949BF59F40728A72009E7989DECEA9EADB44F
+F5680A3DEE60160FCD85D1FD77B0042154140C09838B65CE33A79CAC30134CD1
+1C910ABBA0B1CC0B476696C763D71C233A38A6B7A1A12D0EFF193D9983351BEC
+F723EE088FAA6C9D50AD3086FEB50C3D01751741B63937EB78ACB8A4BA87F74D
+3D8AD65C44574D0A77F14D5346BFFB33973F411544A060729C13137450E10A0B
+8A7A4F84DBCDA4D92492E12BFF3F97E34375E310E85D04D4B2FC673357DD8049
+E4569F59406AF75CAE1AE76FBB10D757D49B4C43DAE6A0D7B9DD139E3D709FDB
+14BA9C95F67371242BEDDAC6FDCB86B37DAB4D6D2B39A15937D031DF7C20BA72
+9FB832B2AC434EA10A2E0B77D676A8DCBE3A1BC25EFF3D4056323B0DC8474F24
+C6772CA087695A4BF902735CC5198E10CAAAF564A3BE95C275F596C864AC7DE0
+C81470DC221EDBEF4C52F3692EDD18623AB79CE79E3A51A3DAFB60198D6304D1
+70B6DDFB7EA19807417DBB975977F7972049D3106C3ACB826A50BCECF68251D7
+545DF4D2C4593857812EB6AB86FAC4DF45BB9F6C64AC12E7D0140AF023FC9CF1
+9C1575E8338A06C25F7CD8B6094300A572C54C4E924CAEC25FAF1B47469B3DDD
+8CFE09AB1FBDE43FCC303C2E00ABAB5A79532573F9DEBB6A75E22CF471ACA244
+6E3332773D6D2B909BAB44E823A2BF4FF371B0A15FE5CBCFEDAC711735A1ADDB
+A02F3527BCEA1354B0556FBF74FD89E1025B48025BA7422AA2F0A0414C77ECC6
+08899CAFFA4BE15F6A5E93D9940E4545F40890C152F05F0FC9984D7650A7B1D3
+1BAA9A0AE70C7A1B1FAFA4FF7C7E6775E821591B6A93AC39F64C37790D69038B
+0566079A890D670599B01F3DABE3F58D1D584CB00BCC30E8EA20169875AC67FE
+BBBCB346C57904519EFFA01709948CFAD69F004FF255CD62B28965DBBC615E54
+FE6CC33BF0279CA79DEC1669A21DF70AEB4A4633053F3507FA9026B4F9A55E1B
+F4D68CFF33EC49C76AFC9D1E6E1EDB188BD981BAD5A83ADD73744DECE79224F6
+F558260BF4D2B04E2E65B37456EB05F7630BA3E15FD4F5F7EF45DBDAAD425116
+092FD7460F9082353E09E20C66110B1FAFF7C11F396A7D0A9D0F460EC78D134A
+74C9B344A3BC3DC10B3E60CA74E4BB575C54500BD22F410B9B5CEA21F3A85165
+25C72187F5120CC724088CA28F3946DB76C592C69A1302A208AC1A51F6305179
+EFBA41AB5B60B13FF1CFB6B6161BF2A01E81691A5A8AEAFF7D9584B419161569
+BD8945FF97B796C60F5FC0712DB15FCCE84D780C2620AB21F764435CCEB3DA64
+703103CA0634A50A0C0A5E3FE2E6FCED1889BE4F5BC7A019F8D8D697CFD24B6A
+5A7B040F98D9993625033A09E9B3D2C6F3DFF413E9BDC5890E4E2F58BF91F676
+0325425559A74E0D3B39E05D4EE6A792E426F6A612FD77AD3937598A36B9A8DA
+1FFE8373DA2C1FDBB8D4DDC3CFBCF20F2B3A2D8E6A7403D1186A8D8DD4E12AD6
+04D8D22B435D16285985C02DDA1410EE25AC222D8623B680403EC4E897A127CB
+F8830FD914F840BA9DB48C12CF6B2A7B8F5249637882B3871CDD2F137981C98A
+0FEBB565BFF01F3D9335AD23BD3B677D1DD762C2364872E9628C33E13F890010
+4B95A53239F2C5697F604F0589671573BFF43753C8B2A7259C84B4D5479DD0A6
+E9C9C05C3A5ECA87ED0007CDB61BD3E85521859EE10BC77B34DA8E7351A050A6
+1333AE0623596BF24E062AFA602DE049362346237C1D7EB805619CBE8A738D1A
+FDB9D5B84AA46A4750BF11C402A329178B2B59413BA0F2E9C3D167176173C163
+C66A980111EC0A30D64C6C8B9F9C7CBFD605F02654F6375B7A3FA7B9BD04377D
+696AC176E06DC2F82802C67389B956D79658422621608808987B90A060A25894
+7FCB55226FD6491E2D0CFBE611B73B4C5BE140521ABDE334B8B0833E6202B714
+62E9CE6FF030912B85A327B69DE37BD89D1A029B22021EB4AE23BAB65EC90355
+2FF485895C62035EFBB36F1FE3CE7F042690A0EA60D4FBA833CABB4DDA727CD9
+D7216985E44CD993591ACED2BD07C282FB95C07E6B3588B0A0EB73CC3FBD3023
+308DDE03060536F69FA9668B1F06B4CB2AC952D4321A99750B42D9D0365EA3B6
+5FE77B627A9A7CFD4F9F1666C0FA02C00CBC6E6EAE13AFD78C8996CA69A02BB6
+65FB02BBECE3AE7A695195F58EA12D941716CAAC8A0997154BC80843DDDCD74B
+5A38B0D70667B7234C5EFBC0F7FB602DB533AFBC2362F88CD60ECEB59CF5B1D8
+0B9591905B04B8C634E6BC3670109BA6D60D1B4D0F6EEE73197FCE27E29D492D
+735B2CAEC1AF3B9AECB81A2B61015F99E848692DF47C23185EE6E3810BCEAE42
+C01A8016BD4F78673E6C00BB8D99C454866921E480CD06444EF43AA035C86F5E
+98FCB238A87AA6EF921B65AA00E2E895DA9DC8FFED2033B079CF45AB3DD48D7F
+FD6D3638CFEF0ADA4048F1D27C9CA6FE58FD608469E9E4AAAF44C4905FB68B34
+598D6E1BA3A21FD81EAC6F65A0CD67F980C4F2A96CD1A763BC91A7704B69D11E
+9BEC8228708304A5419226B9352C8A9E333EB6F3E081CE97DF685FCDA2C08C78
+4776D1F44AF70CE111B05166002D17EFCB31F6DEE5A8EA404AB386777D7E1B3B
+274A4918AA6613FF3B12F101F09D85B5E3F988D8EC02B65BD31F039F80E15403
+1C00783C36EB1686C1DCA30EBD62E072432CA608C4C7182331139F56EB736AD0
+27E2C002A365333635101305B520566CC763401F46F7F85DDBB781CA50744634
+7DE6BBA25DB93F3FF51BAE303FAF4B494C622A207E6AF0BF1064C9121C2F2445
+E8F46B8238C7273B89BA8B33A23C56EABDB3BA2DDF5831EB55F46BFD140DA5A5
+2FE7665CE873CC0CB9FE96DCC91328BF4D0D4F1AD1492C9C7C278AE67290EC68
+2BD0F93FD3E091D93E5BE02A6339C243429BC2D21EBBB920D4633D94185AA4E9
+124A8693E72185413CCE00309D3307DE8E444D8B0F855AFD421D5BB68B3C625B
+A2B9AE0F8CBA9352C63E324F8972DF41904DC78CCF4D425715D1CF5A1EB7A935
+9D0A8C79C14BA670C8D6772F15920622C2292D5E21EFAAA5C60E10D3325DD730
+2BF34A23178AD19DBD50DFA8CC8C0501CD1BE0C492926446CB17FEA772C00D48
+C3B23451AD493A6A6D236DBFD145CB7993D16A58F704DE77FB1470B3CDFA67F4
+835732E65B2A9DF23F53006FF3485E8A1233850D4CBF5BD856B00E3F3F8BBE0D
+BEF7F13E5764D656676A48E947732506A39AE157CF56DA7D7EF49DB48961F6AB
+0F9037A9283B7619763A6CE95BA1B58D2B72155694E84D330657247D0F43D736
+161D5BD49EBE4131072407E1409EFAD6D1BBCD21FC11DA2DC6E93046A06CCE6E
+735F1C3B5C88A01165DBF07CB86E3E609D47BCB2BB87B99F5D8E903D435A330B
+67674BE5E81244BAF17337DC8EA68E86C588C03EA85DA2B78D57CE72B3B62C0D
+3EFFDB07C7210B6A51D2ECD734DA29D8D0C14DDBE61CE176FE226B580427A9CE
+4C76CAA42717849DFBCEC08AA06DE53B013FE246966BA177055A950025CDE913
+E5D9D28E53EE349E03DC8C53C9A1551541CA10F2DDFC05E1C3DBBACDB321FC92
+C3C23E241EBDB8856D0D6A338668210E196141711622E7FAB27F80A07EC32DFE
+16F38B5F3DB735AB199036458D91F4FB1DD88236722FFC8AD032057CE97B64D3
+45167DA10C72B7BF526A6EC0E706BBD0ED91652B2781842F8DE5EC9A1E792236
+1854879179CB67DC53DAF6226C3CF47EE3FFDCE17008ACFED5B5105DC93302D7
+E1D3402691FFB75255E2BF2ED1D3C6EB38754C4120ECF6330FB0CD390E08A88D
+73CBE6D4F468B8B64D23152FA3F94941
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMBX8
+%!PS-AdobeFont-1.1: CMBX8 1.0
+%%CreationDate: 1991 Aug 20 16:36:07
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMBX8) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Bold) readonly def
+/ItalicAngle 0 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMBX8 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 13 /fl put
+dup 19 /acute put
+dup 40 /parenleft put
+dup 41 /parenright put
+dup 45 /hyphen put
+dup 68 /D put
+dup 76 /L put
+dup 88 /X put
+dup 94 /circumflex put
+dup 97 /a put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 103 /g put
+dup 105 /i put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 113 /q put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 120 /x put
+readonly def
+/FontBBox{-59 -250 1235 750}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5F05C11F9A72F5DA508C30BC4BF52C8B1EC5FB
+7F9DDDD0964A6D59193A389D490DAA6F6ACD02CF71C06802F3AE5A001F2B3A6D
+EEB60E9DD26DBCE1D29C825A9BEFE3A6572E70DC7B60344C3E0C9C77ABE1804C
+7ED61C544F0B4A3D6C7662DE8575C07BED3F6DBA7D64A9C8613AA152B74A140E
+AAD9B66E0FAEED6AF9D1820F361C1269A5E90519A3E6D40782E06778C0AFAA30
+E8CEAB87054C4D156C1B14B4E8471D78648FDAC70A3B8ED474FA356393A77420
+4211F60E397D2FEFC6A8D91A80C84EB9E38E663249FB91D5C8A5CBA68BA04272
+5D5D42497E1CF5CA1E62EC2B139F5CD4D6318EBBA7AE28614D2D88709C2A3762
+611524B8A1FFC7B0FCBAF77AD8159C354F4887DB1A27781DE0A4BA7DF2CE2025
+D9278CED48584E8E6BDF30BFD24284BA1DF828B637BF84A02908BBCED67372C9
+EF44711BC2B1DA343C8D9D27A9745525C774F5D639B7AEC197CEEDD06FD27923
+35ED0D402AEEB51134665A47847429D91CF419CA9B09DC905F610F8DFC54E606
+ADCDA19D5CC68A7BC7108EC9236C64205B23CE68B9BC38EF3E5BF9E0E6ADF404
+7365C8D0436609438C82EEB2F356F79186DDF6C1C797D3C278108B1767D15178
+C4C3E8ADC2482BAB9536AE8419E5CF3EE1B6E53BDCE2A83E2E485F496A562C10
+B3F5A131BB19D1E5414C86C5F995521076340536E10613E42779FA15EFDB451F
+53495CE8EFF239E4EC442E1439594549D45F5276F93D496C9AC712D762D0B702
+E894290BA028837304AFDDD8BAA6564E9DC307A14A7A206550FADDC7784DE3BF
+3390188BBCDDD929C82B1D7B529553BA75ACF5B385D31EE3902D96B2B5DDFFF1
+9F0F90FD791E54128C1717F313486896868A34FAFF22E23CEF046D02C1419BA3
+4389DED48DFDE7F78F8ABE3DA17968B0F496945212845780F542C02A9FF04228
+93F0BE060C25D1F025E126D6F118EE0430CB71D5F505F1F1CFA4F13344F0AA89
+B2C910B4D4CAD5C06EF454B46AF7E725041C12CC2AB1F26A27E7EE894FA48475
+EB4A59658B4C84DE0D447BCFEB6DC029FC62E833DED093D365637BB4FFE6E54A
+FA8F11FE00A7F34EF25F9B37B74A763559B8048939CA9717D0A56CD52013D39A
+3418FB36F83A45A97B23B02D78EC7DF62F59495DC7FE2CBDFA2809CF9767D1DC
+B6AA7E9340B087566C3489B54EF32765AA77932C18E32F7F2BF03BCF1C9DB761
+236BF1159D7EF7BA13584E669FB1AB7922657A4096B81055E7285BEC4FDA1B9F
+F357FE89D12BCBA6A212AF2A021E6236B5F3AB3EF737223242746C4EE1FA8B30
+B432961A657121FB2DEBC398F4203366FCF496AF60B6BBD08AEBA243682DF531
+C2D17D85EC6368360462D357784D7563E23AAC44192FF9FD302803945B4718C6
+0A6E8927D340AF205F90ADBCC6D9CF9F2D95AA77EA5D27640D07A64FA082FF70
+AC271AD67AF53EBD42A1A1D06253B87E1D2F9D751985400B50A17851A058607A
+AEB752016567CD73027B5DFBCB2DC21FFECD11A007CF99F2487D49233B53CDF4
+458B10D8A6339B19224B225FC3107F2CE4C8F2A9CB1DB10B756BA3EF075FDA30
+7180AECC9136A728808C5275F04A901D30A0858AE1FF8DE220060113711AEC2E
+BCC5B57FA74225FCC802B16F3C6EF91C0D2A7C161A2FD5CB60C97306F7D3EC8F
+BD51C9DEC56280544FBE7F386F44DB987AA4E7A81F5AD2EC476A5D15CB2104ED
+220EC9D87AABB903BFE776A8E2D6D100BEC447AE99087427FCB5DF0004CB99FA
+629FBAE0AB3120C4CE6A5D1BF2C9056A35A6D8B776717324245FCF4149C448B6
+19698E9BD3BF24806929AE5B42CBAA14D9EF6D293543868166780DB02CCA1CF3
+1B5920B3A1980A159C71E94BBE479CFD35EC091F69D24BF00EA0779CBE23473D
+8574A1EDA79660AC5C47D29C4463C50241C04748792A7FA29AE0543643E27DAB
+0ACD228E449A1C83D5C057980739CD21D5C1CD592E982AB3E476550412904643
+2F3A1C2AD194908096FEF2FA80A071431075951514AE2679803DFA39184CE9A4
+C6AF7580511038A6FA0E54E73D55194F499B4415288FFCAF773B81B9C48B2A9E
+1A7FB96C100CA6D3F0B48209F4862AD9CE8EF933989DCE1B73D3931599E57742
+B040B92C221CE2AFCAAA25ECEFCCE560B94893B93DF096804121D968BCE8A427
+AA3616F7D06DD1423FC7D68318C393C212C707BADCBBB59A94E5E3E057201F61
+5D9DCEB02AEDFB509A65874F85BD531BD56115681838E509607CECA3C3DBF0FA
+93A5E891039FBEF4F564DB3CA8352D64E8A3C30F1B8763311F5834A072532ED4
+8080A6CFDA0CC7F841B55BA2DDF21848E8E9CAFFDE936BF0858A3C09BC536228
+9A11043CE78BA022904DC09828E4D7233B1BD6E1414357E13F010F4A6DF84831
+462BAB2CE0162E168A29204C92732A9C8B65B22743830A8E603C7661509A2A80
+8DF8CEAA63AB92BD4115160DFDACA109AD42582A8FED4584364CA5F0C3CB9EB8
+6D044E28D4BF1629A75984DD7EF5F3444A483B91B43357468816A6BA5922E56C
+168171A7B3CA8DCA7DF1274C921A860C26A36E7D49EE364AD0EBDB2405DF8F06
+BA9A2F4CC686AAB2096C23527A3AC4FD6D4476A46ACCD10566CB0555F0E598E9
+7761702A727A91A0A79FAA65F5B06665DEE1148353627EDE044F267EDC2AA6A0
+39AA0F7DE29608A18C2A3F0520F59B7702C7576AB6D7552E46312B5331849350
+A367272B71B3E6D5109FFE119755486467ED45746B0F27357F1EF931B5E12851
+FB223B588059DCC67362E47A3146F0E16176F362DBBD31A19C6696266E4639A7
+55DCD47CDDF1459D54D26D2422A1B50782CCEA79F35A2D262B2280605EEBC03A
+8835DB418109D38E36C0A44CF2966539F37BD5725CA67809C140A2E17C14E7F4
+912E752F75FAB802B0C62A210428392EBE00822DD61ADBD544F3582F813D10D5
+9873BA68B713E2C7367EB60F3905C0C49BC47C330C0F9DC1819A323D4DF0C45B
+ECF1E1CBB01522FF20E33FCA91121B7663B63F4606465555E569DBE49F88C876
+D497436039869157F7C9171FC1DFE87E1A5B0CC12F2EDD7D7237D93C439F2C48
+C0E9C55C7B0EFA3AEBA6E6C517578ED3D457120512031D3704D38881018743FF
+B95D976F4232A8F64A4CD1931F2584A409788AC47F5773B6312CDDB34AE437BB
+F7A2488EC67FF7BA825DE90DADE93611F6EB7B10F17717DE7C85542E54FDBB64
+A19F859970DE991954DB72945909D63BAB31AB7488F85934C821AEAB24CD8286
+3EC4DDEEFD050E4D03D3888AA6DF636560392E9BB60087FDB7E81054A42986D0
+974F8AE3684A659E9B6F2A34F9C3BD7490686E0F5AFB07F9FEEC6044F93707E4
+8E03750E41E99D93E137D4E999C47B100FF7F33812142BCFFAD81ADC7ADF898A
+28D0FF5065D529CBF95D5D10C3398DAD829F51A60426EF44BE40543FC545301A
+342D0314A5ACD84CB770D706FB5C35E996AABAA277B38F85C7D5C8800ACF8878
+1DBB33B6AD14B25D4523EC01FD08E4F07F1A1FA677ED02DC77BEC346FB1DD19E
+4D1811FF5CEA0CAC53693A8255C2AF5CFA159466BF78EF83AFAB988869D60CAC
+4EBFE6369927861D7F8D6C8AE27DBDFE53E5B16EEBB0274EACAACFC1DAEB1E49
+A6484027A0DFF59C9BE87BADFD7B5CB844C62851A3DF797A5729F6D9F9ABC75C
+47F937C5ECDCB374AEFBC418BDB14E5138814EF1835B21C298BB07650FF84051
+DDB74C4EDC7EE6B0F5132B6D50BBBC30FF60C642853C13BAC92D741E8720BE29
+342D8EC6811C5C493449D79CFD6F8776F72EDEE68020AA4F6AB0C38CDCCBE517
+19382E10BCFD1FBB507B4E06B24602D75E975DFCA3A897215D4ED8D4C1A11DF7
+F68139416A44D9DEB0A077E52501CF2C7FFBE201EB14418F8943E2690E7AC8CB
+173EC890B232E79CF28735C42814597F52A471989259CD1C3D1310D84B668895
+22853809E05F26C28067F5EF97FFC9FA1D870DF1FE5DA1D6E449908FF7D40125
+013B57A34C90AA7F7830CE1F6CFD1C7F9B1FC865B160671B97101CF7961DBAAE
+D8DDF68CDF9150AA4D7D379AAAF0660E8941B5EE08AABB4B2C27163E9BEB55F5
+F35AFE29559B381E23CC07D700CFF4126E020DDFD3034428461D0105A6D27D19
+833F3B38228508953F1B22EC62276AEAF09C4B1D8E7758EA68813A20E79EFBC7
+E3779546015B714A0D903190A1F40FC20CD4AFA681C848A0ECFFF2E0936BE7EA
+CED292FBC25AF6FDB10110A777F59F27166A0A66752204DE35DAD4A78968116D
+E8043BA9C76D12FC987F999F807974F0F386BE2FA01B5A4BC00E7282016722FC
+871C1CD8E3C67BB7DAF2024349E44828480E6C6767F504FC4927C7457D1BAB40
+B955E2FEF273DE998F75633E776B6AC16ADEAB893A66056BFD071C8C05D1FEA5
+86C1282280A25C6A1F974A4AA09819844E9E111D3CCC3B4EDE4B072F3AE10F45
+A7F6CD52A75921A7B2B855E414218EE21985DE3A070FB027D2B9B278206FDB54
+87BD1A73E9E6D5782D9EEE209E90D8948799A30D398B69567F3F90F3BB61BACD
+05390D3BABCCC9BC66BE2124ACE5B1D6AFD7830843028DA1B7E4E0837884CBBF
+C651CFDEB0603366E1EE6E2FF55758E7EBFE961026BA687D5553733C66158F0B
+41B100D85F75D673E4798BA1407CA8D20BC1E4714E7BBFA43C6A0D05E0A2031A
+71922150AEB33EBC109DD017F3AB194A4A26E69316B4FB5DBAD473E8CC965298
+941AA44BDD3E74C6DADE122E10580690FEF825540B334D9E7353A8CE1769BFE6
+9E343B12E672F455EB66F7C7197E5CEA726F775DF83C057EDB5BC3BBEAD4C3F3
+85D74CCD4E0167EABBC015410F64C501934080BECB910E28212A14E5440EEFA7
+A166AD8EE84EEC46B4E7D22BE069CA2E3EA8A4D4D3C7C39F53AA60F2C9BE9CBE
+DA881D39A2648BB0E76B273EEF070881A8D6D5AE0E208494844527344F1CB977
+F9587B6593219D53C2BB242745E2F766EE45476B1CF7A57F5AE1E552F66D86BE
+34DB1328563EBA8C82234FCF3B032CAE4F91EA2D2D654D9FC945792BFA7630CC
+5DD3D58F8CBC0A768C332AA3577A68B078ED678D459CCA95CB2219C3AF9911BC
+757F30B3E5D0F2B65975C9BB457EFEDE18C2A0A84481052304788792190AA148
+5879DA96637FF82EA549C21C261BCBB208382EA8CF88D5F90B459E035881EF0A
+538C11BD0D9DA7DDE779B0EC130D2178FC172D36418A0952F9954891E4F3FDDC
+E2EC9057F744C3E773A86A66FD5F96955849B954C0FF52AB188818C5C61B9246
+420972150A610F9B48703DE474F59C3F4D1BE7D6D2B644A53EBBFD31E0A0C859
+9ED16BDB040B423E7199523253F8B6930B42C3022B987282877176EAA2DA5D8E
+A296E691A63DD4AB1940203A9466DCEA610C1E710E19B51F024AC7290464E0CA
+D71F1ADBBCC929D47C067EEEECE89F51813DDC912BC3A458D0CB124671ADA83A
+E3F84A32C6D7C8328F3A61ED1A6145AA3FB9B0C61494C1727AD7C31179F3A782
+6186AD804A4E7D9FF45F23DB040974D97D234CA4369B0D7E100C9618DB4F0878
+F4D09DCA3951AE16452E0C778DF27929B1E8CA7BA0499C0CED63A1D44A055AEA
+B1B419EA759EB22870D07276550C82984B16CF42EC601180E2761CBF7AE318F8
+08226B26FACEF9D49325C01C5AA0AC3972DCFD03E1087BE1EF3E03706F66C303
+F18034BF95AA2E884E5F3437E82970B1E7EE52C6EF9D9AE515E62A22727E0FF9
+57B57723F2C0D6AB361B69C9706EE642A22D60C50582351071CE7CD2CB2063CE
+F79B68D9889F778A579974A044937D8985EF2EDB4802C41C9F1C90C2CA955E09
+794E1869445DD838C72E6C40B27F0EB4CA469CCA43EF2CBC52D0F85EA9A65A14
+85703F20CB9C8A23DFB37AF40924F4C6DC42845A908FD681EB7A9760CE42E6A8
+CAC78FD7B5CDA0ABD6B7FF2F5A7C11BA6728CA320918A724D258CC0CF39AF7E0
+7F7EB31A504421E7256E4DFC9094DCDF9D5AADD011D28E3BBDD50EDEADD9A6C8
+5A3D88480EBD42B25BC54F25124F74A4AD553381D91BB0073D0E2CA40260F47B
+019DC331A162029C3E83DCC2F671E62285CAAE1508B721A2725C1E393B26C33F
+A21321E0BC4EF1DFE7FD059CEE5714F2F9305DFAE2E13AAB396A8BDCAAB31DA3
+5D2C97192EE1A3F6A3222ED562DCF55938FF3569D575E79EA970CE161EDB92FD
+8AECEBEEC8B1B659354E686D3DC314B9E7CC0BB26335938C1C7E1B345A8EC8E0
+448DD0ACEF4F0DD28EF06BB4CB88949E8BF0FBD7AC280B3C88C965ECFEEFF13B
+AED2C9C86B43AE788B7CF2553AE7F595B8CB7E1D02CDDCB93C15
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMR8
+%!PS-AdobeFont-1.1: CMR8 1.0
+%%CreationDate: 1991 Aug 20 16:39:40
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.0) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMR8) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle 0 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMR8 def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/Encoding 256 array
+0 1 255 {1 index exch /.notdef put} for
+dup 11 /ff put
+dup 12 /fi put
+dup 13 /fl put
+dup 14 /ffi put
+dup 16 /dotlessi put
+dup 18 /grave put
+dup 19 /acute put
+dup 39 /quoteright put
+dup 40 /parenleft put
+dup 41 /parenright put
+dup 44 /comma put
+dup 45 /hyphen put
+dup 46 /period put
+dup 47 /slash put
+dup 49 /one put
+dup 50 /two put
+dup 68 /D put
+dup 69 /E put
+dup 71 /G put
+dup 76 /L put
+dup 78 /N put
+dup 85 /U put
+dup 94 /circumflex put
+dup 96 /quoteleft put
+dup 97 /a put
+dup 98 /b put
+dup 99 /c put
+dup 100 /d put
+dup 101 /e put
+dup 102 /f put
+dup 103 /g put
+dup 104 /h put
+dup 105 /i put
+dup 106 /j put
+dup 108 /l put
+dup 109 /m put
+dup 110 /n put
+dup 111 /o put
+dup 112 /p put
+dup 113 /q put
+dup 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 118 /v put
+dup 120 /x put
+dup 121 /y put
+dup 126 /tilde put
+readonly def
+/FontBBox{-36 -250 1070 750}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
+016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171
+9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F
+D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758
+469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8
+2BDBF16FBC7512FAA308A093FE5CF4E9D2405B169CD5365D6ECED5D768D66D6C
+68618B8C482B341F8CA38E9BB9BAFCFAAD9C2F3FD033B62690986ED43D9C9361
+3645B82392D5CAE11A7CB49D7E2E82DCD485CBA1772CE422BB1D7283AD675B65
+48A7EA0069A883EC1DAA3E1F9ECE7586D6CF0A128CD557C7E5D7AA3EA97EBAD3
+9619D1BFCF4A6D64768741EDEA0A5B0EFBBF347CDCBE2E03D756967A16B613DB
+0FC45FA2A3312E0C46A5FD0466AB097C58FFEEC40601B8395E52775D0AFCD7DB
+8AB317333110531E5C44A4CB4B5ACD571A1A60960B15E450948A5EEA14DD330F
+EA209265DB8E1A1FC80DCD3860323FD26C113B041A88C88A21655878680A4466
+FA10403D24BB97152A49B842C180E4D258C9D48F21D057782D90623116830BA3
+9902B3C5F2F2DD01433B0D7099C07DBDE268D0FFED5169BCD03D48B2F058AD62
+D8678C626DC7A3F352152C99BA963EF95F8AD11DB8B0D351210A17E4C2C55AD8
+9EB64172935D3C20A398F3EEEEC31551966A7438EF3FEE422C6D4E05337620D5
+ACC7B52BED984BFAAD36EF9D20748B05D07BE4414A63975125D272FAD83F76E6
+10FFF8363014BE526D580873C5A42B70FA911EC7B86905F13AFE55EB0273F582
+83158793B8CC296B8DE1DCCF1250FD57CB0E035C7EDA3B0092ED940D37A05493
+2EC54E09B984FCA4AB7D2EA182BCF1263AA244B07EC0EA901C077A059F709F30
+4384CB5FA748F2054FAD9A7A43D4EA427918BD414F766531136B60C3477C6632
+BEFE3897B58C19276A301926C2AEF2756B367319772C9B201C49B4D935A8267B
+041D6F1783B6AEA4DAC4F5B3507D7032AA640AAB12E343A4E9BDCF419C04A721
+3888B25AF4E293AACED9A6BDC78E61DA1C424C6503CC1885F762BFCDAD26E094
+0B5FA59BAF86B33DC3FB410482C89BD49D35366A89B60E664BD2FB8B6BA4C8F0
+6346FB25A30ACD007AFEBF8AD0DF025287F48C231635CB6432E5D07CC199F5E6
+F6F2FCBC82331A9856BBE0AAABAFE8F4557FBC1F1755C616014C46FDD9BCD5E2
+74D6ED50824C60C92D3FE775537FF81BFA46D5CD10719F7759C3202BDD4ACE5B
+16155CEC9104E72C64AE50EF312202BC3868261B1E2FA93DE6232D7A5ACCF319
+E69B1B46CC9059E83E5363F843D7943FE7199A188C7086B2479E51DD46B03661
+026301509A0B5820167D62A4DAB4FB1B2036061C3BD36EF9F17C00B1EF2834BE
+B4EDA7C90D86EAFA03FF8ECBA7E3A965E6FA7C7C58FBBF508D7A1B13F8EFD6F2
+42A708BD62E0044C17422CFA3675F118EC90BEAFF1B0B26FD87DE34F560BACA2
+B3F71DCA46C784DD766FB880AE6C3899154FC1469CEB07DD97AEC7BEE2306813
+72C082827E05174D93C6ADB569125F9216FAC9417AC2F08BCBEE840A1D934F04
+6D2C0D128C20605670488E32EB8A4DF4D1F41F960ACD5B075380E7FABBDD7940
+0061C86E7632B97F0CF576013FC802089CDDD049CC50ACD2577BD46EDE07C475
+4C3E9610BE4169296F1E4548F6D850C3BC0F109EA0C85DF87E794F65C3F7DC47
+BC5D474047FCF7AC44C31ECF04D3777325D8B26CCCDAA6DD5D10A22719C0E9AC
+18DFC769FAA33A7CAE498F93E090559513952CF0C127683AB56FDBBF7FB4C0BD
+FF8DF946996DFA44366FA13EA2DE60E35708456B501485F025FDF67B2527CB5B
+775A28FB4F7A506546A12D7DF1E266B1075465A9DC0B62DBB3C70CF8A9919ACC
+69DF54A36E536FDA79BFDC65D00F1E105515E9B14A5C2CC4350FC582C84CEDD8
+952AAE0AA20AA7A92ECC025964AD79AED3791232D219E04A654A2FF25C901B24
+072CD077FF3949594627A38A32A220C4957F2A5ABE88BBB7DBB360CA19C63D25
+EE7BF0940DD0FD50CD90792A03D61521A82F90376723A190FB039397CD48FC66
+28CEF6D3421040367DB78142702FFD89E0A00E03CC42C6D0B02C5639C26C8A58
+EBC6EAC6CA242376A680A5A73CAE6C893AE7BCF42F21966DF0F487D1FD20826A
+1AB6D9B3E4AED46B224E95668E4DF918C8DA5B63C8CFA1F4BEF212A2E4CA63C8
+73FE76801DAD11E96D059E0EB0672342F505BEB7D0231DACA72F90EEEB0E944B
+973B00DF7FEA21AD2DE77571A922C39D526EBA4907C01EF8719E9591E3CC0BEB
+6798FEF283083109B3807DC715265E6CEA6E874FB01F758E7F4B372CB6967A12
+7C9B1D328AFDDC0DDC32243E1E847F69E02BD6C64CE24AFF85CC05BB90BA3AFE
+1DF8A910A230A48004034D7F72C23A4F1B556BCA4DAAABB66011074615E8992E
+00EECF73939959F27BCACEE2E60389EF53393F861505C0E374B8BA7DA2A54634
+1FD44F541649C585D4EA8012426E957AABBE7B78633800805DD6C958B347F386
+6A4A3F0308081F1EA96676F7221C90674ECC66BA7E32345585363E44B6BEFF11
+8424EC471F8C234B145A9F7C6741C1C0C257A55078BC8897B24E1CC71AEFF8E4
+3C46CF3ED69BE05ED2747D027E55E8D24DB09D9978A5FD5BB5968C777DC6E62B
+7769E18593A21F1D7061B7E01D55FAFF879A299C6990DD8FE4E03F80F2BD85C4
+8489D834EEBA66BBF6A378CA16418091D3B06173130922E9C9AED4CC09B00FA7
+17C0E6218E5F17DB18BDF932EC3B7814CB746CDABE362CFFAF9EA195DB2E3355
+C4804D4E65FEB1BE1293524D1E0C7A9CF87C04107E60EEF8E6316FE1961EFA4C
+380691175D7CAD5D42A04BC9117A8A53E86D17021048A9F73F8BD6C30BCEDCA7
+512B4224F26D5C3F949B65FE8A222539ABF1319FB80F7C1C7A9049849BC39718
+4F081BE49D110030630957DBA11BC38DF9E67F60C3A0E2B4165E81F0E1444690
+7DFA89C8463247F1D84E31A168E6A6C12320012B4BF5104E343CD3A9A4A80ECF
+6FC7B0043E6B9107F1EAD0E949D4C7286A2A9CF506522AA76758ED115800586B
+8765A82598C8F882F3BDDE02EA5A508D23AEE9CCAC51B237E0C004A1B8921F83
+9516AAF0640C2126CBC274A744740A4CE202BF4DBA9B9635A345C90A87994049
+C8C975A3A364DE31790B9138CEDEFD6736626405F5C55F8BAAF6723641688424
+CCA5871C72A65D204F4B9BC8A5B2572CDBC55A615E7BF4695CB5E3FD45280236
+C2B569DBE95893E896D1B300BE04FBA8470F89305584B332486CF98EA496F675
+61AE9FE8C6099BFEC126D8B6E2ABA4CD97F7434DBED0A09151671EE9BDF7F1FB
+029378C428D367A4DD129DA2A33C21C91EBB53045983BC27700DA4F8CD28D4CE
+BCB9D37B5DD4A213BFA8B48BBF40399DCED470E541BFC87C0B14C2EE96959F36
+26536E7442A18F022CF7A1523707E2C71CC700959B038856E4B562E0FEB326A5
+149220427406DBBE2E2DF677BE8F133CAAEFF29B491E590848DDFA014E0A6E61
+D393071FBE1A75DE6D751920045D59831440D0F2F84C48BB712E2787B969FC93
+41B4F53427CECA794D8CFFFC394F5C61FBAB6D289FF49F08EA396111194E941F
+BF0FDE0A480A0D8025C2A1EB0A7123C2C4933FB57F8D5821AD99D87FD6F595DD
+2E3938CDCB424E28C18A5B72F301CF91DAC0A7A52C637BB60561B14903297EE9
+EA8361DDDDE5C3DF4D7BACCA022EC94422F26A233A62FA49B48F59F0B772D4A5
+01D558AC29A11CFBCA0A1D22DFF33E42A6ABD39107FEE8CB267358710AE2018E
+BAE0C60C5115216B4E5A235DE847F2174456DD5167A49FDE0E298BD6F78435CE
+45277AC664AC406D26A46B3EB6FCE8FEF468E1C17F9F3878317E6B93ACD62B83
+873ECE0B8A7E3D577A1DF1CD6BBAE97485680152BCA0A6612EB132F295176232
+FDA5FAFB9570CD4C45F6543857C21D3B529CE2B56A7EB7F8A8AA72775022550A
+C98C1C40A5A2FC71E79D0F13FDCB717272A52EFD70681F899D6FF0F984D2B038
+8F40A07F2EDC6D89905125BF49B8DED77B70CB677B2F5D8E14A596F08D1CA4E6
+FA0E729C9869B9B9D1715235C5FAEEA75E57AB60E6576FC06CE5CAA30BE42B9B
+AF09F2FE4F358526501BA0BDE042CDE1A3B6290FE3A8CB744CA6E2082CCFD6E3
+371D90319099ABC30108CFF909C9E3FFFCD5027FC7792B3337FDAD757F9F189E
+94CFB440246DB5080D22B0484BC9EBA1B71E759B775152DA6750C5125EC57F21
+E3DCF7781F6B1F4F0B8A454F7145C56A013110B56724961F2B5C9D5BBC31C38B
+B03EDEE91AF1842DC0AD3A139514B4B9876074751893AC60D79C9FF29AE3BA0D
+797DA4CCFBF188238B7CD7238909A368964B80904E8B319107529F7740D8CD36
+A4F4416F5CDE3ECD9E96E0528F3DA04EC8D2D9F883649F276CD9E9EEFECE0554
+B59154E978443DEF09DA8E20768C773F64CB6990CE16AEC00CC9C354D7B4A871
+C93433BDECA5C5B29A576352C18DF64415BD65FB49AA4A37C6A08BB49EF727FC
+AF41BAA5561E96C8A8D3C878642B264AE6FE7A4714A95BA15751098B655B8DDE
+BAF7CB671D0C831122C688DF16500092D9893165D84304A76EEF783B1BF9C7BF
+A0A44561034D7B5AF0B941081BAB79935F87CC47C1A94C3474F5A816038ACF55
+A28971441815C25409267CE15DCEE1106DA3AE31DD6CFEE18C56930D8B83F72E
+39D9F8388028B829F8C088AB1DF85E48C9136E7A002F58B6C228B24DADBCB575
+1E46776DFA05BC5B9975B275C4771E133039E03589E91886F9B8D8A24CCE2C28
+869B9611C9F1A1C2DB2B4D98CC2B33657FBD9D401232E8A60B26BAEB7B6ABA0A
+08AC541D2C40E5D5F99E59087B5FA41BEBD443C9DA454515BB212E8871FE5003
+B218CE118BC213128782ED027E29382606F84A730B362206F35E2AF28FE0057D
+66115636DFD24EEB3ADAD99EF5437EBECAC657988475A398815EEA1D47FAACD4
+9D5498CCF68B58B9D733925AE8BE4F49EAF633E000B6AC6FF355058B08E059A5
+FFDF1B568C2FB202E1FE5F0E33667C31AD1BA08C5443FC3DD94F3E70040BF186
+9D6D1759275AA67CBAF0D58C6CA455A3A3E947A5E92B44B9A1A79154918905CE
+6BE152BCA8C421B2B9281917EBF329597BF5072952BCCA4E3B14E783EC0C9FCC
+FA05EAF1EEAB96F7F88FDF23FC5A7C702542B3484F0341D81C235DE61BE04653
+4DF80DA696682CE68CEE9D4DF7611D86EEE18C00ED8E5406F3297ED1E0687F46
+86526AF9C811766A79F26F4A9291C8FA58AC32237696BD52A8C07CFE7DD95E1B
+1B401ED62F4E81B8DB488EE433F7470C09673C5BDD609BBC5F4F92109686B803
+E63FA706A382F6FEBF4486FF7E414886AE0769BF7A45E1A1AF84D31EBB6E8B2E
+760BE525A023166F9C77341C19CC4C83632CCACA07C833B355791BDD303266A3
+8D57C9BD3F75DA69B60C86A0863DD8E7F99AB41875DCCA3BEDFD63E4ABAEF0DC
+20F67CDB3FC225D97D22C6DABEBDE62AD4E6B45F39D796EF2B4EA684DF8AB73C
+BD8C5E8B0515E33497FF95DB0D270AFE7E02463AAA9E507277ECE5A13A408AF8
+1F02675800CF1ABDD3E469D88788C2D7492AAA455B4DA5FA121923F9B33EED5E
+B6D0C1138B364370D9D435C31C85D4C6E351F9922D12EC851B2C53CBA16F36C0
+0FFFBEBF42FAEFC77FEEB164D16668F11F9B279736380482DC333CF89C42A4D1
+E01DE4377AA06BA655DECBEF86F1FD882891BF859BBBD39B73D2FB7DB7678DB4
+77C54FD056D115E7FA62E582B6CD2803D40882204ABE7A245241C149377A7B5A
+BC75982489F6F29A301CABCC547F005CBF01819BB279BC775C1A67C0A1544D81
+1063FA144761F1D0B6BB3CFA49927B1415647D03E62BDF7B37366EC4D3E79068
+D3B70246E1D3AD811DAE133FFD5402059F936D38B9A33499096FA1F674D1A26D
+E4DCDABDE6512815390EB7225E2C2E629624815BC5B7004697A566B15F03340C
+828A635E303A5D8F665EAC15629D68D72EFF4BB28C732D0777DE732139E1F3E4
+7DED96116B8B82894170BA697D2388014AA235BCBA356B8E162463C98D1A602F
+6AE42FF547A0604527364E55585E600D3E9E226F50BBF994D645B458718D4237
+F331C1AAA01901A270BA61A5BEA47A34D2B36F1A01E33167A5120BCB1B95737B
+DFCD6C21AE76B86CF22C34A1BB544E3DA6D0BB02EECA21B537AA3F85384E0685
+FE86FFD4883E5917E8E4A6BA9F72386C04DFABFF7E85FF327D0380A581055E29
+B5DD25F67E459AD8E455701CA56E6682CE157498F8015E9EA9309964507680A8
+129708565754D39295938D39B75F6FA0E60DAA1B3586A73CD93B690ED7075A58
+B1D81CB99A85A4E2C2C7CBDB0BD156A9453DF4A0DBB0B5BE7F2E385AC0CBDF42
+53B43BCB0B7051970CA90668EAE5524B4B47F9316B5EBD95B42DFB6A686366F5
+4E8ECD2EEF1C1DC0D4E91D627CB754D05C42F6B627166B53C5E9979F67C05FC5
+1518A9F66338E6F0A68A073757C1B09C3BA45A4ACEEB88FA312BD29C64B9F704
+2AA83B63F6B79D4BA81804F31C49C5E86DA588D60FF5F5F0DAD45121D1DF136B
+824522C19BC1FD616B7ECFD801A8E6B3C900C8C7EF387ECAFA0171F94B12972B
+9BBB9400329B94664828228A7B082747CE7BB86FA4BA7DFFC70D6369F701F4D6
+75362A1E2E9FC1F9491A21B74A7B7D9E08A2D1CFEEFB1B00B217E9B82BA3F043
+F9A78D26F017DA6E33BFF7FBA1A3F0A7A9FDF9E545C9574B0E643A2576FB5D11
+D2A31C80B7D1E223AE9D65D0DA27ADFFF437D29537A815808C4051D5AD68B8AE
+AB72C83E36CDA0072FBA4BC6BAC1AECF629119AB2A7FC1DA1ECD40A759943EC9
+5F5A5D8C94331532B16C85F79925E485494469A1EB4741D90208E4436BB71700
+DC5A262B1857337F13121EFC90D50416FA6C9F59EF53CAAE5D8FF8B922939F24
+55A8380FDD23B6DBF89CE32FA744951CBB0D1F0F54E2F4D47D07176E08559FEE
+CD080B9EC4E92C389381DD7888F7CFA9B01287B6EB9F7FF4FF4B0B5F14AD44D7
+62502DF574417E86520F578FE229113B707673E7C596947663A6DF14067ADD25
+B2BA77923EF2C29E4CF0AFA1E76A9B3531153D65CE094C768C17A0D429A11FAA
+F765671285FD96EA5759F2FBA19E8520D748D4BB6B2581974004BCA3A231E69A
+80E8B9C3DE4185AA9FE85FBD47CE5FE47CEAD1CE8BAFBEB9F6E1D546537BB712
+76DA80BCDBA6324BDCFDCB33DA14D6CD7FA460A06E5F977ED8295B5529BFB984
+D5CA95E43F2645035CD347640DE79BC6EA3008556279D33AD1EE216DF0C84A6C
+CD78B2EF8F2DE91176FAF066BD0856BBF7C2E9B36269139C51FA2CF9C032CB26
+BA80F92D00D53B626EE4A497006C81F93A4A0ADDB3ECF54ACC6A88F0F4EEA5F0
+C41E4B6455F9D4CD80057C2078D667D74EAFAA08815678EC144B8FC1CE4794F5
+747B942C90896D9BFB7065FF36E37AD38DD5EC51899CDE80A549C816AAC70456
+3B41E00B099BB201B4C49C2A91F5D75AC1F1AD6EB8BF300FC840E8F3C28ECA46
+FDD957D4E9F82828719760F0D067042F7EB687D12AF6ED89F5108B8092D9DEC0
+28362EF0597EA892067603C2F2780283617D14AB3F2998B4D94F272DD48A4FF2
+2240632723F02C2C6C526A0D1D7C3DB7D650979080B936EF2D71B5AEE7F1C743
+730712A2DDD6A7E87FFBB31C0E8B9C57D33E8B7CB24B9B79E2D01D698F4A2B52
+DCA685B76DAAC5A7849829CCB09F533E6AB6EBB2867097D29FD6CC02C6570758
+778207BB9FCEA10E355D2334405A6C5CED25B06D51B564A8FABE0810F3CF1591
+96773D29F172AA58F1A785762B88AD2857C2DD2C582E48E92EEC42F37C956F9C
+754E1C985FD9A3F066DDC7505D55A0019691964BBE8648DB702C2531639C015B
+C919A266078DA05556DA1E18C8609430DBAAF5EF26C3F6C476302CDD49652264
+5F3E12926CE91BA7EA2D77FC046FBDD952C66E35D810FABA0DF577854999D3CD
+17A06E168C4BEE93AB73D6ACF5CBE38AC803B049F89EFB2C5A4D608BF7A6A107
+2FFA1C3020933A896D33D172AF8F313D53572F5646A1BAFF9BBBD7894D9A8968
+D4F04222ADE3A1BE7C5913DFB65FCA39FC3C68FDFD6EC93D6858F0740F93D886
+C09AFF43A5C1DF7052378F128EDB66786A3547CC075C2FA023EA2A63C7A6B064
+97D470AD76B07A59D7CF3ACCC5CC563CEA0B8173812C710A2D44E2D60CAFBF16
+13D1890265804DE85521829FD3DC04F967BBEA013F8178709A51416AE0D87FA8
+8C3DD085CC9D8D2EE5DE3DD630EB053F540B1CBCEE164BF529E3EC1218646437
+CB101F887AC6F5AD782BBB677E8FF3018E686D3DA1DB617759506627C269669C
+5BD0AE3FEF1181ED2B692AD3120E40EBB0D8F3CB127FA865FE7A36130E74720D
+023F60D6A1590E725E0A86468A5D7469AE8F7DB27B45991ADDEBF35BAD7BB467
+CF1CE137C48AD5C648648BE0AD3DC95B888D3432CDA047B58BCECDB1C10740C9
+EBCBFC21732296C3E9E273129E62CDB1ED23C5494DDCF13C72CD91F5495DCD3D
+D9E624B4C516169F6BD6808FD557474A1A49D93C0457CB91C15EEB0C59A2A47C
+CC64EB273209F7ED5292C015F301BC6A004825D9715F988E8417C998F4B3AE39
+AF1EE945944B95CB0BE7C2C78174D36DCC181D2C4485F7A4F6E3F188D84996D2
+7767614B51B595D27D7BA1F010CCBFBB4A850E4924CC190AABCF3FFCF4562262
+DB52023EBCC89EB7FB29F1A56BB5D5D411FD11301FF3FDFCF512FB01D4AA67F4
+ED3F670C222977F22DFCEF59A9C9C76EEE0F914F04D9FBA6D917371F25475624
+3C8CBE5FD9BAEE93BE81AC5F4C35E811277FC61E16D98CDAD851B39360FEE863
+D640317D92FCD587EE527714A70FED5B60976AC6516F7B0DA2E3B48B209BBDB4
+3E8D0F5A68DADEF38A3FEBF97885B68038B397852C5B1EB6081A12C4A19F27B2
+2964C2B12430024135DA79255CF0B9C830F9B67110FB782ABCC0B11F5E5D2E7E
+62007E5B0CAD89273CD169316020DD055AB316CB9E22ECF70A13C7DB0190AD57
+9D8507AA5B1E0AD996137F3D01F74DB257EF115115BF54039B05113E767DBFE9
+6E95259984262CF15B39F40F7557BECC3D72B996945E3748F12D7D264CF03A73
+939711DB0FE60ED2C0C058832D62B36EA9581BF1ECE84BEECA8A532362D045EE
+6A8B375683A3517866FE5CE4BA9AFEB598DF3A521E2D40180063F0146C1E6D70
+69FF30273ACA3B469A4ABA1F00F832F43ECAA26F50EB30AA4A0A43F6672CCCC8
+7AA3261709206497C62FA161DA05BE012FF0C61E8AC135404E11C88E44798FED
+C8624EBA14C3F29E78F6756509AFA6A6DB52F64D1C21131C3D6AC7CCC85DC039
+E7C7F52B7236F799BA55D2E1A0F950157337479E123BED44F10D737CA349BD79
+D7A866B61A41E9E373A72F697074920791C4392683F1065BB05546A3EC1A1BEA
+4E06DF055CC3E49A97D497033CED7F2157E838A71D530574997E8A9ACC9D112B
+6F1E3287BD1D6DE3059D573105BFBF7BB9EA5919EB0D472BD9EA40FFF317A600
+BFF74E9A567300946392FCC1446818C033D5ED18DD09F1FC40C31798C4877C1E
+F7589A7EE12FC113E0D5C394B9E162ABAC29902D2037375064E8B93F85FCC226
+75582633D74F19134963F189FC8BA3534B69B4592C6B43D12F30ED8B11D51D6B
+BCF5FF96E919F7E0071403EAED712255A515079CA17B281318ABB9D44A5AAB96
+956B2E40A8312B3BBF3A928343BF7FE6DE81889EF8629E7A353C1D0771DE8899
+E4D7D47ECE44B4F7D0FE2FA4B10675AA0C24F59E22CC8A432FE7776DF4F042D5
+2C37464202664B75275CD4C46DF7FC32CFAC0CA4D0E6F7805A0221625CBFF147
+17F876EAB25801B3A9BB3020EDD39F2386820D1FF0788F63CDE1B04D0E417F0D
+16DDB16B0850591B0A8B6B0E9BE531558434D2EA441DCA1F99D1DBC0177AED2A
+84D268C923FA11182CD287F35C38441DB259CA632010732A34098A6A7B2036BF
+77AB4B4442062B3F1CEF021BA4EB5A3B7BC51D92555A7E68EA5FA142E6406B9C
+5292A56B48CDC13ACDB8594EB2689AC52D3E1E8F4E3F20DCFD0D60F588274247
+749D26677BC25F74AAF7A9BC4EE9F7CF33B43C56884BFC617DB872339465AA22
+ABFBE14FC1D7C6DFFE26A1384C54E84E4D0C53C8BCF20052E5E0C37DCD7B87A6
+BF43DB8E4095F235A28591C939A0EAED07E7515347CA17F3C861076D590497E3
+379F5671095566EB74480D635DCDFCA0513FBE5D175AD3A70DA5AE551EDA1A82
+0F9626CC07D0DFA4AF84E34D76DA4734165E261E5ADB08A7894F831FA36A8C91
+F4CF41B0395BB698E7AD3B5B53F7823F0F250ABA832E877D5B8D144A507365CE
+DEB558DA47F8325185C0B73E30BD7731B7E529817B3F6B845CE44A5474F2C6E6
+566A7B129544E2ECF251F146555661F8A088FFB50068B052826E5B20832D2328
+EAD92DC22B22BDB5860577CEFD4DF35C46FBAFECDCA3F4074BDCEE3208B77BDA
+FB58A1730DFBB0D984F08735C3CCB821A68CE37567A9817451A7C78FF7F55729
+85ABC2567D522BBAD215095A0447EF30D23BA45A24ACDEC4E38DA511674828DE
+6AD7736F3B989AEE38DB3F7A61DBB7C2438CAA02CB395209780FB22D4BD1CBA9
+5CF9B2169F973E322649597A56064432BCF0A2B484F0A145AD3E79773E1A0466
+9C5644EB6700703E67DDA869E4200FF89F3FEE1CD37318607177B8F8CDEB685D
+87829150D86131929C85630375EA5A1A539DEDE767808E6E55D5AE2346B4D39B
+85E1B3BE9BE4BBABAB62219A05C303D72D63354754513A753DBD8654F2948E87
+12B850890DAB5B0C82EF882AE1A34C2D8CFF44FFB6E9129F0DD7BE6F11606B9C
+7FB57ACAC628C011AAD417478FEBCFA0B1D59051191A2DCFE35A1F0BB3C88EBC
+78C8E1FD5E7ED2980D95AB248D6140AAAF17C9D8ECBE0E553FE476C23905CFFF
+4646C906D39DFB11A3715F260D13F250732EC66D4BDFD3F2D7FA95520A2938E3
+35762638B374221674B700ADD197501ECF1EF1454790B6AE5ADDFAAC6AF1E712
+B2A467591659B7AA4D7BA89C4DB0F16EB49FA37A5632676502A86536D3E38893
+08DC8CFEBCEFBBF7A1A9104E4C9F827AF885A981222E4C9B89B69710B4F761FA
+3992E8168EDB118CE8C3
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+TeXDict begin 39139632 55387786 1000 600 600 (fr-drdref.dvi)
+@start /Fa 242[61 13[{}1 49.8132 /CMSY6 rf /Fb 133[27
+32 32 43 32 34 24 24 24 32 34 30 34 50 18 32 19 18 34
+30 19 27 34 27 34 30 10[45 45 43 34 44 1[41 1[45 54 2[31
+22 1[47 39 41 46 43 42 45 7[30 1[30 30 30 1[30 30 30
+30 1[18 21 18 4[18 14[27 4[30 30 18[{}58 49.8132 /CMR6
+rf /Fc 129[35 35 1[35 2[35 35 35 35 35 35 35 35 35 35
+35 35 35 35 35 35 35 35 35 35 35 35 1[35 1[35 35 3[35
+35 35 2[35 1[35 35 35 35 35 1[35 35 2[35 35 35 3[35 35
+35 35 35 35 35 35 8[35 35 2[35 35 35 1[35 35 1[35 1[35
+35 35 35 1[35 33[{}63 66.4176 /CMTT8 rf /Fd 135[60 1[60
+64 45 45 47 60 64 57 64 95 32 2[32 64 57 1[53 64 51 64
+56 2[57 14[86 1[109 69 5[72 1[88 83 1[87 25[32 19[57
+57 4[64 64 12[{}33 99.6264 /CMBX10 rf /Fe 135[43 2[45
+32 32 34 43 45 41 45 68 23 2[23 1[41 1[37 45 36 1[40
+2[41 5[61 11[49 7[62 22[27 3[32 32 20[41 5[45 13[{}26
+66.4176 /CMBX8 rf /Ff 129[35 4[37 37 1[37 39 27 28 28
+37 39 35 39 59 20 1[22 20 39 35 22 31 39 31 39 35 20
+1[35 8[53 6[53 1[44 4[55 1[48 54 17[35 35 1[35 20 24
+20 2[27 27 20 19[35 35 1[20 1[59 39 39 41 11[{}48 66.4176
+/CMR8 rf /Fg 139[53 1[57 3[76 4[38 2[42 63 76 61 1[67
+28[105 99 47[69 19[{}12 119.552 /CMBX10 rf end
 %%EndProlog
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
 %%PaperSize: A4
-
+ end
 %%EndSetup
 %%Page: 1 1
-1 0 bop -273 -364 a Fg(Carte)46 b(de)g(r)m(\023)-66 b(ef)m(\023)g
-(erence)46 b(de)g(Dired)-8 -256 y Ff(\(bas)n(\023)-33
-b(e)25 b(sur)e(Dired)g(de)h(GNU)f(Emacs)g(21.x\))-342
--176 y(Les)h(commandes)e(marqu)n(\023)-33 b(ees)24 b(par)f
+TeXDict begin 1 0 bop -273 -364 a Fg(Carte)46 b(de)g(r)m(\023)-66
+b(ef)m(\023)g(erence)46 b(de)g(Dired)-8 -256 y Ff(\(bas)n(\023)-33
+b(e)25 b(sur)e(Dired)g(de)h(GNU)f(Emacs)h(21.x\))-342
+-176 y(Les)g(commandes)g(marqu)n(\023)-33 b(ees)25 b(par)e
 Fe(\(D)n(X\))k(n)n(\023)-39 b(ecessiten)n(t)27 b(dired-x)-450
-24 y Fd(Lancer)37 b(et)g(sortir)i(de)e(Dired)-450 184
-y Ff(lancer)24 b(dired)1165 b Fc(C-x)36 b(d)-452 264
-y Ff(\023)-33 b(edite)20 b(le)e(r)n(\023)-33 b(ep)r(ertoire)19
-b(du)g(\014c)n(hier)f(que)i(l'on)e(est)h(en)g(train)-450
-344 y(d')n(\023)-33 b(editer)1080 264 y Fc(C-x)36 b(C-j)p
-Fe(\(D)n(X\))-450 396 y Ff(quitter)24 b(dired)1140 b
-Fc(q)-450 594 y Fd(Commandes)38 b(de)f(d)n(\023)-55 b(eplacemen)m(t)
--450 755 y Ff(ligne)24 b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)1036
-b Fc(p)-450 834 y Ff(ligne)24 b(suiv)l(an)n(te)1111 b
-Fc(n)-450 914 y Ff(ligne)24 b(de)g(r)n(\023)-33 b(ep)r(ertoire)23
-b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)619 b Fc(<)-450
-994 y Ff(ligne)24 b(de)g(r)n(\023)-33 b(ep)r(ertoire)23
-b(suiv)l(an)n(te)694 b Fc(>)-450 1073 y Ff(\014c)n(hier)24
-b(marqu)n(\023)-33 b(e)23 b(suiv)l(an)n(t)848 b Fc(M-})-450
-1153 y Ff(\014c)n(hier)24 b(marqu)n(\023)-33 b(e)23 b(pr)n(\023)-33
-b(ec)n(\023)g(eden)n(t)773 b Fc(M-{)-450 1233 y Ff(sous-r)n(\023)-33
-b(ep)r(ertoire)23 b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(t)759
-b Fc(M-C-p)-450 1312 y Ff(sous-r)n(\023)-33 b(ep)r(ertoire)23
-b(suiv)l(an)n(t)834 b Fc(M-C-n)-450 1392 y Ff(r)n(\023)-33
-b(ep)r(ertoire)24 b(p)n(\022)-33 b(ere)1077 b Fc(^)-450
-1472 y Ff(premier)22 b(sous-r)n(\023)-33 b(ep)r(ertoire)817
-b Fc(M-C-d)-450 1668 y Fd(Commandes)38 b(a)m(v)m(ec)f(la)h(souris)-450
-1828 y Ff(visiter)23 b(le)h(\014c)n(hier)914 b Fc(Mouse_Button_2)-450
-1908 y Ff(ouvrir)23 b(un)h(men)n(u)785 b Fc(Control-Mouse_Button_3)-450
-2095 y Fd(Actions)37 b(immediates)g(sur)h(les)g(\014c)m(hiers)-450
-2255 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)800
-b Fc(f)-450 2335 y Ff(visualiser)23 b(le)g(\014c)n(hier)h(couran)n(t)
-705 b Fc(v)-450 2415 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)i
-(dans)f(une)h(autre)f(fen)n(^)-33 b(etre)83 b Fc(o)-450
-2494 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)i(dans)f(un)g
-(autre)h(cadre)159 b Fc(w)-450 2574 y Ff(a\016c)n(her)24
-b(le)g(\014c)n(hier)f(couran)n(t)769 b Fc(C-u)36 b(o)-450
-2654 y Ff(cr)n(\023)-33 b(eer)24 b(un)g(nouv)n(eau)h(sous-r)n(\023)-33
-b(ep)r(ertoire)523 b Fc(+)-450 2733 y Ff(comparer)23
-b(le)h(\014c)n(hier)g(sous)g(le)g(p)r(oin)n(t)h(a)n(v)n(ec)g(celui)f
-(sous)-450 2813 y(la)f(marque)1080 2733 y Fc(=)-450 3009
+31 y Fd(Lancer)37 b(et)g(sortir)i(de)e(Dired)-450 196
+y Ff(lancer)24 b(dired)1267 b Fc(C-x)36 b(d)-452 276
+y Ff(\023)-33 b(edite)31 b(le)f(r)n(\023)-33 b(ep)r(ertoire)30
+b(du)g(\014c)n(hier)g(que)h(l'on)e(est)i(en)f(train)-450
+356 y(d')n(\023)-33 b(editer)1182 276 y Fc(C-x)36 b(C-j)p
+Fe(\(D)n(X\))-450 409 y Ff(quitter)24 b(dired)1242 b
+Fc(q)-450 613 y Fd(Commandes)38 b(de)f(d)n(\023)-55 b(eplacemen)m(t)
+-450 779 y Ff(ligne)24 b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)1138
+b Fc(p)-450 859 y Ff(ligne)24 b(suiv)l(an)n(te)1213 b
+Fc(n)-450 938 y Ff(ligne)24 b(de)g(r)n(\023)-33 b(ep)r(ertoire)23
+b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)721 b Fc(<)-450
+1018 y Ff(ligne)24 b(de)g(r)n(\023)-33 b(ep)r(ertoire)23
+b(suiv)l(an)n(te)796 b Fc(>)-450 1098 y Ff(\014c)n(hier)24
+b(marqu)n(\023)-33 b(e)24 b(suiv)l(an)n(t)950 b Fc(M-})-450
+1177 y Ff(\014c)n(hier)24 b(marqu)n(\023)-33 b(e)24 b(pr)n(\023)-33
+b(ec)n(\023)g(eden)n(t)875 b Fc(M-{)-450 1257 y Ff(sous-r)n(\023)-33
+b(ep)r(ertoire)23 b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(t)861
+b Fc(M-C-p)-450 1337 y Ff(sous-r)n(\023)-33 b(ep)r(ertoire)23
+b(suiv)l(an)n(t)936 b Fc(M-C-n)-450 1417 y Ff(r)n(\023)-33
+b(ep)r(ertoire)24 b(p)n(\022)-33 b(ere)1179 b Fc(^)-450
+1496 y Ff(premier)23 b(sous-r)n(\023)-33 b(ep)r(ertoire)919
+b Fc(M-C-d)-450 1699 y Fd(Commandes)38 b(a)m(v)m(ec)f(la)h(souris)-450
+1865 y Ff(visiter)23 b(le)h(\014c)n(hier)914 b Fc(Mouse_Button_2)-450
+1945 y Ff(ouvrir)23 b(un)h(men)n(u)786 b Fc(Control-Mouse_Button_3)-450
+2139 y Fd(Actions)37 b(immediates)g(sur)h(les)g(\014c)m(hiers)-450
+2304 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)902
+b Fc(f)-450 2384 y Ff(visualiser)23 b(le)g(\014c)n(hier)h(couran)n(t)
+807 b Fc(v)-450 2464 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)i
+(dans)f(une)h(autre)f(fen)n(^)-33 b(etre)185 b Fc(o)-450
+2543 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)i(dans)f(un)g
+(autre)h(cadre)261 b Fc(w)-450 2623 y Ff(a\016c)n(her)24
+b(le)g(\014c)n(hier)f(couran)n(t)871 b Fc(C-u)36 b(o)-450
+2703 y Ff(cr)n(\023)-33 b(eer)24 b(un)g(nouv)n(eau)h(sous-r)n(\023)-33
+b(ep)r(ertoire)625 b Fc(+)-450 2782 y Ff(comparer)27
+b(le)f(\014c)n(hier)h(sous)g(le)f(p)r(oin)n(t)h(a)n(v)n(ec)h(celui)f
+(sous)g(la)-450 2862 y(marque)1182 2782 y Fc(=)-450 3065
 y Fd(Marquer)38 b(et)f(^)-57 b(oter)38 b(les)f(marques)i(des)e(\014c)m
-(hiers)-450 3170 y Ff(marquer)30 b(un)i(\014c)n(hier)g(ou)f(un)h
-(sous-r)n(\023)-33 b(ep)r(ertoire)31 b(p)r(our)-450 3249
-y(de)24 b(futures)g(commandes)1080 3170 y Fc(m)-450 3302
-y Ff(^)-35 b(oter)19 b(la)f(marque)f(d'un)h(\014c)n(hier)h(ou)f(de)h
-(tous)f(les)g(\014c)n(hiers)-450 3382 y(d'un)24 b(sous-r)n(\023)-33
-b(ep)r(ertoire)1080 3302 y Fc(u)-450 3447 y Ff(^)e(oter)24
-b(la)f(marque)g(de)g(tous)h(les)f(\014c)n(hiers)h(d'un)f(tamp)r(on)71
-b Fc(M-delete)-450 3527 y Ff(marquer)20 b(les)h(\014c)n(hiers)g(a)n(y)n
-(an)n(t)i(une)f(extension)h(donn)n(\023)-33 b(ee)72 b
-Fc(*)36 b(.)-450 3607 y Ff(marquer)22 b(tous)j(les)e(sous-r)n(\023)-33
-b(ep)r(ertoires)512 b Fc(*)36 b(/)-450 3686 y Ff(marquer)22
-b(tous)j(les)e(liens)g(sym)n(b)r(oliques)459 b Fc(*)36
-b(@)-450 3766 y Ff(marquer)22 b(tous)j(les)e(ex)n(\023)-33
-b(ecutables)645 b Fc(*)36 b(*)-450 3846 y Ff(in)n(v)n(erser)23
-b(le)h(marquage)894 b Fc(*)36 b(t)-450 3926 y Ff(marquer)15
+(hiers)-450 3231 y Ff(marquer)31 b(un)h(\014c)n(hier)g(ou)f(un)h
+(sous-r)n(\023)-33 b(ep)r(ertoire)31 b(p)r(our)h(de)-450
+3310 y(futures)24 b(commandes)1182 3231 y Fc(m)-450 3363
+y Ff(^)-35 b(oter)30 b(la)f(marque)h(d'un)g(\014c)n(hier)f(ou)h(de)g
+(tous)g(les)f(\014c)n(hiers)-450 3443 y(d'un)24 b(sous-r)n(\023)-33
+b(ep)r(ertoire)1182 3363 y Fc(u)-450 3509 y Ff(^)e(oter)24
+b(la)g(marque)f(de)i(tous)f(les)f(\014c)n(hiers)h(d'un)g(tamp)r(on)171
+b Fc(M-delete)-450 3588 y Ff(marquer)23 b(les)h(\014c)n(hiers)f(a)n(y)n
+(an)n(t)j(une)e(extension)h(donn)n(\023)-33 b(ee)160
+b Fc(*)36 b(.)-450 3668 y Ff(marquer)23 b(tous)i(les)e(sous-r)n(\023)
+-33 b(ep)r(ertoires)614 b Fc(*)36 b(/)-450 3748 y Ff(marquer)23
+b(tous)i(les)e(liens)g(sym)n(b)r(oliques)562 b Fc(*)36
+b(@)-450 3827 y Ff(marquer)23 b(tous)i(les)e(ex)n(\023)-33
+b(ecutables)747 b Fc(*)36 b(*)-450 3907 y Ff(in)n(v)n(erser)23
+b(le)h(marquage)997 b Fc(*)36 b(t)-450 3987 y Ff(marquer)19
 b(tous)h(les)g(\014c)n(hiers)f(du)h(sous-r)n(\023)-33
-b(ep)r(ertoire)16 b(couran)n(t)p 1160 3939 42 60 v -8
-w Fc(*)36 b(s)-450 4005 y Ff(marquer)15 b(les)i(\014c)n(hiers)f(don)n
-(t)i(les)e(noms)g(corresp)r(onden)n(t)-450 4085 y(\022)-35
-b(a)24 b(une)g(expression)g(rationnelle)1080 4005 y Fc(*)36
-b(\045)-450 4151 y Ff(mo)r(di\014er)22 b(les)i(marques)f(par)g(un)h
-(caract)n(\022)-33 b(ere)25 b(di\013)n(\023)-33 b(eren)n(t)87
-b Fc(*)36 b(c)-450 4230 y Ff(marquer)17 b(les)g(\014c)n(hiers)h(p)r
-(our)g(lesquels)g(une)g(expression)-450 4310 y(Elisp)23
-b(ren)n(v)n(oie)h(t)1080 4230 y Fc(*)36 b(\()p Fe(\(D)n(X\))1866
--364 y Fd(Obtenir)h(de)g(l'aide)1866 -198 y Ff(aide)24
-b(sur)f(dired)1106 b Fc(h)1866 -119 y Ff(r)n(\023)-33
-b(esum)n(\023)g(e)18 b(de)i(dired)f(\(aide)i(succin)n(te\))g(et)f
-(trace)g(d'erreur)70 b Fc(?)1866 88 y Fd(Commandes)50
-b(sur)g(les)f(\014c)m(hiers)g(marqu)n(\023)-55 b(es)50
-b(ou)1866 183 y(sp)n(\023)-55 b(eci\014)n(\023)g(es)37
-b(par)g(le)h(pr)n(\023)-55 b(e\014xe)1866 349 y Ff(copier)24
-b(le\(s\))g(\014c)n(hier\(s\))897 b Fc(C)1866 428 y Ff(renommer)14
-b(un)i(\014c)n(hier)g(ou)g(d)n(\023)-33 b(eplacer)16
-b(des)g(\014c)n(hiers)g(dans)p 3404 441 V 1866 508 a(un)24
-b(autre)g(r)n(\023)-33 b(ep)r(ertoire)3396 428 y Fc(R)1866
-577 y Ff(c)n(hanger)25 b(le)e(propri)n(\023)-33 b(etaire)24
-b(d'un)f(\(des\))i(\014c)n(hier\(s\))205 b Fc(O)1866
-657 y Ff(c)n(hanger)25 b(le)e(group)r(e)i(d'un)e(\(des\))i(\014c)n
-(hier\(s\))356 b Fc(G)1866 737 y Ff(c)n(hanger)25 b(le)e(mo)r(de)g
-(d'un)h(\(des\))h(\014c)n(hier\(s\))399 b Fc(M)1866 817
-y Ff(imprimer)20 b(le\(s\))k(\014c)n(hier\(s\))799 b
-Fc(P)1866 896 y Ff(con)n(v)n(ertir)16 b(le\(s\))h(nom\(s\))f(de)g
-(\014c)n(hier\(s\))h(en)f(min)n(uscules)70 b Fc(\045)36
-b(l)1866 976 y Ff(con)n(v)n(ertir)h(le\(s\))g(nom\(s\))f(de)g(\014c)n
-(hier\(s\))i(en)e(ma)t(jus-)1866 1056 y(cules)3396 976
-y Fc(\045)g(u)1866 1112 y Ff(supprimer)25 b(les)i(\014c)n(hiers)g
-(marqu)n(\023)-33 b(es)26 b(\(pas)i(ceux)g(a)n(y)n(an)n(t)1866
-1192 y(un)c(`\015ag'\))3396 1112 y Fc(X)1866 1265 y Ff(uuenco)r(der)h
-(ou)f(uudeco)r(der)h(le\(s\))g(\014c)n(hier\(s\))328
-b Fc(U)1866 1345 y Ff(compresser)23 b(ou)h(d)n(\023)-33
-b(ecompacter)24 b(le\(s\))h(\014c)n(hier\(s\))233 b Fc(Z)1866
-1424 y Ff(lancer)24 b(info)f(sur)g(le)h(\014c)n(hier)804
-b Fc(I)p Fe(\(D)n(X\))1866 1504 y Ff(cr)n(\023)-33 b(eer)24
-b(un)g(\(des\))g(lien\(s\))g(sym)n(b)r(olique\(s\))435
-b Fc(S)1866 1584 y Ff(cr)n(\023)-33 b(eer)24 b(des)g(liens)f(sym)n(b)r
-(oliques)f(relatifs)467 b Fc(Y)1866 1663 y Ff(cr)n(\023)-33
-b(eer)24 b(un)g(\(des\))g(liens)g(ph)n(ysique\(s\))567
-b Fc(H)1866 1743 y Ff(rec)n(herc)n(her)32 b(une)f(expression)g
-(rationnelle)h(dans)f(des)1866 1823 y(\014c)n(hiers)3396
-1743 y Fc(A)1866 1876 y Ff(remplacer)15 b(in)n(teractiv)n(emen)n(t)i
-(une)f(expression)g(rationnelle)p 3531 1889 V -64 w Fc(Q)1866
-1955 y Ff(b)n(yte-compiler)23 b(des)h(\014c)n(hiers)751
-b Fc(B)1866 2035 y Ff(c)n(harger)24 b(le\(s\))g(\014c)n(hier\(s\))856
-b Fc(L)1866 2115 y Ff(lancer)24 b(une)g(commande)f(shell)g(sur)g
-(le\(s\))h(\014c)n(hier\(s\))132 b Fc(!)1866 2322 y Fd(Mettre)36
-b(un)i(\015ag)g(sur)g(les)g(\014c)m(hiers)e(\022)-56
-b(a)37 b(d)n(\023)-55 b(etruire)1866 2458 y Fe(Les)27
-b(commandes)e(qui)i(^)-41 b(oten)n(t)26 b(les)h(marquen)n(t)e
-(supprimen)n(t)h(les)h(\015ags)g(de)h(suppression)1866
-2567 y Ff(placer)c(un)g(\015ag)g(de)g(suppression)g(sur)f(le)g(\014c)n
-(hier)237 b Fc(d)1866 2646 y Ff(sauv)n(egarder)24 b(et)h(supprimer)c
-(le)i(\015ag)h(de)g(suppression)71 b Fc(delete)1866 2726
-y Ff(placer)21 b(un)f(\015ag)h(sur)f(tous)h(les)f(\014c)n(hiers)g(de)h
-(sauv)n(egarde)1866 2806 y(\(don)n(t)k(les)e(noms)g(se)h(terminen)n(t)f
-(par)h(~\))3396 2726 y Fc(~)1866 2875 y Ff(placer)d(un)f(\015ag)h(sur)f
-(tous)h(les)f(\014c)n(hiers)g(de)h(sauv)n(egarde)1866
-2955 y(automatique)3396 2875 y Fc(#)1866 3021 y Ff(placer)16
-b(un)g(\015ag)h(sur)e(les)g(di\013)n(\023)-33 b(eren)n(ts)17
-b(\014c)n(hiers)e(in)n(term)n(\023)-33 b(ediaires)p 3523
-3034 V -57 w Fc(&)1866 3100 y Ff(placer)34 b(un)g(\015ag)g(sur)f(les)g
-(sauv)n(egardes)i(n)n(um)n(\023)-33 b(erot)n(\023)g(ees)1866
-3180 y(\(\014nissan)n(t)25 b(par)e(.~1~,)h(.~2~,)f(etc.\))3396
-3100 y Fc(.)1866 3253 y Ff(ex)n(\023)-33 b(ecuter)18
-b(les)d(suppressions)h(demand)n(\023)-33 b(ees)16 b(\(\014c)n(hiers)g
-(a)n(y)n(an)n(t)p 3476 3270 42 67 v 1866 3333 a(un)24
-b(\015ag\))3396 3253 y Fc(x)1866 3402 y Ff(placer)33
-b(un)g(\015ag)g(sur)g(les)f(\014c)n(hiers)h(corresp)r(ondan)n(t)h(\022)
--35 b(a)1866 3482 y(une)24 b(expression)g(rationnelle)3396
-3402 y Fc(\045)36 b(d)1590 5603 y Ff(1)p eop
-%%Page: 2 2
-2 1 bop -450 -364 a Fd(Mo)s(di\014er)37 b(le)h(tamp)s(on)f(Dired)-450
--198 y Ff(ins)n(\023)-33 b(erer)23 b(un)h(sous-r)n(\023)-33
-b(ep)r(ertoire)23 b(dans)h(ce)g(tamp)r(on)235 b Fc(i)-450
--119 y Ff(supprimer)22 b(les)h(\014c)n(hiers)h(marqu)n(\023)-33
-b(es)22 b(de)j(la)e(liste)277 b Fc(k)-450 -39 y Ff(supprimer)22
-b(le)h(listing)g(d'un)h(sous-r)n(\023)-33 b(ep)r(ertoire)295
-b Fc(C-u)36 b(k)-450 41 y Ff(relire)e(tous)i(les)f(r)n(\023)-33
-b(ep)r(ertoires)36 b(\(conserv)n(e)h(toutes)g(les)-450
-120 y(marques\))1080 41 y Fc(g)-450 193 y Ff(bascule)17
-b(le)e(tri)g(sur)h(le)f(nom/date)i(du)f(r)n(\023)-33
-b(ep)r(ertoire)16 b(couran)n(t)p 1155 210 42 67 v -3
-w Fc(s)-452 273 y Ff(\023)-33 b(edite)25 b(les)e(options)h(de)g(ls)866
-b Fc(C-u)36 b(s)-450 353 y Ff(r)n(\023)-33 b(ecup)n(\022)g(ere)24
-b(les)g(marques,)e(les)h(lignes)h(cac)n(h)n(\023)-33
-b(ees,)25 b(etc.)168 b Fc(C-_)-450 432 y Ff(cac)n(he)25
-b(tous)f(les)g(sous-r)n(\023)-33 b(ep)r(ertoires)602
-b Fc(M-$)-450 512 y Ff(cac)n(he)25 b(ou)f(fait)g(appara)-8
-b(^)-27 b(\020tre)24 b(le)f(sous-r)n(\023)-33 b(ep)r(ertoire)245
-b Fc($)-450 715 y Fd(Commandes)25 b(sur)h(les)f(expressions)g
-(rationnelles)p 1694 735 42 89 v -450 881 a Ff(marquer)33
-b(les)i(noms)e(de)i(\014c)n(hiers)g(corresp)r(ondan)n(t)h(\022)-35
-b(a)-450 961 y(une)24 b(expression)g(rationnelle)1080
-881 y Fc(\045)36 b(m)-450 1026 y Ff(copier)d(les)g(\014c)n(hiers)g
-(marqu)n(\023)-33 b(es)32 b(par)g(une)i(expression)-450
-1106 y(rationnelle)1080 1026 y Fc(\045)i(C)-450 1159
-y Ff(renommer)26 b(les)i(\014c)n(hiers)h(marqu)n(\023)-33
-b(es)27 b(par)h(une)h(expres-)-450 1238 y(sion)23 b(rationnelle)1080
-1159 y Fc(\045)36 b(R)-450 1291 y Ff(lien)23 b(ph)n(ysique)1129
-b Fc(\045)36 b(H)-450 1371 y Ff(lien)23 b(sym)n(b)r(olique)1051
-b Fc(\045)36 b(S)-450 1451 y Ff(lien)23 b(sym)n(b)r(olique)g(a)n(v)n
-(ec)i(c)n(hemin)e(relatif)449 b Fc(\045)36 b(Y)-450 1530
-y Ff(marquer)22 b(p)r(our)i(une)g(suppression)596 b Fc(\045)36
-b(d)-450 1733 y Fd(Dired)h(et)g(Find)-450 1899 y Ff(\014c)n(hier\(s\))
-22 b(dired)f(don)n(t)h(le)f(nom)g(corresp)r(ond)g(\022)-35
-b(a)22 b(un)f(motif)-197 b Fc(M-x)36 b(find-names-dired)-450
-1979 y Ff(\014c)n(hier\(s\))25 b(dired)e(con)n(tenan)n(t)j(un)e(motif)
-306 b Fc(M-x)36 b(find-grep-dired)-450 2058 y Ff(\014c)n(hier\(s\))25
+b(ep)r(ertoire)19 b(couran)n(t)72 b Fc(*)36 b(s)-450
+4066 y Ff(marquer)24 b(les)f(\014c)n(hiers)h(don)n(t)h(les)e(noms)h
+(corresp)r(onden)n(t)h(\022)-35 b(a)-450 4146 y(une)24
+b(expression)g(rationnelle)1182 4066 y Fc(*)36 b(\045)-450
+4212 y Ff(mo)r(di\014er)23 b(les)h(marques)g(par)f(un)h(caract)n(\022)
+-33 b(ere)25 b(di\013)n(\023)-33 b(eren)n(t)189 b Fc(*)36
+b(c)-450 4292 y Ff(marquer)f(les)f(\014c)n(hiers)h(p)r(our)g(lesquels)g
+(une)g(expression)-450 4371 y(Elisp)23 b(ren)n(v)n(oie)h(t)1182
+4292 y Fc(*)36 b(\()p Fe(\(D)n(X\))-450 4574 y Fd(Mo)s(di\014er)h(le)h
+(tamp)s(on)f(Dired)-450 4740 y Ff(ins)n(\023)-33 b(erer)23
+b(un)h(sous-r)n(\023)-33 b(ep)r(ertoire)23 b(dans)h(ce)g(tamp)r(on)338
+b Fc(i)-450 4820 y Ff(supprimer)23 b(les)g(\014c)n(hiers)h(marqu)n
+(\023)-33 b(es)23 b(de)i(la)e(liste)379 b Fc(k)-450 4899
+y Ff(supprimer)23 b(le)g(listing)g(d'un)h(sous-r)n(\023)-33
+b(ep)r(ertoire)397 b Fc(C-u)36 b(k)-450 4979 y Ff(relire)23
+b(tous)i(les)f(r)n(\023)-33 b(ep)r(ertoires)24 b(\(conserv)n(e)i
+(toutes)f(les)f(mar-)-450 5059 y(ques\))1182 4979 y Fc(g)-450
+5132 y Ff(bascule)c(le)f(tri)g(sur)f(le)h(nom/date)i(du)f(r)n(\023)-33
+b(ep)r(ertoire)19 b(couran)n(t)72 b Fc(s)-452 5211 y
+Ff(\023)-33 b(edite)25 b(les)e(options)h(de)g(ls)968
+b Fc(C-u)36 b(s)-450 5291 y Ff(r)n(\023)-33 b(ecup)n(\022)g(ere)24
+b(les)g(marques,)f(les)g(lignes)h(cac)n(h)n(\023)-33
+b(ees,)25 b(etc.)270 b Fc(C-_)-450 5371 y Ff(cac)n(he)25
+b(tous)f(les)g(sous-r)n(\023)-33 b(ep)r(ertoires)704
+b Fc(M-$)-450 5451 y Ff(cac)n(he)25 b(ou)f(fait)g(appara)-8
+b(^)-27 b(\020tre)24 b(le)f(sous-r)n(\023)-33 b(ep)r(ertoire)347
+b Fc($)1866 -364 y Fd(Commandes)50 b(sur)g(les)f(\014c)m(hiers)g(marqu)
+n(\023)-55 b(es)50 b(ou)1866 -269 y(sp)n(\023)-55 b(eci\014)n(\023)g
+(es)37 b(par)g(le)h(pr)n(\023)-55 b(e\014xe)1866 -125
+y Ff(copier)24 b(le\(s\))g(\014c)n(hier\(s\))999 b Fc(C)1866
+-46 y Ff(renommer)29 b(un)g(\014c)n(hier)h(ou)f(d)n(\023)-33
+b(eplacer)30 b(des)g(\014c)n(hiers)f(dans)1866 34 y(un)24
+b(autre)g(r)n(\023)-33 b(ep)r(ertoire)3498 -46 y Fc(R)1866
+103 y Ff(c)n(hanger)25 b(le)e(propri)n(\023)-33 b(etaire)24
+b(d'un)f(\(des\))i(\014c)n(hier\(s\))307 b Fc(O)1866
+183 y Ff(c)n(hanger)25 b(le)e(group)r(e)i(d'un)e(\(des\))i(\014c)n
+(hier\(s\))458 b Fc(G)1866 263 y Ff(c)n(hanger)25 b(le)e(mo)r(de)h
+(d'un)g(\(des\))h(\014c)n(hier\(s\))501 b Fc(M)1866 342
+y Ff(imprimer)22 b(le\(s\))i(\014c)n(hier\(s\))901 b
+Fc(P)1866 422 y Ff(con)n(v)n(ertir)24 b(le\(s\))g(nom\(s\))h(de)f
+(\014c)n(hier\(s\))g(en)h(min)n(uscules)126 b Fc(\045)36
+b(l)1866 502 y Ff(con)n(v)n(ertir)24 b(le\(s\))g(nom\(s\))h(de)f(\014c)
+n(hier\(s\))g(en)h(ma)t(juscules)122 b Fc(\045)36 b(u)1866
+582 y Ff(supprimer)26 b(les)g(\014c)n(hiers)g(marqu)n(\023)-33
+b(es)27 b(\(pas)g(ceux)h(a)n(y)n(an)n(t)g(un)1866 661
+y(`\015ag'\))3498 582 y Fc(X)1866 734 y Ff(uuenco)r(der)d(ou)f(uudeco)r
+(der)h(le\(s\))g(\014c)n(hier\(s\))430 b Fc(U)1866 814
+y Ff(compresser)24 b(ou)g(d)n(\023)-33 b(ecompacter)25
+b(le\(s\))g(\014c)n(hier\(s\))335 b Fc(Z)1866 894 y Ff(lancer)24
+b(info)f(sur)g(le)h(\014c)n(hier)906 b Fc(I)p Fe(\(D)n(X\))1866
+973 y Ff(cr)n(\023)-33 b(eer)24 b(un)g(\(des\))g(lien\(s\))g(sym)n(b)r
+(olique\(s\))538 b Fc(S)1866 1053 y Ff(cr)n(\023)-33
+b(eer)24 b(des)g(liens)f(sym)n(b)r(oliques)g(relatifs)569
+b Fc(Y)1866 1133 y Ff(cr)n(\023)-33 b(eer)24 b(un)g(\(des\))g(liens)g
+(ph)n(ysique\(s\))669 b Fc(H)1866 1213 y Ff(rec)n(herc)n(her)16
+b(une)h(expression)f(rationnelle)g(dans)g(des)h(\014c)n(hiers)h
+Fc(A)1866 1292 y Ff(remplacer)e(in)n(teractiv)n(emen)n(t)i(une)e
+(expression)g(rationnelle)38 b Fc(Q)1866 1372 y Ff(b)n(yte-compiler)24
+b(des)g(\014c)n(hiers)853 b Fc(B)1866 1452 y Ff(c)n(harger)24
+b(le\(s\))g(\014c)n(hier\(s\))958 b Fc(L)1866 1531 y
+Ff(lancer)24 b(une)g(commande)h(shell)e(sur)g(le\(s\))h(\014c)n
+(hier\(s\))234 b Fc(!)1866 1710 y Fd(Mettre)36 b(un)i(\015ag)g(sur)g
+(les)g(\014c)m(hiers)e(\022)-56 b(a)37 b(d)n(\023)-55
+b(etruire)1866 1831 y Fe(Les)27 b(commandes)g(qui)g(^)-41
+b(oten)n(t)26 b(les)h(marquen)n(t)f(supprimen)n(t)h(les)1866
+1910 y(\015ags)g(de)g(suppression)1866 2013 y Ff(placer)d(un)g(\015ag)g
+(de)g(suppression)g(sur)f(le)g(\014c)n(hier)339 b Fc(d)1866
+2093 y Ff(sauv)n(egarder)25 b(et)f(supprimer)f(le)g(\015ag)i(de)f
+(suppression)171 b Fc(delete)1866 2173 y Ff(placer)33
+b(un)h(\015ag)f(sur)g(tous)h(les)e(\014c)n(hiers)h(de)h(sauv)n(egarde)
+1866 2252 y(\(don)n(t)25 b(les)e(noms)h(se)g(terminen)n(t)g(par)g(~\))
+3498 2173 y Fc(~)1866 2322 y Ff(placer)33 b(un)h(\015ag)f(sur)g(tous)h
+(les)e(\014c)n(hiers)h(de)h(sauv)n(egarde)1866 2401 y(automatique)3498
+2322 y Fc(#)1866 2467 y Ff(placer)16 b(un)g(\015ag)h(sur)e(les)g
+(di\013)n(\023)-33 b(eren)n(ts)17 b(\014c)n(hiers)e(in)n(term)n(\023)
+-33 b(ediaires)46 b Fc(&)1866 2547 y Ff(placer)18 b(un)h(\015ag)f(sur)g
+(les)g(sauv)n(egardes)h(n)n(um)n(\023)-33 b(erot)n(\023)g(ees)20
+b(\(\014nis-)1866 2626 y(san)n(t)k(par)g(.~1~,)f(.~2~,)h(etc.\))3498
+2547 y Fc(.)1866 2700 y Ff(ex)n(\023)-33 b(ecuter)22
+b(les)e(suppressions)g(demand)n(\023)-33 b(ees)21 b(\(\014c)n(hiers)g
+(a)n(y)n(an)n(t)1866 2779 y(un)j(\015ag\))3498 2700 y
+Fc(x)1866 2849 y Ff(placer)k(un)g(\015ag)g(sur)f(les)h(\014c)n(hiers)g
+(corresp)r(ondan)n(t)h(\022)-35 b(a)28 b(une)1866 2928
+y(expression)c(rationnelle)3498 2849 y Fc(\045)36 b(d)1866
+3104 y Fd(Commandes)25 b(sur)h(les)f(expressions)g(rationnelles)1866
+3247 y Ff(marquer)j(les)h(noms)f(de)h(\014c)n(hiers)g(corresp)r(ondan)n
+(t)h(\022)-35 b(a)29 b(une)1866 3327 y(expression)24
+b(rationnelle)3498 3247 y Fc(\045)36 b(m)1866 3392 y
+Ff(copier)31 b(les)f(\014c)n(hiers)g(marqu)n(\023)-33
+b(es)31 b(par)f(une)h(expression)g(ra-)1866 3472 y(tionnelle)3498
+3392 y Fc(\045)36 b(C)1866 3525 y Ff(renommer)29 b(les)f(\014c)n(hiers)
+h(marqu)n(\023)-33 b(es)29 b(par)g(une)h(expression)1866
+3605 y(rationnelle)3498 3525 y Fc(\045)36 b(R)1866 3657
+y Ff(lien)23 b(ph)n(ysique)1231 b Fc(\045)36 b(H)1866
+3737 y Ff(lien)23 b(sym)n(b)r(olique)1154 b Fc(\045)36
+b(S)1866 3817 y Ff(lien)23 b(sym)n(b)r(olique)h(a)n(v)n(ec)h(c)n(hemin)
+f(relatif)551 b Fc(\045)36 b(Y)1866 3897 y Ff(marquer)23
+b(p)r(our)h(une)g(suppression)698 b Fc(\045)36 b(d)1866
+4072 y Fd(Dired)h(et)g(Find)1866 4215 y Ff(\014c)n(hier\(s\))25
+b(dired)e(don)n(t)i(le)e(nom)h(corresp)r(ond)g(\022)-35
+b(a)24 b(un)g(motif)82 b Fc(M-x)36 b(find-names-dired)1866
+4295 y Ff(\014c)n(hier\(s\))25 b(dired)e(con)n(tenan)n(t)j(un)e(motif)
+307 b Fc(M-x)36 b(find-grep-dired)1866 4375 y Ff(\014c)n(hier\(s\))25
 b(dired)e(bas)n(\023)-33 b(es)24 b(sur)f(ce)h(que)h(pro)r(duit)f
-Fc(find)r(M-x)36 b(find-dired)-97 3172 y Fb(Cop)n(yrigh)n(t)206
-3170 y(c)189 3172 y Fa(\015)21 b Fb(2000)i(F)-5 b(ree)21
-b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)-34 3235
-y(conception)g(de)h(Stephen)f(Gildea,)f(Mai)i(2000)i(v0.1)-64
-3299 y(p)r(our)d(GNU)g(Emacs)h(v)n(ersion)g(19)h(sur)f(syst)n(\022)-29
-b(emes)23 b(Unix)-231 3363 y(Mis)d(\022)-30 b(a)22 b(jour)f(p)r(our)f
-(Dired)g(en)g(Mai)h(200)h(par)f(Evgen)n(y)g(Roubinc)n(h)n(tein)77
-3427 y(T)-5 b(raduction)21 b(fran\030)-27 b(caise)22
-b(d')703 3414 y(\023)698 3427 y(Eric)d(Jacob)r(oni)-450
-3519 y(V)-5 b(ous)23 b(p)r(ouv)n(ez)g(faire)g(et)g(distribuer)f(des)h
-(copies)g(de)g(cette)g(carte,)h(p)r(ourvu)e(que)g(la)h(no-)-450
-3583 y(tice)e(de)g(cop)n(yrigh)n(t)g(et)g(cette)h(note)f(de)g(p)r
+Fc(find)r(M-x)36 b(find-dired)1866 4554 y Fd(Obtenir)h(de)g(l'aide)1866
+4697 y Ff(aide)24 b(sur)f(dired)1208 b Fc(h)1866 4777
+y Ff(r)n(\023)-33 b(esum)n(\023)g(e)24 b(de)g(dired)f(\(aide)i(succin)n
+(te\))g(et)f(trace)h(d'erreur)142 b Fc(?)2219 4869 y
+Fb(Cop)n(yrigh)n(t)2522 4867 y(c)2505 4869 y Fa(\015)21
+b Fb(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20
+b(Inc.)2282 4933 y(conception)g(de)h(Stephen)f(Gildea,)f(Mai)i(2006)i
+(v0.1)2252 4997 y(p)r(our)d(GNU)g(Emacs)h(v)n(ersion)g(19)h(sur)f(syst)
+n(\022)-29 b(emes)23 b(Unix)2069 5061 y(Mis)e(\022)-30
+b(a)21 b(jour)g(p)r(our)g(Dired)e(en)i(Mai)g(2000)h(par)f(Evgen)n(y)h
+(Roubinc)n(h)n(tein)2393 5124 y(T)-5 b(raduction)21 b(fran\030)-27
+b(caise)22 b(d')3019 5111 y(\023)3014 5124 y(Eric)d(Jacob)r(oni)1866
+5211 y(V)-5 b(ous)23 b(p)r(ouv)n(ez)g(faire)g(et)g(distribuer)f(des)h
+(copies)g(de)g(cette)g(carte,)h(p)r(ourvu)e(que)g(la)h(no-)1866
+5275 y(tice)e(de)g(cop)n(yrigh)n(t)g(et)g(cette)h(note)f(de)g(p)r
 (ermission)f(soien)n(t)h(pr)n(\023)-29 b(eserv)n(\023)g(ees)25
-b(sur)20 b(toutes)i(les)-450 3647 y(copies.)-450 3739
+b(sur)20 b(toutes)i(les)1866 5339 y(copies.)1866 5425
 y(P)n(our)c(obtenir)f(des)h(copies)g(du)f(man)n(uel)g(de)h(GNU)f
 (Emacs,)g(\023)-29 b(ecriv)n(ez)19 b(\022)-30 b(a)18
-b(la)g(F)-5 b(ree)18 b(Soft)n(w)n(are)-450 3803 y(F)-5
-b(oundation,)20 b(Inc.,)g(675)i(Massac)n(h)n(usetts)i(Av)n(e,)c(Cam)n
-(bridge)h(MA)g(02139.)1590 5603 y Ff(2)p eop
+b(la)g(F)-5 b(ree)18 b(Soft)n(w)n(are)1866 5489 y(F)-5
+b(oundation,)26 b(Inc.,)f(51)h(F)-5 b(ranklin)25 b(Street,)h(Fifth)e
+(Flo)r(or,)i(Boston,)i(MA)d(02110-1301,)1866 5553 y(USA.)p
+eop end
 %%Trailer
-end
+
 userdict /end-hook known{end-hook}if
 %%EOF
--- a/etc/fr-drdref.tex	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/fr-drdref.tex	Sun Apr 22 11:42:03 2007 +0000
@@ -1,4 +1,3 @@
-
 % Reference Card for Dired
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
 %   2006, 2007  Free Software Foundation, Inc.
@@ -96,7 +95,7 @@
   \def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
 \else                           %2 or 3 columns uses prereduced size
   \hsize 3.4in
-  \vsize 7.95in
+  \vsize 10in
   \hoffset -.75in
   \voffset -.745in
   \font\titlefont=cmbx10 \scaledmag2
@@ -217,8 +216,9 @@
 % \key{description of key}{key-name}
 % prints the description left-justified, and the key-name in a \kbd
 % form near the right margin.
+% First hfill tweaked from 0.75 to 0.8 to allow for longer descriptions.
 \def\key#1#2{\leavevmode\hbox to \hsize{\vtop
-  {\hsize=.75\hsize\rightskip=1em
+  {\hsize=.8\hsize\rightskip=1em
   \hskip\keyindent\relax#1}\kbd{#2}\hfil}}
 
 \newbox\metaxbox
@@ -244,6 +244,10 @@
 % commands fit on a page in two-column format
 \def\dx{\bf (DX)}
 
+% Set to non-zero to check for layout problems.
+\overfullrule 0pt
+\nopagenumbers
+
 %**end of header
 
 
@@ -334,10 +338,17 @@
 \key{modifier les marques par un caract\`ere diff\'erent}{* c}
 \key{marquer les fichiers pour lesquels une expression Elisp renvoie t}{* (\dx}
 
-\section{Obtenir de l'aide}
+\section{Modifier le tampon Dired}
 
-\key{aide sur dired}{h}
-\key{r\'esum\'e de dired (aide succinte) et trace d'erreur}{?}
+\key{ins\'erer un sous-r\'epertoire dans ce tampon}{i}
+\key{supprimer les fichiers marqu\'es de la liste}{k}
+\key{supprimer le listing d'un sous-r\'epertoire}{C-u k}
+\key{relire tous les r\'epertoires (conserve toutes les marques)}{g}
+\key{bascule le tri sur le nom/date du r\'epertoire courant}{s}
+\key{\'edite les options de ls }{C-u s}
+\key{r\'ecup\`ere les marques, les lignes cach\'ees, etc.}{C-_}
+\key{cache tous les sous-r\'epertoires}{M-\$}
+\key{cache ou fait appara\^\i{}tre le sous-r\'epertoire}{\$}
 
 \section{Commandes sur les fichiers marqu\'es ou sp\'ecifi\'es par le pr\'efixe}
 
@@ -363,8 +374,9 @@
 \key{lancer une commande shell sur le(s) fichier(s)}{!}
 
 \section{Mettre un flag sur les fichiers \`a d\'etruire}
-\leftline{\bf Les commandes qui \^otent les marquent suppriment les
-  flags de suppression}
+%% Hack for overfull line. Proper fix?
+\leftline{\bf Les commandes qui \^otent les marquent suppriment les}
+\leftline{\bf flags de suppression}
 \key{placer un flag de suppression sur le fichier}{d}
 \key{sauvegarder et supprimer le flag de suppression}{delete}
 \key{placer un flag sur tous les fichiers de sauvegarde (dont les noms
@@ -377,18 +389,6 @@
 \key{placer un flag sur les fichiers correspondant \`a une expression
   rationnelle }{\% d}
 
-\section{Modifier le tampon Dired}
-
-\key{ins\'erer un sous-r\'epertoire dans ce tampon}{i}
-\key{supprimer les fichiers marqu\'es de la liste}{k}
-\key{supprimer le listing d'un sous-r\'epertoire}{C-u k}
-\key{relire tous les r\'epertoires (conserve toutes les marques)}{g}
-\key{bascule le tri sur le nom/date du r\'epertoire courant}{s}
-\key{\'edite les options de ls }{C-u s}
-\key{r\'ecup\`ere les marques, les lignes cach\'ees, etc.}{C-_}
-\key{cache tous les sous-r\'epertoires}{M-\$}
-\key{cache ou fait appara\^\i{}tre le sous-r\'epertoire}{\$}
-
 \section{Commandes sur les expressions rationnelles}
 
 \key{marquer les noms de fichiers correspondant \`a une expression
@@ -401,11 +401,17 @@
 \key{marquer pour une suppression}{\% d}
 
 \section{Dired et Find}
-\metax{fichier(s) dired dont le nom correspond \`a un motif}{M-x
+%% Hack for overfull line (should be \metax). Proper fix?
+\key{fichier(s) dired dont le nom correspond \`a un motif}{M-x
   find-names-dired}
 \metax{fichier(s) dired contenant un motif}{M-x find-grep-dired}
 \metax{fichier(s) dired bas\'es sur ce que produit \kbd{find}}{M-x find-dired}
 
+\section{Obtenir de l'aide}
+
+\key{aide sur dired}{h}
+\key{r\'esum\'e de dired (aide succinte) et trace d'erreur}{?}
+
 \copyrightnotice
 
 \bye
--- a/etc/orgcard.ps	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/orgcard.ps	Sun Apr 22 11:42:03 2007 +0000
@@ -11,7 +11,7 @@
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -t landscape orgcard.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2007.02.21:2030
+%DVIPSSource:  TeX output 2007.02.26:1928
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -157,7 +157,6 @@
 dup 48 /zero put
 dup 50 /two put
 dup 52 /four put
-dup 53 /five put
 dup 54 /six put
 dup 55 /seven put
 dup 58 /colon put
@@ -222,215 +221,208 @@
 CCBD1F58ABBF1F53AD21E3BFF25EEEB046F66A924E5F431EBD7228050BE2DF43
 0B9B538DAAD511EED97630CD9A9C05CC49DC251325A93EA842C6D07B44BE620F
 08E66B611F54314B0177E299304F2294F8DEDE9914736944F125A50B5007373E
-588AD80D9983CE7824DA30CEE5DC3114D69D7ACEC0758D8201805B82925EF3C3
-975289D47E7F35898FD87E0BE88100E53DDB356245666E7F724C208CF200B76D
-6E86BB756E083DC34DE1DCF484CD664C826962DC9CD5DB207262A43EDB8A18BC
-7D3F35237299AE378AD68A89E97D65CB05503E2C2D951E3AD2A544DABB19973C
-2B9AC59428D1FBCD89C058532357D2F4D53F35D49FCDC303475E1B41B3A2E18C
-657AA0AE4D04BFBEEE2A24D462249CDB73EB96B6702C174BDF87642C3CB6F3C0
-86B02C65EE7D5ED2F636F15F50E5D1894F48AE024E1CEB56AEAA3967DCF5ED5A
-63C9DD1DAEB9C8A353C2C90BFAA6B66B9E0B13BA0CE464A3C8CB2C5AE94AAB37
-72C62E70CEFD0558E483789630CB0FDF76E9EF75D8012E5F7FF85253C480F841
-CAA7F9FC1E4AD4576BFAD1825C989D197024F8ADB77B7DF5D341E2B68BD7FF5E
-414852120B733078E1B703AC4845E63CB624BFBC2B575CFF29AFB89BC5957A1C
-D3838B3FEE6252CDDEABBA24259E50B48741EC36BCCC888E09B9A0BDDE044D9B
-0551B31409E7FE2922D73B7E52B08C32481A2F29E81F2B0E0FB694E8F5D0902E
-2C129929552E522E787A6AA73C14A8DD2F16E5A7CAF059077CDB9A605BD7394B
-667FB60EF59D509A1D1087ADF4CFB2747B6B65C0104C2CD896F1564A091D1157
-0B0939DC0FBEE095CFA5E74D0FD806890E1753B4EF7C3DA3272EBE04BD0BDD90
-FF4D0EB7FFEEB3E3D60ED164281113B06C6FFAEEF322947794F4A92EA16CB7A3
-E1229B2CC374589CA539A8487D03DE1B52F0604A9F4DCE6416D53BA81E477D0D
-4E3F711A0226E61A8FF503D3489C620E18F3587E6647BAB0CDE90B922DD07AD0
-3641AA0F77EE52618160FD75E19BF72FDAB57862108D4363DEF5117705DF3870
-BCBF7D9E33AD7DBD16C215130FF9D373A076ACC5220989A11E6CFA4BD001A952
-D261986FC53C2C68FABAB203CCF40109E6D5620E247F35F0F4434FF16E46200C
-D5C70A9F2CF63C75F6226B476E690F8993D5702499F6433F908BB14416CEF4B3
-A890C0473FE34A22DB9D2E06C6FEF4678F30FB1C41DDAA549E7E521417CD0AC3
-A337E20205A8D68B14B060CEAE26BB6BB81306A1D1728CF9AEDC02EF0A3406FC
-B0B28EA98D0EDE23B7757DE0027BD98BDE8BEE7283659DECD5FF0A36FD877468
-43B076168C2026861277E1EE5D78BF31CD40488A9539933452A02E1A5C78D582
-42BFB3D29E6B8E9CFA48C5342BF6165DCB2614D0655A04E1F959475CF68BCE38
-8F92D8211DDDDD13AFABCCC2F7904C3F5DB5FB9A572ECB44D773F3E6E7400C5B
-6B2A48FE864B80F31CD1634E384365330D0AD1930846D9E5912D7789F98D7769
-ACBB5AD3F6641B994E34E7EB1A9ABF957CB5DC884390B684F086A3277B9C6858
-3DAA66AED6F3603622E2A784F8E14B6B0169CAFC0320DC4FCF31A37DD1E68844
-0212C41B7DE4F9A018603DDA6CA305D2BFBF37162F38AB57E913FD92C8113927
-E430504668265025EC61AA691403096AEF35608B0B628E8D3A51AECDE9BF79FF
-E3DE1C48E46233FA50C99976792230CF5F284BF1FAADD602FCCDE0AB84120184
-FC1A48BEB259B191ADE9E1495FB0C59B1180DA2025D791030555F1DCAB25F465
-77D3ADC0DD899B5418B69CC040C7B68390151E80B781FF83F4F2B2662750E6E0
-C1307D9D90F35368DA8F6B22F1F6A04D2B9545AFC83C2E9D0F89AE9FB98A303B
-FF6EF144DD5A8DEB0F190280EDF61FB505A6EC77BBB768190E619612DDBC291A
-EFE357AF5E07FE0178C5172C520D3EA313644C8C64E40A4B0D02919DB21B2A1A
-4FA2C4BACEA8A5A1C670C9EE48B826CF9384318C71F7C76750EE7BBA00A9B9C7
-D144B4873FA84D885FD936FEE9CDD4B09BCDE881B1E6BCC568FBBB3DC6A328F2
-CEAD12E046EB5439715B9E7245C26096C4AFC51217E1723F4A158784CBFC8855
-EB7008B4FE8C05DBC3D6BDDC9CBA3832B3450B3E9C81E634A1B450FBAA6FAA50
-C43F77AC056F77BE12F4264F7BF52E69A9C4D2E2D7927C47D45FE677CC7515CA
-7F25FC9DFD6A5C43B817C3FD9CF751D9AE2979B9182AE25EF23F9A9162F5FAD3
-0EE349472036153813C54E561B54FC59456769150F0C1ABE64F11B6CBD2F1C8B
-EAB2FF2483426A6A18B1274DA86DA16055ECDEA1908C824C12E49CAB2747254A
-4AEA3EC55302C950FC9069E27D2E8AF35ED32C425CBEAD61FF71DCCC2FAD8BF5
-B31666175524B42BCA38578BC7BA0369BE4502CEAF1AEAB96AC0B3CD419738A2
-B6EBA29C7659785BEC0FC4ACD9F0853EB0972DEC94325A16FE89239104B4F5F3
-EB1EEDB3D6D69AF864D87D6192FEB8B0D404F3C4F42F04794F54F1E9B37781E7
-CF9B6051D38A774F30E19C20AD45FBC07F6CED01FAB51DC8F726D529873F0E20
-001EE3C375FD7F6E9EC10F3B60D0A5D7328A7F8F92F1EB3515B129D1761A6795
-FA967CF473AAD02CCD11828A219D3543E5DD3524A3753A64FEB1270EF117FDD0
-EFED4FC04BE656CE56CFAB5FC2911F605FC9F46C6D8ACAF535B0D500FAD59D8C
-AE3D04F1DC2748CAEED16AA35976B482783E37398C674C2F1724B0F048A7CBFB
-D23954485A1C83163245961CA38832155432C17C8A849CF541E1F099696ADF58
-7D93DF53294A10B6533FA32477C1F253163D6708AFC914ACF714143E64A7CD6D
-4297397949E1E4C6C93E0DAAABB9F7A6F14FADDDAAF633C286D92C470EA1B7FE
-B1BE3C6C90763FCD58B2E5F0FEC6626C5AE0EFFA9796382F93C4C8CA52F2D314
-DE01BA4DF502B442133249FDD846B973FF9A56CEDCDC155E9C59572CB6907F86
-BE95DFE0ADC6554C90009904E5E53826CB2239C399BF42A680F3251D3815F614
-09531A90B040AA303BC6E1B99395B6696051BF3DC3B0F8E3C4AC73DA67142739
-799F28E376763446AD1AF57CC7736ECDD7EA64456800F672190B2F036BC12339
-CB001A26432C8C16F028EA73CA325F7D74EE1C03A05073C0F9085D83148EF94D
-FB1AB01078CCAC9FFB7D974069ACD205C8C550AA16D7920DABD2BADFFBCCE520
-49E001C84888DB4D5405F09D6AD75EB23AF2D92550CC9687537C25C48FB08A26
-C8709B6C6896AB2F518150BFFD1D7D7D96FF2E7852E6A54CE08CD3E9D2CE6045
-9912CBC218D309BF2726CEF2D51F22E7906419DDFD0C57EEEB949D01FFBCCE46
-B9EC154C0B80ED9BF84207B7810FD39C073CB95F5C234C7129BB9F5A4326022E
-96F537139092C4C5F35D0B9DDB9EB155D32B1707F21880B4D5DF9277F65232F2
-4C298E0123DE45742D63EA5C1C76E1AC2BE24A6A32DC4811C668004134FB7ABB
-73712810E0FC56C901BB540B99EEE773ECF9DEFFF84FDABD7B1F48F1BAB4FBCE
-4AD40EF9AB7C55BB811C5DF889C644C718543CE502B649B3B0B89C2509A00107
-40F4B7F48435F8F7CDD8B0829D91079B09A9F035FECED249CB4DFD8E92E32AB4
-D66E8FF0EF910DDDC8C4EE04D73C8D27597E65844483F0C6B8C8D4340095E6CE
-36B51AE51F5A743D7013FCCB057616447AB7E3AEF4DC8883F7B38CB9F72DDD88
-3373D8211B95E60EED297EEE89B1E2205B64749830ACC53AB58537EF78FBAB9B
-830CE4FA51F32A1C7935985421EC587392C9DF1954EBB33173A5B1801B92F29F
-0C00DB473E6195A0621E274B1A4B82D6783DE4658E807A530D6B6D137079FCEC
-9D00F3DBA55A678DAA7AB246897AC4200722AC2DD86F2AD6CC24FA195226970A
-A7DCB1ADC016169FBE7CCE7474D70E0436EDB52EEB1E51972666D80890E645F2
-28EF770BFE6C39F5FF3F01B2EB388E843C7583A92D7A745C0C0AA4E4118297FB
-1FEF5DCB95DD27200CEF703395044034A9CB04F28FD6C68AFD5771BB1ED2076C
-AB572E12BB8DFD9B4D810D897D530B90EF3F791DBE28DDA89AD859F571057DF5
-0A62838B170102DD3B8A8DF38B07B6A82013481E514C2D0720178C5750E48164
-74A6A52A5128B49C84CB0707762A6C17255F35D48DC6FC8A1DB932746BBB77F1
-310C17FE0819CB0F03ECF2A1FBEE2AE1760FC4768151AF3250462AC18B5EA4CB
-F82BCCE8DB397D9139F1F453E9DE8BFA495ECADEAE102AD535CEAA1ECE156891
-486CE23486D2B837083D896322D8449254C8ACE8F58108A0F1304112B46A2239
-54621AE0033ACC74270E5D64FB31BF5DF06A6ABC1840097641D03D3CE50FFEA1
-887085677153B9A9E639CB09E72F17D2899BE54E8C6D16F065C48B1D9A3B5389
-9D8BB00A3A158BCD4DAA251DAE69EA5A392A1F36CEF60032F06016BFAC8810C2
-A6794A1CFCF9B41C454C5E85AA98833C5ACC408ED7B2B1AA33793C9F53C2D81F
-0E43754389B307BCB45F6F34C2C2427D4311BDDC681F8167E40FF429C433B92F
-C689D478F045C9DC3CA8BBD745A7850C5B06FFAE9E08D365C3FE6E815B03BC0F
-2FB873FB26B11B147393BAD099CBAA41F47BA18496AC962C0A8BE716CE2FCFDB
-15356438621B591D323DE31742B402E8223457F857E4DA90BA9EB248974C8965
-E5166094384E1FEC63486F7F03512E51E43D9B726D69B0440EBE7D5B177C4572
-6568E9EF6F77C0F0724D6665794A18A6B5070044086B1E0F586DDDE9C645BCDD
-BF64C2E87027F60F8AC4A9A81BF65643AAE1A4E6BAE087A9867FC205518AA1F5
-00B23B234F3A862DA8EDCDC743A08325A6B78C0EDF4E0794B44FA77ACF4609D3
-371342EB81DB96AE1895CF7B6B43032CC81881B45CD68892E17855FE2247EC12
-A9169E3AB8655BA4556DAC33E3F6AB9C6345D4B5AD0C5B997F49BFE5C02ED21B
-8AA88511C99F8115A2AB3621523A5F3E7B24DC65AFF6093E0E28D06D1D57A52F
-E701205478A5CC4E6F9C9DF04D612120819DAA0790E282412E49EE52E0F8E84B
-F492FB5C691E249C8B2D32DC1C3F9A80C9007999A127D6C53AA517E8ABB8C033
-207A36937F33ED8D03F96FD29B44BB81B589AEDC183A23583BA7D9338BF4065C
-E9BE78D84DFB8943AF613024CE70338FEDD995393FBFCED03991FB70D08998BA
-87A2BAE9AFD07FB5E2220324223CCC1AA3750625E71546BA7FA1F8D79D2042B7
-33DE4F1627808DF8B829475F8D8AD6FD84EA0D89EC3C9D3C72C092CCDC52BEFA
-D6C9750EB5BC09EAA868373FD4C883AF81CAFAC82DA5CCF8C6896123009EB524
-05313D790F963020E35716C0379D57277B264436801E0FC185F7096B5EF47FF4
-6CE4D1541A2B55299239414FBE9E03D5A8B256546D8FA5D7A3EAB23116CB67A4
-97E7647B2F8DEB628069C46B08CA89A3B9D58959B5E5B1100BD21620B822DAED
-9FD0B2754220B362A83AD6866C2801412D7E42CC830A3DABD8A4D27566E2A119
-7094AE493CEA88556271467321CA8E009C54FFBAC1D77A8A02B4F646480F91D6
-E505A1E24107F4F91175145295388A25FFEFDC3040C5D3F0D51898BA6139C303
-62070054EC6EB612A585E78B34D82937D16E544ED4A8BDAB8A0C63C711AD792E
-44527FFF6A52ED2F1DF3DDBBAA21698AD24A7C1F73B210678393E3928D24A75D
-9AC5E90791D39A2178A19BC34D53CBC40F6DD03CB785CA3C295159F6F0C2A76C
-3CC9321C7BF9B91321D90F7E3E7EE95878DBA4813427F606492FB9E00DFE9050
-F0FE1C00F80BD4C04E9AC540F0B1EDF8FA384F734A30E56940F7DE538825DDD7
-4AF9AB00B7F567AB3D585F1559C4F8605B23DD98EF639F9F4E949E3A65247A40
-565FBD88842733769E5FE5AC5AED4C7A160868911D46518822DE58898FB86CB3
-FEC4A468779BB1432853ABF9B300DCA612B867ED56B44E3C206D88F16A73C6C9
-32FEEBF3C0C49B7773C1BC293E5EB700B4B35273BC5385D478D6225D6ACB537A
-F9653F41CBB5A48EB0735EB515D436FC231D61ADB698A3C84D9D58708AB2FDA6
-2882CEF69FA9090B6E02E370C26B097B581F5C8C2D0D04A3E6E4C2C6924182D5
-98FA800337CC7B427ADE166DE18791DF388F66A2BC408DE9AA4B289D72792DB0
-E69E883911646E71506408578291771A8E3F58C777E54E4AD49A4ABB8E261DEB
-9C793D5286F0ACB08299EE9E82D43695391B281C557A4ED84F16822F9E77B069
-2A347FE1DD5C0F9E7274D05AC7C4AB7EE7A146685AD61C331894BC73306A24F6
-57C3C44665287167A9DD635F8F616ED4214496F1FC8BC7B4AAED684E8038144B
-37499AA5F1145FCE30E7DB7AFE7BBC9333D545AA8B53492813755F28CAE53D0B
-E4E883BC59E20227B9CB36968DE521989309B8D257119327647E5971D585A90D
-66B50DF184F8A4EA97E5043D1C47256A0617FFDC3FCDAEF7E72E477E264A6AC6
-A443C52F977200E7ADD333FB48F80D422FC03E468E3742C43E09416220627797
-3C20174584633656B0D332D234D1763F673EE2EBB8463FBB651C93CF1AF8BEC1
-98DADA67482255FB2798A9AAB37405B210FF4DB5A293CC41EED34C6D7936194B
-909D6A361F116503196A5C3E7CAEBC7EC987B54E1276EDBC78F4A442C8EB4C36
-B186284CC2DF654E69D4667CC98C6C4C4DEB648E7EE830F9291F2A2B9A8C2D61
-B4907DBC54A79BF1E500718BD45160D4E7C6442AE6B074BD46158B883E6EC8EC
-3F6619453B92B1046C52F7B7F31EC5D865DCF4684C65CABF2FF09B560EA072E0
-9191637ADF48BF707B79034BE6A6175C80B166E0487F450C47B6CA435611C58D
-EBFA2FFF414DD9873EA3279DC80F8516BE0CB9183C94919B5550A895ACDA602B
-4B50C8DE4F5547C25D4D127BEB13EF889E8A5290D00F842535C4B7FEC1266CC2
-902EDD0C1CD3F08930AB7AA4ACE3EF5A59AC42C9BC40D6D55F0A055CA9CF150D
-32AC3618AA6DE2C56832960A19C29C6C667E8C15752E815BE263BBF1491AD6C6
-00361FBEA68D745142890BF1FFD781978D698F81ECFE9D7B4F461C3940DDA318
-FF5C6396BF33012F6B9CB82712947DD712330B7C0D31BE08939A2C68C14D9157
-0CA8F3719AD5D708E5EBA40771F4FCC3C7820C5BAE7CC5D52AA5F910CA33E273
-8B473655DB52642E9450E55DB875BE199EB9076E6550FCCF4EBF8F1C95DA5427
-9FC2435176AB0DB98B7D2C4FDB4792C681056E29953BA8348ABDA4170A17CE68
-74A84BCF4F676B4A4DB3D5A50187AD293BB223F760C9A1BB41D07D94669190CE
-AF8C390587439FDAC850AED0C4E4E674571BA56DF199090170151A5BE497656D
-90F1E616E6C6BD3C4372421AD02D0EC0A3C2A947DF1CA85347600206A4580C6C
-79459F9F0E5290CCF3E5D4ED14D4EB2A5E30EDDFC46F208122CBB7069CE1A87D
-764B7EC87863D603A0F2BD33EE560F8BBA3FD334EBE2D9B8C870FCC06BF2CE87
-93FD86F008CDC9011B18D9CAD8E681CE038F05FF9C58B4282505F32CAEF407C3
-F3AB6FB08FD09D40D7B73371A8C641E787A33103703ABD0AD53AE85AA3794CF8
-231EA4461AA41D4B1AB2669C5B43BCD1AA8697489AB7A0A20A60560023581CB6
-573C51FCA56367C9930FF4137D74E6BAE5363F01E14AD7AA78B49DA7E4C6F663
-47C51D0F616AF4D1F6338D74DB6FB4652FD11045F48469B45AA7A7A197266ECE
-CA0F107E315773C2FB37C4D14AB7320A00F5D3351075DFF72E1E4143C46FD72C
-8C9D291D2574C1455161777DCF8770491B70DE420FB197B60ECEF735728B8C47
-17E5D12E6BCA1CF470E4FE62C999851B817A4BBE54E254A179326E5031F8AF4E
-D23FD9A7A59AC6CF012765DAA0869EAD49997CA17A7836F31D5752872B78EDF2
-CB03582884F31D764CA0750FBFE92CB0C3450BFFE9CAFEBE40638B0E808DB198
-F2FDA854E4C5ACBC30137059478923F9D6F0AA4A1A6FA7FB9FA94BA2EE3B4C6B
-BEDB12F26C793A0CBE47C396B3E75A1B2B0B7BB8149BD130D82738E07BAB7FB4
-38BA61B57359C1ED34CC3ED007348566835ABACECAF1392A073CF8A92C74830C
-22B50F1549C0491B273AB51FE84589BAAFE5183EF22E9EDF92B4025DD970DDC2
-52550D788EF168AA938D96F6FE616523B8358FFB5AB5D66E8330812E0F020B62
-210AA421DCC16CEEEA483E443F2876ED25218A4AF477642AC78F09A85535CB7A
-C4D69B413CB62404760E2C5B83B46801DC51564B30AC742E47F294064B3AFB43
-9A151C4FB2249FE08F9CD5412BE65747267546D00DC5E2074525FCDE98E31BC9
-25D6070796EE2D1068A2D04A2B6087D8D2CBE2B8E0552061706D1F0D6AD1F2CE
-8D311F83073D8E43100D0551ECDA28B3D4A3D4449289FFC92CD3BFA251C5BE54
-2BCC846733CB56D09F939E9B0B73FD71245627895A5A0EE3A7BA7554442D0957
-30CBCAC3FA928F2D92F718F5D43ACF00785165F705B655AF51F421E78C122EE9
-DA81DDD2B4428138C86B18BD5FFACA48119EC57F8DDCFF375EF5E3153A142F56
-71625085E4A103E5E11E348094658BB5CDD5299AE7A4903B3B52EBB911F12E21
-F6DE05EE2B4AE140A9EB9E24C8D33C008BE7ADAFFA7BA68E01695478300F85D5
-3A03BD2E916B266E6A3BE67179D5EF109AD5D44F7A545DE28845631AF670E3B9
-400439348753805EC9F843C8098233A736EBF8D295F0DADCC5E203568087BF22
-4EE4879940C63FE040A25E2A10D7F5327B9AF9F385611CF88AB5C6C89E0A3678
-B2590E1D26662EF4890303EBF6709DF30673AD505656C0E271D98F9E1ACF019B
-D4BCE9384F5F239CD0B7C16E53E1EDBD9B1DB77012735E03317CE87EB4099205
-AF634766BCDA45EDB3271EC9B5B0F71F862498F32BB961D1A159D16651E4086F
-28C4CC4FA227B4420DBB1C8A427AFD3D9301D6D37C1EFF139A58B69492A6C5FA
-847A68ED11C7B009319839C4878ED4445960BE8B3D4AD94918DE2615204CB775
-BF1BFE31F0EE4ECADAEB8C1B49AA6BB83FFD14F0F2CE33DE6D5A2F7AE8654B0C
-EE905DB2A6BBC5099A3AA761B6D9C10F8E1A1304DBBA8A5879711CCB3E85AB26
-52F182255868F791D8DA1D83A7D80FA3D8D9F0B09DDFE58D1B425457B0DBE3C2
-AFDCBB820EF841BC7DCC99A1918A8A324468A2D6E558949D970EFDA82D035B56
-DE0E7B190ADCDA9A121E5A7BA5AC023308EE079E0F5EE637D3400B4C3507A547
-7DEC78AAC932239C696A28432F141AFCF137BEB7677958A4AB4F891DF00EF471
-23EA0B5D8EF98EDF41E1D5A29AE0D5E0675D52E80A936F0BDE52715657BC6637
-C8637E587422AA553D240EC132140FD112DD49FF59CE6E4ECE30826202F9E54F
-67AFDBA33142CA9AF77E64EC9629F56E3451C5B4383576C318FDE5E03B804A26
-1F7B9A88984049BBB52AA1231F2EA75958363897F960C08E9998A4C78DE8F032
-ACA0393E2CFD2BC9778081400E8E99A0C43C39B04FC13488B55B59BA40326AE6
-5CBFE7377EC52149FFFA88E853D4BDC038D67E74541640C04E27155FCAC7A760
-54DB3603BE53FDC7797F2D77CE2CD6E4381E51A06B8B151F3AFE1879B62E15F5
-FA9171A829FA4D863F79FB5C0DAD65CA79E6EEBCAC8FBE6EFDFF198781D136EC
-4FAEE5542F1E6465D69DD949492B238ADE15DE0E249294780D91741A3B513EC0
-8CF280B6E50502DBB928B8DBF053C5A0802D
+588AD80D9983CE7824DA30CEE5DC3114D69D7ACEC0758D8201805B82925EF3C2
+C87A1A169C5ADE44B561EC1660E617FB39D1B1547B33C0FEB33C3A1D7340A62A
+CD9CEFA49481F19B39A704A53A0B98A11744143CDDA0E668E6325935C6497A9F
+AFF471194932AFECBF25B441AD55A43751FBAB76F3E544C4254AEC4BEB5CFE4C
+C1318C3A0FAD0E8C1BABEE20B203E1DD9412E66BC55BEBD6FBBEBA84F56604FD
+85D50F733D9794611F4137EC10ACB4C4ECA5A81CAACC45213E92ED3C26726BBE
+91430E7633A2BDB8EA3D0C55259D7DBE468AC0964A63728C9B8EA4E15CF0EEA3
+2E754B9170EAE6B8818DCCDDAD643B9F6C91C3C5B245CD442358C60AF390DC76
+342E659D4EC45552626F069F346F46B18062CE26D5912336C6B29FCBFA5C3113
+ED86E44B529CD95B7B5B934D899762C4F3457F56ACCC763BCCD5BD08975EB5F1
+C5216DA4CBF3409EC71054B0145183F7DFB31517D199EB16D4C6DB0AF05E5720
+10B06F395BE3C8C59CEEBCEA1E00F9EA3FD880AC197508CEC11E33B6B6EABE3C
+0FAEBF246743F62D280875D052656696AA88DABB918F79279A980754F3DCFBEF
+7999E7FB7C9E7F88CB15E1596F08E48FA74F1CB613B587BFE72717437E38D08A
+C8B160982A6F92CD0BAD7E033766BB1D92F78F22FE5750D002AB2C7A101A57D6
+3E7ABA9BD4B8C0A4F2820123BBCCD520B9608AFD4372366D876F848ED068245B
+6BC1DDF4B826E4A9FEC4390CEB2DAAA63D9D013B706059347709F3E996C3682A
+F88D827B8B7E1206BF2B2A394AFB00B1207819DAE82D112003911EA8A70DC244
+D7AC4EAA9E8FEB152DBB56A092831B8E149DBBF89E38EE4B39AEC0516C059380
+F7629463356E1A99544E6DBAECDC8AC0A5DCEA38C6E60D06F931A0BCD18F897A
+97217E61AA565EB017AD1A04F4BCB9D2773C04A068232F426DA17912BD61463E
+E4D6442E5B5C15715DF0664E565A77CE40F05BF942079BF3EA4E6EB459D452BE
+529DB54833F6EA5A05E2A645905DB6F2BE7E0594F99A20C7A529EE4B60108792
+FA3D0C09BA47241FB3768B6B224E164B87D247552DE8C62F8CA1C4482195F024
+E140450A043B9480F72A9D84518C9D120D267E49FE72ED1D2387051FEB89E474
+9CDC8226CBB3149CB9E5BD3840F81E6E071B71CBE0CAF2AD204B35BB2B4D2252
+8012AAF7493A958146E1E5A7455C21FBF36D299701570F7FD1174D3ACF461E5E
+ECCDA88DB12351D6AEF67FA66A015E6BF17CDC91D7DD10F9CBE389FFAB685507
+A32CF749510BB91F6F17263C548D0B1861B27B473CB9102085E162864214AE8E
+FFCC03E6E28DF8CAC6C6765C7A46657952FB9FAF03ADDB38E4BA14BD501570EF
+7B40AEBFD3320A5AD8BE650612DD04E13715B3DF076C7DE13A7B64AFE51F3AE8
+B26144E7CCA536FD91F083964EB721093DB72047684A6AE9F3995071AF5F5F1C
+EC0185BAD0D3D6BA33F7AA87AF2118EAFB7FE11AED9175D5BD9E56CF070843DD
+4CFF31665E76FD6CBEFCDBE0D7CC5E0638EA98E38ED8733F0A12F9846817D949
+EBED9BC845AA3F66DA46299583C3AB750EA9900AFDFEB5E5F938C565ED20E051
+88B82F596E539FD167FE3DA545CCD4D38526C915CB92CAF583034A6B935E7843
+380494244B87CBCA0116F1BE4B90F65BD82DC2C9954668CD744E701959B53B75
+DE8C1D50C7315BE4D4C94FF5A1D0F13340E8B586AE2FFF33B2307E3BCE5E0757
+8F8D4FC879CDDEB948023B6C3A9B3C989E3C0A12B054C9E4B9B063C4FDCB892B
+057A86F1142142257426515FD76509FF56A2DD69BF98ABC6ABFC4A8602903B84
+CE20B550B57BAED730F44C82DAD117146EFB6C53F705927DA998AFC1FB976484
+BAFB1F4755F6A3FABB7A2CEBD79D1EA9136F1847E3092A0D34DEC695C7509371
+FF077694F0A247AC96DB4A6F75150899C26DA07AB13DF955E0AB0D5EFE0DA8AF
+D7CD24A886975D087A4F2FAB8D0E92991A9499584E3286D78DDC2F59566EEE8C
+4BF9298E78F2A9FEDD9964A9B6A082F1012FFEEA0283E64BFFFFF9E6FF007A17
+16EA43943FF9A5F9D0CBFAF84E19F5C6DB2D89794FD5450DE9BC0D976510BA2F
+CA53022A37D273EAC3E6EC219F931B46E834F85AC444B83E8B150D974717EBCF
+1FAE1AFD51050394258C25055D30C20305C65914596EBB41E7D806BA233D0825
+529F1F5AF5296B170F061E98FF0CABE8D12FB31A34C5AFE93E65BFBEEE38F304
+32C6CE23430DEC4128FFCE4B8EAA54709529F03A12F59156E7D7DF62D4A2AB7B
+6AAA8263F46388410AC2912E551112569057472CCD7FF5ED44726C7F9DDF5750
+EAF49F466CD6F2EAAD4CC6E35FC5513DE139E7E347D0F6767CF153E432C2FEAD
+38E9E54253B1EBD071412823594F4343AB1D2FEFD0C8721505525CCD6FB3F87A
+7FFC5B88FAF58FE2E0E86A1A5162F595DAAE825BFEF488083E5CF2A48C635F74
+4B9FC91982994910A6C06F2D6FEB2CBDA98149DEF502B7BF821DC12DE0664D31
+DAFE24F67B2343510432FC637F15DB3022F9E96AFC7C25A50B508D4C212E3112
+2E86483A8874004B8E2B8F18EF1ED091647BE5950602CAA13896FDB22E10FC9C
+5F2E6CEC122E215D70DF60CFD79456D13A6889544ED4B22DD7D5C79802DDBDBD
+86174DC103DDBA097D049C6E810ED7ABCDD94BA9EDB259FC5818DF62B976DA55
+3048AFF5C449F2EF544E814FBED1339CE8A576A7336CE29CB6D0E83F8E5E3EE2
+B7A3217EE0BED4D01D02CB1D902B05292EF3FC41C04FC23501DD8818BEB701A3
+92C23851656E3614BC6A68C8BBB0FB30557882A55991C1163D2B70B76E0B9F38
+F53544EAB3AD5304077A54D4B3035803684E1837A3760901E36DFDE4407731B2
+36EADADB9FBC5B086B1A27E6F89C9B4BB12CBB26F4F8E86AB4DE8EB0B63D66AE
+CDAEB516E17954E442923697D17058CAED6609D53F7DD50895F2F79A6CA537D2
+344DDA0BDAFFF4A2CCE0753EB27C875D1140E38106DF7B3A42FD696170C05E6B
+B0661A6FABB42516931546B1DDBEDDA19BB9A7F1DC62E0437BAC2D571239C6AC
+791728D482DE9F2624F8A50F03A1ED39AD433793EA48E813C660A8B43C103438
+4C8CEA258F9875E82CC4738F61768B9A0FAA19DFC4C8CF7DDCAAC70981F03C93
+A2A6D2371B8FF974180439E3430438B0A5BE3B8516CAFB05D2EE51F5CFABD5F4
+9FF5166594E0BCAEB18EBF9D8083F38A2A707779627375B2A1AD31909BE34782
+742444578D5BE70297615061131F4A275F28E3E550777E7BD3B10102E03075FD
+9D89C24D708D12814A70F378B5908096524CC9068E8CF2E082D6BB817432FD8C
+89A17C5DC6992C1C3A59083A7F53892360B794D45FDA420CB5FC2560329640A0
+AB0564D8A0421411D481C6C608808C55342A7C5803B50A9E1D8AF4383C7ADDD4
+29CD57BE680CA8A03E9E84500479999304D4B997F8FF3B53898BADD14F89C08C
+E5718620FB4E081C54D064E015C2CCAAE54CB950BE1B8A97E7E5E2E5B5FEF65D
+9D53186116B7943BB8833FE21366E6FE43F8C5AEA2037149A3FE464A034B76F4
+098DB9FEABB4486F01788EE3F8E8C66197E009F1219470E2C95CE9059823E7FA
+4307E26EA8192B9BBE4599B1ABC06541E0A26E6E8A9F57E74B7B2A06E52282E7
+86F92BAE883FFD3D2802696515A2C69A1DA08569EB95FA10D9CA49E110A8CA1A
+350AF5A6F5A989CD498CEA19C47CBFD664EFA5410F0A7BFD969903AE3E1AC77C
+B6326381963668445133B159A9A72ECF078635DD9F89B9BF1C458086C26753B8
+29B47C70DFC282E3021DE9A4D5350BD8F98F68FD49945269FB6C73BBA9081960
+75BA537DF244074B277C4D3BF3A59FAA6F0E0F6F489FFAFAAE94DB13119757F9
+0FD044781469B0B7BA968567B0A07B6B154E7F6401028AA140E5AEF100164792
+BD57EACC8D265A287376B7624BEB67980639020825453CF24621A82C706099AD
+56277695E526C787D44AD36F97C29A471B37EB2F390120E3EE4077B1EC835547
+7FDBB26B646A35643E447E20138F7CE5C3D69CA733B0847CCDC22F5F6E20CA60
+3B81AE63F6A38483E04D634480ACCD2EE089809361D085AB9609DE8D0134F462
+AB5DC21E5A8608D25D7A5B66A6A6921DD8A27CBBD3A5E7CE49BEC015B774294E
+A497B57C35F75AF64631AF4B95258EAD0F9501B35E3C44944DB18466F2619D28
+981D2AFB1654E8CD8E174DB350992BDB35983CAA5EE9184179EAFB93552705A4
+0208877779112BE42C576FCC6A3C94133DB408F4ED2EA4E4A7A6F5EBBA74B161
+1D0F116471708CC98EFC5B14D179EF07DBCD9A5B5E7E6A15C260788A0626BF8F
+0DECA177D2CB45EA9C90F2FDBD8E799BF42C9730F367F3DB1F6167D263E38772
+4D51ABA82E74B481F7C90A4AF598946869466DF606B45FA82F214A3590C02EFE
+9A71EDF6ECA7496812F0F1FEFCB29FB0881100186AB2186509CDB0670337D096
+81A41CACC03363D397272251D7C7A1374949A9D4E3DF32789AEFE3127C224D9B
+73B6CA57FBA0E54F0A2E38C32AFCE9DD385525FFCB5CF9FE6CC9684E77BDDA53
+05049A6A3E589D31C7D7066947175109655B4C3541BF05755B0644B55D34D405
+EFB4BA8A0D486249EAC7CA0C0F185CC19680D8FB5BA540B0A5F27E430C3D0C72
+CC2F2B1F06F36258878CB8AB21BF4A4D7944F19D41B79E17613C272D5E40763E
+4462D5C8643B4E37FC329056CFA0BB8ABB6D64A146145182015F8C892A5576CC
+D22E976930DB0C1094EDB5C122276A0764844C35E10853CA4F69C58EE90D39E0
+9FAB09B52E1DE908A2CA2F33D594F585828495B281022D2D00DED3BBBFA0472B
+5C630EF89ED53FFE9BFAB5B8B7F2B08C0CA31DD7223BBDF5276F39CE71EC8FE3
+7D250EFAB54CFACC7179AAA98EB8F972E8D03485630A87CADC425526D9BF1482
+E5BACF079037F0EB2141DB6CE00D0D11EE1B7B2641D412E78583A547547350A3
+317CD3CD18F7FE7F38FFF9DA57D7D44A58A96F6EA309E2379B186B7C5CEFCB94
+EAE8195E0DE7664A364CDBA016F43EB88FE337FCF80A0498C6A894C092B585C1
+02789DA87114C50B3EFB823EF5813CAD71CA38444B2BAEB33F7387C1A9F512D1
+8439074FCCDCFEA654A5B78BC7F253076F56459695AAED5C72468AA9D48D72C0
+0D9343A63A642D2D216EF05B1D81157629EEC652411879C94F3ED47B953D314B
+8756938270DC9054ABCC8DC28763A8A5C8E561F01E3A2D76DC37EA43771CA11C
+6E06F985539FF4D300BBCA574A755C28203426729FC73F5CCB978E74B4A86F50
+090904E48F9A0A36C1201B809559E385CE9B0CBC885CF20B31BE2215E3DCCD4D
+9F1A56EA2857E0B982F2FCC3FC1F7E7850E34D2296AC3CA92DCAB4026FFA3944
+25A4E19A8C678E695526342EDDD5C9E8D055E212CC7A64E1F3DB7DDD88DB54BB
+BF92D83DAB5A0EF137B84D56883529F1795CC63FDA45EAAB1E66535297FD8A31
+8B683CFA039F6DDA6A21539E68C8C3520B825D4D8C841EDA265E7E04103E14FE
+8F5A6476DB4B6EDBCD085736502B25FF1DC12B9C0C6278E1DA8706AF096C0935
+2BE1E7AE0A5F2E2EE6DFBC34F55A2425344B5FB902F82963C77CD41340E8DEAF
+8B73457EF0031DF0461E37407B439ACEE52757DBA679B788CCD528541E8EED39
+63A63BD312457CF89C911391F10276F426E5022A760AFACA626903D896D4F9FD
+4C485261D16DACBFE6B61E455D2974247FE0F5EBC82AF0575BE40D96128409D1
+F99978F476C9ACF7E77C0F615ECC1769EE2B43900254D7F768F9BDCC0655736B
+5FF04F81066EAC2E6132EFCC2C65E859083D9928086EC36470A84FFD5FEA00D0
+67821313F38A46E47A03FA855A14063F14FD68631DD0E44ED2C6CCB171653A56
+EF323B19961D3B86CCEF235265D30805CFD1C993C71DB7922A5221C5A8C25016
+C380A6557419CC7879EDBB21C349EF33A2595412AF7F2C3688C3C20CDAF1F56D
+36475154A5AED3739FB3082CCCC3B0B325ADF3B8592A0395F1B7FC724A0AC009
+F898E8F9AA80BCB48C76AE94C151FFAF4EBF7D870C65E35002C7E445C7F00C77
+1DB6D2C260BB5E9C9497EBD922E7B9658B925E54E00BAAEE21D6A67EB514711F
+3EF05E302318206291A96BA66572201ECB3F226500277E9638BC84731B764B4E
+76AEB32C03197FF36556D34F2B8172B7924441264C9DF83BAFE162B49742BC52
+B33E31DF2102D57E8C862D930B217AC1CA0CE9534F62CFFF0125CAF9CFAE31C7
+DCEC45861CA4AEC55CF3409C95948ADCDC660BB19772F86D1D456A969F5CC3D2
+A7673706BF239363D20AC2F4A7A351EB3AE4C2DAFEC3947F49673BE9EA68B5E8
+1F35E4478E89E92B38D19C8A368C9180809B53F79FB32F408F7388C76959D215
+C2BFEFDCED1C0C8053DDEAEE81BBC97E15C6CAEE8F05415808488F419AFBBEFE
+691E5A910B53A381C7436954ED3E0E9EA0E5C8817B67288F5E6CCF731FF6B165
+C7000B664C9A38784ECD0F9C214C336AB6BF4C9ADC60F44FDE100330C5609178
+583484D91C84880B36BD316BE0563278D3D29C57D4E3404BF3E0F5069B2988C1
+F1AB5C9973DBBD265FB1165E7808BE8D168B63525D6FA944BE5BD28314AE0A5B
+101C78A4BD532877DFDAF7F4D747C27C1D1FEF2C3556A8A45BF2C88EAE01D95D
+77EE9A180CC28C601CC4B00BBA6198BC5D0E8FAE6843E705A715A51EA14809DB
+02A624CC4BDB623FADFF90F5A137093380095B820A4EF37CB35326CEA4674D9E
+4A8184D25ADCC9D3517E6B02E00B127ECE775FFA250CE9B3AA2984E856087DE9
+7AAF1907D68F8AAF3CB07A034F88E976529AB6F60C190FF952EA0DB2672FB4C0
+D24735FD57932C664B322114EA87D1D98229C1B5AAABAA7649C574E9C05E42CE
+38CDFBB171E7B1FD1882754BFC0737C55DE2DEF0DF0EBDA160D84CB03231078D
+1FD1F588BF9575C29FB680F65078DB52DACC096AEE312BE16882383C9A102E0A
+DC3966939163A1188E252633CBC3D1055AD97AF14393DCBA32EC5D24D0488DF2
+CBA1733AC645B2DE4F7C8A3ABF20C7AC37C8C43EC493F232C054373AD93027C8
+B0A2453AF04AFE94CBF29DB005F24F9AD2E6D4CEC64F329834F2F39A858F0E63
+C0FEBD5EAFA6F5B380C956F445C2BD51AF4234FBD3CA4466B34D6152FE27DF3E
+D6025608EE647DE4BA7A1DC7A1DB1651192EA787BD75D82CAFCC7A5726928CE7
+CEE722D3C8B9DBAB77EB240C51684EEBF570C8ED996018913A8D2DFD12D341CF
+212168B14F6EDC5B95EC6466454F00EC3648C03D1618ED34C57B0D1D4D1732C2
+077AC02B5FD130DAFC09090F1CA5C1743036810EF86FA119A2774E518C82C651
+F3AEAFEFB00233695DAA7528373463C8E3AADCA69D13929A265CE29CAE7C9B22
+411B13F24784DA42EB3DF6C7C6DD9C04B167384A6DF81088F50B51CD10B9A4D8
+1B6DC94827282BE31501C03C29265BE63A20BA54B1690C510A20613ABD10C545
+6A7143BFB9C6E2D5156D926891A0BBCE62EEB65A45A1BD9557C427C1872CEABC
+411CE1ED857190785BF506B52FA56FAD1EE7AA168D9CF763AB2B7DA561008E75
+F84D2DD747282FD0BA924AD3E271E597E9EE4278D1A422317FDAB9C5DF0B55F1
+67FB7847BF5C3D0ABB90D0D0D0DF95A520CDDC778ED22849B23D396774C93702
+D33D20337D58BAD00CCD12FEB34B0D4B5561C41B402A59021CE7023F12B9F305
+9E5D3136228AC189CE3D18761089781C5AAB38B3B7FA6205A926262E58AFF1D7
+FD536B19409F82B8F89457FD7503658DA8CCBB35A9C374EA7664970244F14D04
+2446BFBD583766C2F552EBCBDFFB0BA521C2EBA849B48C9541D6E7E6780A52D1
+B6326A1DFE69B33B5181FFD1013842B314787DA0E86C86F434258DECAF48CBCE
+548A76804C2DA46F3852540B2E194F5CE95B34477EE11299E7C1A08B4D4BD28E
+1AFD0E500F7BDD0B53582FF2B9662E5F608F3E355CD95E6A216EE8BC2C047FC1
+6A5DAACB08C71FDF705F882CB2D86F91964FFAD356B0D35EC4A50E83C104C95B
+724C85D256C06AFA4AA0DBDFE2160F0ED9A8D0BB6846C42055C7BAED7BE1C519
+DA628C270251C4B60D679C9D56DE5563C4C6FCE19B9C6D6EB99EE7F6E3598C9B
+063081DB9D3701B62F3BDFDFB783E35AE6ED183141CAF6867EC74C09D2B5122A
+C478BE7F37FDBEDAE08D4EE9637A4B28B81FE1A3DFCD8DD00828FF42ECF3E22A
+66F0E8317EEB7EECE2DEAAAA78687C26DDD470B49649CE19BA786989B76AA8AE
+4CE3568FB47893AE67D8C79AF5457600CB5B09A5F82CEE8027AFFC026E59F379
+70780DA7A2814587FD3BE93E38BFAC2BD30772BE2771363C561E2D9F54D6D1C1
+EB4C006DCE83EA61B8616FC149D748DEE7D53B1E2C55D487C58F987D1FA8948B
+B116FB9E8CA9BA70F0ED720655B6336764016FA354F334795EBA5FC35AADB9DC
+BB50F313F7B626AB164B5248F9460B957D3E05C047F26776E671837B4B2EB458
+5E4197F3FF3087389755B56A007A501752568F920F04BA3307B24E7211D39FF2
+40FC4988CD86E921ED827DB92212523B7DCF6A14E897A3FF05FA5690C71A2B33
+216ADF5A2E468F0E513CAF9D957688F45A719E220F8C76CD2F86B0915ECB3EE4
+BC64C54A24C753F9333C71A66551993BBAC36975DECC66D43826281B63720418
+7982B6B5C2DE44376E5D7192375381D72069C3137478490927353EAA5E6C24DD
+56AFFFE84F906F71558951ADAEDA19FA3DD49A8A8144BE907B1A139B40A5FABE
+8AB57CE03574469293ACBC02E44BC0C7F6B36FB58761C167BC9A0164B91C9995
+2172898DF2F67D623CEA81904E3589FB4A3CABFD3F8BA922F8A55BA471E799FA
+06292C922ACE066F24EDE84E43D3F34AEA8D199EC21C4BAF8C00EB611D27ECCA
+8BF0678F48EAA7020B9F98CBFF67B12D46A64467FE01BEF5E17EC7B2080655D6
+B384660F1CAF85395CA2325C1A0E8152073E1A4ECB1BA86E4671E9AFCECB044D
+AC5C4892248B1940A3279769779212D6F87CFD18FD76120BDE5AF1DDA4F42802
+90640E1B77DCD2B7B302550C046DF13D1B7C8FC0DF4A202CC4AB5908F8E229B5
+BE28252D80C6D12949DFA9776C7B3DAF0DA811EA7AE53A70B2059FF409271852
+A43F5AF79427F6EB018FEF249B7301D8C9844309A52E41E2A5984035A2860156
+44DED1705CC59885042D71DD20EF695057B8373411B15855CD9C61C59E
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
@@ -1981,8 +1973,8 @@
 dup 50 /two put
 dup 51 /three put
 dup 52 /four put
-dup 53 /five put
 dup 54 /six put
+dup 55 /seven put
 dup 58 /colon put
 dup 65 /A put
 dup 66 /B put
@@ -2153,273 +2145,271 @@
 EDF9BBED09B604C3C44295302CABCD71DE70A6A13B74132E2681F9A6991C3C21
 FE51F5DBFCC724953BE9A06A291EFF0775E358B13470E7B540F322BA9849DF90
 0A493AA0C92C4DB72BCBF21230D67D9EBF2B10B7E8E73EC067BA9F7FB37B26E4
-E41F99FB53B05AE9020D8B7EA591ECE7D47570397CDD32A6C3F19DC1124B9730
-217268D91AFF1F62192572D6478C73632836E7478A8F873FBD58B172277F6D7B
-699DDFFC2CC75490C1EF1D2B00893CB4CFC77EAA03246E7F51272A3F63676D05
-CAFEBD91967DE4D4A02EA53642B7006A9606AED181F3B3428BC9B352898C5E58
-D052295B6A07DC041BE66A4232DA82CDA1B4CED535874BABB3472B9218D87E32
-CEA4697AF232A43627347ACEB59F06E4C81D25AF9F2250BD40C28DE630ADB818
-B09B9722A6E6410FECFC1F936BA6F2330A0F7DC5DE5284A60E81D5B44AC717AD
-171BD3FF3F22A3C6596DF24E79841D756502EEDB36AB9505965A9FAA039336B2
-2DE525161FB93C87CFAB1EFFE4CF43492D708F1BB2E0D844C771AB4588F1CFCA
-EBF55502E8AD02196F8553C3C0EFFABCD83C13D18DC32F9740C2CDC9CBBB5816
-CC5E138354A4480C3A1822453763A11CA75C3979CBCF1E35F7524A28B285250D
-9D494A036220475C04A021F2AE92391E172EBA0156BAED3567B383E1E6226C35
-E60661F94714CBB0869E003C58F48C763E8A4028900693CCB311C340E26AFF28
-BDC8319548D53B1B0B318CEC905CB999C54AC6D6723CF1A653C4DF7C63EBEE18
-12998FC7542FA3EF2D20E255A1E3506B6C37BF854ECEC3F6E8F01BD5D41C7A89
-89C077C3814537854848BC533BB4326CB03E76D8D431F048A69FA694C11092C9
-9CCCDAFC84AF6F6EC577EACF8CD5FFF5B75F0AD7D2CB97E3429487EA4E2375AA
-8CE36563EC889D8DBADEEA41FE711DD61793615E890E633EBE1E647A6D3169C3
-8825E603D059E0591082C2E28D6F563A73C826E58C7CF6EA8F50892AB3E51EFE
-A68D2736122163643CF07BCF081F6357658F3361C84086CACBC066A2470CDAD6
-6D81D56E95454D6F24C3B5ECBA5133C8B9B839696744752832DD7ECAB6F7F3E3
-1CF633E342BABD9A360287732B49F15F63D673EC3EC5870E5D3D8757F9FDBC70
-A46EAE890EFE1F7419163BACB4CC5842E13D8A15CC49EF40C39EE185F3FD7CED
-9405F7E4500D918F2D26EDD2445B889DCDBBD4497F6F4B7C1B4103028B9F1A38
-20E980D846B9DF045AE9058B94A6583825403B3F969F14A5F205EFBF12A7A4A0
-33AC7836ED64CAC2D72184E7C7F202BB943EFB29771C4DB73F974503BD41704E
-C2D0735D8940242C4407866C81A926D5853813BA73C2DE3F24BD9ADC326FB422
-2C9C16544657483785238EA2433435A989E5ABE3CBBEC6B77CFE77ED0C585368
-21473E58E0EAD3CE1929754D4AE85A9183852D0F973DE80627821FB3B4F3A8FD
-E410C7D0B25D124019BD520EE340C0C760EFAAAFB4318803A9A5F4FC75573F7F
-3684116504599E8ADDCFD3F8D9F667829637B01019F42233B9B8864FD9CA0717
-C6999D85F58D8C1953DAFCBC701F7F12D53F86D2593D9F6B89F9263B789EC8A4
-C8BB5E0E6C221B0023A3D4BA02ED462ED6F2CB3D7365707FB6A789B9BFE5E4C6
-4CDF3BA3C90CB2CF9072A8A7FCF216211DC687E8FF2A7E0B731E036165A5CE4E
-AA453EAFB2BCE921CEFEFF3909A0A19A20405942661514299B01458200F53639
-5EA939956EEFD8B799D9AF814B88CB062266EDA180596320741FF3EEEC1F2764
-EAD10C6F0706B589DA8C448F7A2F7ADB9FABBC53F4110BA6381A69FB5D7A48D2
-4D6853FF7BCE23190BB522FAE58F18C11B32B4A1EE71199C454D9BE42D47A3E0
-68F1CC14142E1F3CFA6D0C16918C552C03FA0BCB6E01F1A24F97558C09D412A8
-275B2851A2BDCE430C24B2EAAB8623686288A04B8FAA4C7F7B1EFFD24AF4698A
-838F6B1C09625665D65626EB859237F98EAF54A4586E38236980A4AADB2795F1
-98706F1491E32781E6B4DC4FECD284E15BEA77AB070B82DCDC60B8A953CA15DB
-FED94F80B3517459527B8328E92B6041DD20BB4AF4F19C8601FC41F251450D03
-6EB298FCA6AEEBE201472A5F071D8FA1BF2B42EA1248EA9F94E76A3B1CF3FA76
-4C6F1825461B57D207D5ABAE0A96ED477B2148049D03B4D2DCA05E81C996FA20
-049415CF7EF979F65595B61BE215BBF4E5E6BC75DA4829F8C5EC577656C409D1
-449F7ACE9A7AAC152E7C4F5464F2AD64274D07C921D2430969C6B7B99B8A096A
-BA98D674889AC7FB720D67E750871674B476199CD876F7DC8960B49A7AADDA58
-9FCB4D314702D9845C382A1E23F47260A1D8BA9A0B491417791751BC40157F17
-89513F35FDA035919B1C4B194898E7650673935032D82676EDAAC4CF4652E777
-8EC0A185D9837E3ED24A9D6AA45B355C18F72B9E55ED979B00DEF5FC31034ECF
-D15CAAB45DF4DF57638F0A6F46FC8884751E8E662EF15315A461B8DCF755FD29
-829F1E5423EB67A45C6A81D14BE4E29582671D043CED7BB09CB1C0F320F420BB
-50D4A883E34306A0226ACD954E2BBD2242485CFCBA35CE7C01F08B2603A41970
-A5D1B56E49CEC35BE13957BCCBD1AC8D29E1E85B1853886C94EB626A1355E200
-7706CACBE27755852FB02E239571CD1C4454590A212E7181866213343849B296
-03F619F08B0ED72C886171B361D299A7AF75AD0B04D8753D965B320DB0D04747
-CE490C379C828AF32F8E1F7064490DAC66A8117C8AFF4F3A3A4FCB2A382409AC
-54BF9396B1B83B533A627C71D7B1B796317270244AFB555A0C2D102F9EFACD20
-68A7DE1F87293058E613A93AD09D8745DB21A080F96D1CD8739A2807D1C1FB7E
-EFF35246015C420800842AD270E562881A3D93864AC6105DFF4396218CDEC1C4
-2760B157AE88B0D3D6900965EDD2CAF6E8342A4FD61F98C40443710E72090EAF
-9B255BC9E0FF05669D058EB17BCEAF1D62FB02D2CFAFE882A947FE5E23EEF861
-896D4A228898DD17D6715506F8F8C2810C5E670825C7F6ACA2AD6D245DC8A5CF
-191FE9FCD0AC4F41DE83454D881F6F40CB78951660957323BD7109EF2454417B
-EA62A2FCEDD4F3F68823A513160385FD0A0D2FCB8AB74E493ABA2ABF8B6DC1AF
-049123DAE330F5BE5B9AE62C87DB3A403D3A38534146A26AD30BB354CA909CC8
-C2134B45B572F8A2B5E41C2F7E17D07D2EE083B88FDA3704EC20FEF720F86DE9
-2DE7E1130BC6F0ABCB1BB4C643D9C6BB7D69CBF406A7D77A8928EF5C91384564
-0CFE8B7339DE8B888B941CBEC325E009A761963D92C316E6F441B9B5721F6969
-E4A40862CB0CFB353B70CEE9F698BDA88E057A572A6BF5E66BEF96707D5E8AC8
-3F422DDAEEDF80F7AAA30C38F60C55EF06DE1E71C228376EF7F201BCF492A4C6
-F82B8B229A3D79B668D94E8ACB245E9F3C3FB94DB36023B365CC7C9D15977575
-715AB5633DEECD2F3C0A850DDEC0FD8F66D703B605B77E6635A592EC0DD552DC
-876CC2019DE8877F444957583D1F6DD4B05D603BCF49B1341B82552C2059A924
-BBA6DB70307A63C20673561C478F50CF7ADED23B256A6593FF0B9F7BB91BE0DE
-D0D49E2CB79E71B4E678265F133E4D2D8E42E0A8FCAB22C014502125D121F948
-2A291BAF1C69F0C589C83F73390E1E3223A95A468F5439133B1D617DC2C34C25
-35D732AE7AEE7B8F9F3CB597329478B2D187A29BB23780792D5970620F5F1093
-978ACA7246BEBA1AED2AB6246D722AAA9925B00C6F7FD24BE212D1F8ED672DAE
-47B35305431409FD52CBB4DA6B0CB6553CD8BF35F187D7ED0F95EBE1169D9A68
-C1866AC1891B2D922F651B54C4851F689200F9707A4EB62EB75EA3173DAD414A
-4339567DC982347BF6EE0F2891A837CE0AF7AB0C0813F8B2C9003ADD0D3C4C60
-1754A04516621B12510A4CEF89C185AF560870D1BD6AAA38782D821C9820F5FA
-ACECA5FEB2D655C646ECD5DCD34701E827D99EF8A0BDF406D7055F08CB6BBFB1
-055F6EF9BDE6EE85E0E306ED3D6D2BA004804E159B5C3229A6E3FDD0EE9E46BA
-087FB957283BA2F926172BA8DC6037A27934D79D3A1F0AD0A38E58D88C26632F
-B55D7D203AA1F0344D9299291FDF9EF47D70EEBF92FEAF57EB31038DBA21B5FA
-1014C1BDAED4E9A4BCA7AB689F9E17FBB374D41FEDCEF0C5CB415642525A519F
-7B4B162AF2C6286E42BC2BA96D7CBEE188DA9B24E628F53C6F3BB36411DE5301
-C3303F4E53C1290DC5668D41A858E789D5AE810F867526090D93E0312D6798C6
-A3A7E2F6052844AB9ED4DB874DDB93AFCC407BA7D67958E56010A5016AA84EF8
-145442E4A126CED616F4A007BBFE9A5C95DE6A23C3094AA01DE7D5726137FD41
-3EB2AB296B21416704B6F8F5E38415104E9B7D45990582A793E47FFB90520854
-F2A4E009071AEA3E6D738DE0412625389BA0C2D9072C517D84E436D44F107AF9
-CD2BFA6E681C6F615443DDDC50BA20045CB0EF9D51093A6FFBF3E1C47988CFDE
-567FD11675186BB1D46033171E8C45E593A5630200418C8DBA1AABFB995D5EE1
-98FC4CCF53FFECF03C4AEED429AEB88BB9DE974F7DF9FC145941956BEA5F675E
-AB97A868BA08E4644AEDD8A177EBC02D233BBDFF7D4D4DB312946E3F073570E4
-3795FBBE56E20F52F9EB8CDBE98B2FF21D9C3BC88879B79EA99584C4E278EAA8
-343A0B20A597948F956CA968B2C0321E48DADECCAFBA31B8ACF0D44AAC5CB941
-4A1C9A026382F6CEBD4310795E09DA54D6FD655047426F8660DA28463C8186F9
-D63D9A8875288E6A7BDDF95CCD580AC37A6E30DF309E524A6A067CF914FAA69E
-03ECDF61F22BD10C57160FABB78D29C3489BC2907ED42C646FCCA84585DB3538
-72B7731E3986D935871C96D7E4962D63A7D1E559317603BA937880F8A53B7FB7
-630F0B3E43FF54BDF19E9FCCC1F19DF7BF1563E78829EF41F768FBE976F94E50
-5286A6EF08E2DDAF0FA8B0AFE3C3F7E969BD53F2AF7652B2EB21A1C58F3CCF25
-056A9E0F93656F71CEC0ADA76F844673CB2E27789ECC88C4F388A4A134BAF5F0
-19C6D1AEBFA16E8443F263D0AB1664BCE8A1714BC8FB11686C821F1D538839CB
-66B953BB64A06D342A392131943FE9A414077C9BE0297991C5186F0B05CCBED0
-5E728DED1C542135B9D08493031326D1B7A0C8FC9577C32497266A6C53007E3A
-E79D1B1E5986A13C1404D708B0F9B92EA4B2A7DD2A2D0F8E37A8B378B64E8974
-991D0F971352025E688D5E6DB826D8604CC45CAEF8CA03E5877511D65FD02B9E
-CF34486C14C72A35DE34C3D4A89021E1A9D4237C8727B87D223E2F8DC8849EF7
-B7DB6CC01B4CD52C34BF0807FDA7E4FE55BF39EE2CAD65485F7CF8CD4635E3F6
-D003EC54E6E3049E4B563A8D4C9261C67999E79308395A4CDE6815E6339FF204
-BE6AFBC62D82B51DD3BB31EBA0632AD0A500736A57C0DE42EADA1C0959BBE982
-0D48C1C3CBB516E78A69210E1588296F0F4CC04D1383E47E8BB9632AFF566366
-FD3AFB3C63069BD76D3345DD37E15529DA15C9423A9AA5D994CE65D9031597F6
-24970953828DD41FFA0F797752714A4B57B6E73C70DCBFA0AA7E02838CBFF37B
-9FF5FAAF728E54B00B7F6B1CBEDF2DCE33E2F7E7A494CA4DD17FF3812E9B8CEB
-ABB0425764C25D65B60E7E6CC240947ACFC474D143D899E16B80E5A2B93DB041
-48E43D94A24F6942708FA9838C0E52FF7AD6262A0801B5A32CBB17ACB46EF14E
-FB987B9E77714E27CEF76805EECC801F03F3D80DC5061E90064B5314E0D52FA2
-BC055E8596441F07DD0EB2EC6D7ED95A4A3E53E3D7176B96BD3C341AB8F82882
-DC54256D000D5852105DB8F01C0F0C2A4B74C10CA73210D58C00DA7C574F9C42
-A77FDFC255740BB458604CFEE298F910C290C4D14C7DD9591CD321707E4623BE
-0BE81419EC976B23221C3232A2FE96B62CE689F6B401E06DB688EFC5A06F8E74
-DFCD0C19DCAE4FDECF9B28CEC7AAFBD5E93AC11DEBFC0415507B9466B50BAF2B
-8CBE2918E6DB845EC2A72089BD0960BF4CD264C70AAD8C3DFFB9F6F8C04FF50E
-DEC9EA62FD038A39F86E9B14347994A4B686FCE97E8E97EC1A8B43662E054209
-472BDC94DA8645509CA5E251B1AA22AE89546F35A44F0C0CCED626D711D61FC8
-72E558AC9DDCF87FEAFB7BDC77447CDD11EA536DF06E7B4999716B7EEF357462
-B42B1B26325BC45B338B9F00704B4A9BB560A3A7F1D183EFCA1DA7714FD5512F
-6AB6DFD54F21CBC3B657FE1943F50C72D68833132C65393EB89399071DDE23DB
-FAF6F4DD3C06B99FA8DC7059956CC4F33340277E84740120449F01F49F9223CE
-3235F0E2BDE6C75533A8A14A085CA5A0B1EB9AB2E7985AF863ED93FC7CDE0F83
-0580436EB7F215ABC4D315F623F8DA5B689E5F3410D252BE20693F742772A80F
-27B14E61E8983BEBB0C2750622728D40350D2C005EDEB99DAE8A41F72B3121A1
-BC3ED38E8E5EA9B4EE91B71E111FDA113E697E17D426803A957FC4BB346CF3B2
-3A9DD30ED9DFF44A29E572F21896A1E4DEF818D84F28E5B2E7376FAC8855AF8A
-DC992EEA7988962A10DE65714FD3E47D8CA2CF2E8BF3C071AB42F076A34F8B15
-9E04FBA7ED1CDC8D15E0C074F58608A160C98050B8B784B814B523B262C45400
-8AC797E6840DF536E25876DBD94D86A2F0B41F6490AC32E915875ACFBB73E602
-1FC1A2E522AA5BBB4C9545612C3048F1E85E6866D6867C3BAE47F07AEAB20289
-52B267E0B36CC783F56FAC6C8C81F34BE7AC03A9B08FB4C52EC98CD985AFFBAD
-20EFBAE121A1EEF64418C978F88D30A16AD12F4F2325D9FB3091C20E04503EBA
-048D9E3BBAFC27482A6E230285FD91462B79DDC1B3700F22719227098753FD98
-C389036972EE8E5E70A4558CC83E9EF61AF83B42121DFF02EAED327E555BC4EF
-59BAB5DB1320DA0ED0AFB010B9F78209E7D2E04DC6F6936DB0B6D52721206CD9
-9EAC2784224C258F6AA34181732C5EE4169116E5000D770A92A2027CC0768739
-5231EDE3907D5E55B17F0E2D3031977373A0577BD58265A30A7E48F2B78E3672
-B8A5EA4EB8FA0B258DDF8D6971792A9D1D951BB50B95DFF374F04B5C9A691D35
-FDF7929188B109172679D85C229CB4FB18A1917F6769E8A178A6C9BA41E4958B
-9A92E07232D17FEA5CE606783FB7E2FE0685F98DDDBFCC1584CAAF33B0053393
-1C640AD912D82BFDA2B06A84AF4B32222BC6EA091ACF511D84BF5D1FC8778A92
-010AA01990DF63112A0E6F139405C46B024BA8F3FC0D7BEF9051CC97562D75BB
-72559AF2C74C04A5BD9730488ADE5157262D400CC66621334E32B1EE44190D68
-7551CA102A4565170CCAC9CD9636E49DB6698A897A832C70302B2835D398F69A
-32EF7C636A7FA9FE9AAEEEECDD2332F51AF92E304A012A1DB965011F0E98ADDE
-C0704E700E3B476431A9FAE8FF4CAB7045E465798CBBC2BD8AE98F7CBE66FC85
-925E33D6ED6C2FFE4425381E4CEC001542AAADF1405792F96D99A329F6A6BD31
-55146AA830D3E3FA54465197821077FA98E04A2764BE9342F43FA475F73DCF28
-4B29697FC0B6CF994A70B4ED74C33AAB300A470B7EB7AE0FA53FE660FB6CA8D6
-ECC7B40DE28C5A1F8BD754B0CD1D54258A1A13A1CFFE6FB41B746C58DAD37D53
-9F6518E8EE461A83434A63A027965ACCE9A76F615A6240083132F8E0416D35FD
-D1D9238D5995B3E1263C2A7B91E5A7C9CE4E17F2759508AB3159A7BB5F130443
-E52F4E9232564A0DB6810DE44C17692A979C30F8E9DC97B64738E81623DEB430
-D1BF50A2CF5939350B7081D54A5C667FEDF5423A396EADA1E2C1756BA7ACF6BD
-41CAC5CA6C32F0BCB337DA0D6181D112E685DB3FC40F062D63C157877AEA89CF
-F93B35669C262804F3FF502A1FD587C6CDABCC5AE5CEB7FAF55C23AAE8D1468F
-D285FB8119C77007A4E8F711909A4BD5E8860607FA69FEC7A32E7F52BB21436A
-BDECBBA65F476C372AB774A9875566D07EC88A10E87EA406410C59D784CB9F2D
-7FB3D3CD20CE042D122A376B70AFC4A2B135F5A715F2E334ABE10D19DF8A0601
-157A954DB7BC3734EED1AD576C2D256960C72419AF44ADA49DBBE37CEB9A56C3
-1EF2D76C87749A3414D092C698989DF4974B88B06480F681826219F1E07279DB
-88789D005208993DEEA8528989D9B43E09DBBEDDF830ECE89B52F7848698B869
-2E951CBCC1A0E6AC010BB50BEDCF70B0C65717FD61C602FF02AF2ADC48128A73
-364712A1CCF8CF9D63576799B4D98EA6E9D23061AAF97378F57A9671F061DACC
-90D85C2E4C8F6BAD705389451E69D43343F325A8B6FCDB3B29DC86BE4E49C0DE
-E3582844B795EC77A271308991032A4D2C937466C82BB980E780AC85238820AE
-DEF1FCAD756C7CF996EA73D5829B27BBD72BD13732F8336E4C0EDB0E9A0B2D78
-66F2734FFA1395D09C291C64C6E63D2F87592313B3681879983483B88D5F9577
-FD87CB3B8BEF6B799E64BAB303B603229F1B075EC076B39FF220D84D19C5659F
-3FADB3C01D9E3952973C7B6031239B7573AA2D8797842630300C9102191C25A2
-3F98DBF572B423743212CDA78466438D352B23B7A083E28D2054A8D680ED7E7D
-7C1197351194E57AF95301A9A18CC158087D1ABE1C9909548FED789E07F5104D
-F08AEB8E71CD0CE6310B7037D9BC55BF31B8A73CE8BF8471C98B190072A03C55
-9B4BD03FBAE481483E61BE586D1F77BCC662A65E8963FE9F79BE24A6C14DC48A
-288D54E74570EF1B33796BC14CEC9B7A4887174B1A3205E89380B41F10030D37
-B7B3E310B3C886273917745DE8E0B5E54AA2053685C074DF37548D5E2C005713
-92AA8B915DB690D371E3B634885546AD95C4C74146C3E3ADFE3618DD84CAA0E1
-8FF0BA23B096282BA9BE041B7AA722F97E0CE34EFA994BD06C4021DD0E11B2BB
-38654DDFF7865F88A369FF74ED4E95392DEDE5B563086D49367EBA215AF8E7F4
-56F58251342CA0BD02F11D09DCC76B5C4EFF6D1C22A7D797087BF9F49F8A60FB
-81870C40020D6A0C056F6AF9CA5DD8112A6521671AAD1845A662815DA10884EA
-5CC6A55881C3794B37F217E837AB4F5590A413CCF9AF72C2AA183BA1EBF95E09
-3737C706A56D68CAB9B761032E3B4794A11678345DDAA10F295508A6371DBE40
-D39594CF451DF3F6EBCE8269429D7491C52384EA7C86113D57CDB4B4812A916E
-9C24D64F136CB20BD183EE93C9544AFA4040143841D111B37634F3B54C32E575
-7782024AE2BCCF60D13DAF8D5A55406EA21F1ACF1AB9F11C35B54CA19DA2011C
-2F6C54EBE5733F5EF829DA0E2F642AF1FD72A31E4DF39B5CC2C64B97392DC092
-F212009609DC9C94E904D02569A1350F9E3F5C8DC03230D664A641B74459BDEB
-9426B13D68E10D15F60A69E84C2E2A04252F44985D059EAE5A2772814409FDD5
-96E69BAF47E1A6F4F4AE5208622DBCB02070F71E5DDA6C93CA69087084847E20
-299332C465DE606B75068C95B8E41E4588F3A997FC4EAA94BFCEBB2F81CE25E8
-F576B628C3F3FB57BDDD79BFD6349952A794060516A5A17ABBBEC52D52030B6C
-5302B15A335712205BD5AA1A3E257CFF61B1CDA3A2C4AEB3B1F7CA177A09E351
-D7F4FCA4C995AB92F9E598934CB64F3A8DC2C94B5DAC4CA235363D83920ECD29
-3A4FB8EFC92206BA51A41DB3FBC5035CE246A6E5F6017C6FCCB9C3F46964B827
-0818401A09B376610BBDCAAB96707F516D1218AB7607D90C4D9FA97F1A5E5187
-44A62C80B9D6C7D0EF41EC9CB6ADEE4490CFDB7BDED213B647236570CB235942
-05F970C5266F8587CE590A07661B667A6E11A20726DD9001A69F50E4BACEC13C
-42C333CD3CFE97998111C2890FD0FC231A597161FC0A15AB2CA82C718288B2BC
-AFB4153BA22CCB64C80F9858FA67C186A515DD34E1F7157AEDF0D09B678FFEE3
-3C61AE48A2EFC125C2CE35ED4201B71E4F577D4E9573D65E702B3CAA8939A13A
-74F0F21AD2F52352ACEAA94E2EA3671ABFD857091DB797899B61E48E3684D631
-19FB1A5003A237184BC20D32A86B67148E93A776E2F5AEB2B80A830B3A237B3B
-5E271E3B6CF0E664F98633C9BD5E0DF7D0BA592FBBD1759101992E63347EF663
-A65FE0D97385D607D1DDB6E69D817313597A523DFCC8CBEFF21C5B6B0D90EC93
-107808267F95554F38ED75573494E049A8166CE40E18DB57CDCF28F70F300AA8
-18977126925C71DD42C75D0A08AFB11012B0DC305B84F02F87ABECC0B9CB8D71
-9A3B646FB925491AA31CBFBCB956F6205F8B053CCC2F7086249616C113F6B5C2
-DA67D254961F3FA281562BE5261EB8D71D22A253653E39912234931F8BE59C9C
-A16437AC7D54E6FA6DCF6800AB1571528151D43B74B7E440E756F03EE029A109
-BAD7C7D247EFAC8709581F95BECFE10845E70D471903BFF2E575D20131A5C44A
-33942C918A96F145C6DBA26F516641F657FA4BE19D3691F9395A3E0E4EF9ED82
-CD49A3A3C14CD0D2EB5C554B1E9A04778F882B002269197A29167DC62F7707A1
-5BF05C4660A5BAF0B88BEC91F830003F77F90353D73C3AE4230DEB9692A97DA9
-FA90046449E61BE786CBBE7B88D375E6134974E41AF206A43275BE5835FEA972
-436234E94C52859215C9FB4BB36E4E2CE0F0BE4E11A52DE89F08195D99F5998B
-16CD5D737F35EF7291E83DEC7EFF7B757C516126AB70BA4ED3B209D13F3A8429
-F350F87431D0C471348A098BEF926878EE630536A5E74ED29F1EBE61D98137EC
-FEFA6CC0810A8D08C379A6B5AE2B83BFFA0E5ED110AC5997DD17BEFEE8D25DCE
-AD405486D0EBCF2350E53A5A05C265C5464DB2856950A3EC36E0DD15372FE35C
-49AF42D72CC4EE7986557FDA330E0FD83356B701B25AD35C4CD6A3A0AD4D1D2A
-78596AF360FBF47D31C1AF065A0C95F94DF1248BFD56D56082B5BD73D4FBB08A
-FF964A2D52EE3282061D3E9FA7070121198D6576FE64E4A5AE414FE4BD37E705
-2D648E83E5597C3CACE305A1BF5185F4338DA88F2C7EC27B0B19CB0EDC4736EA
-06DC3E8B456BF4B9CD543567283DE11D7BFEA17187F65F85BC047710C6710B70
-4451B8B4349CDDF34FD99AE30D04C4687D6D4EC9379E287F9C3DBA0B0B09ACAE
-58F3F8E8811AEE6F20EF9BDA1E9A3D967A97F05B7DDEC089D2FDE664314942F4
-A4660B8A9C47FBE1480640CB04485E2EBD7625B4A469B96F26723649472C8D19
-0703A0A4B851CA0ECD050A20EA18E1BD0E56AC5DB1F0A1D994DEA120EEDE1194
-18F953E45FC49F058E50ECC461D980AFD8B440BFCF532A148CED9D2CF5C7975F
-8DDE31867F9A0E6D2B4800583734CCB84F2B35D62F85847A3EE4E0504D75CB5F
-C7BD3A1086BB8959F6FB1687A508575290F5541C0DB47642DEFD897882276211
-8CAF62C590FA35452A13F2FD5F1CBB35A625FEE26161686522AF83D7179F58D8
-A1323F6689C74D41B3BFC25C8D2D34EDC682129C59ABD6726C00601861FC8521
-2EB7868E04D3CF19FAC33CBBB8B69D1F653D159530349870484F039643E1DCB4
-A5844F06EAEBB1330DF9DA84FF06A3ED9A848E88D5C87D2357EAF98728EB78D0
-CEB0C8F21C1814722BA6E59A6E2773DC24C63469619063E988FA8154262D05ED
-7E595C3C271927245C9D174F81FB1FADDC989AD33244F87002C97F03A28C7655
-99140DF7DDC4FC87359F537EE58FC72E500C2580184A75465D53D3C34610E6D1
-74A5E1E3615A9FE97B5E2138E01659BFE44FE6CC0C309025ECA2B6D18113DB31
-A801CB5652630C47E37B87AD90226D0D3E02F715AD5EEC5CCD7B3E3FA72FE04C
-04B700E8C2434E32F6F669CD4BC30509B2DF856CF1E6B3C72AEF32B2C58FAEF4
-B03BBE2987E32131C6A1CE54AE1B481AD7D6699EB1855D282843CEF62322D919
-F677485ABEFBF611D822E07592AEE62A955CC089C82291779A61D900B32684E0
-E84F71A65070293092CDA2849E39B420D6D294DD875CCC95F574BFB1905E934B
-F3477F8C52B171176FE1D7CE1FF5FA0114BCE1D74ACF1E6905D076210FE01FE0
-3E131EBDA08C8BA5260335C7532CC4E326C9CD4ED3AF3EEDAA3E5CF66F2AE1E4
-8F9546DB70B257B81B139F3932A97A8DF4211B12B54D3474283D619DBC04617B
-DB427A7E03BD98816A8ED21D30EE8926849114FB050DE35F3029125A29B26DAF
-E11667BA8812469A20163A5B2D4578205D0C0B595AB9D55A3E2B118A65ADDBE6
-29FB661DA52726A565FDC9A3A9AB8F82CC871898A0F93124EA53D81EADCC819B
-0695A1E0049108552F4DD0C68564BCE3D588206A2E54873EA519AD15
+E41F99FB53B05AE9020D8B7EA591ECF2F53A2563D5B9860A2B464110A4AB3464
+E6A6C30D5AC9D6FA0D7C020231154910D325F098EF3C22CDE49FDC91022855CE
+54DA964FE24D59260F6DC5C940A0A5D7E564B8DB34E042889CB0DE84B301C4AD
+CCD1F1F9537673D5773EC6BA5756C0EEE40270FF801628AB3C397775DF0031B0
+AEB581603CA9BDFDE2C0DF758B97A8BE52EA20D35103B19B5AA2D7FDD26842BF
+F14EB69B7C8F6E5187AB60A186303942ACFF394260E95DFF9429F30C481A1921
+D48F75F7E748126A4DE5DB5458438A608D0AD758BE984B309D9F2EE1C19F833E
+ADEFF840EC97A03074ABD2CB0A4D70F750C574DBA1D139E896ED5521FFFBAAF6
+278B28E401E29D3170DC88B205899D30D668DE66642635DD8DF45865250D1E53
+4AFBD2F81B98B717895C4A51AE9679BF2B5D80EB811F0EE1D3C639EBC47EB194
+CF466F9471403F48F9B7BA17754D872C987BC22A0E0679E7BE2B7E37EAAC4B71
+BA21BBE539FFF3ABF563ECC1A2DA9E61D478C66DE3B93D4D82F3E43883BD28BD
+FE63C9189DCEEDC2D7011748FEFE8768217F138A5D304C1C20847F24F6E61D3F
+D1200BA5D94711082D250659D9CA9B4C6A9509C4C753558144622BFA364B031A
+3CD32F3358A5165C8604F06B0871B86921B210A4B2D95D0DFFEC6E06A5B06894
+787323DC6B7CC6C7AA8044743083B3CE670762229E8355AD0519F0D7043CCA79
+A37205AA182F723A3FC3E7E05AAA07D7315DD7FBA672D81E261649C5FE832866
+31976B9A567680AAED953A13F98921D0476BBBCFEEFA09264BBA421C0915092B
+1C94F775173A74D92ED9C600626B30BC0AFCBEE5749DDC362AB86C1F5F22CC2D
+6C0D9D4E6E44FAEE6D1DE961C51677812672644E2784E3ED3861D46D807493B4
+92EA8AF7D95A701100CD7570DD0A302BDD4CD7309EDC2E4D1281DBD9091FB89B
+EDDA3EC4FFFCF36DD46A509D20E202C703BAF2546E854862FA3F2B812DA1FBB2
+BCAA4FC095E0027DFC4D7845E98B9698855C38F587A4E7CB21BB7F85C3F65B36
+7343612C43DA4EAD5E9543E51F92144F0BCE6238912508AE66CE7034D23823E7
+3155F0976C4DE253FD340EEE8588044DE58DACD046BE1561F9833FEB0B64673B
+E68B0FD1D0A728C73A0E2DF54138F54FF741838AE3A81E2648907D9E9B7216E7
+2438B86A019F03354101E5FA9E7D63A02EBB2B84E1AA10565F4F34C46487D260
+7121B2F584C11F9D96B9F285465E639BC9494A0AD5F24A234A92447E0F568B71
+4C8E867D79F8DA50CE7FE73DA5EAD0BA98327095260F87DCCABB8E8A11A3D394
+1012082942A5C55C3D5FE68F9BB14FEDA80A78022D2E4612A86FCFEFF0E8A9A4
+9C5A36EF1320C143AB5B85E1547423D9FC8D5B354E551F6FD15049BA210C2249
+9170A4D5583A0715C9324D98F87A4AEDAA8AC89E5009B7639A17178DC19F474F
+474C14686D2B1E432DEF3BB0163914CB83C474DA09205188D41C080CEE1E1725
+63108F30542B8AFE5519884FC2FA36C05D5E9D49D3482F8BCA8E28260384C275
+C141C52CFDDA480514A553AD517D6F0BA8F086533D6169DD6C6E85564D0F0C2B
+018B5E6008D59A919B507C9D9ED8E61DB0B62BA874656DB7B36AE0E8168C42DC
+AA69A38A8ACB17E3F4A17F64ADD37D6E4761C815087F3316E2D1A28675DDD319
+AF189249C8E838E567E63C91D5309681B9B26565275DE739A37C6C63FD267A72
+23D018641CA1C9EC413CBE625FCB98B209A28E1A078D62159369AFE5824446F8
+CCFF3D9E1DA58AA9FAD15399DF370F3575739011C90AA013EEBBB2378506F486
+44C0D8F20E480500A761EAEE24E9A187A54F3BA9227B049782C21E4899FA0C22
+A9DEE48C564974CF49EBB1CC7AED3307C75988C1333673E11D322694EA0F60C4
+322AF2EBD48F9601F0D73BAA4273D6D2EA0FF2E03D5A3E7D8A7416B2BFAF8D1C
+380BB26FB72F7C6FF61CAA645A3AEACF0FE24375DA61572F8D9A6984BE512C25
+9B2CE5AAF0A7112B9D4EA75AF218B95B10E8D09C8A8F07BD6C7A74F7FE68C8E3
+4D8CA542FCBF1E14ED5CF2812CDDB00D6E6FCAEF4F8BBA742CB361455959CC2F
+70AE061FA46E282396921D6B3027622A30198C0893347CE952493282F7374FC9
+E6D4FAEFB1E7B6A9C291900A18843C71D1F0960AA4948EE41F4661A7FA82FE63
+EE3E3C5A7C7C031C74316A42686C299938FF605A8BC55A76E4BE11CB03AC9930
+E574BFBD6EE691ED832149E95DF5375C352406BEAF3B21BBA8CD7EAFAB6AB516
+94DFB7F03F1A3B26DE26EDE2279F541608FC6F42F955502A10888A5A21ACCC8F
+D3A9E7E4D91CA303B651287F2676608FF130C2D31B3E2D4963B165FC3F4A4B3D
+16CC4BF4209537C147C1DA9034B1A98794C56F6BA588F30968D3695BFF242DF5
+0420899AA19E45828F826AD0C97080FF2698AC33F2A93BEBEEFE66E1688E67F7
+F0D14D174E50F0981851FA0E0A7DDAFC39D69339E0B3BEA12E0A57937AA1101C
+A2D34D3B78F8D33CB545333B5A5E98287B77C615949E0D3E2A5E006E84D20A1E
+DF8BD21FE8443D1B88F01FE60AD70B7013700774CFDA9B90EEB952C956F95DD2
+F0CC75F3FB271818D0F3DB52E5838AD0E233A1725B3995D134786C267BBDFC51
+772CA3764F2AC50372ACD485E7A04104B52DCE20A9E7F282698BB0D06B49DDF9
+F454C5176FE4A331406FACDDB579FD6D29473E40EAEE218B62ADA9FF9DC9C667
+B706788AC68013EAEC48E7E7AE5495E0BDEE36A8F289007433DDECDCD9020B9D
+73FECDDDD4489BB5FE0F25C147F69E61D16F8AE9BFD5D3F94C6AE3F273C61E8B
+6D74FAD823D7977D93E01E504B64DC7DE542C7B3F363D7C7B5EEB17774D82263
+1428D494F9CBAF4DF416A83A85E0EB37E352DBED8E1350338907956A5518FB5A
+3DBFC4289AD7925471EE3F11BDC917D93A85853D101667C933CA00C8AB3F7D10
+0CE0A62324705CCFFAD98D93E6F23CF8039C5C4E7675D6C770742EC5556D92E8
+222D9F58C6DB3BAE67C9DE815EF1DD22920CF93BBD9A001F3551E1D129CDBE11
+9CDF4926EE48048B207F64B30C676E39F71FE69A981FF6A763257E77F96BC1A3
+1538DDC45F204C4EC6D4971F542DBDFE503DD1ED59B5022ED2B2188B6A1E5B9E
+8B5DD767E3C41E83B0640C4473FA5834964A1832DC8452B589F678E31F1F7524
+432D4D3CB3F487F8C2CB1BCF5B3C43B992EF8C8F5CDF0AB2DB9AB8FB0BBDE8EB
+4544918F442109A6C7195AC11903835CE46E82D05EFF7FFFE3701B6DCE9FF64D
+0066F1722C4FC1B148688C431120C5CB958E9C6F1CEEDE7DCB0E12E95C60FB56
+8AB7B60182C8346982E62650D31C0D717357B2492E50850D839785FD4BEB5DA4
+4901ED42B374FDC37CBE894C71FB6BB440F9439D7CAD8B94381660115A39371E
+C828E88DF1A75245377872351AE054CB9E3D3A10734D3C29F276844036ACE3C7
+2DBBA8F956620FB541EFAB83D8C2CD247E94326DDACB00402294CFF6E51C2209
+76073ED148B6BF55165D253F1013B653560FCDC84875B2CBA9703ACCA6220D58
+3D4147FA9A009B880C937ED0D583D252269785DE66293FFD58D04911F2C45E19
+211A9CFB03967E80A82299629A9979D68ABED7848BE9C66BE41ED517A89EA5E8
+FF0A957A885F92F12ADE25DE96F66CBE05C1BF074F127858F8C10EE636F90A8A
+1EAEF16ED8FA59616BF2F520617E70205AAE9A98FC97DD6CE2C4AD069B1B4A4B
+9FAE6A11520A619D3806AA096FA549CEB493267D3288EF94C0B71CF93F8AE863
+F2E0B77C23A3235EDE56B80134904A3EE43B8117CCD2784D9EACBC8CE5E7AB44
+B1ACDADC552C27026004E128D6D2F46377480507846DA1BD011700664E4C91AC
+DE0B1D81E68259E4F99DDCE27B6A53E8AE095E92CC5DC148D4250C26EA013AB1
+733EC33E21982D17D993DEED27528841BAF3AF0048C1CADE3C957B32C50AE1C2
+9ABBBE7B95792357179C12617103C3FFE49F3ABD0C9968BDB1AAC7430898C3D4
+3F41D510EB990B5AA8FCFC7B23260268352532955C9F805ACC41692FB5B96136
+F5FD6A64D0CFA5010F60CDE76DEAB40F7EB5E9588BD58A67716FDC109CF43515
+E71ADEC3636E73F80B80A6E9B26C7B2988C030503B8C229BE9DDEA857B801D69
+50BE7DD68ECD411B168C3063B2D387DE91FFF469151C5707CCF5950A9DF36432
+1835C7F7D7CEFFF49CBE9E859A0BF95D20C424708B3CAE98839294C453400C36
+5C5F2AE3964092522A04B0505E8C0A5E9D6770067C6D99E4BEEB8C2E1420C3DE
+25CED757A7CABE35C38CC750A823D69746368ABEDB6383A4926DEE9DFB3B2074
+E96F21D4E52DE8B3228B057A10F36E4BC6CF057916FD9FA21075A504E20F5473
+04D4BA5C45FA3F95BE41ECDDE5311D63F1B5ACA33FDFEFADF811A0CA3308949E
+98F53ED130386E3C12AD2D6A3AE35CF27C9BC2C551F2D9DFFD2219AF7D4A98DD
+DC195EB1F943C7FAAB9E2758440B10F0FF62AF5D340E04EA697D0F67AC456BDD
+006CD1D7F0AEE17F01C0FEB6E711C978AA1D0A8640FC512A7A797533D24BC65D
+0A19AFF9A01A392376B47C4F9A62233540201BC1C92FD2A157E0E8D15F08B6C3
+5A8A60008C5127E4A1CF35345AF3DC4E917BB89D7E642DF326C3B006D0C85D9C
+5AD27D02AFA792A2436C0BB073E7230FF626E9C9ABCB3D9C5306DBFE902DD8A2
+7BC63135022D4250C40AFBC8FC4C877016BAFECCE7D1BCAEA5DC8ED70C85E719
+AD21AE35A533B640D4926C5B95259A24971D0220A89BF02676098D150496BEEE
+FEE72D1A05EAAB995B0F35D9248519AD6837C4506B3AC5056CC31AE130A9AF60
+D3EEFA8672522924D5CCE22208B2EF5AB31342F42C153483344E24AB1E9046AA
+A5E26BB5D1F068F089E936ADE53AB510DFE7FB8B065E713FEA90C4A6E7DFCE12
+8AEC089FE864793307B779D8806353E5E91BE12E11F01C5F1DD44533B93D22EE
+632A1978A56ABE9B1B6973B2F742B9EE9F0C1C8BB222AB5DCBAE010691BE7AE1
+EAC06889C1BED9B89C26E6E2FF90B8339D70749FC0B2A721120B6327E8768CEC
+029E99ACE4DD1882D8C582B1436D4D7137E5124D67211702E45F72CBA6282CB5
+9F29738FBAD0D768C6DA978C42BEECA998A04C1F7287456602860635EA487C5D
+4439C4880665DB286483BE9654CB80E13561D242D85FC89951469826B07D210C
+75C2DE7BC78542152214F3FA92F8CF7902A1C95ACA9A6FB0DDF0EF117C7096B1
+32FD795DED3DBB5017047F38357097E111E1D362ECE788ADFF41CCE6406655FD
+410AB8F61CC14BE2C300EA25AB441F58F90EDE8B93678E09491A5B04916B4995
+51DD887E476E18738419E0B8A691C4B36C70EC09071E1B173ADD0622FB8F5F43
+CB9632A903F6461350A9C67589D33AFB22EFFDD22F76DB860609B1D641726052
+B7CB84925A6D55FC505904BCC38CD7344B78C07327C0BBED8936C3573432B418
+7992B9CAB68B4E1730B5428DDBE29C7BDC635CCBEEB7EC2614776A66A2199D9F
+45C53C4614537F640AD0E0451BBB338580E49841CF38EE5EAED7FF7D134ABEE0
+F08593A235B0FC63F555D1B949EE838D933A232CBA5B50E80D2CDEEF933766E3
+0EFD1587117B763701FA12018B1655D6E615EAB5A02DA41FDC6C144EF0363ED5
+CC145ABDB2A896154EF12B5341BDCECA568779EBB2D69A44453551754900319D
+D263DECA53499AA13D3ABCFC0F2DEBA8666DD85B62AE202A53ECE5B9D0A332DB
+317D9D83541E4A389D2373B7C244EB26A18A478A87E36997623C91644B3DD2DA
+2305ED1E9A6737D0EECC15207C98244E86ABCFA03CE90E448EDC0D425A76D2BD
+5CB57DA5879CC0510B3DB37F330C650C180815E459C33CF0260784F5D3067556
+A210F3DF26F101DD977A80C017BD9BE3A93EB9EEEC319A3897BBB5CC37C744C3
+E87532930951309F4289D946139B639A501F212C76E8CDEA8414B156932C9968
+1F5A0AAF4C8E27981B2CBB1B6D57981C91F1D9503A8A8CD63A914CBD058D613C
+A29538C6C40621656F149BA82E9ADF48DB129C9FE67DB0F3889CD773D1344EB8
+6836FFD09FBD83137E766AA76930199E1E74DCC608931E88C0587B38714B15DB
+DB61D069034581C574DE119ED68F7A7D1018017D910A6E76A31044B2F5D97848
+118CA5675E6A4CF4BCE2C4885DEFF02FAFC07BADEB8AC2C3870FF37049998306
+EE8A3AA61465B2073CF9A962AD576A683FD83A6300CE2C23ED0D249C8A730E26
+B3444488FB97A3F0F14E5BBF056DA1E99DACDF796728D4BEB53348E3C94D2993
+52F04F3170A731C90F821F25300E21E8FDAD2D79139CCE2BBDFD4F092936BB55
+60F50D597F4E664E0053BC7D96F148578324B93333A694A08B2BD8D27609D821
+A4622B815A6C11D81C8F5C67C98373D9C682F53E552AFE5F775D70E03326970A
+36AA5820C369958BAE2CC2BF5A38016D986905A1A71F6404B54A6742E42098C6
+D8547D8584D86288C16580EBAA6A9F6A0B8472926A184A3604CE941B02B80724
+674AC3C2A8E1AEA7D607DA25E9D14A04278A455F75B320E392835AC80721EA68
+47356167E8C4ABBB4487F4A13576716645C7C998AB0BA0E121699924AE1AA868
+39CB66B9538AE1FEC40B5760CD691B6C93362DBC95109BB95CE7E15EEB2C5CC2
+B0D301F2E18DBC0BB28F75C0735E4BDF1B3A57171BFC4563497A4607A2F8CDF1
+7BF8B1940607FC9F086C8EE502404CBBE78316BD643F85AAB14B5FC40A16D98D
+51FCA6940D0A574A47D26761BCABC4DF0944D1B9AB19FC2DD13C7F129E25763B
+03CA38F2A7A293D7625895EE8AA192F9E3BE7A89A92FEDB73B6E6837C7255A93
+50DD7C57A318C763FB44E2EAA156E3EF2EFD828E85AB7E40281BAC038EA3B775
+880A1BD39CE89E2A4296E734B8A158A59B849A73D91C17FBBF6C3734006732A9
+12C57790B61BEEB5FD9BC8408F26733F37D2F5257EDD0B8CFB6AE71CA15E5372
+6CE269E9105EE47C3834EC4DC9C2BB4E3F201FE28B2FC9B905CDDA877B338DD9
+2BAFFD5923D615FFF6F78C64BB959B6CB194EDA4EF176D805580F4CBAD51BD60
+90F858FF170B34B26C8DC3AB99DBFB6F67D7F871344783332E66715EF72692DC
+C1173EDB01892B62A153894D0DB280084E5AAE6370531005479CDAF8A0F59A69
+85E5377C09D2E25C8EDD6FB08EE556A51C13A2709F18D0F028D5CD582485C425
+216AE79A201B80061160516685DD583A7CBDC355CCC0A94AFFB4AB11497C0231
+7CEDEEFC73AC0F63B61470DA14C740D335B72C880C8CD92ED61104CEA26F181C
+6BD9B8B9AFBA2AA87551CFB09425F30AB6A28FFF777B7C375F2160A89C98E15A
+1DE1947E698DB197E053AB1635E653A062ABFADC470F2907B23AD06165683282
+2FC8271911304436EC7D55176E20AB645784C67707DB1B16C6DF4AB3C01E7434
+C68A0D01A704C73137C315D648248AB98D2EC6EB026905089E69F01B7EFEA57C
+E00CC62B0A12CDE4530ACE0A3FA59C18AFD75B36F789A39C6FAC36533A4DC147
+433CA47C4E32DE8EB62418565ED2240778F902C4461549C2B39D2B8AD041E410
+F0B538B4B62416A7E4099E3BB73A69E9AE79FEACAA422EA38AF038E1A95A3EA6
+C97ACB26CA869F75A7C16ED0AEDF918CD62BA71AE4C9BCA99C2DAF3F2D6D277D
+A9D2331E25D8AAB1DF014E58879D09E38CB9029AD2C58C39FECAF89D223239D3
+34AD88BA6D822399C411E6432D2BDB87CDADDEBDE37EE9FE231216964EC8CF69
+DC53CF66E9D8277611DCAD5AF3F2971DA84191C5A5C98C0FCCBA2544D58AA2D6
+E9475D787630677F8A6A995612DB47AE0801E197453E79666054A435745E9E14
+CE605CC3904127EAFF6876F89BD9207ED51CE30E81715A1E7AF6A50A20072E9F
+CDD7C179CBBA25724FEF2E8BA565675FE9C8E3409530F30085B632AA8790732C
+1E8DDF950D11B43885C710C9FB51D7224555F64308CB8BF281184AA6F95079C5
+EFF29B67B1AB58F1038890D944927AF462F00C683ACD8B22D50ADD052DFC7B1D
+3CA6137854F2ACA5398AFEE10880D1E619382FDC534A6C8DDCAB18A1327B81C4
+3E19E771F49237735A52D61B54A78432A36DC4F52D97543C1B4CB3D3E582EF41
+76224D2ADFA2EE9393B60AFB70EC652AC882919303A817532B739D853126B219
+756B4211795C0331630F6173ED63F793F84E8479957BB859B9E0B834B96BB889
+65C55158ABB70A6708A1A6828853E8999CE0EB78EDB7076C7D844FDD7A4EC721
+264E38186F5BE696E7CEF981B08059E80A993DA342041FFA3F55D7FBAAAFBAC8
+67077D1E794EC949C6142DD492A31CB5EE91690DFCF4FF4FC02FA8083425EF8B
+13C9FC09628674D9ABB2D86BD1E8CEFDF13D2FA22EEACCA34A0A13F74E406546
+8943E1FCE6CB34FE5138EA0EA2C15DFA7628663ADDCD621583B1CE8DF44E387B
+8682678002D9A15CB92C103C5B99A7740801A687D63BB666B1C784B426B5591F
+CE1D200BD1050905B62B5AA0198E11D21A53D011FD3808AA880E867FAB9BD9CE
+11B3265A53F382463E85A40CFCAB3DF12D09359B463D9C6B919E26A71486CBBF
+D5994B10C4C83007F8F1953F85B79ACFDB0976B4E00B478CE0BA8EB8E01F94D8
+69D4C0AEEDE6402C95B8522CA2C58E98CBA0D7720FF1F13C680F8A2A215B693E
+DF29CC6B106A919E7D99B70CA4EE33BD95354595F706405187D55A48CA9D9921
+E70B393D4FB453B1E731EB69BE8EEE7E8B4A48279898FE6E26D86B562E121778
+80214E4EE58DD6A2B16A61D59314A3E57D7C3892A3D558751A4106C0F962A5D2
+DAE214CFE1E9FE76A146662EF4307A2C62FA23D6D85FBD488834F7F7F5992E95
+ED15829CF1F36DF3CF62036FFFECA564D1EE0D949F3EA016CD0F19B305C4CCAF
+AAE8A57CDBF7B04D82C05F0FCD7B61928B3BD2814139CDAA798ECA033D4E7628
+2856ABC0A3201C43FFBD794CA3735CD2482E9F4B2C4C3B039B7ABDDAC5523135
+304833B55B3EA5CB3A1D0ED2E5E6A85A1D241B4E937BACAF2D6A311E26DA1CC8
+A823FE4A10D5CDD45DB84C99102E6CEF7D2467300A4093A4B5C1CB45F9D78149
+EFC04CD7E4717D74A8B708627FBF3640E6CB8424234B0D41A54A4385EFFACC11
+2ABF427C7416DC18946CA2B53DDD6B837F1AB9763D4A2F66E964D985D14AF408
+93AAF0FA61C90F4DC72734843947B5799493F11CB2D58E109362B003977981DA
+9B55AB5BB4DA25517335612E08C9385FAC90AFC09A5EACC3868F5982F4778805
+BEB09E0F9DCBB64D4591A92502F72B2CA1ECC8BB3179DF2E5062EDAC808C1897
+68D846DF3F87801B1FF4CA4F230811655475B245DEAA6A5E1AB290CDB3F1BC89
+C520E3411076C7882F55B018D1D48CA5BFD44D5EFD4FAE4D972C49E4301FA1B4
+4924C0FAD2C159E7552160E310C99159D4270B7F28541DFBF5B6D0A9663787E1
+9FC24DF89EC5EB7C876454FFEAB290C81519A09518CF556910A70B776CBC1375
+ECE11465577B0FDF26BAE00B0344B8DE0C41F5D2967956E8C38343D5AB79C9CC
+B015185DE0F98FD3F4296E41EBA0A5B41E2B849F80938BA21637D7D68EC65668
+5BC550FEE3123C61BD695FDC3464E5B922F696FA2AD56A842B31898B13D7F136
+DB3407C8C8D6BF091BC091D1244EE4964674AB977FC762BF582895B87492BF65
+623868AD8AB7300886C66B3A4029CB8BB96A45B8004A8EDC51E085B88824DC6E
+2B8F934C0BF938557D9E30EA2F6FDCF5B861271DCB61E1DCF2B092905E0E06E3
+630512BC9BB3CABC76C6D4ED40A9AC30DB6A595967436980B6DE103D518B08B5
+9730D8FABD09D05A1A9F8F5634D6AE4CB81FC21AF938A657FC88742DC81E809C
+C1ED81A953E19B0EEA907DAA54EB093BA9FADF6AB67769D035C7E214A445FF58
+9C277544F036623B1C06D3BA0FBFBCB94C4A5ACC290841D1B1C990304BF73B6E
+B636553F3C2326255EA57A62EEF22B7E2AF61B45A332D9DB768FBDEDB2ECD7CA
+561D4CBE7A77E0766A85DAADBEFFF969D32F7B2466F88EB821C4BAE4CE668F1E
+DC428455D9915BB0976E79BA49D57E87411AE9CE13AAB02F00447C79C8A76061
+9CA2B941F7B59A910CC714E64D0243B34A048D0507167CD2743281E8653919A2
+3197D15E34F7F57698E125B1C26B10FA55DEF390ED5034B4BFC84F71C11DCA58
+565DF8DA32D123F1919C13F3B5EB60F972C06F3E6FD7248B7A65877CCE6C6655
+988FB5B96A0509F33E984C819CAA63E411A6CA8D448C5CD0BAA74D4C5D7FDAB7
+84E514A239CAE0DA8E9B692ADAF3B66D55D5BAC0B8FB27FC2BD14D2D58A0AEE5
+6E03248A37CD0A938E633C78B60BD7D7804A07984693C6280AD9F6AFA883F588
+7EFAC89D13D06AB50DA00190B0F99414294EF59B4EBB5AB58AD968AF48C568F3
+C4AD4CBCA882F8F1CD7CF95397E6A05F97216D522E9E22C43B83981AA9C72A27
+C1A8DF7BD7BBFEEC44036924872B59BDBF6EEEF2255DF79253C204DEDEBE6168
+880F5B748D8E3EA2FB632A3C580AD35879AE044B2B12D12FB4DB566F2E001B1C
+60741F4BE72C53539B840255EB071AEC55CA0A1E22D65C4CD3F9A5230B48B317
+B3431F6F579196F72050C7ECE47A310B92515E87FC0F534D9747A216B47C8461
+75984BEE5BE9E47AA41840FD5DD746A0308748A1BA208B350BC04AA61795A290
+7EB5F91FEF7CF7937FF43AE9E29BE6F643007B1E39EE83351B936BE74BD6D052
+B7CF111A49677FFF872F3BB025DEF8649B2741935A96AC27BB7EF345FD156B4B
+3E4A5F0206AE2AF893BFCC6A4FB5FAE7A5B058ED17D2D25E81FD0E60AA720620
+9765912ADEE418695301E51124A77FDA93882C926288A3E7B9F9924000E74E30
+8B18DDA5D0A70020C9419BAC3970CA461DB34FF9D288696FCB732F58A909518A
+57D61B0D41A8BDD24A6DE0FE6EA8700DD5400691D9456CEBE6B0EE460B2CCA1E
+E4F6B5E3228A061996C30CC032CCDB70A6B00B395A92E4C707C9DE3AFEC3C290
+B00292939C106B9BB11DBC16587FC9B005D3E6162EBC12C6AB493EAC3EB84A6A
+6BDBEED24C02F827D4A94B73A0676B30A2670887B73C55B01218832EB3F57690
+C68CB1407D6088994A100D4966B43389ED0118043223EEC6345DF34A9A87D2D8
+DCCF6D5CA31C98D4A331B1DD6794E5BA75EA62BD3075FDF67AAFB910EE555813
+22E68CEB7D346B3E745DD7C8A130CA576A1B96F8C7AD5B6918836164138D6480
+35DA3A931648C9E64850A97DC73326D5605BD7B8508AA84F022771F264BD809D
+0D9260653BB70B89DB02A2EA018B615FA01105789081E8DB1A94B252C3B87A4E
+34AE5D2068EDB2F2BC5B9E577EBF8A40ADB7ADAF5741945856696744FAA0806F
+25596349553F4BF7955E60937C7A8DD6B1BC14ACC0F0E63C99B0EC211EE437D6
+97CBCEA075B12C458799A88A45501FC4C5ECC10C144E1F265C696C2BCFD14BA5
+30747B5D50F9F6A80A2E231B55E6BB42FF34C83FD1B32C751072DCAC20E480DB
+2FE35E0C58D127E80DE6741E8C2D04232E9A9300EA471D02E142E6A5687E6C34
+DC5108038E82C7238EE473AC70BF088B4C5D338A30E6FEE90C7D80CA6EBB6B82
+7750E463F5C0BC280B21DFFCEA48CF78B90AC2AB175DFAC78059D8839263937B
+7E1E7BE2C8421A02C011AE1718EA71302A73BEA2ED188274D80DAB1C3E2F7E65
+62A5F646C9859A7536B7719F7D95F2AFC3834D742D5D88D3A7A7C25959BBBF36
+B88DE17C568729E857E980B049345BE1224FDCD255356D9B5B5F7615483EB063
+CDC576B2736823C0CF5034EC0C2475C05C365F0FF775DBB724AD996203A281CB
+235FAEBEF583113C5BD8C8CCF4336C45E53CA940F3AEC63C42F08A3BE4BB63DA
+0326C9913C48C6BB5F4B64362A40F14D299A658F47BF6C47192672634F598D74
+60419837C75965C661853CD7AA551581241D0E6CB5097175A9AD7417404C6F4B
+7F2F5C248DEFE4EA85A877C1E3E5A3C10A21150FE918B6CE9FE26C234C91A69F
+9D0FF58102C128DA7AB1211DD029C946C4E88B0623C7425FE63641DC118EA01C
+7F358CCDA82B5FB6F3F7
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
@@ -2434,30 +2424,30 @@
 @start /Fa 242[61 13[{}1 49.8132 /CMSY6 rf /Fb 134[32
 1[43 32 34 24 24 24 1[34 30 34 50 18 32 1[18 34 30 19
 27 34 27 34 30 13[34 44 1[41 47 1[54 3[22 1[47 39 2[43
-1[45 6[18 2[30 30 30 30 1[30 1[30 1[18 21 18 44[{}42
-49.8132 /CMR6 rf /Fc 219[71 29[55 6[{}2 66.4176 /CMSY8
-rf /Fd 135[33 3[24 29 4[40 58 18 2[22 36 2[33 36 33 33
-36 50[22 46[{}14 66.4176 /CMTI8 rf /Fe 134[43 43 59 43
-45 32 32 34 1[45 41 45 68 23 43 1[23 45 41 25 37 45 36
-45 40 10[61 1[57 1[61 61 1[61 1[77 49 2[30 63 2[53 1[59
-8[23 12[27 32[45 47 11[{}38 66.4176 /CMBX8 rf /Ff 204[33
-33 33 49[{}3 58.1154 /CMR7 rf /Fg 129[35 1[35 1[35 35
+1[45 6[18 2[30 30 1[30 1[30 1[30 1[18 21 18 44[{}41 49.8132
+/CMR6 rf /Fc 219[71 29[55 6[{}2 66.4176 /CMSY8 rf /Fd
+135[33 3[24 29 4[40 58 18 2[22 36 2[33 36 33 33 36 50[22
+46[{}14 66.4176 /CMTI8 rf /Fe 134[43 43 59 43 45 32 32
+34 1[45 41 45 68 23 43 1[23 45 41 25 37 45 36 45 40 10[61
+1[57 1[61 61 1[61 1[77 49 2[30 63 2[53 1[59 8[23 12[27
+32[45 47 11[{}38 66.4176 /CMBX8 rf /Ff 204[33 33 33 49[{}3
+58.1154 /CMR7 rf /Fg 129[35 1[35 1[35 35 35 35 35 35
 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 1[35 35 35 35 35
+35 35 35 35 35 35 35 35 1[35 35 35 35 35 35 35 35 35
 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
-35 35 35 35 35 35 35 35 35 35 5[35 35 35 35 35 35 35
-35 35 35 35 35 35 35 35 35 35 35 35 33[{}86 66.4176 /CMTT8
-rf /Fh 134[60 60 83 60 64 45 45 47 1[64 57 64 95 32 60
-1[32 64 57 1[53 64 51 64 56 8[87 1[87 1[80 64 86 1[78
-86 90 109 69 2[43 1[90 72 75 88 83 81 87 19[38 45[{}41
-99.6264 /CMBX10 rf /Fi 133[31 37 37 51 37 39 27 28 28
-37 39 35 39 59 20 37 22 20 39 35 22 31 39 31 39 35 2[35
-1[35 3[53 1[53 53 51 39 52 1[48 55 53 65 44 55 1[25 53
-55 46 48 54 51 50 53 6[20 3[35 35 35 35 35 35 1[35 20
-24 20 1[35 27 27 20 2[35 59 35 20 19[39 39 41 11[{}71
-66.4176 /CMR8 rf /Fj 141[57 2[69 76 6[69 42 63 76 61
-1[67 14[103 2[103 1[131 9[99 16[69 69 1[69 1[46 3[53
-53 40[{}19 119.552 /CMBX10 rf end
+35 35 35 35 35 35 5[35 35 35 35 35 35 35 35 35 35 35
+35 35 35 35 35 35 35 35 33[{}86 66.4176 /CMTT8 rf /Fh
+134[60 60 83 60 64 45 45 47 1[64 57 64 95 32 60 1[32
+64 57 1[53 64 51 64 56 8[87 1[87 1[80 64 86 1[78 86 90
+109 69 2[43 1[90 72 75 88 83 81 87 19[38 45[{}41 99.6264
+/CMBX10 rf /Fi 133[31 37 37 51 37 39 27 28 28 37 39 35
+39 59 20 37 22 20 39 35 22 31 39 31 39 35 2[35 1[35 3[53
+1[53 53 51 39 52 1[48 55 53 65 44 55 1[25 53 55 46 48
+54 51 50 53 6[20 2[35 35 1[35 35 35 35 1[35 20 24 20
+1[35 27 27 20 2[35 59 35 20 19[39 39 41 11[{}71 66.4176
+/CMR8 rf /Fj 141[57 2[69 76 6[69 42 63 76 61 1[67 14[103
+2[103 1[131 9[99 16[69 69 1[69 1[46 3[53 53 40[{}19 119.552
+/CMBX10 rf end
 %%EndProlog
 %%BeginSetup
 %%Feature: *Resolution 600dpi
@@ -2468,62 +2458,65 @@
 %%Page: 1 1
 TeXDict begin @landscape 1 0 bop -169 -357 a Fj(Org-Mo)t(de)45
 b(Reference)h(Card)g(\(1/2\))546 -242 y Fi(\(for)23 b(v)n(ersion)h
-(4.56\))-150 -39 y Fh(Getting)37 b(Started)-150 90 y
+(4.67\))-150 -45 y Fh(Getting)37 b(Started)-150 79 y
 Fg(\(add-to-list)i('auto-mode-alist)h('\("\\\\.org$")e(.)e
-(org-mode\)\))-150 173 y(\(define-key)i(global-map)h("\\C-cl")e
-('org-store-link\))1504 149 y Ff(1)-150 255 y Fg(\(define-key)h
-(global-map)h("\\C-ca")e('org-agenda\))1364 231 y Ff(1)-150
-353 y Fi(F)-6 b(or)23 b(the)i(man)n(y)f(customization)h(options)g(try)
-68 b Fg(M-x)36 b(org-customize)-150 422 y Fi(T)-6 b(o)24
+(org-mode\)\))-150 162 y(\(define-key)i(global-map)h("\\C-cl")e
+('org-store-link\))1504 138 y Ff(1)-150 244 y Fg(\(define-key)h
+(global-map)h("\\C-ca")e('org-agenda\))1364 221 y Ff(1)-150
+341 y Fi(F)-6 b(or)23 b(the)i(man)n(y)f(customization)h(options)g(try)
+68 b Fg(M-x)36 b(org-customize)-150 410 y Fi(T)-6 b(o)24
 b(read)g(the)g(on-line)g(do)r(cumen)n(tation)i(try)111
-b Fg(M-x)36 b(org-info)-150 624 y Fh(Visibilit)m(y)h(Cycling)-150
-777 y Fi(rotate)25 b(curren)n(t)f(subtree)g(b)r(et)n(w)n(een)i(states)
-291 b Fg(TAB)-150 847 y Fi(rotate)25 b(en)n(tire)f(bu\013er)g(b)r(et)n
-(w)n(een)h(states)384 b Fg(S-TAB)-150 916 y Fi(sho)n(w)24
-b(the)g(whole)g(\014le)854 b Fg(C-c)36 b(C-a)-150 986
+b Fg(M-x)36 b(org-info)-150 606 y Fh(Visibilit)m(y)h(Cycling)-150
+754 y Fi(rotate)25 b(curren)n(t)f(subtree)g(b)r(et)n(w)n(een)i(states)
+291 b Fg(TAB)-150 824 y Fi(rotate)25 b(en)n(tire)f(bu\013er)g(b)r(et)n
+(w)n(een)h(states)384 b Fg(S-TAB)-150 893 y Fi(sho)n(w)24
+b(the)g(whole)g(\014le)854 b Fg(C-c)36 b(C-a)-150 963
 y Fi(rev)n(eal)24 b(con)n(text)i(around)e(p)r(oin)n(t)586
-b Fg(C-c)36 b(C-r)-150 1186 y Fh(Motion)-150 1339 y Fi(next/previous)25
-b(heading)751 b Fg(C-c)36 b(C-n/p)-150 1408 y Fi(next/previous)25
-b(heading,)g(same)e(lev)n(el)393 b Fg(C-c)36 b(C-f/b)-150
-1478 y Fi(bac)n(kw)n(ard)25 b(to)f(higher)g(lev)n(el)f(heading)424
-b Fg(C-c)36 b(C-u)-150 1548 y Fi(jump)23 b(to)i(another)f(place)h(in)e
-(do)r(cumen)n(t)350 b Fg(C-c)36 b(C-j)-150 1630 y Fi(previous/next)25
-b(plain)f(list)f(item)557 b Fg(S-UP/DOWN)1605 1607 y
-Ff(3)-150 1834 y Fh(Structure)36 b(Editing)-150 1986
-y Fi(insert)23 b(new)i(heading/item)g(at)f(curren)n(t)g(lev)n(el)195
-b Fg(M-RET)-150 2056 y Fi(insert)23 b(new)i(TODO)e(en)n(try/c)n(hec)n
-(kb)r(o)n(x)k(item)225 b Fg(M-S-RET)-150 2154 y Fi(promote)24
-b(curren)n(t)h(heading)f(up)g(one)h(lev)n(el)285 b Fg(M-LEFT)-150
-2224 y Fi(demote)25 b(curren)n(t)f(heading)h(do)n(wn)f(one)g(lev)n(el)
-233 b Fg(M-RIGHT)-150 2293 y Fi(promote)24 b(curren)n(t)h(subtree)f(up)
-g(one)g(lev)n(el)301 b Fg(M-S-LEFT)-150 2363 y Fi(demote)25
+b Fg(C-c)36 b(C-r)-150 1033 y Fi(sho)n(w)24 b(subtree)g(in)g(indirect)f
+(bu\013er,)h(ded.)g(frame)127 b Fg(C-c)36 b(C-k)-150
+1227 y Fh(Motion)-150 1375 y Fi(next/previous)25 b(heading)751
+b Fg(C-c)36 b(C-n/p)-150 1444 y Fi(next/previous)25 b(heading,)g(same)e
+(lev)n(el)393 b Fg(C-c)36 b(C-f/b)-150 1514 y Fi(bac)n(kw)n(ard)25
+b(to)f(higher)g(lev)n(el)f(heading)424 b Fg(C-c)36 b(C-u)-150
+1584 y Fi(jump)23 b(to)i(another)f(place)h(in)e(do)r(cumen)n(t)350
+b Fg(C-c)36 b(C-j)-150 1666 y Fi(previous/next)25 b(plain)f(list)f
+(item)557 b Fg(S-UP/DOWN)1605 1643 y Ff(3)-150 1864 y
+Fh(Structure)36 b(Editing)-150 2012 y Fi(insert)23 b(new)i
+(heading/item)g(at)f(curren)n(t)g(lev)n(el)195 b Fg(M-RET)-150
+2081 y Fi(insert)23 b(new)i(TODO)e(en)n(try/c)n(hec)n(kb)r(o)n(x)k
+(item)225 b Fg(M-S-RET)-150 2178 y Fi(promote)24 b(curren)n(t)h
+(heading)f(up)g(one)h(lev)n(el)285 b Fg(M-LEFT)-150 2248
+y Fi(demote)25 b(curren)n(t)f(heading)h(do)n(wn)f(one)g(lev)n(el)233
+b Fg(M-RIGHT)-150 2317 y Fi(promote)24 b(curren)n(t)h(subtree)f(up)g
+(one)g(lev)n(el)301 b Fg(M-S-LEFT)-150 2387 y Fi(demote)25
 b(curren)n(t)f(subtree)h(do)n(wn)f(one)g(lev)n(el)248
-b Fg(M-S-RIGHT)-150 2461 y Fi(mo)n(v)n(e)24 b(subtree/list)h(item)e
-(up/do)n(wn)445 b Fg(M-S-UP/DOWN)-150 2530 y Fi(kill)23
-b(subtree)1097 b Fg(C-c)36 b(C-x)g(C-w)-150 2600 y Fi(cop)n(y)25
-b(subtree)1052 b Fg(C-c)36 b(C-x)g(M-w)-150 2670 y Fi(y)n(ank)25
-b(subtree)1046 b Fg(C-c)36 b(C-x)g(C-y)-150 2740 y Fi(narro)n(w)23
+b Fg(M-S-RIGHT)-150 2484 y Fi(mo)n(v)n(e)24 b(subtree/list)h(item)e
+(up/do)n(wn)445 b Fg(M-S-UP/DOWN)-150 2553 y Fi(kill)23
+b(subtree)1097 b Fg(C-c)36 b(C-x)g(C-w)-150 2623 y Fi(cop)n(y)25
+b(subtree)1052 b Fg(C-c)36 b(C-x)g(M-w)-150 2693 y Fi(y)n(ank)25
+b(subtree)1046 b Fg(C-c)36 b(C-x)g(C-y)-150 2763 y Fi(narro)n(w)23
 b(bu\013er)h(to)h(curren)n(t)f(subtree)446 b Fg(C-x)36
-b(n)g(s)-150 2920 y Fh(Arc)m(hiving)-150 3073 y Fi(toggle)25
-b(AR)n(CHIVE)e(tag)779 b Fg(C-c)36 b(C-x)g(C-a)-150 3143
+b(n)g(s)-150 2937 y Fh(Arc)m(hiving)-150 3085 y Fi(toggle)25
+b(AR)n(CHIVE)e(tag)779 b Fg(C-c)36 b(C-x)g(C-a)-150 3155
 y Fi(mark)23 b(fully)g(done)i(c)n(hildren)542 b Fg(C-u)36
-b(C-c)g(C-x)g(C-a)-150 3213 y Fi(force)24 b(cycling)g(of)f(an)h(AR)n
-(CHIVEd)g(tree)341 b Fg(C-TAB)-150 3283 y Fi(mo)n(v)n(e)24
+b(C-c)g(C-x)g(C-a)-150 3225 y Fi(force)24 b(cycling)g(of)f(an)h(AR)n
+(CHIVEd)g(tree)341 b Fg(C-TAB)-150 3295 y Fi(mo)n(v)n(e)24
 b(subtree)h(to)f(arc)n(hiv)n(e)g(\014le)593 b Fg(C-c)36
-b($)-150 3352 y Fi(mo)n(v)n(e)24 b(all)f(fully)g(done)i(c)n(hildren)585
-b Fg(C-u)36 b(C-c)g($)-150 3433 y Fi(T)-6 b(o)24 b(set)g(arc)n(hiv)n(e)
-g(lo)r(cation)h(for)e(curren)n(t)h(\014le,)f(add)h(a)g(line)f(lik)n(e)
-1495 3409 y Ff(2)1533 3433 y Fi(:)-150 3507 y Fg(#+ARCHIVE:)38
-b(archfile::*)h(Archived)e(Tasks)-150 3688 y Fh(Filtering)g(and)g
-(Sparse)g(T)-10 b(rees)-150 3840 y Fi(sho)n(w)24 b(sparse)f(tree)i(for)
-d(all)h(matc)n(hes)i(of)f(a)g(regexp)92 b Fg(C-c)36 b(/)-150
-3910 y Fi(view)24 b(TODO's)e(in)i(sparse)f(tree)580 b
-Fg(C-c)36 b(C-v)-150 3991 y Fi(global)24 b(TODO)f(list)g(in)g(agenda)i
-(mo)r(de)389 b Fg(C-c)36 b(t)1466 3967 y Ff(1)-150 4060
-y Fi(create)25 b(sparse)e(tree)i(with)e(all)g(deadlines)i(due)204
-b Fg(C-c)36 b(C-w)-150 4130 y Fi(time)24 b(sorted)g(view)g(of)f(curren)
-n(t)h(org)g(\014le)367 b Fg(C-c)36 b(a)g(L)2046 -364
-y Fh(T)-10 b(ables)2046 -223 y Fe(Creating)25 b(a)i(table)2046
+b(C-x)g(C-s)-150 3364 y Fi(mo)n(v)n(e)24 b(all)f(fully)g(done)i(c)n
+(hildren)444 b Fg(C-u)36 b(C-c)g(C-x)g(C-s)-150 3445
+y Fi(T)-6 b(o)24 b(set)g(arc)n(hiv)n(e)g(lo)r(cation)h(for)e(curren)n
+(t)h(\014le,)f(add)h(a)g(line)f(lik)n(e)1495 3421 y Ff(2)1533
+3445 y Fi(:)-150 3518 y Fg(#+ARCHIVE:)38 b(archfile::*)h(Archived)e
+(Tasks)-150 3692 y Fh(Filtering)g(and)g(Sparse)g(T)-10
+b(rees)-150 3840 y Fi(sho)n(w)24 b(sparse)f(tree)i(for)d(all)h(matc)n
+(hes)i(of)f(a)g(regexp)92 b Fg(C-c)36 b(/)-150 3910 y
+Fi(view)24 b(TODO's)e(in)i(sparse)f(tree)580 b Fg(C-c)36
+b(C-v)-150 3991 y Fi(global)24 b(TODO)f(list)g(in)g(agenda)i(mo)r(de)
+389 b Fg(C-c)36 b(t)1466 3967 y Ff(1)-150 4060 y Fi(create)25
+b(sparse)e(tree)i(with)e(all)g(deadlines)i(due)204 b
+Fg(C-c)36 b(C-w)-150 4130 y Fi(time)24 b(sorted)g(view)g(of)f(curren)n
+(t)h(org)g(\014le)367 b Fg(C-c)36 b(a)g(L)2046 -364 y
+Fh(T)-10 b(ables)2046 -223 y Fe(Creating)25 b(a)i(table)2046
 -128 y Fi(just)d(start)g(t)n(yping,)g(e.g.)349 b Fg(|Name|Phone|Age)39
 b(RET)d(|-)g(TAB)2046 -59 y Fi(con)n(v)n(ert)25 b(region)f(to)g(table)
 741 b Fg(C-c)36 b(|)2046 11 y Fi(...)30 b(separator)24
@@ -2550,33 +2543,33 @@
 1302 y Fi(kill)23 b(the)h(curren)n(t)g(ro)n(w)g(or)f(horizon)n(tal)h
 (line)291 b Fg(M-S-UP)2046 1372 y Fi(insert)23 b(new)i(ro)n(w)e(ab)r(o)
 n(v)n(e)i(the)f(curren)n(t)g(ro)n(w)285 b Fg(M-S-DOWN)2046
-1441 y Fi(insert)23 b(horizon)n(tal)i(line)e(b)r(elo)n(w)h(the)h
-(curren)n(t)f(ro)n(w)100 b Fg(C-c)36 b(-)2046 1511 y
-Fi(insert)23 b(horizon)n(tal)i(line)e(ab)r(o)n(v)n(e)i(the)g(curren)n
-(t)f(ro)n(w)100 b Fg(C-u)36 b(C-c)g(-)2046 1581 y Fi(sort)24
-b(lines)f(in)g(region)867 b Fg(C-c)36 b(^)2046 1675 y
-Fe(Regions)2046 1770 y Fi(cut)25 b(rectangular)f(region)758
-b Fg(C-c)36 b(C-x)g(C-w)2046 1840 y Fi(cop)n(y)25 b(rectangular)f
-(region)715 b Fg(C-c)36 b(C-x)g(M-w)2046 1910 y Fi(paste)25
-b(rectangular)f(region)695 b Fg(C-c)36 b(C-x)g(C-y)2046
-1979 y Fi(\014ll)23 b(paragraph)h(across)g(selected)h(cells)399
-b Fg(C-c)36 b(C-q)2046 2074 y Fe(Calculations)21 b Fi(\(in)j(com)n
-(bination)h(with)f(Emacs)f Fg(calc)i Fi(pac)n(k)l(age\))2046
-2169 y(set)f(and)g(ev)l(al)g(column)g(form)n(ula)567
-b Fg(C-c)36 b(=)2046 2239 y Fi(set)24 b(and)g(ev)l(al)g(named-\014eld)h
-(form)n(ula)433 b Fg(C-u)36 b(C-c)g(=)2046 2308 y Fi(edit)24
-b(form)n(ulas)f(in)g(separate)i(bu\013er)473 b Fg(C-c)36
-b(')2046 2378 y Fi(re-apply)23 b(all)g(stored)i(equations)g(to)f
-(curren)n(t)g(line)96 b Fg(C-c)36 b(*)2046 2448 y Fi(re-apply)23
-b(all)g(stored)i(equations)g(to)f(en)n(tire)g(table)101
-b Fg(C-u)36 b(C-c)g(*)2046 2542 y Fi(rotate)25 b(calculation)g(mark)e
-(through)i(#)e(*)h(!)31 b(^)p 3291 2542 22 4 v 49 w($)115
-b Fg(C-#)2046 2637 y Fi(displa)n(y)24 b(column)g(n)n(um)n(b)r(er)f
-(cursor)h(is)f(in)354 b Fg(C-c)36 b(?)2046 2707 y Fi(sum)23
-b(n)n(um)n(b)r(ers)h(in)f(curren)n(t)i(column/rectangle)143
-b Fg(C-c)36 b(+)2046 2791 y Fi(cop)n(y)25 b(do)n(wn)f(with)g(incremen)n
-(t)625 b Fg(S-RET)3661 2768 y Ff(3)2046 2886 y Fi(F)-6
-b(orm)n(ulas)22 b(t)n(yp)r(ed)j(in)d(\014eld)h(are)g(executed)i(b)n(y)e
+1441 y Fi(insert)23 b(hline)h(b)r(elo)n(w)g(\()p Fg(C-u)h
+Fi(:)31 b(ab)r(o)n(v)n(e\))25 b(curren)n(t)f(ro)n(w)79
+b Fg(C-c)36 b(-)2046 1511 y Fi(sort)24 b(lines)f(in)g(region)867
+b Fg(C-c)36 b(^)2046 1606 y Fe(Regions)2046 1700 y Fi(cut)25
+b(rectangular)f(region)758 b Fg(C-c)36 b(C-x)g(C-w)2046
+1770 y Fi(cop)n(y)25 b(rectangular)f(region)715 b Fg(C-c)36
+b(C-x)g(M-w)2046 1840 y Fi(paste)25 b(rectangular)f(region)695
+b Fg(C-c)36 b(C-x)g(C-y)2046 1910 y Fi(\014ll)23 b(paragraph)h(across)g
+(selected)h(cells)399 b Fg(C-c)36 b(C-q)2046 2004 y Fe(Calculations)21
+b Fi(\(in)j(com)n(bination)h(with)f(Emacs)f Fg(calc)i
+Fi(pac)n(k)l(age\))2046 2099 y(set)f(and)g(ev)l(al)g(column)g(form)n
+(ula)567 b Fg(C-c)36 b(=)2046 2169 y Fi(set)24 b(and)g(ev)l(al)g
+(\014eld)g(form)n(ula)661 b Fg(C-u)36 b(C-c)g(=)2046
+2239 y Fi(edit)24 b(form)n(ulas)f(in)g(separate)i(bu\013er)473
+b Fg(C-c)36 b(')2046 2308 y Fi(re-apply)23 b(all)g(stored)i(equations)g
+(to)f(curren)n(t)g(line)96 b Fg(C-c)36 b(*)2046 2378
+y Fi(re-apply)23 b(all)g(stored)i(equations)g(to)f(en)n(tire)g(table)
+101 b Fg(C-u)36 b(C-c)g(*)2046 2448 y Fi(iterate)25 b(table)f(to)g
+(stabilit)n(y)703 b Fg(C-u)36 b(C-u)g(C-c)g(*)2046 2542
+y Fi(rotate)25 b(calculation)g(mark)e(through)i(#)e(*)h(!)31
+b(^)p 3291 2542 22 4 v 49 w($)115 b Fg(C-#)2046 2637
+y Fi(sho)n(w)24 b(line,)f(column,)g(form)n(ula)g(reference)315
+b Fg(C-c)36 b(?)2046 2707 y Fi(sum)23 b(n)n(um)n(b)r(ers)h(in)f(curren)
+n(t)i(column/rectangle)143 b Fg(C-c)36 b(+)2046 2791
+y Fi(cop)n(y)25 b(do)n(wn)f(with)g(incremen)n(t)625 b
+Fg(S-RET)3661 2768 y Ff(3)2046 2886 y Fi(F)-6 b(orm)n(ulas)22
+b(t)n(yp)r(ed)j(in)d(\014eld)h(are)g(executed)i(b)n(y)e
 Fg(TAB)p Fi(,)h Fg(RET)f Fi(and)g Fg(C-c)37 b(C-c)p Fi(.)2046
 2955 y Fg(=)24 b Fi(in)n(tro)r(duces)g(a)g(column)g(form)n(ula,)f
 Fg(:=)h Fi(a)f(named-\014eld)i(form)n(ula.)2046 3050
@@ -2584,9 +2577,9 @@
 3120 y Fi(...)30 b(with)24 b(prin)n(tf)f(format)g(sp)r(eci\014cation)
 387 b Fg(=$1+$2;\045.2f)2046 3190 y Fi(...)30 b(with)24
 b(constan)n(ts)h(from)e(constan)n(ts.el)352 b Fg(=$1/$c/$cm)2046
-3259 y Fi(sum)23 b(from)g(3rd)h(hline)f(ab)r(o)n(v)n(e)i(to)f(here)411
-b Fg(:=vsum\(&III\))2046 3329 y Fi(apply)24 b(curren)n(t)g(column)g
-(form)n(ula)518 b Fg(=)2046 3424 y Fe(Miscellaneous)2046
+3259 y Fi(sum)23 b(from)g(2nd)h(to)h(3rd)e(hline)485
+b Fg(:=vsum\(@II..@III\))2046 3329 y Fi(apply)24 b(curren)n(t)g(column)
+g(form)n(ula)518 b Fg(=)2046 3424 y Fe(Miscellaneous)2046
 3519 y Fi(to)24 b(limit)f(column)h(width)g(to)g Fg(N)g
 Fi(c)n(haracters,)g(use)140 b Fg(...|)36 b(<N>)h(|...)2046
 3588 y Fi(edit)24 b(the)h(curren)n(t)f(\014eld)g(in)f(a)h(separate)h
@@ -2601,74 +2594,76 @@
 y Fi(recognize)25 b(existing)f(table.el)g(table)474 b
 Fg(C-c)36 b(C-c)2046 4126 y Fi(con)n(v)n(ert)25 b(table)f(\(Org-mo)r
 (de)g Fc($)f Fi(table.el\))312 b Fg(C-c)36 b(~)4242 -364
-y Fh(Links)4242 -208 y Fi(globally)24 b(store)g(link)f(to)h(the)h
-(curren)n(t)f(lo)r(cation)166 b Fg(C-c)36 b(l)5858 -232
-y Ff(1)4242 -139 y Fi(insert)23 b(a)h(link)f(\(T)-6 b(AB)24
+y Fh(Links)4242 -217 y Fi(globally)24 b(store)g(link)f(to)h(the)h
+(curren)n(t)f(lo)r(cation)166 b Fg(C-c)36 b(l)5858 -241
+y Ff(1)4242 -148 y Fi(insert)23 b(a)h(link)f(\(T)-6 b(AB)24
 b(completes)h(stored)f(links\))138 b Fg(C-c)36 b(C-l)4242
--69 y Fi(insert)23 b(\014le)h(link)f(with)h(\014le)g(name)g(completion)
-192 b Fg(C-u)36 b(C-c)g(C-l)4242 1 y Fi(edit)24 b(\(also)g(hidden)g
+-78 y Fi(insert)23 b(\014le)h(link)f(with)h(\014le)g(name)g(completion)
+192 b Fg(C-u)36 b(C-c)g(C-l)4242 -8 y Fi(edit)24 b(\(also)g(hidden)g
 (part)g(of)5 b(\))24 b(link)g(at)g(p)r(oin)n(t)247 b
-Fg(C-c)36 b(C-l)4242 99 y Fi(op)r(en)25 b(\014le)e(links)g(in)h(emacs)
-722 b Fg(C-c)36 b(C-o)4242 169 y Fi(...force)22 b(op)r(en)j(in)e
+Fg(C-c)36 b(C-l)4242 88 y Fi(op)r(en)25 b(\014le)e(links)g(in)h(emacs)
+722 b Fg(C-c)36 b(C-o)4242 158 y Fi(...force)22 b(op)r(en)j(in)e
 (emacs/other)j(windo)n(w)320 b Fg(C-u)36 b(C-c)g(C-o)4242
-239 y Fi(op)r(en)25 b(link)e(at)h(p)r(oin)n(t)884 b Fg(mouse-1/2)4242
-308 y Fi(...force)22 b(op)r(en)j(in)e(emacs/other)j(windo)n(w)320
-b Fg(mouse-3)4242 378 y Fi(record)24 b(a)g(p)r(osition)g(in)f(mark)g
-(ring)510 b Fg(C-c)36 b(\045)4242 448 y Fi(jump)23 b(bac)n(k)i(to)f
+227 y Fi(op)r(en)25 b(link)e(at)h(p)r(oin)n(t)884 b Fg(mouse-1/2)4242
+297 y Fi(...force)22 b(op)r(en)j(in)e(emacs/other)j(windo)n(w)320
+b Fg(mouse-3)4242 367 y Fi(record)24 b(a)g(p)r(osition)g(in)f(mark)g
+(ring)510 b Fg(C-c)36 b(\045)4242 437 y Fi(jump)23 b(bac)n(k)i(to)f
 (last)g(follo)n(w)n(ed)f(link\(s\))403 b Fg(C-c)36 b(&)4242
-546 y Fe(In)n(ternal)26 b(Links)4242 644 y Fg(<<My)36
-b(Target>>)984 b Fi(target)4242 727 y Fg(<<<My)37 b(Target>>>)913
-b Fi(radio)23 b(target)6045 703 y Ff(2)4242 796 y Fg([[*this)37
-b(text]])948 b Fi(\014nd)24 b(headline)4242 866 y Fg([[this)37
+506 y Fi(Find)24 b(next)g(link)998 b Fg(C-c)36 b(C-x)g(C-n)4242
+576 y Fi(Find)24 b(previous)f(link)876 b Fg(C-c)36 b(C-x)g(C-p)4242
+672 y Fe(In)n(ternal)26 b(Links)4242 768 y Fg(<<My)36
+b(Target>>)984 b Fi(target)4242 851 y Fg(<<<My)37 b(Target>>>)913
+b Fi(radio)23 b(target)6045 827 y Ff(2)4242 920 y Fg([[*this)37
+b(text]])948 b Fi(\014nd)24 b(headline)4242 990 y Fg([[this)37
 b(text]])620 b Fi(\014nd)24 b(target)h(or)e(text)i(in)f(bu\013er)4242
-936 y Fg([[this)37 b(text][description]])387 b Fi(optional)24
-b(link)f(text)4242 1034 y Fe(External)j(Links)4242 1133
+1060 y Fg([[this)37 b(text][description]])387 b Fi(optional)24
+b(link)f(text)4242 1156 y Fe(External)j(Links)4242 1252
 y Fg(file:/home/dominik/img/)q(mars)q(.jp)q(g)352 b Fi(\014le,)23
-b(absolute)4242 1202 y Fg(file:papers/last.pdf)740 b
-Fi(\014le,)23 b(relativ)n(e)4242 1272 y Fg(file:projects.org::*tha)q(t)
-41 b(text)418 b Fi(\014nd)24 b(headline)4242 1342 y Fg
+b(absolute)4242 1322 y Fg(file:papers/last.pdf)740 b
+Fi(\014le,)23 b(relativ)n(e)4242 1391 y Fg(file:projects.org::*tha)q(t)
+41 b(text)418 b Fi(\014nd)24 b(headline)4242 1461 y Fg
 (file:projects.org::find)42 b(me)523 b Fi(\014nd)24 b(trgt/string)4242
-1412 y Fg(http://www.astro.uva.nl)q(/~do)q(min)q(ik)317
-b Fi(on)24 b(the)h(w)n(eb)4242 1481 y Fg(mailto:adent@galaxy.net)635
-b Fi(Email)23 b(address)4242 1551 y Fg(news:comp.emacs)915
-b Fi(Usenet)25 b(group)4242 1621 y Fg(bbdb:Richard)39
-b(Stallman)701 b Fi(BBDB)23 b(p)r(erson)4242 1691 y Fg(gnus:group)1090
-b Fi(GNUS)24 b(group)4242 1760 y Fg(gnus:group#id)985
-b Fi(GNUS)24 b(message)4242 1830 y Fg(vm|wl|mhe|rmail:folder)670
-b Fi(Mail)23 b(folder)4242 1900 y Fg(vm|wl|mhe|rmail:folder#)q(id)564
-b Fi(Mail)23 b(message)4242 1969 y Fg(info:emacs:Regexps)810
-b Fi(Info)24 b(\014le:no)r(de)4242 2039 y Fg(shell:ls)38
-b(*.org)947 b Fi(shell)23 b(command)4242 2109 y Fg(elisp:\(calendar\))
-880 b Fi(elisp)23 b(form)4242 2179 y Fg([[external)38
+1531 y Fg(http://www.astro.uva.nl)q(/~do)q(min)q(ik)317
+b Fi(on)24 b(the)h(w)n(eb)4242 1601 y Fg(mailto:adent@galaxy.net)635
+b Fi(Email)23 b(address)4242 1670 y Fg(news:comp.emacs)915
+b Fi(Usenet)25 b(group)4242 1740 y Fg(bbdb:Richard)39
+b(Stallman)701 b Fi(BBDB)23 b(p)r(erson)4242 1810 y Fg(gnus:group)1090
+b Fi(GNUS)24 b(group)4242 1880 y Fg(gnus:group#id)985
+b Fi(GNUS)24 b(message)4242 1949 y Fg(vm|wl|mhe|rmail:folder)670
+b Fi(Mail)23 b(folder)4242 2019 y Fg(vm|wl|mhe|rmail:folder#)q(id)564
+b Fi(Mail)23 b(message)4242 2089 y Fg(info:emacs:Regexps)810
+b Fi(Info)24 b(\014le:no)r(de)4242 2159 y Fg(shell:ls)38
+b(*.org)947 b Fi(shell)23 b(command)4242 2228 y Fg(elisp:\(calendar\))
+880 b Fi(elisp)23 b(form)4242 2298 y Fg([[external)38
 b(link][description]])246 b Fi(optional)24 b(link)f(text)4242
-2384 y Fh(Remem)m(b)s(er-mo)s(de)38 b(In)m(tegration)4242
-2539 y Fi(See)32 b(the)g(man)n(ual)g(for)e(ho)n(w)i(to)g(mak)n(e)g
-(remem)n(b)r(er.el)f(use)g(Org-mo)r(de)4242 2609 y(links)25
+2492 y Fh(Remem)m(b)s(er-mo)s(de)38 b(In)m(tegration)4242
+2638 y Fi(See)32 b(the)g(man)n(ual)g(for)e(ho)n(w)i(to)g(mak)n(e)g
+(remem)n(b)r(er.el)f(use)g(Org-mo)r(de)4242 2708 y(links)25
 b(and)g(\014les.)36 b(The)25 b(note-\014nishing)h(command)g
-Fg(C-c)36 b(C-c)26 b Fi(will)e(\014rst)4242 2679 y(prompt)g(for)f(an)h
+Fg(C-c)36 b(C-c)26 b Fi(will)e(\014rst)4242 2778 y(prompt)g(for)f(an)h
 (org)f(\014le.)32 b(In)24 b(the)g(\014le,)g(\014nd)g(a)g(lo)r(cation)g
-(with:)4242 2777 y(rotate)h(subtree)f(visibilit)n(y)719
-b Fg(TAB)4242 2847 y Fi(next)25 b(heading)1043 b Fg(DOWN)4242
-2916 y Fi(previous)24 b(heading)921 b Fg(UP)4242 3015
+(with:)4242 2874 y(rotate)h(subtree)f(visibilit)n(y)719
+b Fg(TAB)4242 2944 y Fi(next)25 b(heading)1043 b Fg(DOWN)4242
+3013 y Fi(previous)24 b(heading)921 b Fg(UP)4242 3109
 y Fi(Insert)24 b(the)h(note)g(with)e(one)i(of)e(the)i(follo)n(wing:)
-4242 3113 y(as)f(sublev)n(el)g(of)f(heading)i(at)f(cursor)468
-b Fg(RET)4242 3183 y Fi(righ)n(t)24 b(here)g(\(cursor)f(not)i(on)f
-(heading\))388 b Fg(RET)4242 3253 y Fi(b)r(efore)24 b(curren)n(t)g
-(heading)745 b Fg(LEFT)4242 3322 y Fi(after)24 b(curren)n(t)g(heading)
-790 b Fg(RIGHT)4242 3392 y Fi(shortcut)20 b(to)f(end)h(of)f(bu\013er)g
-(\(cursor)g(at)g(buf-start\))71 b Fg(RET)4242 3462 y
-Fi(Ab)r(ort)1256 b Fg(q)4242 3667 y Fh(Completion)4242
-3822 y Fi(In-bu\013er)34 b(completion)g(completes)h(TODO)d(k)n(eyw)n
-(ords)i(at)g(headline)4242 3892 y(start,)19 b(T)-6 b(eX)19
+4242 3206 y(as)f(sublev)n(el)g(of)f(heading)i(at)f(cursor)468
+b Fg(RET)4242 3275 y Fi(righ)n(t)24 b(here)g(\(cursor)f(not)i(on)f
+(heading\))388 b Fg(RET)4242 3345 y Fi(b)r(efore)24 b(curren)n(t)g
+(heading)745 b Fg(LEFT)4242 3415 y Fi(after)24 b(curren)n(t)g(heading)
+790 b Fg(RIGHT)4242 3484 y Fi(shortcut)20 b(to)f(end)h(of)f(bu\013er)g
+(\(cursor)g(at)g(buf-start\))71 b Fg(RET)4242 3554 y
+Fi(Ab)r(ort)1256 b Fg(q)4242 3748 y Fh(Completion)4242
+3895 y Fi(In-bu\013er)34 b(completion)g(completes)h(TODO)d(k)n(eyw)n
+(ords)i(at)g(headline)4242 3964 y(start,)19 b(T)-6 b(eX)19
 b(macros)f(after)h(\\)p Fg(\\)p Fi(",)h(option)f(k)n(eyw)n(ords)g
-(after)f(\\)p Fg(#-)p Fi(",)i(T)-6 b(A)n(GS)4242 3962
+(after)f(\\)p Fg(#-)p Fi(",)i(T)-6 b(A)n(GS)4242 4034
 y(after)24 b(\\)p Fg(:)p Fi(",)g(and)g(dictionary)g(w)n(ords)g
-(elsewhere.)4242 4060 y(Complete)h(w)n(ord)e(at)h(p)r(oin)n(t)702
+(elsewhere.)4242 4130 y(Complete)h(w)n(ord)e(at)h(p)r(oin)n(t)702
 b Fg(M-TAB)p eop end
 %%Page: 2 2
 TeXDict begin @landscape 2 1 bop -169 -357 a Fj(Org-Mo)t(de)45
 b(Reference)h(Card)g(\(2/2\))546 -242 y Fi(\(for)23 b(v)n(ersion)h
-(4.56\))-150 -47 y Fh(TODO)38 b(Items)g(and)f(Chec)m(kb)s(o)m(xes)-150
+(4.67\))-150 -47 y Fh(TODO)38 b(Items)g(and)f(Chec)m(kb)s(o)m(xes)-150
 99 y Fi(rotate)25 b(the)f(state)h(of)f(the)g(curren)n(t)g(item)354
 b Fg(C-c)36 b(C-t)-150 169 y Fi(view)24 b(TODO)f(items)g(in)h(a)g
 (sparse)f(tree)380 b Fg(C-c)36 b(C-v)-150 239 y Fi(view)24
@@ -2735,142 +2730,134 @@
 4057 y Fi(Expand)25 b(abbreviation)f(\(cdlatex-mo)r(de\))305
 b Fg(TAB)-150 4126 y Fi(Insert/mo)r(dify)24 b(math)h(sym)n(b)r(ol)e
 (\(cdlatex-mo)r(de\))99 b Fg(`)36 b(/)f(')2046 -364 y
-Fh(Agenda)i(Views)2046 -246 y Fi(add/mo)n(v)n(e)25 b(curren)n(t)f
+Fh(Agenda)i(Views)2046 -208 y Fi(add/mo)n(v)n(e)25 b(curren)n(t)f
 (\014le)g(to)g(fron)n(t)g(of)f(agenda)197 b Fg(C-c)36
-b([)2046 -176 y Fi(remo)n(v)n(e)24 b(curren)n(t)g(\014le)g(from)f(y)n
-(our)g(agenda)299 b Fg(C-c)36 b(])2046 -106 y Fi(cycle)24
-b(through)h(agenda)g(\014le)f(list)551 b Fg(C-,)2046
--7 y Fi(compile)24 b(agenda)h(for)e(the)h(curren)n(t)g(w)n(eek)320
-b Fg(C-c)36 b(a)g(a)3733 -30 y Ff(1)2046 74 y Fi(compile)24
-b(global)g(TODO)f(list)640 b Fg(C-c)36 b(a)g(t)3733 50
-y Ff(1)2046 154 y Fi(compile)24 b(TODO)f(list)g(for)g(sp)r(eci\014c)h
-(k)n(eyw)n(ord)218 b Fg(C-c)36 b(a)g(T)3733 131 y Ff(1)2046
-235 y Fi(matc)n(h)25 b(tags)f(in)f(agenda)j(\014les)637
-b Fg(C-c)36 b(a)g(m)3733 211 y Ff(1)2046 315 y Fi(matc)n(h)25
+b([)2046 -139 y Fi(remo)n(v)n(e)24 b(curren)n(t)g(\014le)g(from)f(y)n
+(our)g(agenda)299 b Fg(C-c)36 b(])2046 -69 y Fi(cycle)24
+b(through)h(agenda)g(\014le)f(list)551 b Fg(C-')2046
+40 y Fi(compile)24 b(agenda)h(for)e(the)h(curren)n(t)g(w)n(eek)320
+b Fg(C-c)36 b(a)g(a)3733 17 y Ff(1)2046 121 y Fi(compile)24
+b(global)g(TODO)f(list)640 b Fg(C-c)36 b(a)g(t)3733 97
+y Ff(1)2046 201 y Fi(compile)24 b(TODO)f(list)g(for)g(sp)r(eci\014c)h
+(k)n(eyw)n(ord)218 b Fg(C-c)36 b(a)g(T)3733 178 y Ff(1)2046
+281 y Fi(matc)n(h)25 b(tags)f(in)f(agenda)j(\014les)637
+b Fg(C-c)36 b(a)g(m)3733 258 y Ff(1)2046 362 y Fi(matc)n(h)25
 b(tags)f(in)f(TODO)h(en)n(tries)554 b Fg(C-c)36 b(a)g(M)3733
-292 y Ff(1)2046 395 y Fi(sho)n(w)24 b(timeline)f(of)h(curren)n(t)g(org)
-f(\014le)458 b Fg(C-c)36 b(a)g(L)3733 372 y Ff(1)2046
-476 y Fi(con\014gure)25 b(custom)f(commands)570 b Fg(C-c)36
-b(a)g(C)3733 452 y Ff(1)2046 546 y Fi(agenda)25 b(for)e(date)i(at)f
-(cursor)661 b Fg(C-c)36 b(C-o)2046 669 y Fi(T)-6 b(o)24
-b(set)g(categories,)h(add)f(lines)f(lik)n(e)3010 645
-y Ff(2)3047 669 y Fi(:)2046 734 y Fg(#+CATEGORY:)38 b(MyCateg)2046
-823 y Fe(Commands)26 b(a)n(v)-5 b(ailable)25 b(in)i(an)g(agenda)g
-(bu\013er)2046 912 y(View)g(Org)g(\014le)2046 1001 y
-Fi(sho)n(w)d(original)f(lo)r(cation)h(of)g(item)524 b
-Fg(SPC/mouse-3)2046 1071 y Fi(sho)n(w)24 b(and)g(recen)n(ter)h(windo)n
-(w)626 b Fg(L)2046 1141 y Fi(goto)25 b(original)e(lo)r(cation)h(in)g
-(other)g(windo)n(w)260 b Fg(TAB/mouse-2)2046 1210 y Fi(goto)25
+338 y Ff(1)2046 442 y Fi(\014nd)24 b(stuc)n(k)h(pro)t(jects)869
+b Fg(C-c)36 b(a)g(#)3733 419 y Ff(1)2046 523 y Fi(sho)n(w)24
+b(timeline)f(of)h(curren)n(t)g(org)f(\014le)458 b Fg(C-c)36
+b(a)g(L)3733 499 y Ff(1)2046 603 y Fi(con\014gure)25
+b(custom)f(commands)570 b Fg(C-c)36 b(a)g(C)3733 580
+y Ff(1)2046 684 y Fi(con\014gure)25 b(stuc)n(k)g(pro)t(jects)708
+b Fg(C-c)36 b(a)g(!)3733 660 y Ff(1)2046 753 y Fi(agenda)25
+b(for)e(date)i(at)f(cursor)661 b Fg(C-c)36 b(C-o)2046
+886 y Fi(T)-6 b(o)24 b(set)g(categories,)h(add)f(lines)f(lik)n(e)3010
+863 y Ff(2)3047 886 y Fi(:)2046 961 y Fg(#+CATEGORY:)38
+b(MyCateg)2046 1059 y Fe(Commands)26 b(a)n(v)-5 b(ailable)25
+b(in)i(an)g(agenda)g(bu\013er)2046 1157 y(View)g(Org)g(\014le)2046
+1256 y Fi(sho)n(w)d(original)f(lo)r(cation)h(of)g(item)524
+b Fg(SPC/mouse-3)2046 1326 y Fi(sho)n(w)24 b(and)g(recen)n(ter)h(windo)
+n(w)626 b Fg(L)2046 1395 y Fi(goto)25 b(original)e(lo)r(cation)h(in)g
+(other)g(windo)n(w)260 b Fg(TAB/mouse-2)2046 1465 y Fi(goto)25
 b(original)e(lo)r(cation,)h(delete)h(other)f(windo)n(ws)91
-b Fg(RET)2046 1280 y Fi(toggle)25 b(follo)n(w-mo)r(de)861
-b Fg(f)2046 1369 y Fe(Change)27 b(displa)n(y)2046 1458
-y Fi(delete)e(other)f(windo)n(ws)791 b Fg(o)2046 1528
-y Fi(switc)n(h)24 b(to)g(daily)g(/)g(w)n(eekly)g(view)534
-b Fg(d)36 b(/)f(w)2046 1597 y Fi(toggle)25 b(inclusion)e(of)h(diary)f
-(en)n(tries)473 b Fg(D)2046 1667 y Fi(toggle)25 b(time)f(grid)f(for)g
-(daily)g(sc)n(hedule)388 b Fg(g)2046 1737 y Fi(toggle)25
-b(displa)n(y)e(of)h(logb)r(o)r(ok)g(en)n(tries)446 b
-Fg(l)2046 1807 y Fi(refresh)23 b(agenda)i(bu\013er)f(with)g(an)n(y)g(c)
-n(hanges)239 b Fg(r)2046 1876 y Fi(sa)n(v)n(e)24 b(all)f(org-mo)r(de)h
-(bu\013ers)673 b Fg(s)2046 1946 y Fi(displa)n(y)24 b(the)g(follo)n
-(wing)f Fg(org-agenda-ndays)221 b(RIGHT)2046 2016 y Fi(displa)n(y)24
-b(the)g(previous)g Fg(org-agenda-ndays)238 b(LEFT)2046
-2086 y Fi(goto)25 b(to)r(da)n(y)1110 b Fg(.)2046 2175
-y Fe(Remote)27 b(editing)2046 2264 y Fi(digit)d(argumen)n(t)984
-b Fg(0-9)2046 2333 y Fi(c)n(hange)25 b(state)g(of)f(curren)n(t)g(TODO)f
-(item)333 b Fg(t)2046 2403 y Fi(kill)23 b(item)g(and)i(source)830
-b Fg(C-k)2046 2473 y Fi(sho)n(w)24 b(tags)g(of)g(curren)n(t)g(headline)
-536 b Fg(T)2046 2543 y Fi(set)24 b(tags)h(for)d(curren)n(t)j(headline)
-573 b Fg(:)2046 2612 y Fi(toggle)25 b(AR)n(CHIVE)e(tag)779
-b Fg(a)2046 2682 y Fi(set)24 b(priorit)n(y)f(of)g(curren)n(t)i(item)612
-b Fg(p)2046 2764 y Fi(raise/lo)n(w)n(er)23 b(priorit)n(y)g(of)h(curren)
-n(t)g(item)361 b Fg(S-UP/DOWN)3801 2741 y Ff(3)2046 2834
+b Fg(RET)2046 1535 y Fi(sho)n(w)24 b(subtree)g(in)g(indirect)f
+(bu\013er,)h(ded.)g(frame)127 b Fg(b)2046 1604 y Fi(toggle)25
+b(follo)n(w-mo)r(de)861 b Fg(f)2046 1703 y Fe(Change)27
+b(displa)n(y)2046 1801 y Fi(delete)e(other)f(windo)n(ws)791
+b Fg(o)2046 1871 y Fi(switc)n(h)24 b(to)g(daily)g(/)g(w)n(eekly)g(view)
+534 b Fg(d)36 b(/)f(w)2046 1941 y Fi(toggle)25 b(inclusion)e(of)h
+(diary)f(en)n(tries)473 b Fg(D)2046 2010 y Fi(toggle)25
+b(time)f(grid)f(for)g(daily)g(sc)n(hedule)388 b Fg(g)2046
+2080 y Fi(toggle)25 b(displa)n(y)e(of)h(logb)r(o)r(ok)g(en)n(tries)446
+b Fg(l)2046 2150 y Fi(refresh)23 b(agenda)i(bu\013er)f(with)g(an)n(y)g
+(c)n(hanges)239 b Fg(r)2046 2220 y Fi(sa)n(v)n(e)24 b(all)f(org-mo)r
+(de)h(bu\013ers)673 b Fg(s)2046 2289 y Fi(displa)n(y)24
+b(the)g(follo)n(wing)f Fg(org-agenda-ndays)221 b(RIGHT)2046
+2359 y Fi(displa)n(y)24 b(the)g(previous)g Fg(org-agenda-ndays)238
+b(LEFT)2046 2429 y Fi(goto)25 b(to)r(da)n(y)1110 b Fg(.)2046
+2527 y Fe(Remote)27 b(editing)2046 2625 y Fi(digit)d(argumen)n(t)984
+b Fg(0-9)2046 2695 y Fi(c)n(hange)25 b(state)g(of)f(curren)n(t)g(TODO)f
+(item)333 b Fg(t)2046 2765 y Fi(kill)23 b(item)g(and)i(source)830
+b Fg(C-k)2046 2835 y Fi(arc)n(hiv)n(e)24 b(the)h(subtree)854
+b Fg($)2046 2904 y Fi(sho)n(w)24 b(tags)g(of)g(curren)n(t)g(headline)
+536 b Fg(T)2046 2974 y Fi(set)24 b(tags)h(for)d(curren)n(t)j(headline)
+573 b Fg(:)2046 3044 y Fi(toggle)25 b(AR)n(CHIVE)e(tag)779
+b Fg(a)2046 3114 y Fi(set)24 b(priorit)n(y)f(of)g(curren)n(t)i(item)612
+b Fg(p)2046 3196 y Fi(raise/lo)n(w)n(er)23 b(priorit)n(y)g(of)h(curren)
+n(t)g(item)361 b Fg(S-UP/DOWN)3801 3172 y Ff(3)2046 3266
 y Fi(displa)n(y)24 b(w)n(eigh)n(ted)h(priorit)n(y)e(of)g(curren)n(t)h
-(item)189 b Fg(P)2046 2904 y Fi(sc)n(hedule/set)26 b(deadline)e(for)f
-(this)g(item)377 b Fg(C-c)36 b(C-s/d)2046 2988 y Fi(c)n(hange)25
+(item)189 b Fg(P)2046 3335 y Fi(sc)n(hedule/set)26 b(deadline)e(for)f
+(this)g(item)377 b Fg(C-c)36 b(C-s/d)2046 3420 y Fi(c)n(hange)25
 b(timestamp)g(to)f(one)g(da)n(y)h(earlier/later)139 b
-Fg(S-LEFT/RIGHT)3906 2964 y Ff(3)2046 3058 y Fi(c)n(hange)25
-b(timestamp)g(to)f(to)r(da)n(y)598 b Fg(>)2046 3127 y
+Fg(S-LEFT/RIGHT)3906 3396 y Ff(3)2046 3489 y Fi(c)n(hange)25
+b(timestamp)g(to)f(to)r(da)n(y)598 b Fg(>)2046 3559 y
 Fi(insert)23 b(new)i(en)n(try)f(in)n(to)g(diary)612 b
-Fg(i)2046 3216 y Fi(Start)24 b(the)h(clo)r(c)n(k)f(on)g(curren)n(t)g
-(item)g(\(clo)r(c)n(k-in\))165 b Fg(I)2046 3286 y Fi(Stop)25
-b(the)f(clo)r(c)n(k)h(\(clo)r(c)n(k-out\))642 b Fg(O)2046
-3356 y Fi(Cancel)24 b(curren)n(t)g(clo)r(c)n(k)810 b
-Fg(X)2046 3445 y Fe(Calendar)26 b(commands)2046 3534
-y Fi(\014nd)e(agenda)h(cursor)f(date)g(in)g(calendar)350
-b Fg(c)2046 3603 y Fi(compute)25 b(agenda)g(for)e(calendar)i(cursor)e
-(date)180 b Fg(c)2046 3673 y Fi(sho)n(w)24 b(phases)g(of)f(the)i(mo)r
-(on)669 b Fg(M)2046 3743 y Fi(sho)n(w)24 b(sunrise/sunset)g(times)636
-b Fg(S)2046 3813 y Fi(sho)n(w)24 b(holida)n(ys)1014 b
-Fg(H)2046 3882 y Fi(con)n(v)n(ert)25 b(date)g(to)f(other)g(calendars)
-478 b Fg(C)2046 3971 y Fe(Quit)27 b(and)g(Exit)2046 4060
-y Fi(quit)d(agenda,)h(remo)n(v)n(e)f(agenda)h(bu\013er)376
-b Fg(q)2046 4130 y Fi(exit)24 b(agenda,)h(remo)n(v)n(e)f(all)f(agenda)i
-(bu\013ers)258 b Fg(x)4242 -364 y Fh(Calendar)36 b(and)h(Diary)i(In)m
-(tegration)4242 -241 y Fi(Include)25 b(Emacs)f(diary)f(en)n(tries)h(in)
-n(to)g(Org-mo)r(de)f(agenda)j(with:)4242 -151 y Fg(\(setq)37
-b(org-agenda-include-diary)42 b(t\))4242 14 y Fh(Exp)s(orting)d(and)e
-(Publishing)4242 137 y Fi(Exp)r(orting)32 b(creates)g(\014les)g(with)f
+Fg(i)2046 3657 y Fi(start)24 b(the)h(clo)r(c)n(k)f(on)g(curren)n(t)g
+(item)g(\(clo)r(c)n(k-in\))176 b Fg(I)2046 3727 y Fi(stop)24
+b(the)h(clo)r(c)n(k)f(\(clo)r(c)n(k-out\))654 b Fg(O)2046
+3797 y Fi(cancel)25 b(curren)n(t)f(clo)r(c)n(k)829 b
+Fg(X)2046 3895 y Fe(Misc)2046 3993 y Fi(Op)r(en)24 b(link)f(in)h
+(curren)n(t)g(line)673 b Fg(C-c)36 b(C-o)4242 -364 y
+Fe(Calendar)26 b(commands)4242 -273 y Fi(\014nd)e(agenda)h(cursor)f
+(date)g(in)g(calendar)350 b Fg(c)4242 -203 y Fi(compute)25
+b(agenda)g(for)e(calendar)i(cursor)e(date)180 b Fg(c)4242
+-133 y Fi(sho)n(w)24 b(phases)g(of)f(the)i(mo)r(on)669
+b Fg(M)4242 -64 y Fi(sho)n(w)24 b(sunrise/sunset)g(times)636
+b Fg(S)4242 6 y Fi(sho)n(w)24 b(holida)n(ys)1014 b Fg(H)4242
+76 y Fi(con)n(v)n(ert)25 b(date)g(to)f(other)g(calendars)478
+b Fg(C)4242 167 y Fe(Quit)27 b(and)g(Exit)4242 258 y
+Fi(quit)d(agenda,)h(remo)n(v)n(e)f(agenda)h(bu\013er)376
+b Fg(q)4242 328 y Fi(exit)24 b(agenda,)h(remo)n(v)n(e)f(all)f(agenda)i
+(bu\013ers)258 b Fg(x)4242 495 y Fh(Calendar)36 b(and)h(Diary)i(In)m
+(tegration)4242 622 y Fi(Include)25 b(Emacs)f(diary)f(en)n(tries)h(in)n
+(to)g(Org-mo)r(de)f(agenda)j(with:)4242 713 y Fg(\(setq)37
+b(org-agenda-include-diary)42 b(t\))4242 882 y Fh(Exp)s(orting)d(and)e
+(Publishing)4242 1009 y Fi(Exp)r(orting)32 b(creates)g(\014les)g(with)f
 (extensions)i Fd(.txt)k Fi(and)32 b Fd(.html)38 b Fi(in)31
-b(the)4242 206 y(curren)n(t)c(directory)-6 b(.)38 b(Publishing)26
+b(the)4242 1078 y(curren)n(t)c(directory)-6 b(.)38 b(Publishing)26
 b(puts)g(the)h(resulting)f(\014le)g(in)n(to)h(some)4242
-276 y(other)d(place.)4242 366 y(exp)r(ort/publish)h(dispatc)n(her)642
-b Fg(C-c)36 b(C-e)4242 457 y Fi(exp)r(ort)25 b(visible)e(part)g(only)
-715 b Fg(C-c)36 b(C-e)g(v)4242 526 y Fi(insert)23 b(template)j(of)d
-(exp)r(ort)h(options)423 b Fg(C-c)36 b(C-x)g(t)4242 596
+1148 y(other)d(place.)4242 1239 y(exp)r(ort/publish)h(dispatc)n(her)642
+b Fg(C-c)36 b(C-e)4242 1331 y Fi(exp)r(ort)25 b(visible)e(part)g(only)
+715 b Fg(C-c)36 b(C-e)g(v)4242 1400 y Fi(insert)23 b(template)j(of)d
+(exp)r(ort)h(options)423 b Fg(C-c)36 b(C-x)g(t)4242 1470
 y Fi(toggle)25 b(\014xed)f(width)g(for)f(en)n(try)h(or)g(region)295
-b Fg(C-c)36 b(:)4242 686 y Fe(HTML)27 b(formatting)4242
-776 y Fi(mak)n(e)d(w)n(ords)g Fe(b)r(old)897 b Fg(*bold*)4242
-846 y Fi(mak)n(e)24 b(w)n(ords)g Fd(italic)898 b Fg(/italic/)4242
-916 y Fi(mak)n(e)24 b(w)n(ords)g(underlined)p 4629 929
-326 4 v 728 w Fg(_underlined_)4242 986 y Fi(sub-)f(and)i(sup)r
-(erscripts)781 b Fg(x^3,)36 b(J_dust)4242 1055 y Fi(T)4281
-1069 y(E)4320 1055 y(X-lik)n(e)23 b(macros)940 b Fg(\\alpha,)37
-b(\\to)4242 1125 y Fi(t)n(yp)r(eset)25 b(lines)f(in)f(\014xed)h(width)g
-(fon)n(t)460 b Fg(start)37 b(with)f(:)4242 1195 y Fi(tables)24
+b Fg(C-c)36 b(:)4242 1561 y Fe(HTML)27 b(formatting)4242
+1652 y Fi(mak)n(e)d(w)n(ords)g Fe(b)r(old)897 b Fg(*bold*)4242
+1722 y Fi(mak)n(e)24 b(w)n(ords)g Fd(italic)898 b Fg(/italic/)4242
+1792 y Fi(mak)n(e)24 b(w)n(ords)g(underlined)p 4629 1805
+326 4 v 728 w Fg(_underlined_)4242 1861 y Fi(sub-)f(and)i(sup)r
+(erscripts)781 b Fg(x^3,)36 b(J_dust)4242 1931 y Fi(T)4281
+1945 y(E)4320 1931 y(X-lik)n(e)23 b(macros)940 b Fg(\\alpha,)37
+b(\\to)4242 2001 y Fi(t)n(yp)r(eset)25 b(lines)f(in)f(\014xed)h(width)g
+(fon)n(t)460 b Fg(start)37 b(with)f(:)4242 2071 y Fi(tables)24
 b(are)g(exp)r(orted)h(as)f(HTML)f(tables)321 b Fg(start)37
-b(with)f(|)4242 1265 y Fi(links)23 b(b)r(ecome)i(HTML)e(links)640
-b Fg(http:...)73 b(etc)4242 1334 y Fi(include)24 b(h)n(tml)g(tags)905
-b Fg(@<b>...@</b>)4242 1425 y Fe(Exp)r(ort)27 b(options)4242
-1515 y Fi(Include)20 b(additional)f(information)g(for)f(exp)r(ort)i(b)n
-(y)f(putting)h(these)g(an)n(y-)4242 1584 y(where)g(in)f(the)h(org)g
-(\014le.)30 b(Use)19 b Fg(M-TAB)i Fi(completion)f(to)g(mak)n(e)h(sure)e
-(to)h(get)4242 1654 y(the)i(righ)n(t)e(k)n(eyw)n(ords.)31
-b Fg(M-TAB)22 b Fi(again)f(just)g(after)g(k)n(eyw)n(ord)g(is)g
-(complete)4242 1724 y(inserts)i(examples.)4242 1814 y(the)i(title)f(to)
-g(b)r(e)g(sho)n(wn)797 b Fg(#+TITLE:)4242 1884 y Fi(the)25
-b(author)1115 b Fg(#+AUTHOR:)4242 1954 y Fi(authors)24
-b(email)f(address)769 b Fg(#+EMAIL:)4242 2023 y Fi(language)25
-b(co)r(de)g(for)e(h)n(tml)732 b Fg(#+LANGUAGE:)4242 2093
-y Fi(free)23 b(text)i(description)f(of)g(\014le)626 b
-Fg(#+TEXT:)4242 2163 y Fi(...)30 b(whic)n(h)24 b(can)g(carry)g(o)n(v)n
-(er)g(m)n(ultiple)f(lines)271 b Fg(#+TEXT:)4242 2233
-y Fi(settings)25 b(for)d(the)j(exp)r(ort)f(pro)r(cess)506
-b Fg(#+OPTIONS:)4242 2323 y Fe(Commen)n(ts:)35 b(T)-7
-b(ext)27 b(not)f(b)r(eing)i(exp)r(orted)4242 2413 y Fi(T)-6
+b(with)f(|)4242 2140 y Fi(links)23 b(b)r(ecome)i(HTML)e(links)640
+b Fg(http:...)73 b(etc)4242 2210 y Fi(include)24 b(h)n(tml)g(tags)905
+b Fg(@<b>...@</b>)4242 2301 y Fe(Commen)n(ts:)35 b(T)-7
+b(ext)27 b(not)f(b)r(eing)i(exp)r(orted)4242 2392 y Fi(T)-6
 b(ext)22 b(b)r(efore)f(the)h(\014rst)f(headline)g(is)f(not)i
-(considered)g(part)f(of)g(the)h(do)r(c-)4242 2483 y(umen)n(t)29
+(considered)g(part)f(of)g(the)h(do)r(c-)4242 2462 y(umen)n(t)29
 b(and)f(is)f(therefore)h(nev)n(er)g(exp)r(orted.)44 b(Lines)28
-b(starting)g(with)g Fg(#)4242 2552 y Fi(are)j(commen)n(ts)g(and)h(are)e
+b(starting)g(with)g Fg(#)4242 2532 y Fi(are)j(commen)n(ts)g(and)h(are)e
 (not)i(exp)r(orted.)53 b(Subtrees)32 b(whose)f(header)4242
-2622 y(starts)24 b(with)g(COMMENT)e(are)i(nev)n(er)g(exp)r(orted.)4242
-2712 y(toggle)h(COMMENT)d(k)n(eyw)n(ord)j(on)f(en)n(try)285
-b Fg(C-c)36 b(;)4242 2875 y Fh(Dynamic)i(Blo)s(c)m(ks)4242
-2998 y Fi(up)r(date)25 b(dynamic)f(blo)r(c)n(k)h(at)f(p)r(oin)n(t)486
-b Fg(C-c)36 b(C-x)g(C-u)4242 3068 y Fi(up)r(date)25 b(all)e(dynamic)h
+2602 y(starts)24 b(with)g(COMMENT)e(are)i(nev)n(er)g(exp)r(orted.)4242
+2693 y(toggle)h(COMMENT)d(k)n(eyw)n(ord)j(on)f(en)n(try)285
+b Fg(C-c)36 b(;)4242 2860 y Fh(Dynamic)i(Blo)s(c)m(ks)4242
+2987 y Fi(up)r(date)25 b(dynamic)f(blo)r(c)n(k)h(at)f(p)r(oin)n(t)486
+b Fg(C-c)36 b(C-x)g(C-u)4242 3056 y Fi(up)r(date)25 b(all)e(dynamic)h
 (blo)r(c)n(ks)490 b Fg(C-u)36 b(C-c)g(C-x)g(C-u)4242
-3229 y Fh(Notes)4242 3329 y Ff(1)4313 3352 y Fi(This)e(is)f(only)h(a)h
+3223 y Fh(Notes)4242 3326 y Ff(1)4313 3350 y Fi(This)e(is)f(only)h(a)h
 (suggestion)g(for)e(a)h(binding)h(of)e(this)h(command.)4242
-3422 y(Cho)r(ose)24 b(y)n(ou)h(o)n(wn)f(k)n(ey)g(as)g(sho)n(wn)g(under)
-g(INST)-6 b(ALLA)g(TION.)4242 3500 y Ff(2)4304 3523 y
+3419 y(Cho)r(ose)24 b(y)n(ou)h(o)n(wn)f(k)n(ey)g(as)g(sho)n(wn)g(under)
+g(INST)-6 b(ALLA)g(TION.)4242 3498 y Ff(2)4304 3521 y
 Fi(After)24 b(c)n(hanging)i(a)f Fg(#+KEYWORD)i Fi(or)e
-Fg(<<<target>>>)j Fi(line,)c(press)g Fg(C-c)4242 3593
+Fg(<<<target>>>)j Fi(line,)c(press)g Fg(C-c)4242 3591
 y(C-c)g Fi(with)g(the)h(cursor)e(still)f(in)i(the)g(line)g(to)g(up)r
-(date.)4242 3670 y Ff(3)4303 3694 y Fi(Keybinding)g(a\013ected)i(b)n(y)
-e Fg(org-CUA-compatibility)p Fi(.)4535 3778 y Fb(Cop)n(yrigh)n(t)4838
-3776 y(c)4821 3778 y Fa(\015)d Fb(2007)i(F)-5 b(ree)21
-b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)4795 3834
-y(v4.56)h(for)h(Org-Mo)r(de)e(4.56,)i(2006)4912 3890
+(date.)4242 3669 y Ff(3)4303 3693 y Fi(Keybinding)g(a\013ected)i(b)n(y)
+e Fg(org-CUA-compatibility)p Fi(.)4535 3777 y Fb(Cop)n(yrigh)n(t)4838
+3775 y(c)4821 3777 y Fa(\015)d Fb(2007)i(F)-5 b(ree)21
+b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)4795 3833
+y(v4.67)h(for)h(Org-Mo)r(de)e(4.67,)i(2007)4912 3889
 y(Author:)k(Philip)18 b(Ro)r(ok)n(e)4473 3945 y(based)j(on)g(refcard)g
 (design)g(and)f(format)i(b)n(y)f(Stephen)f(Gildea)4242
 4022 y(P)n(ermission)28 b(is)f(gran)n(ted)i(to)f(mak)n(e)h(and)e
--- a/etc/orgcard.tex	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/orgcard.tex	Sun Apr 22 11:42:03 2007 +0000
@@ -1,6 +1,6 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.56}
-\def\versionyear{2006}          % latest update
+\def\orgversionnumber{4.67}
+\def\versionyear{2007}          % latest update
 \def\year{2007}                 % latest copyright year
 %
 %**start of header
@@ -21,7 +21,7 @@
 
 \columnsperpage=3
 
-% Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+% Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc
 
 % 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
@@ -286,6 +286,7 @@
 \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}
@@ -317,8 +318,8 @@
 \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 \$}
-\key{move all fully done children}{C-u C-c \$}
+\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%
@@ -367,8 +368,7 @@
 \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{insert hline below (\kbd{C-u} : above) current row}{C-c -}
 \key{sort lines in region}{C-c \^{}}
 
 {\bf Regions}
@@ -381,17 +381,18 @@
 {\bf Calculations} (in combination with Emacs \kbd{calc} package)
 
 \key{set and eval column formula}{C-c =}
-\key{set and eval named-field formula}{C-u C-c =}
+\key{set and eval 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{iterate table to stability}{C-u C-u C-c *}
 
 %\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
 %in lines starting with: {\tt | \# |}.
 
 \key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
 
-\key{display column number cursor is in}{C-c ?}
+\key{show line, column, formula reference}{C-c ?}
 \key{sum numbers in current column/rectangle}{C-c +}
 \key{copy down with increment}{S-RET$^3$}
 
@@ -402,7 +403,7 @@
 \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)}
+\metax{sum from 2nd to 3rd hline}{:=vsum(@II..@III)}
 \key{apply current column formula}{=}
 
 {\bf Miscellaneous}
@@ -432,6 +433,8 @@
 \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}
 
@@ -566,15 +569,17 @@
 
 \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}
 
 \vskip 1mm
@@ -594,6 +599,7 @@
 \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}
@@ -614,6 +620,7 @@
 \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}
@@ -625,11 +632,15 @@
 \key{change timestamp to today}{>}
 \key{insert new entry into diary}{i}
 
-\key{Start the clock on current item (clock-in)}{I}
-\key{Stop the clock (clock-out)}{O}
-\key{Cancel current clock}{X}
+\key{start the clock on current item (clock-in)}{I}
+\key{stop the clock (clock-out)}{O}
+\key{cancel current clock}{X}
 
+{\bf Misc}
 
+\key{Open link in current line}{C-c C-o}
+
+\newcolumn
 {\bf Calendar commands}
 
 \key{find agenda cursor date in calendar}{c}
@@ -675,20 +686,19 @@
 \key{links become HTML links}{http:... etc}
 \key{include html tags}{@<b>...@</b>}
 
-{\bf Export options}
-
-Include additional information for export by putting these anywhere in the
-org file.  Use {\tt M-TAB} completion to make sure to get the right
-keywords. {\tt M-TAB} again just after keyword is complete inserts examples.
-
-\key{the title to be shown}{\#+TITLE:}
-\key{the author}{\#+AUTHOR:}
-\key{authors email address}{\#+EMAIL:}
-\key{language code for html}{\#+LANGUAGE:}
-\key{free text description of file}{\#+TEXT:}
-\key{... which can carry over multiple lines}{\#+TEXT:}
-%\key{settings for the export process - see below}{\#+OPTIONS:}
-\key{settings for the export process}{\#+OPTIONS:}
+%{\bf Export options}
+%
+%Include additional information for export by putting these anywhere in the
+%org file.  Use {\tt M-TAB} completion to make sure to get the right
+%keywords. {\tt M-TAB} again just after keyword is complete inserts examples.
+%
+%\key{the title to be shown}{\#+TITLE:}
+%\key{the author}{\#+AUTHOR:}
+%\key{authors email address}{\#+EMAIL:}
+%\key{language code for html}{\#+LANGUAGE:}
+%\key{free text description of file}{\#+TEXT:}
+%\key{... which can carry over multiple lines}{\#+TEXT:}
+%\key{settings for the export process}{\#+OPTIONS:}
 
 %\key{set number of headline levels for export}{H:2}
 %\key{turn on/off section numbers}{num:t}
--- a/etc/sk-dired-ref.tex	Sat Feb 24 20:29:24 2007 +0000
+++ b/etc/sk-dired-ref.tex	Sun Apr 22 11:42:03 2007 +0000
@@ -104,7 +104,7 @@
   \def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
 \else                           %2 or 3 columns uses prereduced size
   \hsize 3.4in
-  \vsize 7.95in
+  \vsize 9.2in
   \hoffset -.75in
   \voffset -.745in
   \font\titlefont=csbx10 \scaledmag2
@@ -252,6 +252,8 @@
 % commands fit on a page in two-column format
 \def\dx{{\bf (DX)}}
 
+\nopagenumbers
+
 %**end of header
 
 
@@ -335,10 +337,17 @@
 \key{zmeò znaèku na iné písmeno}{* c}
 \key{oznaè súbory, pre ktoré elispový výraz vrací t}{* ( \dx}
 
-\section{Nápoveda}
+\section{Modifikácia Dired bufferu}
 
-\key{zobraz nápovedu}{h}
-\key{prehµad príkazov dired}{?}
+\key{vlo¾ do tohto bufferu podadresár}{i}
+\key{odstráò oznaèené súbory z bufferu}{k}
+\key{odstráò z bufferu výpis podadresára}{C-u k}
+\key{znovu naèítaj adresár (znaèky sa zachovajú)}{g}
+\key{prepni triedenie adresára podµa mena/dátumu}{s}
+\key{uprav voµby príkazu ls}{C-u s}
+\key{obnov znaèky, skryté riadky a~pod.}{C-_}
+\key{skry v¹etky podadresáre}{M-\$}
+\key{skry alebo odkry v¹etky podadresáre}{\$}
 
 \section{Príkazy nad oznaèenými súbormi}
 
@@ -375,18 +384,6 @@
 \key{vyma¾ súbory oznaèené na zmazanie}{x}
 \key{oznaè súbory vyhovujúce regulárnemu výrazu}{\% d}
 
-\section{Modifikácia Dired bufferu}
-
-\key{vlo¾ do tohto bufferu podadresár}{i}
-\key{odstráò oznaèené súbory z bufferu}{k}
-\key{odstráò z bufferu výpis podadresára}{C-u k}
-\key{znovu naèítaj adresár (znaèky sa zachovajú)}{g}
-\key{prepni triedenie adresára podµa mena/dátumu}{s}
-\key{uprav voµby príkazu ls}{C-u s}
-\key{obnov znaèky, skryté riadky a~pod.}{C-_}
-\key{skry v¹etky podadresáre}{M-\$}
-\key{skry alebo odkry v¹etky podadresáre}{\$}
-
 \section{Príkazy s regulárnymi výrazmi}
 
 \key{oznaè súbory vyhovujúce regulárnemu výrazu}{\% m}
@@ -402,7 +399,12 @@
 \metax{otvor v dired súbory obsahujúce vzorku}{M-x find-grep-dired}
 \metax{otvor v dired súbory podµa výstupu \kbd{find}}{M-x find-dired}
 
-%\copyrightnotice
+\section{Nápoveda}
+
+\key{zobraz nápovedu}{h}
+\key{prehµad príkazov dired}{?}
+
+\copyrightnotice
 
 \bye
 
--- a/lib-src/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/lib-src/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,7 @@
+2007-02-26  Francesco Potort,Al(B  <pot@gnu.org>
+
+	* Makefile.in (etags, ctags): Define EMACS_NAME as "GNU Emacs".
+
 2007-02-20  Ulrich Mueller  <ulm@kph.uni-mainz.de>  (tiny change)
 
 	* Makefile.in (EMACS, EMACSOPT): New variables.
@@ -107,8 +111,7 @@
 
 2006-11-27  Eli Zaretskii  <eliz@gnu.org>
 
-	* makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on
-	makefile.w32-in.
+	* makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on makefile.w32-in.
 
 2006-11-25  Juanma Barranquero  <lekktu@gmail.com>
 
--- a/lib-src/Makefile.in	Sat Feb 24 20:29:24 2007 +0000
+++ b/lib-src/Makefile.in	Sun Apr 22 11:42:03 2007 +0000
@@ -413,7 +413,7 @@
 	${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
 
 etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
-	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
+	$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
 
 ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
 	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
@@ -421,7 +421,7 @@
 /* We depend on etags to assure that parallel makes don\'t write two
    etags.o files on top of each other.  */
 ctags${EXEEXT}: etags${EXEEXT}
-	$(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+	$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
 
 profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
--- a/lib-src/etags.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/lib-src/etags.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,23 +1,62 @@
 /* Tags file maker to go with GNU Emacs           -*- coding: latin-1 -*-
-   Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995,
-                 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007 Free Software Foundation, Inc. and Ken Arnold
-
- This file is not considered part of GNU Emacs.
-
- This program 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 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+Copyright (C) 1984 The Regents of the University of California
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the
+   distribution.
+3. Neither the name of the University nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
+  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+
+This file is not considered part of GNU Emacs.
+
+This program 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 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+
+/* NB To comply with the above BSD license, copyright information is
+reproduced in etc/ETAGS.README.  That file should be updated when the
+above notices are.
+
+To the best of our knowledge, this code was originally based on the
+ctags.c distributed with BSD4.2, which was copyrighted by the
+University of California, as described above. */
+
 
 /*
  * Authors:
@@ -842,8 +881,8 @@
 print_version ()
 {
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
-  puts ("Copyright (C) 2007 Free Software Foundation, Inc. and Ken Arnold");
-  puts ("This program is distributed under the same terms as Emacs");
+  puts ("Copyright (C) 2007 Free Software Foundation, Inc.");
+  puts ("This program is distributed under the terms in ETAGS.README");
 
   exit (EXIT_SUCCESS);
 }
--- a/lib-src/makefile.w32-in	Sat Feb 24 20:29:24 2007 +0000
+++ b/lib-src/makefile.w32-in	Sun Apr 22 11:42:03 2007 +0000
@@ -24,7 +24,7 @@
 
 .PHONY: $(ALL)
 
-VERSION		= 22.0.94
+VERSION		= 22.0.95
 
 LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
 		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
--- a/lisp/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,296 @@
+2007-03-03  Christopher Allan Webber  <cwebber@dustycloud.org>  (tiny change)
+
+	* play/gamegrid.el (gamegrid-add-score-with-update-game-score-1):
+	Jump to the line where new score has been uploaded.
+
+	* play/tetris.el (tetris-move-bottom, tetris-move-left)
+	(tetris-move-right, tetris-rotate-prev, tetris-rotate-next):
+	Do nothing when the game is paused.
+
+2007-03-03  Carsten Dominik  <dominik@science.uva.nl>
+
+	* textmodes/org.el (org-set-tags): Prevent slipping of point
+	during completion.
+
+2007-03-01  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+	* isearch.el (isearch-message-prefix):
+	Use minibuffer-prompt-properties.
+
+2007-03-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* ps-print.el: Replace (defvar VAR nil) by (defvar VAR).
+	(ps-setup): Print which Emacsen is running ps-print package.
+
+2007-03-01  Stuart Herring  <herring@lanl.gov>  (tiny change)
+
+	* files.el (set-auto-mode-0): Use `indirect-function'.
+	(hack-one-local-variable): Don't reapply current major mode.
+
+2007-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/python.el (python-quote-syntax): Don't bother with
+	syntax-ppss-context.
+	(python-fill-paragraph): Make sure that fenced-string delimiters that
+	stand on their own line stay there
+
+2007-03-01  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+	* replace.el (perform-replace): Propertize message.
+
+2007-03-01  Carsten Dominik  <dominik@science.uva.nl>
+
+	* textmodes/org.el (org-prepare-agenda-buffers): Also check for
+	invisible heading.
+
+2007-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* net/tramp.el (tramp-file-name-handler): Revert last change.
+
+2007-02-28  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gdb-ui.el (gdb-mouse-until, gdb-mouse-jump):
+	Correct doc strings.
+
+2007-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* replace.el (perform-replace): Undo forward-char immediately if
+	non-adjacent search fails.
+
+2007-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* version.el (emacs-major-version, emacs-minor-version):
+	string-to-int -> string-to-number.
+
+2007-02-28  Juanma Barranquero  <lekktu@gmail.com>
+
+	* help.el (where-is): Fail gracefully when not passed a command.
+
+2007-02-28  Stuart Herring  <herring@lanl.gov>  (tiny change)
+
+	* find-lisp.el (find-lisp-default-directory-predicate):
+	Fix bug: Do symlink check on expanded filename.
+
+2007-02-28  Carsten Dominik  <dominik@science.uva.nl>
+
+	* textmodes/org.el (org-set-tags, org-table-get-field): Avoid case
+	changes during replacement.
+	(org-agenda-mode-map): Add default binding for `org-agenda-archive'.
+
+2007-02-28  Lars Hansen  <larsh@soem.dk>
+
+	* desktop.el: Delete header line listing me as maintainer.
+
+2007-02-28  Glenn Morris  <rgm@gnu.org>
+
+	* tutorial.el (tutorial--describe-nonstandard-key): Tweak text in
+	the menus case.
+
+2007-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* net/tramp.el (tramp-file-name-handler): Inhibit modification
+	hooks to avoid confusion when combining after-change calls.
+
+2007-02-27  Ken Manheimer  <ken.manheimer@gmail.com>
+
+	* allout.el (allout-encrypt-string): Remove inhibition of gpg-agent,
+	now that pgg-gpg-process-region correctly honors passed-in passphrase.
+	(allout-distinctive-bullets-string): Add info about bullet conventions.
+	(allout-mode): Add info about distinctive vs plain bullets.
+
+2007-02-27  Carsten Dominik  <dominik@science.uva.nl>
+
+	* textmodes/org.el (org-archive-subtree): Quote variable name.
+	(org-agenda-get-todos): Make sure skip properties are checked correctly.
+
+2007-02-26  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gud.el (gud-bashdb-history, gud-bashdb-marker-filter)
+	(gud-bashdb-command-name, bashdb): Remove.
+	(gud, gud-menu-map): Remove references to bash/bashdb.
+
+2007-02-26  Andrey Zhdanov  <susuman@hotmail.com>  (tiny change)
+
+	(gud-pdb-marker-regexp): Add optional <module> keyword for Python 2.5.
+
+2007-02-26  Romain Francoise  <romain@orebokech.com>
+
+	* net/net-utils.el (whois-server-tld): Update server for .org.
+	(whois-server-list): Add whois.publicinterestregistry.net.
+	(whois-guess-server): Fix formatting in docstring.
+
+2007-02-26  Kim F. Storm  <storm@cua.dk>
+
+	* mouse.el (mouse-show-mark): Run hooks and perform command
+	remapping for mouse-region-delete-keys.
+
+2007-02-26  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
+
+	* font-core.el (font-lock-mode): Doc fix.
+
+2007-02-25  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-buffer-internal): Set this-command to fallback command.
+	Add selected buffer to buffer-name-history.
+	(ido-file-internal): Set this-command to fallback command.
+	Add file names to file-name-history.
+
+	* emacs-lisp/map-ynp.el (map-y-or-n-p):
+	Apply minibuffer-prompt-properties.
+
+2007-02-25  Andreas Schwab  <schwab@suse.de>
+
+	* files.el (hack-one-local-variable-eval-safep): Correct handling
+	of edebug-form-spec property value.  Reported by Johan Bockg,Ae(Brd.
+
+2007-02-25  Carsten Dominik  <dominik@science.uva.nl>
+
+	* textmodes/org.el (org-table-overlay-coordinates)
+	(org-table-toggle-coordinate-overlays): New functions.
+	(org-table-overlay-coordinates, org-table-coordinate-overlays):
+	New variables.
+	(org-startup-with-deadline-check): Option removed.
+	(org-mode): Remove deadline check on startup.
+	(org-table-limit-column-width): Option removed.
+	(org-table-formula-numbers-only): Option removed.
+	(org-link-style, org-link-format): Options removed.
+	(org-select-agenda-window, org-fit-agenda-window): Options removed.
+	(org-export-ascii-show-new-buffer)
+	(org-export-html-show-new-buffer): Options removed.
+	(org-activate-links): Camel option removed.
+	(org-file-link-context-use-camel-case): Option removed.
+	(org-camel-regexp): Veriable removed.
+	(org-activate-camels): Function removed.
+	(org-store-link): Removed Camel stuff.
+	(org-make-org-heading-camel): Function removed.
+	(org-open-at-point): Removed camel stuff.
+	(org-link-search): Removed camel stuff.
+	(org-camel-to-words): Function removed.
+	(org-get-agenda-file-buffer): Make sure we prepare the base
+	buffers, not any indirect buffers.
+	(org-sort-entries): Sort top-level when not on a headline, and no
+	active region.
+	(org-in-regexp): New function.
+	(org-search-not-self): Renamed from `org-search-not-link'.
+	(org-open-link-marker): New variable.
+	(org-open-at-point): Set `org-open-link-marker'.
+	(org-print-icalendar-entries): Fixed bug with excluding DONE
+	entries from the exported list.
+	(org-edit-formula-lisp-indent): New command.
+	(orgtbl-to-texinfo, orgtbl-to-html): New functions.
+	(orgtbl-to-latex, orgtbl-insert-radio-table)
+	(orgtbl-toggle-comment, orgtbl-send-table): New functions.
+	(orgtbl-radio-table-templates): New option.
+	(org-store-link-props):
+	(org-remember-templates): More possibilities to insert info
+	into templates.
+	(org-remember-apply-template): Make use of the extended
+	template capabilities.
+	(org-remember-redo-template): New command.
+	(org-upgrade-old-links)
+	(org-table-modify-formulas, org-table-replace-in-formulas)
+	(org-table-find-dataline)
+	(org-table-get-vertical-vector): Functions removed.
+	(org-table-remove-rectangle-highlight)
+	(org-time-stamp-format, org-toggle-log-option)
+	(org-table-highlight-rectangle)
+	(org-table-iterate, org-table-make-reference):
+	(org-translate-time, org-tree-to-indirect-buffer)
+	(org-table-field-info, org-table-fix-formulas)
+	(org-table-force-dataline, org-table-get-descriptor-line)
+	(org-table-get-range)
+	(org-skip-comments, org-sort)
+	(org-sort-entries, org-sublist, org-table-add-rectangle-overlay)
+	(org-table-current-dline, org-table-current-field-formula)
+	(org-table-edit-backward-field)
+	(org-table-edit-formulas-post-command)
+	(org-table-edit-line-down, org-table-edit-line-up)
+	(org-agenda-archive)
+	(org-agenda-clock-cancel)
+	(org-agenda-clock-out, org-agenda-list-stuck-projects)
+	(org-agenda-open-link, org-agenda-show-new-time)
+	(org-agenda-skip-subtree-when-regexp-matches)
+	(org-agenda-tree-to-indirect-buffer, org-agenda-undo)
+	(org-at-regexp-p, org-auto-repeat-maybe, org-check-log-option)
+	(org-do-sort, org-file-image-p, org-find-overlays)
+	(org-find-row-type, org-get-indirect-buffer, org-get-repeat)
+	(org-highlight-until-next-command, org-isearch-end)
+	(org-match-any-p, org-next-link, org-previous-link):
+	(org-remove-subtree-entries-from-agenda, org-replace-escapes)
+	(org-rewrite-old-row-references)
+	(org-isearch-post-command)
+	(org-table-edit-move, org-table-edit-next-field)
+	(org-table-edit-scroll, org-table-edit-scroll-down)
+	(org-set-frame-title, org-show-reference)
+	(org-unhighlight-once, org-verify-change-for-undo): New functions.
+	(org-show-variable): Command removed.
+	(org-add-log-maybe): New arguments STATE, FINDPOS
+	(org-table-sort-lines): Rewritten from scratch.
+	(org-link-search): New argument AVOID-POS.
+	(org-print-icalendar-entries): Argument CATEGORY removed.
+	(org-run-agenda-series): Argument WONDOW removed.
+	(org-next-link, org-previous-link): New commands.
+	(org-agenda-date-format): New option.
+	(org-table-iterate): New command.
+	(org-table-modify-formulas)
+	(org-table-replace-in-formulas): Functions removed.
+	(org-table-fix-formulas): New function.
+	(org-table-insert-column, org-table-delete-column)
+	(org-table-move-column): Use `org-table-fix-formulas'.
+	(org-follow-gnus-link): Patch from Bastien/Leo.
+	(org-table-current-field-formula): New function.
+	(org-file-image-p): New function.
+	(org-agenda-show-new-time): New function.
+	(org-agenda-date-later): Call `org-agenda-show-new-time'.
+	(org-with-remote-undo): New macro.
+	(org-agenda-undo): New command.
+	(org-verify-change-for-undo): New function.
+	(org-time-stamp-format): New function.
+	(org-agenda-get-timestamps): Skip scheduled if DONE and requested
+	by user.
+	(org-match-any-p): New function.
+	(org-make-tags-matcher): Handle regular expressions for tag and
+	todo matches.
+	(org-read-date): Accept "+N" as input for a date relative to the
+	current date.
+	(org-remove-subtree-entries-from-agenda): New function.
+	(org-agenda-archive, org-agenda-kill): Use
+	`org-remove-subtree-entries-from-agenda'.
+	(org-do-sort, org-sort-entries): New functions.
+	(org-sort): New command.
+	(org-table-sort-lines): Use `org-do-sort'.
+	(org-fix-decoded-time): New function.
+	(org-table-number-regexp): Require 0x... to identify as number
+	in tables.
+	(org-startup-options): New keywords for note taking.
+	(org-upgrade-old-links): Function removed.
+	(org-get-repeat): New function.
+	(org-show-context): Also show siblings on current level.
+	(org-show-siblings): New function.
+	(org-isearch-end, org-isearch-post-command): New functions.
+	(org-show-siblings): New option.
+	(org-show-context): Use `org-show-siblings'.
+	(org-table-maybe-recalculate-line): No longer require `calc-eval'
+	to be bound, because user may just use elisp.
+
+2007-02-24  Kim F. Storm  <storm@cua.dk>
+
+	* emulation/cua-base.el (cua-paste): Handle x-clipboard-yank.
+	(cua--init-keymaps): Remap x-clipboard-yank to cua-paste.
+
+2007-02-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* startup.el (command-line): Also check if the abbrev file is readable.
+
+2007-02-24  John Paul Wallington  <jpw@pobox.com>
+
+	* net/tls.el (tls-certtool-program): Fix custom type.
+
+	* mail/feedmail.el (feedmail-message-id-generator)
+	(feedmail-date-generator): Fix custom types.
+
+	* mail/rmail.el (rmail-message-filter): Fix custom type.
+
 2007-02-24  Eli Zaretskii  <eliz@gnu.org>
 
 	* startup.el (command-line): If simple.el cannot be found, proceed
@@ -8,7 +301,7 @@
 	* international/utf-8.el (utf-8-pre-write-conversion): Handle the
 	case that BEG is a string.
 
-2007-02-24  Chris Moore <dooglus@gmail.com>
+2007-02-24  Chris Moore  <dooglus@gmail.com>
 
 	* pgg-pgp5.el (pgg-pgp5-encrypt-region):
 	* pgg-pgp.el (pgg-pgp-encrypt-region):
@@ -27,7 +320,7 @@
 	* comint.el (comint-read-input-ring): Use comint-input-ring-size
 	from the comint buffer instead of the temporary one.
 
-2007-02-23  David Reitter <david.reitter@gmail.com>
+2007-02-23  David Reitter  <david.reitter@gmail.com>
 
 	* cus-edit.el (custom-save-all): Canonicalize custom-file before
 	storing it in recentf-exclude.
@@ -41,16 +334,14 @@
 
 	* progmodes/idlw-shell.el (idlwave-shell-mode): Clean up pending
 	commands, for restart.
-	(idlwave-shell-current-module): Fix handling of module name by
-	type.
+	(idlwave-shell-current-module): Fix handling of module name by type.
 	(idlwave-shell-break-in): Update type handling.
 	(idlwave-shell-bp-get): Encode type in BP structure.
-	(idlwave-shell-set-bp): Fix setting condition/count on disabled
-	BPs.
-	(idlwave-shell-module-source-query): Query routine info based on
-	type.  Fix path parsing for non-compiled files.
-	(idlwave-shell-module-source-filter): Don't signal error in
-	filter if no source found.
+	(idlwave-shell-set-bp): Fix setting condition/count on disabled BPs.
+	(idlwave-shell-module-source-query): Query routine info based on type.
+	Fix path parsing for non-compiled files.
+	(idlwave-shell-module-source-filter): Don't signal error in filter
+	if no source found.
 	(idlwave-shell-set-bp-in-module): Use fallback source to prevent
 	filter race.
 
--- a/lisp/allout.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/allout.el	Sun Apr 22 11:42:03 2007 +0000
@@ -324,29 +324,42 @@
 (defcustom allout-distinctive-bullets-string "*+-=>()[{}&!?#%\"X@$~_\\:;^"
   "*Persistent outline header bullets used to distinguish special topics.
 
-These bullets are used to distinguish topics from the run-of-the-mill
-ones.  They are not used in the standard topic headers created by
-the topic-opening, shifting, and rebulleting (eg, on topic shift,
-topic paste, blanket rebulleting) routines, but are offered among the
-choices for rebulleting.  They are not altered by the above automatic
-rebulleting, so they can be used to characterize topics, eg:
-
- `?' question topics
- `(' parenthetic comment (with a matching close paren inside)
- `[' meta-note (with a matching close ] inside)
- `\"' a quotation
- `=' value settings
- `~' \"more or less\"
- `^' see above
-
- ... for example.  (`#' typically has a special meaning to the software,
-according to the value of `allout-numbered-bullet'.)
-
-See `allout-plain-bullets-string' for the selection of
-alternating bullets.
+These bullets are distinguish topics with particular character.
+They are not used by default in the topic creation routines, but
+are offered as options when you modify topic creation with a
+universal argument \(\\[universal-argument]), or during rebulleting \(\\[allout-rebullet-current-heading]).
+
+Distinctive bullets are not cycled when topics are shifted or
+otherwise automatically rebulleted, so their marking is
+persistent until deliberately changed.  Their significance is
+purely by convention, however.  Some conventions suggest
+themselves:
+
+ `(' - open paren - an aside or incidental point
+ `?' - question mark - uncertain or outright question
+ `!' - exclamation point/bang - emphatic
+ `[' - open square bracket - meta-note, about item instead of item's subject
+ `\"' - double quote - a quotation or other citation
+ `=' - equal sign - an assignement, equating a name with some connotation
+ `^' - carat - relates to something above
+
+Some are more elusive, but their rationale may be recognizable:
+
+ `+' - plus - pending consideration, completion
+ `_' - underscore - done, completed
+ `&' - ampersand - addendum, furthermore
+
+\(Some other non-plain bullets have special meaning to the
+software.  By default:
+
+ `~' marks encryptable topics - see `allout-topic-encryption-bullet'
+ `#' marks auto-numbered bullets - see `allout-numbered-bullet'.)
+
+See `allout-plain-bullets-string' for the standard, alternating
+bullets.
 
 You must run `set-allout-regexp' in order for outline mode to
-reconcile to changes of this value.
+adopt changes of this value.
 
 DO NOT include the close-square-bracket, `]', on either of the bullet
 strings."
@@ -1878,11 +1891,14 @@
         bullet, determining the ITEM's DEPTH.
 BULLET: A character at the end of the ITEM PREFIX, it must be one of
         the characters listed on `allout-plain-bullets-string' or
-        `allout-distinctive-bullets-string'.  (See the documentation
-        for these variables for more details.)  The default choice of
-        BULLET when generating ITEMs varies in a cycle with the DEPTH of
-        the ITEM.
-
+        `allout-distinctive-bullets-string'.  When creating a TOPIC,
+        plain BULLETs are by default used, according to the DEPTH of the
+        TOPIC.  Choice among the distinctive BULLETs is offered when you
+        provide a universal argugment \(\\[universal-argument]) to the
+        TOPIC creation command, or when explictly rebulleting a TOPIC.  The
+        significance of the various distinctive bullets is purely by
+        convention.  See the documentation for the above bullet strings for
+        more details.
 EXPOSURE:
         The state of a TOPIC which determines the on-screen visibility
         of its OFFSPRING and contained ENTRY text.
@@ -1994,6 +2010,7 @@
                       minor-mode-map-alist)))
 
       (add-to-invisibility-spec '(allout . t))
+
       (allout-add-resumptions '(line-move-ignore-invisible t))
       (add-hook 'pre-command-hook 'allout-pre-command-business nil t)
       (add-hook 'post-command-hook 'allout-post-command-business nil t)
@@ -5998,10 +6015,7 @@
          (rejections-left (- allout-encryption-ciphertext-rejection-ceiling
                              rejected))
          result-text status
-         ;; Inhibit gpg-agent use for symmetric keys in the scope of this let:
-         (pgg-gpg-use-agent (if (equal key-type 'keypair)
-                                pgg-gpg-use-agent
-                              nil)))
+         )
 
     (if (and fetch-pass (not passphrase))
         ;; Force later fetch by evicting passphrase from the cache.
--- a/lisp/desktop.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/desktop.el	Sun Apr 22 11:42:03 2007 +0000
@@ -4,7 +4,6 @@
 ;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
-;; Maintainter: Lars Hansen <larsh@soem.dk>
 ;; Keywords: convenience
 ;; Favourite-brand-of-beer: None, I hate beer.
 
--- a/lisp/emacs-lisp/map-ynp.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/emacs-lisp/map-ynp.el	Sun Apr 22 11:42:03 2007 +0000
@@ -149,7 +149,8 @@
 		     ;; Prompt in the echo area.
 		     (let ((cursor-in-echo-area (not no-cursor-in-echo-area))
 			   (message-log-max nil))
-		       (message "%s(y, n, !, ., q, %sor %s) "
+		       (message (apply 'propertize "%s(y, n, !, ., q, %sor %s) "
+				       minibuffer-prompt-properties)
 				prompt user-keys
 				(key-description (vector help-char)))
 		       (if minibuffer-auto-raise
--- a/lisp/emulation/cua-base.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/emulation/cua-base.el	Sun Apr 22 11:42:03 2007 +0000
@@ -930,6 +930,8 @@
 	  (if arg (goto-char pt))))
        ((eq this-original-command 'clipboard-yank)
 	(clipboard-yank))
+       ((eq this-original-command 'x-clipboard-yank)
+	(x-clipboard-yank))
        (t (yank arg)))))))
 
 
@@ -1406,6 +1408,7 @@
   ;; replace region with rectangle or element on kill ring
   (define-key cua-global-keymap [remap yank]		'cua-paste)
   (define-key cua-global-keymap [remap clipboard-yank]	'cua-paste)
+  (define-key cua-global-keymap [remap x-clipboard-yank] 'cua-paste)
   ;; replace current yank with previous kill ring element
   (define-key cua-global-keymap [remap yank-pop]		'cua-paste-pop)
   ;; set mark
--- a/lisp/files.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/files.el	Sun Apr 22 11:42:03 2007 +0000
@@ -2285,14 +2285,12 @@
 If optional arg KEEP-MODE-IF-SAME is non-nil, MODE is chased of
 any aliases and compared to current major mode.  If they are the
 same, do nothing and return nil."
-  (when keep-mode-if-same
-    (while (symbolp (symbol-function mode))
-      (setq mode (symbol-function mode)))
-    (if (eq mode major-mode)
-	(setq mode nil)))
-  (when mode
-    (funcall mode)
-    mode))
+  (unless (and keep-mode-if-same
+	       (eq (indirect-function mode)
+		   (indirect-function major-mode)))
+    (when mode
+      (funcall mode)
+      mode)))
 
 (defun set-auto-mode-1 ()
   "Find the -*- spec in the buffer.
@@ -2788,7 +2786,8 @@
 		    ;; During bootstrapping, edebug-basic-spec might not be
 		    ;; defined yet.
                     (and (fboundp 'edebug-basic-spec)
-                         (edebug-basic-spec val))))))
+			 (hack-one-local-variable-quotep val)
+                         (edebug-basic-spec (nth 1 val)))))))
       ;; Allow expressions that the user requested.
       (member exp safe-local-eval-forms)
       ;; Certain functions can be allowed with safe arguments
@@ -2811,9 +2810,15 @@
 		      ok)))))))
 
 (defun hack-one-local-variable (var val)
-  "Set local variable VAR with value VAL."
+  "Set local variable VAR with value VAL.
+If VAR is `mode', call `VAL-mode' as a function unless it's
+already the major mode."
   (cond ((eq var 'mode)
-	 (funcall (intern (concat (downcase (symbol-name val)) "-mode"))))
+	 (let ((mode (intern (concat (downcase (symbol-name val))
+				     "-mode"))))
+	   (unless (eq (indirect-function mode)
+		       (indirect-function major-mode))
+	     (funcall mode))))
 	((eq var 'eval)
 	 (save-excursion (eval val)))
 	(t
--- a/lisp/find-lisp.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/find-lisp.el	Sun Apr 22 11:42:03 2007 +0000
@@ -95,7 +95,7 @@
 	   (string= dir "..")
 	   ;; Skip directories which are symlinks
 	   ;; Easy way to circumvent recursive loops
-	   (file-symlink-p dir))))
+	   (file-symlink-p (expand-file-name dir parent)))))
 
 (defun find-lisp-default-file-predicate  (file dir)
   "True if FILE matches `find-lisp-regexp'.
--- a/lisp/font-core.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/font-core.el	Sun Apr 22 11:42:03 2007 +0000
@@ -124,10 +124,6 @@
 fontified/defontified, though fontification occurs only if the buffer is
 less than `font-lock-maximum-size'.
 
-For example, to use maximum levels of fontification, put in your ~/.emacs:
-
- (setq font-lock-maximum-decoration t)
-
 To add your own highlighting for some major mode, and modify the highlighting
 selected automatically via the variable `font-lock-maximum-decoration', you can
 use `font-lock-add-keywords'.
--- a/lisp/gnus/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/gnus/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,16 @@
+2007-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (message-make-in-reply-to): Quote name containing
+	non-ASCII characters.  It will make the RFC2047 encoder cause an error
+	if there are special characters.  Reported by NAKAJI Hiroyuki
+	<nakaji@kankyo-u.ac.jp>.
+
+2007-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nntp.el (nntp-never-echoes-commands)
+	(nntp-open-connection-functions-never-echo-commands): New variables.
+	(nntp-send-command): Use them.
+
 2007-02-15  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
 	* nnweb.el (nnweb-google-parse-1): Fix date parsing to also match on
--- a/lisp/gnus/message.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/gnus/message.el	Sun Apr 22 11:42:03 2007 +0000
@@ -4864,13 +4864,32 @@
 	  (msg-id (mail-header-message-id message-reply-headers)))
       (when from
 	(let ((name (mail-extract-address-components from)))
-	  (concat msg-id (if msg-id " (")
-		  (or (car name)
-		      (nth 1 name))
-		  "'s message of \""
-		  (if (or (not date) (string= date ""))
-		      "(unknown date)" date)
-		  "\"" (if msg-id ")")))))))
+	  (concat
+	   msg-id (if msg-id " (")
+	   (if (car name)
+	       (if (string-match "[^\000-\177]" (car name))
+		   ;; Quote a string containing non-ASCII characters.
+		   ;; It will make the RFC2047 encoder cause an error
+		   ;; if there are special characters.
+		   (let ((default-enable-multibyte-characters t))
+		     (with-temp-buffer
+		       (insert (car name))
+		       (goto-char (point-min))
+		       (while (search-forward "\"" nil t)
+			 (when (prog2
+				   (backward-char)
+				   (zerop (% (skip-chars-backward "\\\\") 2))
+				 (goto-char (match-beginning 0)))
+			   (insert "\\"))
+			 (forward-char))
+		       ;; Those quotes will be removed by the RFC2047 encoder.
+		       (concat "\"" (buffer-string) "\"")))
+		 (car name))
+	     (nth 1 name))
+	   "'s message of \""
+	   (if (or (not date) (string= date ""))
+	       "(unknown date)" date)
+	   "\"" (if msg-id ")")))))))
 
 (defun message-make-distribution ()
   "Make a Distribution header."
--- a/lisp/gnus/nntp.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/gnus/nntp.el	Sun Apr 22 11:42:03 2007 +0000
@@ -88,6 +88,21 @@
 - `nntp-open-via-rlogin-and-telnet',
 - `nntp-open-via-telnet-and-telnet'.")
 
+(defvoo nntp-never-echoes-commands nil
+  "*Non-nil means the nntp server never echoes commands.
+It is reported that some nntps server doesn't echo commands.  So, you
+may want to set this to non-nil in the method for such a server setting
+`nntp-open-connection-function' to `nntp-open-ssl-stream' for example.
+Note that the `nntp-open-connection-functions-never-echo-commands'
+variable overrides the nil value of this variable.")
+
+(defvoo nntp-open-connection-functions-never-echo-commands
+    '(nntp-open-network-stream)
+  "*List of functions that never echo commands.
+Add or set a function which you set to `nntp-open-connection-function'
+to this list if it does not echo commands.  Note that a non-nil value
+of the `nntp-never-echoes-commands' variable overrides this variable.")
+
 (defvoo nntp-pre-command nil
   "*Pre-command to use with the various nntp-open-via-* methods.
 This is where you would put \"runsocks\" or stuff like that.")
@@ -450,11 +465,15 @@
 				nntp-server-buffer
 				wait-for nnheader-callback-function)
 	  ;; If nothing to wait for, still remove possibly echo'ed commands.
-	  ;; We don't have echos if nntp-open-connection-function
-	  ;; is `nntp-open-network-stream', so we skip this in that case.
+	  ;; We don't have echoes if `nntp-never-echoes-commands' is non-nil
+	  ;; or the value of `nntp-open-connection-function' is in
+	  ;; `nntp-open-connection-functions-never-echo-commands', so we
+	  ;; skip this in that cases.
 	  (unless (or wait-for
-		      (equal nntp-open-connection-function
-			     'nntp-open-network-stream))
+		      nntp-never-echoes-commands
+		      (memq
+		       nntp-open-connection-function
+		       nntp-open-connection-functions-never-echo-commands))
 	    (nntp-accept-response)
 	    (save-excursion
 	      (set-buffer buffer)
--- a/lisp/help.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/help.el	Sun Apr 22 11:42:03 2007 +0000
@@ -491,6 +491,7 @@
 		  "Where is command: ")
 		obarray 'commandp t))
      (list (if (equal val "") fn (intern val)) current-prefix-arg)))
+  (unless definition (error "No command"))
   (let ((func (indirect-function definition))
         (defs nil)
         (standard-output (if insert (current-buffer) t)))
--- a/lisp/ido.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/ido.el	Sun Apr 22 11:42:03 2007 +0000
@@ -2163,9 +2163,9 @@
 
        ((eq ido-exit 'fallback)
 	(let ((read-buffer-function nil))
-	  (run-hook-with-args 'ido-before-fallback-functions
-			      (or fallback 'switch-to-buffer))
-	  (call-interactively (or fallback 'switch-to-buffer))))
+	  (setq this-command (or fallback 'switch-to-buffer))
+	  (run-hook-with-args 'ido-before-fallback-functions this-command)
+	  (call-interactively this-command)))
 
        ;; Check buf is non-nil.
        ((not buf) nil)
@@ -2173,6 +2173,7 @@
 
        ;; View buffer if it exists
        ((get-buffer buf)
+	(add-to-history 'buffer-name-history buf)
 	(if (eq method 'insert)
 	    (progn
 	      (ido-record-command 'insert-buffer buf)
@@ -2192,6 +2193,7 @@
 
        ;; create a new buffer
        (t
+	(add-to-history 'buffer-name-history buf)
 	(setq buf (get-buffer-create buf))
 	(if (fboundp 'set-buffer-major-mode)
 	    (set-buffer-major-mode buf))
@@ -2304,9 +2306,9 @@
 	;; we don't want to change directory of current buffer.
 	(let ((default-directory ido-current-directory)
 	      (read-file-name-function nil))
-	  (run-hook-with-args 'ido-before-fallback-functions
-			      (or fallback 'find-file))
-	  (call-interactively (or fallback 'find-file))))
+	  (setq this-command (or fallback 'find-file))
+	  (run-hook-with-args 'ido-before-fallback-functions this-command)
+	  (call-interactively this-command)))
 
        ((eq ido-exit 'switch-to-buffer)
 	(ido-buffer-internal ido-default-buffer-method nil nil nil ido-text))
@@ -2363,9 +2365,11 @@
        ((eq method 'write)
 	(ido-record-work-file filename)
 	(setq default-directory ido-current-directory)
-	(ido-record-command 'write-file (concat ido-current-directory filename))
+	(setq filename (concat ido-current-directory filename))
+	(ido-record-command 'write-file filename)
+	(add-to-history 'file-name-history filename)
 	(ido-record-work-directory)
-	(write-file (concat ido-current-directory filename)))
+	(write-file filename))
 
        ((eq method 'read-only)
 	(ido-record-work-file filename)
@@ -2381,6 +2385,7 @@
 	(ido-record-command
 	 (if ido-find-literal 'insert-file-literally 'insert-file)
 	 filename)
+	(add-to-history 'file-name-history filename)
 	(ido-record-work-directory)
 	(insert-file-1 filename
 		       (if ido-find-literal
@@ -2391,6 +2396,7 @@
 	(ido-record-work-file filename)
 	(setq filename (concat ido-current-directory filename))
 	(ido-record-command 'find-file filename)
+	(add-to-history 'file-name-history filename)
 	(ido-record-work-directory)
 	(ido-visit-buffer (find-file-noselect filename nil ido-find-literal) method))))))
 
--- a/lisp/isearch.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/isearch.el	Sun Apr 22 11:42:03 2007 +0000
@@ -1957,8 +1957,9 @@
 		       (concat " [" current-input-method-title "]: ")
 		     ": ")
 		   )))
-    (propertize (concat (upcase (substring m 0 1)) (substring m 1))
-		'face 'minibuffer-prompt)))
+    (apply 'propertize
+	   (concat (upcase (substring m 0 1)) (substring m 1))
+	   minibuffer-prompt-properties)))
 
 (defun isearch-message-suffix (&optional c-q-hack ellipsis)
   (concat (if c-q-hack "^Q" "")
--- a/lisp/ldefs-boot.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/ldefs-boot.el	Sun Apr 22 11:42:03 2007 +0000
@@ -524,7 +524,7 @@
 ;;;***
 
 ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el"
-;;;;;;  (17888 32278))
+;;;;;;  (17963 18444))
 ;;; Generated autoloads from allout.el
 
 (put (quote allout-show-bodies) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil)))))))
@@ -796,11 +796,14 @@
         bullet, determining the ITEM's DEPTH.
 BULLET: A character at the end of the ITEM PREFIX, it must be one of
         the characters listed on `allout-plain-bullets-string' or
-        `allout-distinctive-bullets-string'.  (See the documentation
-        for these variables for more details.)  The default choice of
-        BULLET when generating ITEMs varies in a cycle with the DEPTH of
-        the ITEM.
-
+        `allout-distinctive-bullets-string'.  When creating a TOPIC,
+        plain BULLETs are by default used, according to the DEPTH of the
+        TOPIC.  Choice among the distinctive BULLETs is offered when you
+        provide a universal argugment (\\[universal-argument]) to the
+        TOPIC creation command, or when explictly rebulleting a TOPIC.  The
+        significance of the various distinctive bullets is purely by
+        convention.  See the documentation for the above bullet strings for
+        more details.
 EXPOSURE:
         The state of a TOPIC which determines the on-screen visibility
         of its OFFSPRING and contained ENTRY text.
@@ -5542,7 +5545,7 @@
 ;;;***
 
 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (17888 32279))
+;;;;;;  (17963 18438))
 ;;; Generated autoloads from emulation/cua-base.el
 
 (defvar cua-mode nil "\
@@ -6520,7 +6523,7 @@
 ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
 ;;;;;;  desktop-load-default desktop-read desktop-remove desktop-save
 ;;;;;;  desktop-clear desktop-locals-to-save desktop-save-mode) "desktop"
-;;;;;;  "desktop.el" (17888 32279))
+;;;;;;  "desktop.el" (17963 18446))
 ;;; Generated autoloads from desktop.el
 
 (defvar desktop-save-mode nil "\
@@ -10732,7 +10735,7 @@
 
 ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
 ;;;;;;  feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
-;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (17888 32266))
+;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (17963 18438))
 ;;; Generated autoloads from mail/feedmail.el
 
 (autoload (quote feedmail-send-it) "feedmail" "\
@@ -11233,7 +11236,7 @@
 ;;;***
 
 ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories
-;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17888 32279))
+;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17963 18447))
 ;;; Generated autoloads from find-lisp.el
 
 (autoload (quote find-lisp-find-dired) "find-lisp" "\
@@ -11676,7 +11679,7 @@
 ;;;***
 
 ;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el"
-;;;;;;  (17888 36650))
+;;;;;;  (17963 18447))
 ;;; Generated autoloads from progmodes/gdb-ui.el
 
 (autoload (quote gdba) "gdb-ui" "\
@@ -12820,8 +12823,8 @@
 
 ;;;***
 
-;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx
-;;;;;;  sdb gdb) "gud" "progmodes/gud.el" (17888 36930))
+;;;### (autoloads (gdb-script-mode jdb pdb perldb xdb dbx sdb gdb)
+;;;;;;  "gud" "progmodes/gud.el" (17963 18441))
 ;;; Generated autoloads from progmodes/gud.el
 
 (autoload (quote gdb) "gud" "\
@@ -12893,13 +12896,6 @@
 gud, see `gud-mode'.
 
 \(fn COMMAND-LINE)" t nil)
-
-(autoload (quote bashdb) "gud" "\
-Run bashdb on program FILE in buffer *gud-FILE*.
-The directory containing FILE becomes the initial working directory
-and source-file directory for your debugger.
-
-\(fn COMMAND-LINE)" t nil)
  (add-hook 'same-window-regexps "\\*gud-.*\\*\\(\\|<[0-9]+>\\)")
 
 (add-to-list (quote auto-mode-alist) (quote ("/\\.gdbinit" . gdb-script-mode)))
@@ -14710,8 +14706,8 @@
 ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
 ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
 ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
-;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17888
-;;;;;;  36648))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17963
+;;;;;;  18439))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -17682,7 +17678,7 @@
 ;;;;;;  message-cite-function message-yank-prefix message-citation-line-function
 ;;;;;;  message-send-mail-function message-user-organization-file
 ;;;;;;  message-signature-separator message-from-style) "message"
-;;;;;;  "gnus/message.el" (17888 32279))
+;;;;;;  "gnus/message.el" (17963 18449))
 ;;; Generated autoloads from gnus/message.el
 
 (defvar message-from-style (quote default) "\
@@ -18884,7 +18880,7 @@
 ;;;### (autoloads (network-connection network-connection-to-service
 ;;;;;;  whois-reverse-lookup whois finger ftp run-dig dns-lookup-host
 ;;;;;;  nslookup nslookup-host route arp netstat ipconfig ping traceroute)
-;;;;;;  "net-utils" "net/net-utils.el" (17888 32280))
+;;;;;;  "net-utils" "net/net-utils.el" (17963 18441))
 ;;; Generated autoloads from net/net-utils.el
 
 (autoload (quote traceroute) "net-utils" "\
@@ -19506,12 +19502,12 @@
 ;;;***
 
 ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files
-;;;;;;  org-export-icalendar-this-file orgtbl-mode turn-on-orgtbl
-;;;;;;  org-remember-handler org-remember-apply-template org-remember-annotation
-;;;;;;  org-store-link org-tags-view org-diary org-cycle-agenda-files
-;;;;;;  org-todo-list org-agenda-list org-batch-agenda org-agenda
+;;;;;;  org-export-icalendar-this-file org-diary org-tags-view org-todo-list
+;;;;;;  org-agenda-list org-cycle-agenda-files org-batch-agenda org-agenda
+;;;;;;  org-remember-handler org-remember org-remember-apply-template
+;;;;;;  org-remember-annotation org-store-link orgtbl-mode turn-on-orgtbl
 ;;;;;;  org-global-cycle org-cycle org-mode) "org" "textmodes/org.el"
-;;;;;;  (17888 36930))
+;;;;;;  (17963 18455))
 ;;; Generated autoloads from textmodes/org.el
 
 (autoload (quote org-mode) "org" "\
@@ -19570,6 +19566,84 @@
 
 \(fn &optional ARG)" t nil)
 
+(autoload (quote turn-on-orgtbl) "org" "\
+Unconditionally turn on `orgtbl-mode'.
+
+\(fn)" nil nil)
+
+(autoload (quote orgtbl-mode) "org" "\
+The `org-mode' table editor as a minor mode for use in other modes.
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote org-store-link) "org" "\
+\\<org-mode-map>Store an org-link to the current location.
+This link can later be inserted into an org-buffer with
+\\[org-insert-link].
+For some link types, a prefix arg is interpreted:
+For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
+For file links, arg negates `org-context-in-file-links'.
+
+\(fn ARG)" t nil)
+
+(autoload (quote org-remember-annotation) "org" "\
+Return a link to the current location as an annotation for remember.el.
+If you are using Org-mode files as target for data storage with
+remember.el, then the annotations should include a link compatible with the
+conventions in Org-mode.  This function returns such a link.
+
+\(fn)" nil nil)
+
+(autoload (quote org-remember-apply-template) "org" "\
+Initialize *remember* buffer with template, invoke `org-mode'.
+This function should be placed into `remember-mode-hook' and in fact requires
+to be run from that hook to fucntion properly.
+
+\(fn &optional USE-CHAR SKIP-INTERACTIVE)" nil nil)
+
+(autoload (quote org-remember) "org" "\
+Call `remember'.  If this is already a remember buffer, re-apply template.
+If there is an active region, make sure remember uses it as initial content
+of the remember buffer.
+
+\(fn)" t nil)
+
+(autoload (quote org-remember-handler) "org" "\
+Store stuff from remember.el into an org file.
+First prompts for an org file.  If the user just presses return, the value
+of `org-default-notes-file' is used.
+Then the command offers the headings tree of the selected file in order to
+file the text at a specific location.
+You can either immediately press RET to get the note appended to the
+file, or you can use vertical cursor motion and visibility cycling (TAB) to
+find a better place.  Then press RET or <left> or <right> in insert the note.
+
+Key      Cursor position   Note gets inserted
+-----------------------------------------------------------------------------
+RET      buffer-start      as level 2 heading at end of file
+RET      on headline       as sublevel of the heading at cursor
+RET      no heading        at cursor position, level taken from context.
+			   Or use prefix arg to specify level manually.
+<left>   on headline       as same level, before current heading
+<right>  on headline       as same level, after current heading
+
+So the fastest way to store the note is to press RET RET to append it to
+the default file.  This way your current train of thought is not
+interrupted, in accordance with the principles of remember.el.  But with
+little extra effort, you can push it directly to the correct location.
+
+Before being stored away, the function ensures that the text has a
+headline, i.e. a first line that starts with a \"*\".  If not, a headline
+is constructed from the current date and some additional data.
+
+If the variable `org-adapt-indentation' is non-nil, the entire text is
+also indented so that it starts in the same column as the headline
+\(i.e. after the stars).
+
+See also the variable `org-reverse-note-order'.
+
+\(fn)" nil nil)
+
 (autoload (quote org-agenda) "org" "\
 Dispatch agenda commands to collect entries to the agenda buffer.
 Prompts for a character to select a command.  Any prefix arg will be passed
@@ -19602,6 +19676,13 @@
 
 \(fn CMD-KEY &rest PARAMETERS)" nil (quote macro))
 
+(autoload (quote org-cycle-agenda-files) "org" "\
+Cycle through the files in `org-agenda-files'.
+If the current buffer visits an agenda file, find the next one in the list.
+If the current buffer does not, find the first agenda file.
+
+\(fn)" t nil)
+
 (autoload (quote org-agenda-list) "org" "\
 Produce a weekly view from all files in variable `org-agenda-files'.
 The view will be for the current week, but from the overview buffer you
@@ -19626,12 +19707,11 @@
 
 \(fn ARG)" t nil)
 
-(autoload (quote org-cycle-agenda-files) "org" "\
-Cycle through the files in `org-agenda-files'.
-If the current buffer visits an agenda file, find the next one in the list.
-If the current buffer does not, find the first agenda file.
-
-\(fn)" t nil)
+(autoload (quote org-tags-view) "org" "\
+Show all headlines for all `org-agenda-files' matching a TAGS criterion.
+The prefix arg TODO-ONLY limits the search to TODO entries.
+
+\(fn &optional TODO-ONLY MATCH)" t nil)
 
 (autoload (quote org-diary) "org" "\
 Return diary information from org-files.
@@ -19679,83 +19759,6 @@
 
 \(fn &rest ARGS)" nil nil)
 
-(autoload (quote org-tags-view) "org" "\
-Show all headlines for all `org-agenda-files' matching a TAGS criterion.
-The prefix arg TODO-ONLY limits the search to TODO entries.
-
-\(fn &optional TODO-ONLY MATCH)" t nil)
-
-(autoload (quote org-store-link) "org" "\
-\\<org-mode-map>Store an org-link to the current location.
-This link can later be inserted into an org-buffer with
-\\[org-insert-link].
-For some link types, a prefix arg is interpreted:
-For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
-For file links, arg negates `org-context-in-file-links'.
-
-\(fn ARG)" t nil)
-
-(autoload (quote org-remember-annotation) "org" "\
-Return a link to the current location as an annotation for remember.el.
-If you are using Org-mode files as target for data storage with
-remember.el, then the annotations should include a link compatible with the
-conventions in Org-mode.  This function returns such a link.
-
-\(fn)" nil nil)
-
-(autoload (quote org-remember-apply-template) "org" "\
-Initialize *remember* buffer with template, invoke `org-mode'.
-This function should be placed into `remember-mode-hook' and in fact requires
-to be run from that hook to fucntion properly.
-
-\(fn)" nil nil)
-
-(autoload (quote org-remember-handler) "org" "\
-Store stuff from remember.el into an org file.
-First prompts for an org file.  If the user just presses return, the value
-of `org-default-notes-file' is used.
-Then the command offers the headings tree of the selected file in order to
-file the text at a specific location.
-You can either immediately press RET to get the note appended to the
-file, or you can use vertical cursor motion and visibility cycling (TAB) to
-find a better place.  Then press RET or <left> or <right> in insert the note.
-
-Key      Cursor position   Note gets inserted
------------------------------------------------------------------------------
-RET      buffer-start      as level 2 heading at end of file
-RET      on headline       as sublevel of the heading at cursor
-RET      no heading        at cursor position, level taken from context.
-			   Or use prefix arg to specify level manually.
-<left>   on headline       as same level, before current heading
-<right>  on headline       as same level, after current heading
-
-So the fastest way to store the note is to press RET RET to append it to
-the default file.  This way your current train of thought is not
-interrupted, in accordance with the principles of remember.el.  But with
-little extra effort, you can push it directly to the correct location.
-
-Before being stored away, the function ensures that the text has a
-headline, i.e. a first line that starts with a \"*\".  If not, a headline
-is constructed from the current date and some additional data.
-
-If the variable `org-adapt-indentation' is non-nil, the entire text is
-also indented so that it starts in the same column as the headline
-\(i.e. after the stars).
-
-See also the variable `org-reverse-note-order'.
-
-\(fn)" nil nil)
-
-(autoload (quote turn-on-orgtbl) "org" "\
-Unconditionally turn on `orgtbl-mode'.
-
-\(fn)" nil nil)
-
-(autoload (quote orgtbl-mode) "org" "\
-The `org-mode' table editor as a minor mode for use in other modes.
-
-\(fn &optional ARG)" t nil)
-
 (autoload (quote org-export-icalendar-this-file) "org" "\
 Export current file as an iCalendar file.
 The iCalendar file will be located in the same directory as the Org-mode
@@ -21462,8 +21465,8 @@
 ;;;;;;  ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer
 ;;;;;;  ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces
 ;;;;;;  ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type
-;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17888
-;;;;;;  36936))
+;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17963
+;;;;;;  18455))
 ;;; Generated autoloads from ps-print.el
 
 (defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\
@@ -21660,7 +21663,7 @@
 ;;;***
 
 ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;;  (17888 32281))
+;;;;;;  (17963 18448))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
@@ -22662,8 +22665,8 @@
 ;;;;;;  rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output
 ;;;;;;  rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers
 ;;;;;;  rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names
-;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17888
-;;;;;;  32280))
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17963
+;;;;;;  18438))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload (quote rmail-movemail-variant-p) "rmail" "\
@@ -26598,7 +26601,7 @@
 
 ;;;***
 
-;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17888 32281))
+;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17963 18455))
 ;;; Generated autoloads from play/tetris.el
 
 (autoload (quote tetris) "tetris" "\
@@ -27969,7 +27972,7 @@
 ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
 ;;;;;;  tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
 ;;;;;;  tramp-file-name-handler tramp-completion-file-name-regexp
-;;;;;;  tramp-file-name-regexp) "tramp" "net/tramp.el" (17888 36931))
+;;;;;;  tramp-file-name-regexp) "tramp" "net/tramp.el" (17963 18447))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\
@@ -28228,8 +28231,8 @@
 
 ;;;***
 
-;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17888
-;;;;;;  36587))
+;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17963
+;;;;;;  18445))
 ;;; Generated autoloads from tutorial.el
 
 (autoload (quote help-with-tutorial) "tutorial" "\
@@ -31225,7 +31228,7 @@
 ;;;;;;  "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el"
 ;;;;;;  "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el"
 ;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el"
-;;;;;;  "x-dnd.el") (17888 39099 529730))
+;;;;;;  "x-dnd.el") (17963 18741 697794))
 
 ;;;***
 
--- a/lisp/mail/feedmail.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/mail/feedmail.el	Sun Apr 22 11:42:03 2007 +0000
@@ -629,7 +629,7 @@
 probably won't hurt you to generate your own, and it will then show up
 in the saved message if you use Fcc:."
   :group 'feedmail-headers
-  :type '(choice (const nil) function)
+  :type '(choice (const t) (const nil) function)
   )
 
 
@@ -678,7 +678,7 @@
 probably won't hurt you to generate your own, and it will then show up
 in the saved message if you use Fcc:."
   :group 'feedmail-headers
-  :type '(choice (const nil) function)
+  :type '(choice (const t) (const nil) function)
   )
 
 
--- a/lisp/mail/rmail.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/mail/rmail.el	Sun Apr 22 11:42:03 2007 +0000
@@ -422,7 +422,7 @@
 Called with region narrowed to the message, including headers,
 before obeying `rmail-ignored-headers'."
   :group 'rmail-headers
-  :type 'function)
+  :type '(choice (const nil) function))
 
 (defcustom rmail-automatic-folder-directives nil
   "List of directives specifying where to put a message.
--- a/lisp/mouse.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/mouse.el	Sun Apr 22 11:42:03 2007 +0000
@@ -1276,7 +1276,17 @@
     (unless ignore
       ;; For certain special keys, delete the region.
       (if (member key mouse-region-delete-keys)
-	  (delete-region (mark t) (point))
+	  (progn
+	    ;; Since notionally this is a separate command,
+	    ;; run all the hooks that would be run if it were
+	    ;; executed separately.
+	    (run-hooks 'post-command-hook)
+	    (setq last-command this-command)
+	    (setq this-original-command 'delete-region)
+	    (setq this-command (or (command-remapping this-original-command)
+				   this-original-command))
+	    (run-hooks 'pre-command-hook)
+	    (call-interactively this-command))
 	;; Otherwise, unread the key so it gets executed normally.
 	(setq unread-command-events
 	      (nconc events unread-command-events))))
--- a/lisp/net/net-utils.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/net/net-utils.el	Sun Apr 22 11:42:03 2007 +0000
@@ -674,6 +674,7 @@
 (defcustom whois-server-list
   '(("whois.arin.net")     ; Networks, ASN's, and related POC's (numbers)
     ("rs.internic.net")  ; domain related info
+    ("whois.publicinterestregistry.net")
     ("whois.abuse.net")
     ("whois.apnic.net")
     ("nic.ddn.mil")
@@ -684,9 +685,12 @@
   :group 'net-utils
   :type '(repeat (list string)))
 
+;; FIXME: modern whois clients include a much better tld <-> whois server
+;; list, Emacs should probably avoid specifying the server as the client
+;; will DTRT anyway... -rfr
 (defcustom whois-server-tld
   '(("rs.internic.net" . "com")
-    ("rs.internic.net" . "org")
+    ("whois.publicinterestregistry.net" . "org")
     ("whois.ripe.net" . "be")
     ("whois.ripe.net" . "de")
     ("whois.ripe.net" . "dk")
@@ -707,7 +711,7 @@
 (defcustom whois-guess-server t
   "If non-nil then whois will try to deduce the appropriate whois
 server from the query.  If the query doesn't look like a domain or hostname
-then the server named by whois-server-name is used."
+then the server named by `whois-server-name' is used."
   :group 'net-utils
   :type 'boolean)
 
--- a/lisp/net/tls.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/net/tls.el	Sun Apr 22 11:42:03 2007 +0000
@@ -86,7 +86,7 @@
   "Name of  GnuTLS certtool.
 Used by `tls-certificate-information'."
   :version "22.1"
-  :type '(repeat string)
+  :type 'string
   :group 'tls)
 
 (defun tls-certificate-information (der)
--- a/lisp/play/gamegrid.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/play/gamegrid.el	Sun Apr 22 11:42:03 2007 +0000
@@ -514,7 +514,17 @@
 
 (defun gamegrid-add-score-with-update-game-score-1 (file target score)
   (let ((default-directory "/")
-	(errbuf (generate-new-buffer " *update-game-score loss*")))
+	(errbuf (generate-new-buffer " *update-game-score loss*"))
+        (marker-string (concat
+			(user-full-name)
+			" <"
+			(cond ((fboundp 'user-mail-address)
+			       (user-mail-address))
+			      ((boundp 'user-mail-address)
+			       user-mail-address)
+			      (t ""))
+			">  "
+			(current-time-string))))
     ;; This can be called from a timer, so enable local quits.
     (with-local-quit
       (apply
@@ -529,28 +539,25 @@
 		(file-name-directory target))
 	 file
 	 (int-to-string score)
-	 (concat
-	  (user-full-name)
-	  " <"
-	  (cond ((fboundp 'user-mail-address)
-		 (user-mail-address))
-		((boundp 'user-mail-address)
-		 user-mail-address)
-		(t ""))
-	  ">  "
-	  (current-time-string))))))
+	 marker-string))))
     (if (buffer-modified-p errbuf)
 	(progn
 	  (display-buffer errbuf)
 	  (error "Failed to update game score file"))
       (kill-buffer errbuf))
     (let ((buf (find-buffer-visiting target)))
-      (if buf
-	  (progn
-	    (with-current-buffer buf
-	      (revert-buffer nil t nil))
-	    (display-buffer buf))
-	(find-file-read-only-other-window target)))))
+      (save-excursion
+        (if buf
+	    (progn
+	      (switch-to-buffer buf)
+	      (revert-buffer nil t nil)
+	      (display-buffer buf))
+	  (find-file-read-only target))
+        (goto-char (point-min))
+        (search-forward (concat (int-to-string score)
+				" " (user-login-name) " "
+				marker-string))
+        (beginning-of-line)))))
 
 (defun gamegrid-add-score-insecure (file score &optional directory)
   (save-excursion
--- a/lisp/play/tetris.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/play/tetris.el	Sun Apr 22 11:42:03 2007 +0000
@@ -512,19 +512,21 @@
 (defun tetris-move-bottom ()
   "Drops the shape to the bottom of the playing area"
   (interactive)
-  (let ((hit nil))
-    (tetris-erase-shape)
-    (while (not hit)
-      (setq tetris-pos-y (1+ tetris-pos-y))
-      (setq hit (tetris-test-shape)))
-    (setq tetris-pos-y (1- tetris-pos-y))
-    (tetris-draw-shape)
-    (tetris-shape-done)))
+  (if (not tetris-paused)
+      (let ((hit nil))
+        (tetris-erase-shape)
+        (while (not hit)
+          (setq tetris-pos-y (1+ tetris-pos-y))
+          (setq hit (tetris-test-shape)))
+        (setq tetris-pos-y (1- tetris-pos-y))
+        (tetris-draw-shape)
+        (tetris-shape-done))))
 
 (defun tetris-move-left ()
   "Moves the shape one square to the left"
   (interactive)
-  (unless (= tetris-pos-x 0)
+  (unless (or (= tetris-pos-x 0)
+              tetris-paused)
     (tetris-erase-shape)
     (setq tetris-pos-x (1- tetris-pos-x))
     (if (tetris-test-shape)
@@ -534,8 +536,9 @@
 (defun tetris-move-right ()
   "Moves the shape one square to the right"
   (interactive)
-  (unless (= (+ tetris-pos-x (tetris-shape-width))
-	     tetris-width)
+  (unless (or (= (+ tetris-pos-x (tetris-shape-width))
+                 tetris-width)
+              tetris-paused)
     (tetris-erase-shape)
     (setq tetris-pos-x (1+ tetris-pos-x))
     (if (tetris-test-shape)
@@ -545,20 +548,23 @@
 (defun tetris-rotate-prev ()
   "Rotates the shape clockwise"
   (interactive)
-  (tetris-erase-shape)
-  (setq tetris-rot (% (+ 1 tetris-rot) 4))
-  (if (tetris-test-shape)
-      (setq tetris-rot (% (+ 3 tetris-rot) 4)))
-  (tetris-draw-shape))
+  (if (not tetris-paused)
+      (progn (tetris-erase-shape)
+             (setq tetris-rot (% (+ 1 tetris-rot) 4))
+             (if (tetris-test-shape)
+                 (setq tetris-rot (% (+ 3 tetris-rot) 4)))
+             (tetris-draw-shape))))
 
 (defun tetris-rotate-next ()
   "Rotates the shape anticlockwise"
   (interactive)
-  (tetris-erase-shape)
-  (setq tetris-rot (% (+ 3 tetris-rot) 4))
-  (if (tetris-test-shape)
-      (setq tetris-rot (% (+ 1 tetris-rot) 4)))
-  (tetris-draw-shape))
+  (if (not tetris-paused)
+      (progn
+        (tetris-erase-shape)
+        (setq tetris-rot (% (+ 3 tetris-rot) 4))
+        (if (tetris-test-shape)
+            (setq tetris-rot (% (+ 1 tetris-rot) 4)))
+        (tetris-draw-shape))))
 
 (defun tetris-end-game ()
   "Terminates the current game"
--- a/lisp/progmodes/gdb-ui.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/progmodes/gdb-ui.el	Sun Apr 22 11:42:03 2007 +0000
@@ -618,8 +618,9 @@
 
 (defun gdb-mouse-until (event)
   "Continue running until a source line past the current line.
-The destination source line can be selected either by clicking with mouse-2
-on the fringe/margin or dragging the arrow with mouse-1 (default bindings)."
+The destination source line can be selected either by clicking
+with mouse-3 on the fringe/margin or dragging the arrow
+with mouse-1 (default bindings)."
   (interactive "e")
   (let ((start (event-start event))
 	(end (event-end event)))
@@ -634,8 +635,8 @@
 
 (defun gdb-mouse-jump (event)
   "Set execution address/line.
-The destination source line can be selected either by clicking with mouse-2
-on the fringe/margin or dragging the arrow with mouse-1 (default bindings).
+The destination source line can be selected either by clicking with C-mouse-3
+on the fringe/margin or dragging the arrow with C-mouse-1 (default bindings).
 Unlike gdb-mouse-until the destination address can be before the current
 line, and no execution takes place."
   (interactive "e")
--- a/lisp/progmodes/gud.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/progmodes/gud.el	Sun Apr 22 11:42:03 2007 +0000
@@ -58,7 +58,7 @@
 
 (defgroup gud nil
   "Grand Unified Debugger mode for gdb and other debuggers under Emacs.
-Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python), jdb, and bash."
+Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python), jdb."
   :group 'unix
   :group 'tools)
 
@@ -166,18 +166,18 @@
     ([tbreak]	menu-item "Temporary Breakpoint" gud-tbreak
                   :enable (not gud-running)
 		  :visible (memq gud-minor-mode
-				'(gdbmi gdba gdb sdb xdb bashdb)))
+				'(gdbmi gdba gdb sdb xdb)))
     ([break]	menu-item "Set Breakpoint" gud-break
                   :enable (not gud-running)
 		  :visible (gud-tool-bar-item-visible-no-fringe))
     ([up]	menu-item "Up Stack" gud-up
 		  :enable (not gud-running)
 		  :visible (memq gud-minor-mode
-				 '(gdbmi gdba gdb dbx xdb jdb pdb bashdb)))
+				 '(gdbmi gdba gdb dbx xdb jdb pdb)))
     ([down]	menu-item "Down Stack" gud-down
 		  :enable (not gud-running)
 		  :visible (memq gud-minor-mode
-				 '(gdbmi gdba gdb dbx xdb jdb pdb bashdb)))
+				 '(gdbmi gdba gdb dbx xdb jdb pdb)))
     ([pp]	menu-item "Print S-expression" gud-pp
                   :enable (and (not gud-running)
 				  gdb-active-process)
@@ -196,7 +196,7 @@
     ([finish]	menu-item "Finish Function" gud-finish
                   :enable (not gud-running)
 		  :visible (memq gud-minor-mode
-				 '(gdbmi gdba gdb xdb jdb pdb bashdb)))
+				 '(gdbmi gdba gdb xdb jdb pdb)))
     ([stepi]	menu-item "Step Instruction" gud-stepi
                   :enable (not gud-running)
 		  :visible (memq gud-minor-mode '(gdbmi gdba gdb dbx)))
@@ -1520,7 +1520,7 @@
 ;; Last group is for return value, e.g. "> test.py(2)foo()->None"
 ;; Either file or function name may be omitted: "> <string>(0)?()"
 (defvar gud-pdb-marker-regexp
-  "^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\)()\\(->[^\n]*\\)?\n")
+  "^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\|<module>\\)()\\(->[^\n]*\\)?\n")
 (defvar gud-pdb-marker-regexp-file-group 1)
 (defvar gud-pdb-marker-regexp-line-group 2)
 (defvar gud-pdb-marker-regexp-fnname-group 3)
@@ -2286,127 +2286,6 @@
 		 (gud-jdb-build-source-files-list gud-jdb-directories
 						  "\\.java$"))))
     (fset 'gud-jdb-find-source 'gud-jdb-find-source-file)))
-
-
-;; ======================================================================
-;;
-;; BASHDB support. See http://bashdb.sourceforge.net
-;;
-;; AUTHOR:	Rocky Bernstein <rocky@panix.com>
-;;
-;; CREATED:	Sun Nov 10 10:46:38 2002 Rocky Bernstein.
-;;
-;; INVOCATION NOTES:
-;;
-;; You invoke bashdb-mode with:
-;;
-;;    M-x bashdb <enter>
-;;
-;; It responds with:
-;;
-;;    Run bashdb (like this): bash
-;;
-
-;; History of argument lists passed to bashdb.
-(defvar gud-bashdb-history nil)
-
-;; Convert a command line as would be typed normally to run a script
-;; into one that invokes an Emacs-enabled debugging session.
-;; "--debugger" in inserted as the first switch.
-
-;; There's no guarantee that Emacs will hand the filter the entire
-;; marker at once; it could be broken up across several strings.  We
-;; might even receive a big chunk with several markers in it.  If we
-;; receive a chunk of text which looks like it might contain the
-;; beginning of a marker, we save it here between calls to the
-;; filter.
-(defun gud-bashdb-marker-filter (string)
-  (setq gud-marker-acc (concat gud-marker-acc string))
-  (let ((output ""))
-
-    ;; Process all the complete markers in this chunk.
-    ;; Format of line looks like this:
-    ;;   (/etc/init.d/ntp.init:16):
-    ;; but we also allow DOS drive letters
-    ;;   (d:/etc/init.d/ntp.init:16):
-    (while (string-match "\\(^\\|\n\\)(\\(\\([a-zA-Z]:\\)?[^:\n]*\\):\\([0-9]*\\)):.*\n"
-			 gud-marker-acc)
-      (setq
-
-       ;; Extract the frame position from the marker.
-       gud-last-frame
-       (cons (match-string 2 gud-marker-acc)
-	     (string-to-number (match-string 4 gud-marker-acc)))
-
-       ;; Append any text before the marker to the output we're going
-       ;; to return - we don't include the marker in this text.
-       output (concat output
-		      (substring gud-marker-acc 0 (match-beginning 0)))
-
-       ;; Set the accumulator to the remaining text.
-       gud-marker-acc (substring gud-marker-acc (match-end 0))))
-
-    ;; Does the remaining text look like it might end with the
-    ;; beginning of another marker?  If it does, then keep it in
-    ;; gud-marker-acc until we receive the rest of it.  Since we
-    ;; know the full marker regexp above failed, it's pretty simple to
-    ;; test for marker starts.
-    (if (string-match "\032.*\\'" gud-marker-acc)
-	(progn
-	  ;; Everything before the potential marker start can be output.
-	  (setq output (concat output (substring gud-marker-acc
-						 0 (match-beginning 0))))
-
-	  ;; Everything after, we save, to combine with later input.
-	  (setq gud-marker-acc
-		(substring gud-marker-acc (match-beginning 0))))
-
-      (setq output (concat output gud-marker-acc)
-	    gud-marker-acc ""))
-
-    output))
-
-(defcustom gud-bashdb-command-name "bash --debugger"
-  "File name for executing bash debugger."
-  :type 'string
-  :group 'gud)
-
-;;;###autoload
-(defun bashdb (command-line)
-  "Run bashdb on program FILE in buffer *gud-FILE*.
-The directory containing FILE becomes the initial working directory
-and source-file directory for your debugger."
-  (interactive
-   (list (read-from-minibuffer "Run bashdb (like this): "
-			       (if (consp gud-bashdb-history)
-				   (car gud-bashdb-history)
-				 (concat gud-bashdb-command-name
-					 " "))
-			       gud-minibuffer-local-map nil
-			       '(gud-bashdb-history . 1))))
-
-  (gud-common-init command-line nil 'gud-bashdb-marker-filter)
-
-  (set (make-local-variable 'gud-minor-mode) 'bashdb)
-
-  (gud-def gud-break  "break %l"   "\C-b" "Set breakpoint at current line.")
-  (gud-def gud-tbreak "tbreak %l"  "\C-t" "Set temporary breakpoint at current line.")
-  (gud-def gud-remove "clear %l"   "\C-d" "Remove breakpoint at current line")
-  (gud-def gud-step   "step"       "\C-s" "Step one source line with display.")
-  (gud-def gud-next   "next"       "\C-n" "Step one line (skip functions).")
-  (gud-def gud-cont   "continue"   "\C-r" "Continue with display.")
-  (gud-def gud-finish "finish"     "\C-f" "Finish executing current function.")
-  (gud-def gud-up     "up %p"      "<" "Up N stack frames (numeric arg).")
-  (gud-def gud-down   "down %p"    ">" "Down N stack frames (numeric arg).")
-  (gud-def gud-print  "x %e"      "\C-p" "Evaluate BASH expression at point.")
-
-  ;; Is this right?
-  (gud-def gud-statement "eval %e" "\C-e" "Execute BASH statement at point.")
-
-  (setq comint-prompt-regexp "^bashdb<+(*[0-9]+)*>+ ")
-  (setq paragraph-start comint-prompt-regexp)
-  (run-hooks 'bashdb-mode-hook)
-  )
 
 ;;
 ;; End of debugger-specific information
--- a/lisp/progmodes/python.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/progmodes/python.el	Sun Apr 22 11:42:03 2007 +0000
@@ -163,7 +163,7 @@
 	       (= (match-beginning 1) (match-end 1))) ; prefix is null
 	  (and (= n 1)			; prefix
 	       (/= (match-beginning 1) (match-end 1)))) ; non-empty
-      (unless (eq 'string (syntax-ppss-context (syntax-ppss)))
+      (unless (nth 3 (syntax-ppss))
         (eval-when-compile (string-to-syntax "|"))))
      ;; Otherwise (we're in a non-matching string) the property is
      ;; nil, which is OK.
@@ -1743,12 +1743,11 @@
 	       (orig (point))
 	       (start (nth 8 syntax))
 	       end)
-	  (cond ((eq t (nth 3 syntax))	    ; in fenced string
-		 (goto-char (nth 8 syntax)) ; string start
-		 (condition-case ()	    ; for unbalanced quotes
-		     (progn (forward-sexp)
-			    (setq end (point)))
-		   (error (setq end (point-max)))))
+	  (cond ((eq t (nth 3 syntax))	      ; in fenced string
+		 (goto-char (nth 8 syntax))   ; string start
+		 (setq end (condition-case () ; for unbalanced quotes
+                               (progn (forward-sexp) (point))
+                             (error (point-max)))))
 		((re-search-backward "\\s|\\s-*\\=" nil t) ; end of fenced
 							   ; string
 		 (forward-char)
@@ -1756,13 +1755,17 @@
 		 (condition-case ()
 		     (progn (backward-sexp)
 			    (setq start (point)))
-		   (error nil))))
+		   (error (setq end nil)))))
 	  (when end
 	    (save-restriction
 	      (narrow-to-region start end)
 	      (goto-char orig)
-	      (fill-paragraph justify))))))
-      t)
+              (let ((paragraph-separate
+                     ;; Make sure that fenced-string delimiters that stand
+                     ;; on their own line stay there.
+                     (concat "[ \t]*['\"]+[ \t]*$\\|" paragraph-separate)))
+                (fill-paragraph justify))))))
+      t))
 
 (defun python-shift-left (start end &optional count)
   "Shift lines in region COUNT (the prefix arg) columns to the left.
--- a/lisp/ps-print.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/ps-print.el	Sun Apr 22 11:42:03 2007 +0000
@@ -1450,14 +1450,14 @@
 
 (let ((case-fold-search t))
   (cond ((string-match "XEmacs" emacs-version))
-        ((string-match "Lucid" emacs-version)
-         (error "`ps-print' doesn't support Lucid"))
-        ((string-match "Epoch" emacs-version)
-         (error "`ps-print' doesn't support Epoch"))
-        (t
-         (unless (and (boundp 'emacs-major-version)
-                      (>= emacs-major-version 22))
-           (error "`ps-print' only supports Emacs 22 and higher")))))
+	((string-match "Lucid" emacs-version)
+	 (error "`ps-print' doesn't support Lucid"))
+	((string-match "Epoch" emacs-version)
+	 (error "`ps-print' doesn't support Epoch"))
+	(t
+	 (unless (and (boundp 'emacs-major-version)
+		      (>= emacs-major-version 22))
+	   (error "`ps-print' only supports Emacs 22 and higher")))))
 
 
 ;; GNU Emacs
@@ -1498,8 +1498,8 @@
 (defalias 'ps-e-x-color-values      'x-color-values)
 (defalias 'ps-e-color-values        'color-values)
 (defalias 'ps-e-find-composition (if (fboundp 'find-composition)
-                                     'find-composition
-                                   'ignore))
+				     'find-composition
+				   'ignore))
 
 
 (defconst ps-windows-system
@@ -1515,11 +1515,12 @@
 
 (defalias 'ps-frame-parameter
   (if (fboundp 'frame-parameter) 'frame-parameter 'frame-property))
+
 (defalias 'ps-mark-active-p
   (if (fboundp 'region-active-p)
-      'region-active-p                  ; XEmacs
-    (defvar mark-active)                ; To shup up XEmacs's byte compiler.
-    (lambda () mark-active)))                ; Emacs
+      'region-active-p			; XEmacs
+    (defvar mark-active)		; To shup up XEmacs's byte compiler.
+    (lambda () mark-active)))		; Emacs
 
 (cond ((featurep 'xemacs)		; XEmacs
        (defun ps-face-foreground-name (face)
@@ -3337,13 +3338,13 @@
 
 (defcustom ps-postscript-code-directory
   (or (if (featurep 'xemacs)
-	  (cond ((fboundp 'locate-data-directory) ; xemacs
+	  (cond ((fboundp 'locate-data-directory) ; XEmacs
 		 (locate-data-directory "ps-print"))
-		((boundp 'data-directory) ; xemacs
+		((boundp 'data-directory) ; XEmacs
 		 data-directory)
 		(t			; don't know what to do
 		 nil))
-	data-directory)			; emacs
+	data-directory)			; Emacs
       (error "`ps-postscript-code-directory' isn't set properly"))
   "*Directory where it's located the PostScript prologue file used by ps-print.
 By default, this directory is the same as in the variable `data-directory'."
@@ -3585,11 +3586,12 @@
     (mapconcat
      #'ps-print-quote
      (list
-      (concat "\n;;; ps-print version " ps-print-version "\n")
+      (concat "\n;;; (" (if (featurep 'xemacs) "XEmacs" "Emacs")
+	      ") ps-print version " ps-print-version "\n")
       ";; internal vars"
-      (ps-comment-string "emacs-version      " emacs-version)
-      (ps-comment-string "ps-windows-system  " ps-windows-system)
-      (ps-comment-string "ps-lp-system       " ps-lp-system)
+      (ps-comment-string "emacs-version     " emacs-version)
+      (ps-comment-string "ps-windows-system " ps-windows-system)
+      (ps-comment-string "ps-lp-system      " ps-lp-system)
       nil
       '(25 . ps-print-color-p)
       '(25 . ps-lpr-command)
@@ -3843,18 +3845,18 @@
 ;; This function is not yet implemented for GNU emacs.
 (defalias 'ps-color-device
   (cond ((and (featurep 'xemacs)
-              ;; XEmacs change: Need to check for emacs-major-version too.
-              (or (> emacs-major-version 19)
-                  (and (= emacs-major-version 19)
-                       (>= emacs-minor-version 12)))) ; XEmacs >= 19.12
-         (lambda ()
-           (eq (ps-x-device-class) 'color)))
-
-        (t				; Emacs
-         (lambda ()
-           (if (fboundp 'color-values)
-               (ps-e-color-values "Green")
-             t)))))
+	      ;; XEmacs change: Need to check for emacs-major-version too.
+	      (or (> emacs-major-version 19)
+		  (and (= emacs-major-version 19)
+		       (>= emacs-minor-version 12)))) ; XEmacs >= 19.12
+	 (lambda ()
+	   (eq (ps-x-device-class) 'color)))
+
+	(t				; Emacs
+	 (lambda ()
+	   (if (fboundp 'color-values)
+	       (ps-e-color-values "Green")
+	     t)))))
 
 
 (defun ps-mapper (extent list)
@@ -3964,7 +3966,7 @@
 	     filename))))
 
 
-(defvar ps-mark-code-directory nil)
+(defvar ps-mark-code-directory)
 
 (defvar ps-print-prologue-0 ""
   "ps-print PostScript error handler.")
@@ -3974,12 +3976,12 @@
 
 ;; Start Editing Here:
 
-(defvar ps-source-buffer nil)
+(defvar ps-source-buffer)
 (defvar ps-spool-buffer-name "*PostScript*")
-(defvar ps-spool-buffer nil)
-
-(defvar ps-output-head nil)
-(defvar ps-output-tail nil)
+(defvar ps-spool-buffer)
+
+(defvar ps-output-head)
+(defvar ps-output-tail)
 
 (defvar ps-page-postscript 0)		; page number
 (defvar ps-page-order 0)		; PostScript page counter
@@ -3989,29 +3991,29 @@
 (defvar ps-page-n-up 0)			; n-up counter
 (defvar ps-lines-printed 0)		; total lines printed
 (defvar ps-showline-count 1)		; line number counter
-(defvar ps-first-page nil)
-(defvar ps-last-page nil)
+(defvar ps-first-page)
+(defvar ps-last-page)
 (defvar ps-print-page-p t)
 
-(defvar ps-control-or-escape-regexp nil)
-(defvar ps-n-up-on nil)
-
-(defvar ps-background-pages nil)
-(defvar ps-background-all-pages nil)
+(defvar ps-control-or-escape-regexp)
+(defvar ps-n-up-on)
+
+(defvar ps-background-pages)
+(defvar ps-background-all-pages)
 (defvar ps-background-text-count 0)
 (defvar ps-background-image-count 0)
 
 (defvar ps-current-font 0)
-(defvar ps-default-foreground nil)
-(defvar ps-default-background nil)
-(defvar ps-default-color nil)
-(defvar ps-current-color nil)
-(defvar ps-current-bg nil)
-
-(defvar ps-zebra-stripe-full-p nil)
+(defvar ps-default-foreground)
+(defvar ps-default-background)
+(defvar ps-default-color)
+(defvar ps-current-color)
+(defvar ps-current-bg)
+
+(defvar ps-zebra-stripe-full-p)
 (defvar ps-razchunk 0)
 
-(defvar ps-color-p nil)
+(defvar ps-color-p)
 (defvar ps-color-format
   (if (featurep 'xemacs)
       ;; XEmacs will have to make do with %s (princ) for floats.
@@ -4040,20 +4042,20 @@
 (defmacro ps-page-dimensions-get-height (dims) `(nth 1 ,dims))
 (defmacro ps-page-dimensions-get-media  (dims) `(nth 2 ,dims))
 
-(defvar ps-landscape-page-height nil)
-
-(defvar ps-print-width nil)
-(defvar ps-print-height nil)
-
-(defvar ps-height-remaining nil)
-(defvar ps-width-remaining nil)
-
-(defvar ps-font-size-internal nil)
-(defvar ps-header-font-size-internal nil)
-(defvar ps-header-title-font-size-internal nil)
-(defvar ps-footer-font-size-internal nil)
-(defvar ps-line-spacing-internal nil)
-(defvar ps-paragraph-spacing-internal nil)
+(defvar ps-landscape-page-height)
+
+(defvar ps-print-width)
+(defvar ps-print-height)
+
+(defvar ps-height-remaining)
+(defvar ps-width-remaining)
+
+(defvar ps-font-size-internal)
+(defvar ps-header-font-size-internal)
+(defvar ps-header-title-font-size-internal)
+(defvar ps-footer-font-size-internal)
+(defvar ps-line-spacing-internal)
+(defvar ps-paragraph-spacing-internal)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -4250,10 +4252,10 @@
        message-log-max))
 
 
-(defvar ps-print-hook nil)
-(defvar ps-print-begin-sheet-hook nil)
-(defvar ps-print-begin-page-hook nil)
-(defvar ps-print-begin-column-hook nil)
+(defvar ps-print-hook)
+(defvar ps-print-begin-sheet-hook)
+(defvar ps-print-begin-page-hook)
+(defvar ps-print-begin-column-hook)
 
 
 (defun ps-print-without-faces (from to &optional filename region-p)
@@ -4830,10 +4832,10 @@
 	    content (cdr content)))
     (nreverse str)))
 
-(defvar ps-lh-cache nil)
-(defvar ps-rh-cache nil)
-(defvar ps-lf-cache nil)
-(defvar ps-rf-cache nil)
+(defvar ps-lh-cache)
+(defvar ps-rh-cache)
+(defvar ps-lf-cache)
+(defvar ps-rf-cache)
 
 (defun ps-header-footer-string ()
   (and ps-print-header
@@ -6126,7 +6128,7 @@
 			 (/ q-done (/ q-todo 100)))
 		       ))))))
 
-(defvar ps-last-font nil)
+(defvar ps-last-font)
 
 (defun ps-set-font (font)
   (setq ps-last-font (format "f%d" (setq ps-current-font font)))
--- a/lisp/replace.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/replace.el	Sun Apr 22 11:42:03 2007 +0000
@@ -1423,8 +1423,10 @@
 
 	(message
 	 (if query-flag
-	     (substitute-command-keys
-	      "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) "))))
+	     (apply 'propertize
+		    (substitute-command-keys
+		     "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) ")
+		    minibuffer-prompt-properties))))
 
     ;; If region is active, in Transient Mark mode, operate on region.
     (when start
@@ -1466,27 +1468,35 @@
 		    ;; otherwise, search for a match after moving forward
 		    ;; one char if progress is required.
 		    (setq real-match-data
-			  (if (consp match-again)
-			      (progn (goto-char (nth 1 match-again))
-				     (replace-match-data t
-				      real-match-data
-				      match-again))
-			    (and (or match-again
-				     ;; MATCH-AGAIN non-nil means we
-				     ;; accept an adjacent match.  If
-				     ;; we don't, move one char to the
-				     ;; right.  This takes us a
-				     ;; character too far at the end,
-				     ;; but this is undone after the
-				     ;; while-loop.
-				     (progn
-				       (forward-char 1)
-				       (not (or (eobp)
-						(and limit (>= (point) limit))))))
-				 (funcall search-function search-string limit t)
-				 ;; For speed, use only integers and
-				 ;; reuse the list used last time.
-				 (replace-match-data t real-match-data)))))
+			  (cond ((consp match-again)
+				 (goto-char (nth 1 match-again))
+				 (replace-match-data
+				  t real-match-data match-again))
+				;; MATCH-AGAIN non-nil means accept an
+				;; adjacent match.
+				(match-again
+				 (and
+				  (funcall search-function search-string
+					   limit t)
+				  ;; For speed, use only integers and
+				  ;; reuse the list used last time.
+				  (replace-match-data t real-match-data)))
+				((and (< (1+ (point)) (point-max))
+				      (or (null limit)
+					  (< (1+ (point)) limit)))
+				 ;; If not accepting adjacent matches,
+				 ;; move one char to the right before
+				 ;; searching again.  Undo the motion
+				 ;; if the search fails.
+				 (let ((opoint (point)))
+				   (forward-char 1)
+				   (if (funcall
+					search-function search-string
+					limit t)
+				       (replace-match-data
+					t real-match-data)
+				     (goto-char opoint)
+				     nil))))))
 
 	  ;; Record whether the match is nonempty, to avoid an infinite loop
 	  ;; repeatedly matching the same empty string.
@@ -1702,12 +1712,6 @@
 			      (match-data t)))
 		      stack)))))
 
-      ;; The code preventing adjacent regexp matches in the condition
-      ;; of the while-loop above will haven taken us one character
-      ;; beyond the last replacement.  Undo that.
-      (when (and regexp-flag (not match-again) (> replace-count 0))
-	(backward-char 1))
-
       (replace-dehighlight))
     (or unread-command-events
 	(message "Replaced %d occurrence%s"
--- a/lisp/startup.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/startup.el	Sun Apr 22 11:42:03 2007 +0000
@@ -653,6 +653,8 @@
 
   ;; Convert preloaded file names in load-history to absolute.
   (let ((simple-file-name
+	 ;; Look for simple.el or simple.elc and use their directory
+	 ;; as the place where all Lisp files live.
 	 (locate-file "simple" load-path (get-load-suffixes)))
 	lisp-dir)
     ;; Don't abort if simple.el cannot be found, but print a warning.
@@ -959,8 +961,12 @@
 	    (with-current-buffer (window-buffer)
 	      (deactivate-mark)))
 
-	;; If the user has a file of abbrevs, read it.
-	(if (file-exists-p abbrev-file-name)
+	;; If the user has a file of abbrevs, read it.  
+        ;; FIXME: after the 22.0 release this should be changed so
+	;; that it does not read the abbrev file when -batch is used
+	;; on the command line.
+	(when (and (file-exists-p abbrev-file-name) 
+		   (file-readable-p abbrev-file-name))
 	    (quietly-read-abbrev-file abbrev-file-name))
 
 	;; If the abbrevs came entirely from the init file or the
--- a/lisp/textmodes/org.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/textmodes/org.el	Sun Apr 22 11:42:03 2007 +0000
@@ -1,11 +1,11 @@
-;;; org.el --- Outline-based notes management and organize
+;;;; org.el --- Outline-based notes management and organize
 ;; Carstens outline-mode for keeping track of everything.
 ;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 4.56f
+;; Version: 4.67c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -59,46 +59,13 @@
 ;; excellent reference card made by Philip Rooke.  This card can be found
 ;; in the etc/ directory of Emacs 22.
 ;;
-;; Recent changes
-;; --------------
-;; Version 4.56
-;;    - `C-k' in agenda kills current line and corresponding subtree in file.
-;;    - XEmacs compatibility issues fixed, in particular tag alignment.
-;;    - M-left/right now in/outdents plain list items, no Shift needed.
-;;    - Bug fixes.
-;;
-;; Version 4.55
-;;    - Bug fixes.
-;;
-;; Version 4.54
-;;    - Improvements to fast tag selection
-;;      + show status also in target line.
-;;      + option to auto-exit after first change to tags list (see manual).
-;;    - Tags sparse trees now also respect the settings in
-;;      `org-show-hierarchy-above' and `org-show-following-heading'.
-;;    - Bug fixes.
-;;
-;; Version 4.53
-;;    - Custom time formats can be overlayed over time stamps.
-;;    - New option `org-agenda-todo-ignore-deadlines'.
-;;    - Work-around for flyspell bug (CVS Emacs has this fixed in flyspell.el).
-;;    - Work-around for session.el problem with circular data structures.
-;;    - Bug fixes.
-;;
-;; Version 4.52
-;;    - TAG matches can also specify conditions on TODO keywords.
-;;    - The fast tag interface allows setting tags that are not in the
-;;      predefined list.
-;;    - Bug fixes.
-;;
-;; Version 4.51
-;;    - Link abbreviations (manual section 4.5).
-;;    - More control over how agenda is displayed.  See the new variables
-;;      `org-agenda-window-setup', `org-agenda-restore-windows-after-quit'.
-;;    - Bug fixes.
+;; A list of recent changes can be found at
+;; http://www.astro.uva.nl/~dominik/Tools/org/Changes
 ;;
 ;;; Code:
 
+;;;; Require other packages
+
 (eval-when-compile
   (require 'cl)
   (require 'gnus-sum)
@@ -112,15 +79,17 @@
 (require 'time-date)
 (require 'easymenu)
 
-;;; Customization variables
-
-(defvar org-version "4.56f"
+;;;; Customization variables
+
+;;; Version
+
+(defvar org-version "4.67c"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
   (message "Org-mode version %s" org-version))
 
-;; Compatibility constants
+;;; Compatibility constants
 (defconst org-xemacs-p (featurep 'xemacs)) ; not used by org.el itself
 (defconst org-format-transports-properties-p
   (let ((x "a"))
@@ -128,6 +97,8 @@
     (get-text-property 0 'test (format "%s" x)))
   "Does format transport text properties?")
 
+;;; The custom variables
+
 (defgroup org nil
   "Outline-based notes management and organizer."
   :tag "Org"
@@ -172,17 +143,6 @@
   :group 'org-startup
   :type 'boolean)
 
-(defcustom org-startup-with-deadline-check nil
-  "Non-nil means, entering Org-mode will run the deadline check.
-This means, if you start editing an org file, you will get an
-immediate reminder of any due deadlines.
-This can also be configured on a per-file basis by adding one of
-the following lines anywhere in the buffer:
-   #+STARTUP: dlcheck
-   #+STARTUP: nodlcheck"
-  :group 'org-startup
-  :type 'boolean)
-
 (defcustom org-insert-mode-line-in-empty-file nil
   "Non-nil means insert the first line setting Org-mode in empty files.
 When the function `org-mode' is called interactively in an empty file, this
@@ -210,8 +170,9 @@
 If you do not like the alternative keys, take a look at the variable
 `org-disputed-keys'.
 
-This option is only relevant at load-time of Org-mode.  Changing it requires
-a restart of Emacs to become effective."
+This option is only relevant at load-time of Org-mode, and must be set
+*before* org.el is loaded.  Changing it requires a restart of Emacs to
+become effective."
   :group 'org-startup
   :type 'boolean)
 
@@ -294,11 +255,114 @@
   :group 'org-keywords
   :type 'string)
 
+(defvar org-repeat-re "\\<REPEAT(\\([-+ 0-9dwmy]+\\))"
+  "Regular expression for specifying repeated events.
+After a match, group 1 contains the repeat expression.")
+
 (defgroup org-structure nil
   "Options concerning the general structure of Org-mode files."
   :tag "Org Structure"
   :group 'org)
 
+(defgroup org-reveal-location nil
+  "Options about how to make context of a location visible."
+  :tag "Org Reveal Location"
+  :group 'org-structure)
+
+(defcustom org-show-hierarchy-above '((default . t))
+  "Non-nil means, show full hierarchy when revealing a location.
+Org-mode often shows locations in an org-mode file which might have
+been invisible before.  When this is set, the hierarchy of headings
+above the exposed location is shown.
+Turning this off for example for sparse trees makes them very compact.
+Instead of t, this can also be an alist specifying this option for different
+contexts.  Valid contexts are
+  agenda         when exposing an entry from the agenda
+  org-goto       when using the command `org-goto' on key C-c C-j
+  occur-tree     when using the command `org-occur' on key C-c /
+  tags-tree      when constructing a sparse tree based on tags matches
+  link-search    when exposing search matches associated with a link
+  mark-goto      when exposing the jump goal of a mark
+  bookmark-jump  when exposing a bookmark location
+  isearch        when exiting from an incremental search
+  default        default for all contexts not set explicitly"
+  :group 'org-reveal-location
+  :type '(choice
+	  (const :tag "Always" t)
+	  (const :tag "Never" nil)
+	  (repeat :greedy t :tag "Individual contexts"
+		  (cons
+		   (choice :tag "Context"
+		    (const agenda)
+		    (const org-goto)
+		    (const occur-tree)
+		    (const tags-tree)
+		    (const link-search)
+		    (const mark-goto)
+		    (const bookmark-jump)
+		    (const isearch)
+		    (const default))
+		   (boolean)))))
+
+(defcustom org-show-following-heading '((default . t))
+  "Non-nil means, show following heading when revealing a location.
+Org-mode often shows locations in an org-mode file which might have
+been invisible before.  When this is set, the heading following the
+match is shown.
+Turning this off for example for sparse trees makes them very compact,
+but makes it harder to edit the location of the match.  In such a case,
+use the command \\[org-reveal] to show more context.
+Instead of t, this can also be an alist specifying this option for different
+contexts.  See `org-show-hierarchy-above' for valid contexts."
+  :group 'org-reveal-location
+  :type '(choice
+	  (const :tag "Always" t)
+	  (const :tag "Never" nil)
+	  (repeat :greedy t :tag "Individual contexts"
+		  (cons
+		   (choice :tag "Context"
+		    (const agenda)
+		    (const org-goto)
+		    (const occur-tree)
+		    (const tags-tree)
+		    (const link-search)
+		    (const mark-goto)
+		    (const bookmark-jump)
+		    (const isearch)
+		    (const default))
+		   (boolean)))))
+
+(defcustom org-show-siblings '((default . nil) (isearch t))
+  "Non-nil means, show all sibling heading when revealing a location.
+Org-mode often shows locations in an org-mode file which might have
+been invisible before.  When this is set, the sibling of the current entry
+heading are all made visible.  If `org-show-hierarchy-above' is t,
+the same happens on each level of the hierarchy above the current entry.
+
+By default this is on for the isearch context, off for all other contexts.
+Turning this off for example for sparse trees makes them very compact,
+but makes it harder to edit the location of the match.  In such a case,
+use the command \\[org-reveal] to show more context.
+Instead of t, this can also be an alist specifying this option for different
+contexts.  See `org-show-hierarchy-above' for valid contexts."
+  :group 'org-reveal-location
+  :type '(choice
+	  (const :tag "Always" t)
+	  (const :tag "Never" nil)
+	  (repeat :greedy t :tag "Individual contexts"
+		  (cons
+		   (choice :tag "Context"
+		    (const agenda)
+		    (const org-goto)
+		    (const occur-tree)
+		    (const tags-tree)
+		    (const link-search)
+		    (const mark-goto)
+		    (const bookmark-jump)
+		    (const isearch)
+		    (const default))
+		   (boolean)))))
+
 (defgroup org-cycle nil
   "Options concerning visibility cycling in Org-mode."
   :tag "Org Cycle"
@@ -342,6 +406,7 @@
   :group 'org-cycle
   :type 'hook)
 
+
 (defgroup org-edit-structure nil
   "Options concerning structure editing in Org-mode."
   :tag "Org Edit Structure"
@@ -417,61 +482,6 @@
   :group 'org-time
   :type 'boolean)
 
-(defcustom org-show-hierarchy-above '((default . t))
-  "Non-nil means, show full hierarchy when showing a spot in the tree.
-Turning this off makes sparse trees more compact, but also less clear.
-Instead of t, this can also be an alist specifying this option for different
-contexts.  Valid contexts are
-  agenda         when exposing an entry from the agenda
-  org-goto       when using the command `org-goto' on key C-c C-j
-  occur-tree     when using the command `org-occur' on key C-c /
-  tags-tree      when constructing a sparse tree based on tags matches
-  link-search    when exposing search matches associated with a link
-  mark-goto      when exposing the jump goal of a mark
-  bookmark-jump  when exposing a bookmark location
-  default        default for all contexts not set explicitly"
-  :group 'org-sparse-trees
-  :type '(choice
-	  (const :tag "Always" t)
-	  (const :tag "Never" nil)
-	  (repeat :greedy t :tag "Individual contexts"
-		  (cons
-		   (choice :tag "Context"
-		    (const agenda)
-		    (const org-goto)
-		    (const occur-tree)
-		    (const tags-tree)
-		    (const link-search)
-		    (const mark-goto)
-		    (const bookmark-jump)
-		    (const default))
-		   (boolean)))))
-
-(defcustom org-show-following-heading '((default . t))
-  "Non-nil means, show heading following match in `org-occur'.
-When doing an `org-occur' it is useful to show the headline which
-follows the match, even if they do not match the regexp.  This makes it
-easier to edit directly inside the sparse tree.  However, if you use
-`org-occur' mainly as an overview, the following headlines are
-unnecessary clutter.
-Instead of t, this can also be an alist specifying this option for different
-contexts.  See `org-show-hierarchy-above' for valid contexts."
-  :group 'org-sparse-trees
-  :type '(choice
-	  (const :tag "Always" t)
-	  (const :tag "Never" nil)
-	  (repeat :greedy t :tag "Individual contexts"
-		  (cons
-		   (choice :tag "Context"
-		    (const agenda)
-		    (const org-goto)
-		    (const occur-tree)
-		    (const tags-tree)
-		    (const link-search)
-		    (const mark-goto)
-		    (const bookmark-jump)
-		    (const default))
-		   (boolean)))))
 
 (defcustom org-occur-hook '(org-first-headline-recenter)
   "Hook that is run after `org-occur' has constructed a sparse tree.
@@ -519,7 +529,7 @@
 When this is set, checkbox statistics is updated each time you either insert
 a new checkbox with \\[org-insert-todo-heading] or toggle a checkbox
 with \\[org-ctrl-c-ctrl-c\\]."
-  :group 'org
+  :group 'org-plain-lists
   :type 'boolean)
 
 (defgroup org-archive nil
@@ -539,7 +549,7 @@
   "Non-nil means, the agenda will skip any items located in archived trees.
 An archived tree is a tree marked with the tag ARCHIVE."
   :group 'org-archive
-  :group 'org-agenda-display
+  :group 'org-agenda-skip
   :type 'boolean)
 
 (defcustom org-cycle-open-archived-trees nil
@@ -658,6 +668,33 @@
   :group 'org-table
   :type 'boolean)
 
+(defcustom orgtbl-radio-table-templates
+  '((latex-mode "% BEGIN RECEIVE ORGTBL %n
+% END RECEIVE ORGTBL %n
+\\begin{comment}
+#+ORGTBL: SEND %n orgtbl-to-latex :splice nil :skip 0
+| | |
+\\end{comment}\n")
+    (texinfo-mode "@c BEGIN RECEIVE ORGTBL %n
+@c END RECEIVE ORGTBL %n
+@ignore
+#+ORGTBL: SEND %n orgtbl-to-html :splice nil :skip 0
+| | |
+@end ignore\n")
+    (html-mode "<!-- BEGIN RECEIVE ORGTBL %n -->
+<!-- END RECEIVE ORGTBL %n -->
+<!--
+#+ORGTBL: SEND %n orgtbl-to-html :splice nil :skip 0
+| | |
+-->\n"))
+  "Templates for radio tables in different major modes.
+All occurrences of %n in a template will be replaced with the name of the
+table, obtained by prompting the user."
+  :group 'org-table
+  :type '(repeat
+	  (list (symbol :tag "Major mode")
+		(string :tag "Format"))))
+
 (defgroup org-table-settings nil
   "Settings for tables in Org-mode."
   :tag "Org Table Settings"
@@ -669,7 +706,7 @@
    :type 'string)
 
 (defcustom org-table-number-regexp
-  "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|\\(0[xX]\\)?[0-9a-fA-F]+\\)$"
+  "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\)$"
   "Regular expression for recognizing numbers in table columns.
 If a table column contains mostly numbers, it will be aligned to the
 right.  If not, it will be aligned to the left.
@@ -694,7 +731,7 @@
 	  (const :tag "Exponential, Floating point, Integer"
 		 "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$")
 	  (const :tag "Very General Number-Like, including hex"
-		 "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|\\(0[xX]\\)?[0-9a-fA-F]+\\)$")
+		 "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\)$")
 	  (string :tag "Regexp:")))
 
 (defcustom org-table-number-fraction 0.5
@@ -717,11 +754,6 @@
   :group 'org-table-editing
   :type 'boolean)
 
-(defcustom org-table-limit-column-width t ;kw
-  "Non-nil means, allow to limit the width of table columns with <N> fields."
-  :group 'org-table-editing
-  :type 'boolean)
-
 (defcustom org-table-auto-blank-field t
   "Non-nil means, automatically blank table field when starting to type into it.
 This only happens when typing immediately after a field motion
@@ -783,7 +815,9 @@
   :group 'org-table-calculation
   :type 'boolean)
 
-
+;; FIXME this is also a variable that makes Org-mode files non-portable
+;; Maybe I should have a #+ options for constants?
+;; How about the SI/cgs issue?
 (defcustom org-table-formula-use-constants t
   "Non-nil means, interpret constants in formulas in tables.
 A constant looks like `$c' or `$Grav' and will be replaced before evaluation
@@ -806,14 +840,6 @@
 	  (cons (string :tag "name")
 		(string :tag "value"))))
 
-(defcustom org-table-formula-numbers-only nil
-  "Non-nil means, calculate only with numbers in table formulas.
-Then all input fields will be converted to a number, and the result
-must also be a number.  When nil, calc's full potential is available
-in table calculations, including symbolics etc."
-  :group 'org-table-calculation
-  :type 'boolean)
-
 (defcustom org-table-allow-automatic-line-recalculation t
   "Non-nil means, lines marked with |#| or |*| will be recomputed automatically.
 Automatically means, when TAB or RET or C-c C-c are pressed in the line."
@@ -836,7 +862,7 @@
 The cdrs are replacement values, like (\"linkkey\" . REPLACE).  Abbreviated
 links in Org-mode buffers can have an optional tag after a double colon, e.g.
 
-     [[linkkey::tag][description]]
+     [[linkkey:tag][description]]
 
 If REPLACE is a string, the tag will simply be appended to create the link.
 If the string contains \"%s\", the tag will be inserted there.  REPLACE may
@@ -853,30 +879,6 @@
   :group 'org-link
   :type 'boolean)
 
-(defcustom org-link-style 'bracket
-  "The style of links to be inserted with \\[org-insert-link].
-Possible values are:
-bracket    [[link][description]].   This is recommended
-plain      Description \\n link.     The old way, no longer recommended."
-  :group 'org-link
-  :type '(choice
-	  (const :tag "Bracket (recommended)" bracket)
-	  (const :tag "Plain (no longer recommended)" plain)))
-
-(defcustom org-link-format "%s"
-  "Default format for external, URL-like linkes in the buffer.
-This is a format string for printf, %s will be replaced by the link text.
-The recommended value is just \"%s\", since links will be protected by
-enclosing them in double brackets.  If you prefer plain links (see variable
-`org-link-style'), \"<%s>\" is useful. Some people also recommend an
-additional URL: prefix, so the format would be \"<URL:%s>\"."
-  :group 'org-link
-  :type '(choice
-	  (const :tag "\"%s\"   (e.g. http://www.there.com)" "%s")
-	  (const :tag "\"<%s>\"  (e.g. <http://www.there.com>)" "<%s>")
-	  (const :tag "\"<URL:%s>\"  (e.g. <URL:http://www.there.com>)" "<URL:%s>")
-	  (string :tag "Other" :value "<%s>")))
-
 (defcustom org-link-file-path-type 'adaptive
   "How the path name in file links should be stored.
 Valid values are:
@@ -907,7 +909,6 @@
 radio     Text that is matched by a radio target, see manual for details.
 tag       Tag settings in a headline (link to tag search).
 date      Time stamps (link to calendar).
-camel     CamelCase words defining text searches.
 
 Changing this variable requires a restart of Emacs to become effective."
   :group 'org-link
@@ -916,14 +917,45 @@
 	      (const :tag "plain text links" plain)
 	      (const :tag "Radio target matches" radio)
 	      (const :tag "Tags" tag)
-	      (const :tag "Timestamps" date)
-	      (const :tag "CamelCase words" camel)))
+	      (const :tag "Timestamps" date)))
 
 (defgroup org-link-store nil
   "Options concerning storing links in Org-mode"
   :tag "Org Store Link"
   :group 'org-link)
 
+(defcustom org-email-link-description-format "Email %c: %.30s"
+  "Format of the description part of a link to an email or usenet message.
+The following %-excapes will be replaced by corresponding information:
+
+%F   full \"From\" field
+%f   name, taken from \"From\" field, address if no name
+%T   full \"To\" field
+%t   first name in \"To\" field, address if no name
+%c   correspondent.  Unually \"from NAME\", but if you sent it yourself, it
+     will be \"to NAME\".  See also the variable `org-from-is-user-regexp'.
+%s   subject
+%m   message-id.
+
+You may use normal field width specification between the % and the letter.
+This is for example useful to limit the length of the subject.
+
+Examples: \"%f on: %.30s\", \"Email from %f\", \"Email %c\""
+  :group 'org-link-store
+  :type 'string)
+
+(defcustom org-from-is-user-regexp
+  (let (r1 r2)
+    (when (and user-mail-address (not (string= user-mail-address "")))
+      (setq r1 (concat "\\<" (regexp-quote user-mail-address) "\\>")))
+    (when (and user-full-name (not (string= user-full-name "")))
+      (setq r2 (concat "\\<" (regexp-quote user-full-name) "\\>")))
+    (if (and r1 r2) (concat r1 "\\|" r2) (or r1 r2)))
+  "Regexp mached against the \"From:\" header of an email or usenet message.
+It should match if the message is from the user him/herself."
+  :group 'org-link-store
+  :type 'regexp)
+
 (defcustom org-context-in-file-links t
   "Non-nil means, file links from `org-store-link' contain context.
 A search string will be added to the file name with :: as separator and
@@ -934,13 +966,6 @@
   :group 'org-link-store
   :type 'boolean)
 
-(defcustom org-file-link-context-use-camel-case nil
-  "Non-nil means, use CamelCase to store a search context in a file link.
-When nil, the search string simply consists of the words of the string.
-CamelCase is deprecated, and support for it may be dropped in the future."
-  :group 'org-link-store
-  :type 'boolean)
-
 (defcustom org-keep-stored-link-after-insertion nil
   "Non-nil means, keep link in list for entire session.
 
@@ -1041,9 +1066,8 @@
   :group 'org-link-follow
   :type 'boolean)
 
-
 (defcustom org-open-non-existing-files nil
-  "Non-nil means, `org-open-file' will open non-existing file.
+  "Non-nil means, `org-open-file' will open non-existing files.
 When nil, an error will be generated."
   :group 'org-link-follow
   :type 'boolean)
@@ -1176,7 +1200,7 @@
 (defcustom org-mhe-search-all-folders nil
   "Non-nil means, that the search for the mh-message will be extended to
 all folders if the message cannot be found in the folder given in the link.
-Searching all folders is very effective with one of the search engines
+Searching all folders is very efficient with one of the search engines
 supported by MH-E, but will be slow with pick."
   :group 'org-link-follow
   :type 'boolean)
@@ -1196,39 +1220,83 @@
 (defcustom org-default-notes-file "~/.notes"
   "Default target for storing notes.
 Used by the hooks for remember.el.  This can be a string, or nil to mean
-the value of `remember-data-file'."
+the value of `remember-data-file'.
+You can set this on a per-template basis with the variable
+`org-remember-templates'."
   :group 'org-remember
   :type '(choice
 	  (const :tag "Default from remember-data-file" nil)
 	  file))
 
+(defcustom org-remember-default-headline ""
+  "The headline that should be the default location in the notes file.
+When filing remember notes, the cursor will start at that position.
+You can set this on a per-template basis with the variable
+`org-remember-templates'."
+  :group 'org-remember
+  :type 'string)
+
 (defcustom org-remember-templates nil
   "Templates for the creation of remember buffers.
 When nil, just let remember make the buffer.
-When not nil, this is a list of 3-element lists.  In each entry, the first
+When not nil, this is a list of 4-element lists.  In each entry, the first
 element is a character, a unique key to select this template.
 The second element is the template.  The third element is optional and can
 specify a destination file for remember items created with this template.
-The default file is given by `org-default-notes-file'.
+The default file is given by `org-default-notes-file'.  An optional third
+element can specify the headline in that file that should be offered
+first when the user is asked to file the entry.  The default headline is
+given in the variable `org-remember-default-headline'.
 
 The template specifies the structure of the remember buffer.  It should have
 a first line starting with a star, to act as the org-mode headline.
 Furthermore, the following %-escapes will be replaced with content:
-  %t  time stamp, date only
-  %T  time stamp with date and time
-  %u  inactive time stamp, date only
-  %U  inactive time stamp with date and time
-  %n  user name
-  %a  annotation, normally the link created with org-store-link
-  %i  initial content, the region when remember is called with C-u.
-      If %i is indented, the entire inserted text will be indented as well.
-  %?  This will be removed, and the cursor placed at this position."
+
+  %^{prompt}  prompt the user for a string and replace this sequence with it.
+  %t          time stamp, date only
+  %T          time stamp with date and time
+  %u, %U      like the above, but inactive time stamps
+  %^t         like %t, but prompt for date.  Similarly %^T, %^u, %^U
+              You may define a prompt like %^{Please specify birthday}t
+  %n          user name (taken from `user-full-name')
+  %a          annotation, normally the link created with org-store-link
+  %i          initial content, the region when remember is called with C-u.
+              If %i is indented, the entire inserted text will be indented
+              as well.
+
+  %?          After completing the template, position cursor here.
+
+Apart from these general escapes, you can access information specific to the
+link type that is created.  For example, calling `remember' in emails or gnus
+will record the author and the subject of the message, which you can access
+with %:author and %:subject, respectively.  Here is a complete list of what
+is recorded for each link type.
+
+Link type          |  Available information
+-------------------+------------------------------------------------------
+bbdb               |  %:type %:name %:company
+vm, wl, mh, rmail  |  %:type %:subject %:message-id
+                   |  %:from %:fromname %:fromaddress
+                   |  %:to   %:toname   %:toaddress
+                   |  %:fromto (either \"to NAME\" or \"from NAME\")
+gnus               |  %:group, for messages also all email fields
+w3, w3m            |  %:type %:url
+info               |  %:type %:file %:node
+calendar           |  %:type %:date"
   :group 'org-remember
-  :type '(repeat :tag "enabled"
-		 (list :value (?a "\n" nil)
-		       (character :tag "Selection Key")
-		       (string :tag "Template")
-		       (file :tag "Destination file (optional)"))))
+  :get (lambda (var) ; Make sure all entries have 4 elements
+	 (mapcar (lambda (x)
+		   (cond ((= (length x) 3) (append x '("")))
+			 ((= (length x) 2) (append x '("" "")))
+			 (t x)))
+		 (default-value var)))
+  :type '(repeat
+	  :tag "enabled"
+	  (list :value (?a "\n" nil nil)
+		(character :tag "Selection Key")
+		(string :tag "Template")
+		(file :tag "Destination file (optional)")
+		(string :tag "Destination headline (optional)"))))
 
 (defcustom org-reverse-note-order nil
   "Non-nil means, store new notes at the beginning of a file or entry.
@@ -1245,6 +1313,11 @@
   :tag "Org TODO"
   :group 'org)
 
+(defgroup org-progress nil
+  "Options concerning Progress logging in Org-mode."
+  :tag "Org Progress"
+  :group 'org-time)
+
 (defcustom org-todo-keywords '("TODO" "DONE")
   "List of TODO entry keywords.
 \\<org-mode-map>By default, this is '(\"TODO\" \"DONE\").  The last entry in the list is
@@ -1291,6 +1364,10 @@
 Valid members of this list are
 
   done       Offer to record a note when marking entries done
+  state      Offer to record a note whenever changing the TODO state
+             of an item.  This is only relevant if TODO keywords are
+             interpreted as sequence, see variable `org-todo-interpretation'.
+             When `state' is set, this includes tracking `done'.
   clock-out  Offer to record a note when clocking out of an item.
 
 A separate window will then pop up and allow you to type a note.
@@ -1301,26 +1378,51 @@
 Logging can also be configured on a per-file basis by adding one of
 the following lines anywhere in the buffer:
 
-   #+STARTUP: logging
-   #+STARTUP: nologging"
-;; FIXME: in-buffer words for notes???????
+   #+STARTUP: logdone
+   #+STARTUP: nologging
+   #+STARTUP: lognotedone
+   #+STARTUP: lognotestate
+   #+STARTUP: lognoteclock-out"
   :group 'org-todo
+  :group 'org-progress
   :type '(choice
 	  (const :tag "off" nil)
 	  (const :tag "on" t)
-	  (set :tag "on, with notes" :greedy t :value (done)
-	       (const done) (const clock-out))))
-
-(defcustom org-log-note-headings '((done . "CLOSING NOTE") (clock-out . ""))
+	  (set :tag "on, with notes, detailed control" :greedy t :value (done)
+	       (const :tag "when item is marked DONE" done)
+	       (const :tag "when TODO state changes" state)
+	       (const :tag "when clocking out" clock-out))))
+
+(defcustom org-log-note-headings
+  '((done . "CLOSING NOTE %t")
+    (state . "State %-12s %t")
+    (clock-out . ""))
   "Headings for notes added when clocking out or closing TODO items.
 The value is an alist, with the car being a sympol indicating the note
 context, and the cdr is the heading to be used.  The heading may also be the
-empty string."
+empty string.
+%t in the heading will be replaced by a time stamp.
+%s will be replaced by the new TODO state, in double quotes.
+%u will be replaced by the user name.
+%U will be replaced by the full user name."
   :group  'org-todo
+  :group  'org-progress
   :type '(list :greedy t
 	  (cons (const :tag "Heading when closing an item" done) string)
+	  (cons (const :tag
+		       "Heading when changing todo state (todo sequence only)"
+		       state) string)
 	  (cons (const :tag "Heading when clocking out" clock-out) string)))
 
+(defcustom org-allow-auto-repeat t
+  "Non-nil means, find REPEAT cookies in entries and apply them.
+A repeat cookie looks like REPEAT(+1m) and causes deadlines and schedules
+to repeat themselves shifted by a certain amount of time, each time an
+entry is marked DONE."
+  :group 'org-todo
+  :group 'org-progress
+  :type 'boolean)
+
 (defgroup org-priorities nil
   "Priorities in Org-mode."
   :tag "Org Priorities"
@@ -1381,6 +1483,14 @@
   :group 'org-time
   :type 'sexp)
 
+(defun org-time-stamp-format (&optional long inactive)
+  "Get the right format for a time string."
+  (let ((f (if long (cdr org-time-stamp-formats)
+	     (car org-time-stamp-formats))))
+    (if inactive
+	(concat "[" (substring f 1 -1) "]")
+      f)))
+
 (defcustom org-deadline-warning-days 30
   "No. of days before expiration during which a deadline becomes active.
 This variable governs the display in sparse trees and in the agenda."
@@ -1440,9 +1550,14 @@
 (defcustom org-fast-tag-selection-single-key nil
   "Non-nil means, fast tag selection exits after first change.
 When nil, you have to press RET to exit it.
-During fast tag selection, you can toggle this flag with `C-c'."
+During fast tag selection, you can toggle this flag with `C-c'.
+This variable can also have the value `expert'.  In this case, the window
+displaying the tags menu is not even shown, until you press C-c again."
   :group 'org-tags
-  :type 'boolean)
+  :type '(choice
+	  (const :tag "No" nil)
+	  (const :tag "Yes" t)
+	  (const :tag "Expert" expert)))
 
 (defcustom org-tags-column 48
   "The column to which tags should be indented in a headline.
@@ -1489,7 +1604,7 @@
   "The last used completion table for tags.")
 
 (defgroup org-agenda nil
-  "Options concerning agenda display Org-mode."
+  "Options concerning agenda views in Org-mode."
   :tag "Org Agenda"
   :group 'org)
 
@@ -1520,8 +1635,31 @@
 	  (repeat :tag "List of files" file)
 	  (file :tag "Store list in a file\n" :value "~/.agenda_files")))
 
-(defcustom org-agenda-custom-commands ;'(("w" todo "WAITING"))
-'(("w" todo "WAITING" ((aaa 1) (bbb 2))))
+
+(defcustom org-agenda-confirm-kill 1
+  "When set, remote killing from the agenda buffer needs confirmation.
+When t, a confirmation is always needed.  When a number N, confirmation is
+only needed when the text to be killed contains more than N non-white lines."
+  :group 'org-agenda
+  :type '(choice
+	  (const :tag "Never" nil)
+	  (const :tag "Always" t)
+	  (number :tag "When more than N lines")))
+
+(defcustom org-calendar-to-agenda-key [?c]
+  "The key to be installed in `calendar-mode-map' for switching to the agenda.
+The command `org-calendar-goto-agenda' will be bound to this key.  The
+default is the character `c' because then `c' can be used to switch back and
+forth between agenda and calendar."
+  :group 'org-agenda
+  :type 'sexp)
+
+(defgroup org-agenda-custom-commands nil
+ "Options concerning agenda views in Org-mode."
+ :tag "Org Agenda Custom Commands"
+ :group 'org-agenda)
+
+(defcustom org-agenda-custom-commands '(("w" todo "WAITING"))
   "Custom commands for the agenda.
 These commands will be offered on the splash screen displayed by the
 agenda dispatcher \\[org-agenda].  Each entry is a list like this:
@@ -1556,6 +1694,7 @@
        So valid commands for a set are:
        (agenda)
        (alltodo)
+       (stuck)
        (todo \"match\" options)
        (tags \"match\" options )
        (tags-todo \"match\" options)
@@ -1563,7 +1702,7 @@
 Each command can carry a list of options, and another set of options can be
 given for the whole set of commands.  Individual command options take
 precedence over the general options."
-  :group 'org-agenda
+  :group 'org-agenda-custom-commands
   :type '(repeat
 	  (choice
 	   (list :tag "Single command"
@@ -1574,7 +1713,8 @@
 		  (const :tag "TODO keyword search (all agenda files)" todo)
 		  (const :tag "Tags sparse tree (current buffer)" tags-tree)
 		  (const :tag "TODO keyword tree (current buffer)" todo-tree)
-		  (const :tag "Occur tree (current buffer)" occur-tree))
+		  (const :tag "Occur tree (current buffer)" occur-tree)
+		  (symbol :tag "Other, user-defined function"))
 		 (string :tag "Match")
 		 (repeat :tag "Local options"
 			 (list (variable :tag "Option") (sexp :tag "Value"))))
@@ -1585,6 +1725,7 @@
 		  (choice
 		   (const :tag "Agenda" (agenda))
 		   (const :tag "TODO list" (alltodo))
+		   (const :tag "Stuck projects" (stuck))
 		   (list :tag "Tags search"
 			 (const :format "" tags)
 			 (string :tag "Match")
@@ -1604,16 +1745,51 @@
 			 (string :tag "Match")
 			 (repeat :tag "Local options"
 				 (list (variable :tag "Option")
+				       (sexp :tag "Value"))))
+
+		   (list :tag "Other, user-defined function"
+			 (symbol :tag "function")
+			 (string :tag "Match")
+			 (repeat :tag "Local options"
+				 (list (variable :tag "Option")
 				       (sexp :tag "Value"))))))
+
 		 (repeat :tag "General options"
 			 (list (variable :tag "Option")
 			       (sexp :tag "Value")))))))
 
+(defcustom org-stuck-projects
+  '("+LEVEL=2/-DONE" ("TODO" "NEXT" "NEXTACTION") nil)
+  "How to identify stuck projects.
+This is a list of three items:
+1. A tags/todo matcher string that is used to identify a project.
+   The entire tree below a headline matched by this is considered a project.
+2. A list of TODO keywords itentifying non-stuck projects.
+   If the project subtree contains any headline with one of these todo
+   keywords, the project is consitered to be not stuck.
+3. A list of tags identifying non-stuck projects.
+   If the project subtree contains any headline with one of these tags,
+   the project is consitered to be not stuck.
+
+After defining this variable, you may use \\[org-agenda-list-stuck-projects]
+or `C-c a #' to produce the list."
+  :group 'org-agenda-custom-commands
+  :type '(list
+	  (string :tag "Tags/TODO match to identify a project")
+	  (repeat :tag "Projects are *not* stuck if they have an entry with TODO keyword any of" (string))
+	  (repeat :tag "Projects are *not* stuck if they have an entry with TAG being any of" (string))))
+
+
+(defgroup org-agenda-skip nil
+ "Options concerning skipping parts of agenda files."
+ :tag "Org Agenda Skip"
+ :group 'org-agenda)
+
 (defcustom org-agenda-todo-list-sublevels t
   "Non-nil means, check also the sublevels of a TODO entry for TODO entries.
 When nil, the sublevels of a TODO entry are not checked, resulting in
 potentially much shorter TODO lists."
-  :group 'org-agenda
+  :group 'org-agenda-skip
   :group 'org-todo
   :type 'boolean)
 
@@ -1621,7 +1797,7 @@
   "Non-nil means, don't show scheduled entries in the global todo list.
 The idea behind this is that by scheduling it, you have already taken care
 of this item."
-  :group 'org-agenda
+  :group 'org-agenda-skip
   :group 'org-todo
   :type 'boolean)
 
@@ -1629,10 +1805,15 @@
   "Non-nil means, don't show near deadline entries in the global todo list.
 Near means closer than `org-deadline-warning-days' days.
 The idea behind this is that such items will appear in the agenda anyway."
-  :group 'org-agenda
+  :group 'org-agenda-skip
   :group 'org-todo
   :type 'boolean)
 
+(defcustom org-agenda-skip-scheduled-if-done nil
+  "Non-nil means don't show scheduled items in agenda when they are done.
+This is relevant for the daily/weekly agenda, not for the TODO list."
+  :group 'org-agenda-skip
+  :type 'boolean)
 
 (defcustom org-timeline-show-empty-dates 3
   "Non-nil means, `org-timeline' also shows dates without an entry.
@@ -1640,46 +1821,38 @@
 When t, all days between the first and the last date are shown.
 When an integer, show also empty dates, but if there is a gap of more than
 N days, just insert a special line indicating the size of the gap."
-  :group 'org-agenda
+  :group 'org-agenda-skip
   :type '(choice
 	  (const :tag "None" nil)
 	  (const :tag "All" t)
 	  (number :tag "at most")))
 
-(defcustom org-agenda-confirm-kill 1
-  "When set, remote killing from the agenda buffer needs confirmation.
-When t, a confirmation is always needed.  When a number N, confirmation is
-only needed when the text to be killed contains more than N non-white lines."
-  :group 'org-agenda ;; FIXME
-  :type '(choice
-	  (const :tag "Never" nil)
-	  (const :tag "Always" t)
-	  (number :tag "When more than N lines")))
-
-;; FIXME: This variable could be removed
-(defcustom org-agenda-include-all-todo nil
-  "Set  means weekly/daily agenda will always contain all TODO entries.
-The TODO entries will be listed at the top of the agenda, before
-the entries for specific days."
-  :group 'org-agenda
-  :type 'boolean)
-
-(defcustom org-agenda-include-diary nil
-  "If non-nil, include in the agenda entries from the Emacs Calendar's diary."
-  :group 'org-agenda
-  :type 'boolean)
-
-(defcustom org-calendar-to-agenda-key [?c]
-  "The key to be installed in `calendar-mode-map' for switching to the agenda.
-The command `org-calendar-goto-agenda' will be bound to this key.  The
-default is the character `c' because then `c' can be used to switch back and
-forth between agenda and calendar."
-  :group 'org-agenda
-  :type 'sexp)
-
-(defgroup org-agenda-setup nil
-  "Options concerning setting up the Agenda window in Org Mode."
-  :tag "Org Agenda Window Setup"
+
+(defgroup org-agenda-startup nil
+  "Options concerning initial settings in the Agenda in Org Mode."
+  :tag "Org Agenda Startup"
+  :group 'org-agenda)
+
+(defcustom org-finalize-agenda-hook nil
+  "Hook run just before displaying an agenda buffer."
+  :group 'org-agenda-startup
+  :type 'hook)
+
+(defcustom org-agenda-mouse-1-follows-link nil
+  "Non-nil means, mouse-1 on a link will follow the link in the agenda.
+A longer mouse click will still set point.  Does not wortk on XEmacs.
+Needs to be set before org.el is loaded."
+  :group 'org-agenda-startup
+  :type 'boolean)
+
+(defcustom org-agenda-start-with-follow-mode nil
+  "The initial value of follwo-mode in a newly created agenda window."
+  :group 'org-agenda-startup
+  :type 'boolean)
+
+(defgroup org-agenda-windows nil
+  "Options concerning the windows used by the Agenda in Org Mode."
+  :tag "Org Agenda Windows"
   :group 'org-agenda)
 
 (defcustom org-agenda-window-setup 'reorganize-frame
@@ -1690,11 +1863,9 @@
 other-frame       Use `switch-to-buffer-other-frame' to display agenda.
 other-window      Use `switch-to-buffer-other-window' to display agenda.
 reorganize-frame  Show only two windows on the current frame, the current
-                  window and the agenda.  Also, if the option
-                  `org-fit-agenda-window' is set, resize the agenda window to
-                  try to show as much as possible of the buffer content.
+                  window and the agenda.
 See also the variable `org-agenda-restore-windows-after-quit'."
-  :group 'org-agenda-setup
+  :group 'org-agenda-windows
   :type '(choice
 	  (const current-window)
 	  (const other-frame)
@@ -1708,64 +1879,75 @@
 `q' or `x' and this option is set, the old state is restored.  If
 `org-agenda-window-setup' is `other-frame', the value of this
 option will be ignored.."
-  :group 'org-agenda-setup
-  :type 'boolean)
-
-;; FIXME: I think this variable could be removed.
-(defcustom org-select-agenda-window t
-  "Non-nil means, after creating an agenda, move cursor into Agenda window.
-When nil, cursor will remain in the current window."
-  :group 'org-agenda-setup
-  :type 'boolean)
-
-;; FIXME: I think this variable could be removed.
-(defcustom org-fit-agenda-window t
-  "Non-nil means, change window size of agenda to fit content.
-This is only effective if `org-agenda-window-setup' is `reorganize-frame'."
-  :group 'org-agenda-setup
-  :type 'boolean)
-
-(defcustom org-finalize-agenda-hook nil
-  "Hook run just before displaying an agenda buffer."
-  :group 'org-agenda-setup
-  :type 'hook)
-
-(defcustom org-agenda-mouse-1-follows-link nil
-  "Non-nil means, mouse-1 on a link will follow the link in the agenda.
-A longer mouse click will still set point.  Does not wortk on XEmacs.
-Needs to be set before org.el is loaded."
-  :group 'org-agenda-setup
-  :type 'boolean)
-
-(defcustom org-agenda-start-with-follow-mode nil
-  "The initial value of follwo-mode in a newly created agenda window."
-  :group 'org-agenda-setup
-  :type 'boolean)
-
-(defgroup org-agenda-display nil
-  "Options concerning what to display initially in Agenda."
-  :tag "Org Agenda Display"
+  :group 'org-agenda-windows
+  :type 'boolean)
+
+(defcustom org-indirect-buffer-display 'other-window
+  "How should indirect tree buffers be displayed?
+This applies to indirect buffers created with the commands
+\\[org-tree-to-indirect-buffer] and \\[org-agenda-tree-to-indirect-buffer].
+Valid values are:
+current-window   Display in the current window
+other-window     Just display in another window.
+dedicated-frame  Create one new frame, and re-use it each time.
+new-frame        Make a new frame each time."
+  :group 'org-structure
+  :group 'org-agenda-windows
+  :type '(choice
+	  (const :tag "In current window" current-window)
+	  (const :tag "In current frame, other window" other-window)
+	  (const :tag "Each time a new frame" new-frame)
+	  (const :tag "One dedicated frame" dedicated-frame)))
+
+(defgroup org-agenda-daily/weekly nil
+  "Options concerning the daily/weekly agenda."
+  :tag "Org Agenda Daily/Weekly"
   :group 'org-agenda)
 
-(defcustom org-agenda-show-all-dates t
-  "Non-nil means, `org-agenda' shows every day in the selected range.
-When nil, only the days which actually have entries are shown."
-  :group 'org-agenda-display
-  :type 'boolean)
+(defcustom org-agenda-ndays 7
+  "Number of days to include in overview display.
+Should be 1 or 7."
+  :group 'org-agenda-daily/weekly
+  :type 'number)
 
 (defcustom org-agenda-start-on-weekday 1
   "Non-nil means, start the overview always on the specified weekday.
 0 denotes Sunday, 1 denotes Monday etc.
 When nil, always start on the current day."
-  :group 'org-agenda-display
+  :group 'org-agenda-daily/weekly
   :type '(choice (const :tag "Today" nil)
 		 (number :tag "Weekday No.")))
 
-(defcustom org-agenda-ndays 7
-  "Number of days to include in overview display.
-Should be 1 or 7."
-  :group 'org-agenda-display
-  :type 'number)
+(defcustom org-agenda-show-all-dates t
+  "Non-nil means, `org-agenda' shows every day in the selected range.
+When nil, only the days which actually have entries are shown."
+  :group 'org-agenda-daily/weekly
+  :type 'boolean)
+
+(defcustom org-agenda-date-format "%A %d %B %Y"
+  "Format string for displaying dates in the agenda.
+Used by the daily/weekly agenda and by the timeline.  This should be
+a format string understood by `format-time-string'.
+FIXME: Not used currently, because of timezone problem."
+  :group 'org-agenda-daily/weekly
+  :type 'string)
+  
+(defcustom org-agenda-include-diary nil
+  "If non-nil, include in the agenda entries from the Emacs Calendar's diary."
+  :group 'org-agenda-daily/weekly
+  :type 'boolean)
+
+(defcustom org-agenda-include-all-todo nil
+  "Set  means weekly/daily agenda will always contain all TODO entries.
+The TODO entries will be listed at the top of the agenda, before
+the entries for specific days."
+  :group 'org-agenda-daily/weekly
+  :type 'boolean)
+
+(defgroup org-agenda-time-grid nil
+  "Options concerning the time grid in the Org-mode Agenda."
+  :tag "Org Agenda Time Grid"
+  :group 'org-agenda)
 
 (defcustom org-agenda-use-time-grid t
   "Non-nil means, show a time grid in the agenda schedule.
@@ -1774,7 +1956,7 @@
 sorted in between these lines.
 For details about when the grid will be shown, and what it will look like, see
 the variable `org-agenda-time-grid'."
-  :group 'org-agenda-display
+  :group 'org-agenda-time-grid
   :type 'boolean)
 
 (defcustom org-agenda-time-grid
@@ -1795,7 +1977,7 @@
 
 The third item is a list of integers, indicating the times that should have
 a grid line."
-  :group 'org-agenda-display
+  :group 'org-agenda-time-grid
   :type
   '(list
     (set :greedy t :tag "Grid Display Options"
@@ -1809,6 +1991,11 @@
     (string :tag "Grid String")
     (repeat :tag "Grid Times" (integer :tag "Time"))))
 
+(defgroup org-agenda-sorting nil
+  "Options concerning sorting in the Org-mode Agenda."
+  :tag "Org Agenda Sorting"
+  :group 'org-agenda)
+
 (let ((sorting-choice
        '(choice
 	 (const time-up) (const time-down)
@@ -1848,7 +2035,7 @@
 
 Leaving out `category-keep' would mean that items will be sorted across
 categories by priority."
-  :group 'org-agenda-display
+  :group 'org-agenda-sorting
   :type `(choice
 	  (repeat :tag "General" ,sorting-choice)
 	  (list :tag "Individually"
@@ -1866,7 +2053,7 @@
 do have a time.  When nil, the default time is before 0:00.  You can use this
 option to decide if the schedule for today should come before or after timeless
 agenda entries."
-  :group 'org-agenda-display
+  :group 'org-agenda-sorting
   :type 'boolean)
 
 (defgroup org-agenda-prefix nil
@@ -2070,15 +2257,24 @@
 (defcustom org-export-with-toc t
   "Non-nil means, create a table of contents in exported files.
 The TOC contains headlines with levels up to`org-export-headline-levels'.
+When an integer, include levels up to N in the toc, this may then be
+different from `org-export-headline-levels', but it will not be allowed
+to be larger than the number of headline levels.
+When nil, no table of contents is made.
 
 Headlines which contain any TODO items will be marked with \"(*)\" in
-ASCII export, and with red color in HTML output.
+ASCII export, and with red color in HTML output, if the option
+`org-export-mark-todo-in-toc' is set.
 
 In HTML output, the TOC will be clickable.
 
-This option can also be set with the +OPTIONS line, e.g. \"toc:nil\"."
+This option can also be set with the +OPTIONS line, e.g. \"toc:nil\"
+or \"toc:3\"."
   :group 'org-export-general
-  :type 'boolean)
+  :type '(choice
+	  (const :tag "No Table of Contents" nil)
+	  (const :tag "Full Table of Contents" t)
+	  (integer :tag "TOC to level")))
 
 (defcustom org-export-mark-todo-in-toc nil
   "Non-nil means, mark TOC lines that contain any open TODO items."
@@ -2279,12 +2475,6 @@
   :group 'org-export-ascii
   :type '(repeat character))
 
-(defcustom org-export-ascii-show-new-buffer t
-  "Non-nil means, popup buffer containing the exported ASCII text.
-Otherwise the buffer will just be saved to a file and stay hidden."
-  :group 'org-export-ascii
-  :type 'boolean)
-
 (defgroup org-export-xml nil
   "Options specific for XML export of Org-mode files."
   :tag "Org Export XML"
@@ -2317,7 +2507,7 @@
   table { border-collapse: collapse; }
   td, th {
 	vertical-align: top;
-	border: 1pt solid #ADB9CC;
+	<!--border: 1pt solid #ADB9CC;-->
   }
 </style>"
   "The default style specification for exported HTML files.
@@ -2377,6 +2567,7 @@
 		 (const :tag "Always" t)
 		 (const :tag "When there is no description" maybe)))
 
+;; FIXME: rename 
 (defcustom org-export-html-expand t
   "Non-nil means, for HTML export, treat @<...> as HTML tag.
 When nil, these tags will be exported as plain text and therefore
@@ -2387,7 +2578,7 @@
   :type 'boolean)
 
 (defcustom org-export-html-table-tag
-  "<table border=\"1\" cellspacing=\"0\" cellpadding=\"6\">"
+  "<table border=\"2\" cellspacing=\"0\" cellpadding=\"6\" rules=\"groups\" frame=\"hsides\">"
   "The HTML tag used to start a table.
 This must be a <table> tag, but you may change the options like
 borders and spacing."
@@ -2407,12 +2598,6 @@
   :group 'org-export-html
   :type 'string)
 
-(defcustom org-export-html-show-new-buffer nil
-  "Non-nil means, popup buffer containing the exported html text.
-Otherwise, the buffer will just be saved to a file and stay hidden."
-  :group 'org-export-html
-  :type 'boolean)
-
 (defgroup org-export-icalendar nil
   "Options specific for iCalendar export of Org-mode files."
   :tag "Org Export iCalendar"
@@ -2428,7 +2613,10 @@
 (defcustom org-icalendar-include-todo nil
   "Non-nil means, export to iCalendar files should also cover TODO items."
   :group 'org-export-icalendar
-  :type 'boolean)
+  :type '(choice
+	  (const :tag "None" nil)
+	  (const :tag "Unfinished" t)
+	  (const :tag "All" all)))
 
 (defcustom org-icalendar-combined-name "OrgMode"
   "Calendar name for the combined iCalendar representing all agenda files."
@@ -2521,7 +2709,7 @@
 		    "\\([" post (if stacked markers) "]\\|$\\)")))))
 
 (defcustom org-emphasis-regexp-components
-  '(" \t(" " \t.,?;'\")" " \t\r\n," "." 1 nil)
+  '(" \t('\"" " \t.,?;'\")" " \t\r\n," "." 1 nil)
   "Components used to build the reqular expression for emphasis.
 This is a list with 6 entries.  Terminology:  In an emphasis string
 like \" *strong word* \", we call the initial space PREMATCH, the final
@@ -2575,6 +2763,8 @@
 	   (string :tag "HTML start tag")
 	   (string :tag "HTML end tag"))))
 
+;;; The faces
+
 (defgroup org-faces nil
   "Faces in Org-mode."
   :tag "Org Faces"
@@ -2829,7 +3019,8 @@
 (defconst org-n-levels (length org-level-faces))
 
 
-;; Variables for pre-computed regular expressions, all buffer local
+;;; Variables for pre-computed regular expressions, all buffer local
+
 (defvar org-done-string nil
   "The last string in `org-todo-keywords', indicating an item is DONE.")
 (make-variable-buffer-local 'org-done-string)
@@ -2881,14 +3072,17 @@
 (make-variable-buffer-local 'org-closed-time-regexp)
 
 (defvar org-keyword-time-regexp nil
+  "Matches any of the 4 keywords, together with the time stamp.")
+(make-variable-buffer-local 'org-keyword-time-regexp)
+(defvar org-keyword-time-not-clock-regexp nil
   "Matches any of the 3 keywords, together with the time stamp.")
-(make-variable-buffer-local 'org-keyword-time-regexp)
+(make-variable-buffer-local 'org-keyword-time-not-clock-regexp)
 (defvar org-maybe-keyword-time-regexp nil
   "Matches a timestamp, possibly preceeded by a keyword.")
-(make-variable-buffer-local 'org-keyword-time-regexp)
+(make-variable-buffer-local 'org-maybe-keyword-time-regexp)
 
 (defconst org-rm-props '(invisible t face t keymap t intangible t mouse-face t
-				   rear-nonsticky t mouse-map t)
+				   rear-nonsticky t mouse-map t fontified t)
   "Properties to remove when a string without properties is wanted.")
 
 (defsubst org-match-string-no-properties (num &optional string)
@@ -2927,7 +3121,6 @@
 (defun org-let2 (list1 list2 &rest body)
   (eval (cons 'let (cons list1 (list (cons 'let (cons list2 body)))))))
 (put 'org-let2 'lisp-indent-function 2)
-
 (defconst org-startup-options
   '(("fold" org-startup-folded t)
     ("overview" org-startup-folded t)
@@ -2942,9 +3135,16 @@
     ("noalign" org-startup-align-all-tables nil)
     ("customtime" org-display-custom-times t)
     ("logging" org-log-done t)
+    ("logdone" org-log-done t)
     ("nologging" org-log-done nil)
-    ("dlcheck" org-startup-with-deadline-check t)
-    ("nodlcheck" org-startup-with-deadline-check nil)))
+    ("lognotedone" org-log-done done push)
+    ("lognotestate" org-log-done state push)
+    ("lognoteclock-out" org-log-done clock-out push))
+  "Variable associated with STARTUP options for org-mode.
+Each element is a list of three items: The startup options as written
+in the #+STARTUP line, the corresponding variable, and the value to
+set this variable to if the option is found.  An optional forth element PUSH
+means to push this value onto the list in the variable.")
 
 (defun org-set-regexps-and-options ()
   "Precompute regular expressions for current buffer."
@@ -2986,7 +3186,12 @@
 		    l var val)
 		(while (setq l (assoc (pop opts) org-startup-options))
 		  (setq var (nth 1 l) val (nth 2 l))
-		  (set (make-local-variable var) val))))
+		  (if (not (nth 3 l))
+		      (set (make-local-variable var) val)
+		    (if (not (listp (symbol-value var)))
+			(set (make-local-variable var) nil))
+		    (set (make-local-variable var) (symbol-value var))
+		    (add-to-list var val)))))
 	     ((equal key "ARCHIVE")
 	      (string-match " *$" value)
 	      (setq arch (replace-match "" t t value))
@@ -3059,6 +3264,11 @@
 		  "\\|" org-closed-string
 		  "\\|" org-clock-string "\\)"
 		  " *[[<]\\([^]>]+\\)[]>]")
+	  org-keyword-time-not-clock-regexp
+	  (concat "\\<\\(" org-scheduled-string
+		  "\\|" org-deadline-string
+		  "\\|" org-closed-string "\\)"
+		  " *[[<]\\([^]>]+\\)[]>]")
 	  org-maybe-keyword-time-regexp
 	  (concat "\\(\\<\\(" org-scheduled-string
 		  "\\|" org-deadline-string
@@ -3068,70 +3278,194 @@
 
     (org-set-font-lock-defaults)))
 
-;; Tell the compiler about dynamically scoped variables,
-;; and variables from other packages
-(defvar calc-embedded-close-formula)  ; defined by the calc package
-(defvar calc-embedded-open-formula)   ; defined by the calc package
-(defvar font-lock-unfontify-region-function) ; defined by font-lock.el
-(defvar zmacs-regions) ; XEmacs regions
-(defvar original-date) ; dynamically scoped in calendar
-(defvar org-old-auto-fill-inhibit-regexp) ; local variable used by `orgtbl-mode'
-(defvar orgtbl-mode-menu) ; defined when orgtbl mode get initialized
-(defvar org-html-entities) ; defined later in this file
-(defvar org-goto-start-pos) ; dynamically scoped parameter
-(defvar org-time-was-given) ; dynamically scoped parameter
-(defvar org-ts-what) ; dynamically scoped parameter
-(defvar org-current-export-file) ; dynamically scoped parameter
-(defvar org-current-export-dir) ; dynamically scoped parameter
-(defvar mark-active) ; Emacs only, not available in XEmacs.
-(defvar timecnt) ; dynamically scoped parameter
-(defvar levels-open) ; dynamically scoped parameter
-(defvar entry) ; dynamically scoped parameter
-(defvar state) ; dynamically scoped into `org-after-todo-state-change-hook'
-(defvar date) ; dynamically scoped parameter
-(defvar description) ; dynamically scoped parameter
-(defvar ans1) ; dynamically scoped parameter
-(defvar ans2) ; dynamically scoped parameter
-(defvar starting-day) ; local variable
-(defvar include-all-loc) ; local variable
-(defvar vm-message-pointer) ; from vm
-(defvar vm-folder-directory) ; from vm
-(defvar gnus-other-frame-object) ; from gnus
-(defvar wl-summary-buffer-elmo-folder) ; from wanderlust
-(defvar wl-summary-buffer-folder-name) ; from wanderlust
-(defvar gnus-group-name) ; from gnus
-(defvar gnus-article-current) ; from gnus
-(defvar w3m-current-url) ; from w3m
-(defvar w3m-current-title) ; from w3m
-(defvar mh-progs) ; from MH-E
-(defvar mh-current-folder) ; from MH-E
-(defvar mh-show-folder-buffer) ; from MH-E
-(defvar mh-index-folder) ; from MH-E
-(defvar mh-searcher) ; from MH-E
-(defvar org-selected-point) ; dynamically scoped parameter
-(defvar calendar-mode-map) ; from calendar.el
-(defvar last-arg) ; local variable
-(defvar remember-save-after-remembering) ; from remember.el
-(defvar remember-data-file) ; from remember.el
-(defvar annotation) ; from remember.el, dynamically scoped in `remember-mode'
-(defvar initial)    ; from remember.el, dynamically scoped in `remember-mode'
-(defvar orgtbl-mode) ; defined later in this file
-(defvar Info-current-file) ; from info.el
-(defvar Info-current-node) ; from info.el
-(defvar texmathp-why) ; from texmathp.el
-(defvar org-latex-regexps)
+
+;;; Some variables ujsed in various places
+
+(defvar org-window-configuration nil
+  "Used in various places to store a window configuration.")
+(defvar org-finish-function nil
+  "Function to be called when `C-c C-c' is used.
+This is for getting out of special buffers like remember.")
+
+;;; Foreign variables, to inform the compiler
+
+;; XEmacs only
 (defvar outline-mode-menu-heading)
 (defvar outline-mode-menu-show)
 (defvar outline-mode-menu-hide)
-
-;;; Define the mode
+(defvar zmacs-regions) ; XEmacs regions
+;; Emacs only
+(defvar mark-active)
+
+;; Packages that org-mode interacts with
+(defvar calc-embedded-close-formula)
+(defvar calc-embedded-open-formula)
+(defvar font-lock-unfontify-region-function)
+(defvar org-goto-start-pos)
+(defvar vm-message-pointer)
+(defvar vm-folder-directory)
+(defvar wl-summary-buffer-elmo-folder)
+(defvar wl-summary-buffer-folder-name)
+(defvar gnus-other-frame-object)
+(defvar gnus-group-name)
+(defvar gnus-article-current)
+(defvar w3m-current-url)
+(defvar w3m-current-title)
+(defvar mh-progs)
+(defvar mh-current-folder)
+(defvar mh-show-folder-buffer)
+(defvar mh-index-folder)
+(defvar mh-searcher)
+(defvar calendar-mode-map)
+(defvar Info-current-file)
+(defvar Info-current-node)
+(defvar texmathp-why)
+(defvar remember-save-after-remembering)
+(defvar remember-data-file)
+(defvar annotation) ; from remember.el, dynamically scoped in `remember-mode'
+(defvar initial)    ; from remember.el, dynamically scoped in `remember-mode'
+(defvar org-latex-regexps)
+
+(defvar original-date) ; dynamically scoped in calendar.el does scope this
+
+;; FIXME: Occasionally check by commenting these, to make sure
+;;        no other functions uses these, forgetting to let-bind them.
+(defvar entry)
+(defvar state)
+(defvar last-state)
+(defvar date)
+(defvar description)
+
+
+;; Defined somewhere in this file, but used before definition.
+(defvar orgtbl-mode-menu) ; defined when orgtbl mode get initialized
+(defvar org-agenda-undo-list)
+(defvar org-agenda-pending-undo-list)
+(defvar org-agenda-overriding-header)
+(defvar orgtbl-mode)
+(defvar org-html-entities)
+(defvar org-struct-menu)
+(defvar org-org-menu)
+(defvar org-tbl-menu)
+(defvar org-agenda-keymap)
+(defvar org-category-table)
+
+;;;; Emacs/XEmacs compatibility
+
+;; Overlay compatibility functions
+(defun org-make-overlay (beg end &optional buffer)
+  (if (featurep 'xemacs)
+      (make-extent beg end buffer)
+    (make-overlay beg end buffer)))
+(defun org-delete-overlay (ovl)
+  (if (featurep 'xemacs) (delete-extent ovl) (delete-overlay ovl)))
+(defun org-detach-overlay (ovl)
+  (if (featurep 'xemacs) (detach-extent ovl) (delete-overlay ovl)))
+(defun org-move-overlay (ovl beg end &optional buffer)
+  (if (featurep 'xemacs)
+      (set-extent-endpoints ovl beg end (or buffer (current-buffer)))
+    (move-overlay ovl beg end buffer)))
+(defun org-overlay-put (ovl prop value)
+  (if (featurep 'xemacs)
+      (set-extent-property ovl prop value)
+    (overlay-put ovl prop value)))
+(defun org-overlay-display (ovl text &optional face evap)
+  "Make overlay OVL display TEXT with face FACE."
+  (if (featurep 'xemacs)
+      (let ((gl (make-glyph text)))
+	(and face (set-glyph-face gl face))
+	(set-extent-property ovl 'invisible t)
+	(set-extent-property ovl 'end-glyph gl))
+    (overlay-put ovl 'display text)
+    (if face (overlay-put ovl 'face face))
+    (if evap (overlay-put ovl 'evaporate t))))
+(defun org-overlay-before-string (ovl text &optional face evap)
+  "Make overlay OVL display TEXT with face FACE."
+  (if (featurep 'xemacs)
+      (let ((gl (make-glyph text)))
+	(and face (set-glyph-face gl face))
+	(set-extent-property ovl 'begin-glyph gl))
+    (if face (org-add-props text nil 'face face))
+    (overlay-put ovl 'before-string text)
+    (if evap (overlay-put ovl 'evaporate t))))
+(defun org-overlay-get (ovl prop)
+  (if (featurep 'xemacs)
+      (extent-property ovl prop)
+    (overlay-get ovl prop)))
+(defun org-overlays-at (pos)
+  (if (featurep 'xemacs) (extents-at pos) (overlays-at pos)))
+(defun org-overlays-in (&optional start end)
+  (if (featurep 'xemacs)
+      (extent-list nil start end)
+    (overlays-in start end)))
+(defun org-overlay-start (o)
+  (if (featurep 'xemacs) (extent-start-position o) (overlay-start o)))
+(defun org-overlay-end (o)
+  (if (featurep 'xemacs) (extent-end-position o) (overlay-end o)))
+(defun org-find-overlays (prop &optional pos delete)
+  "Find all overlays specifying PROP at POS or point.
+If DELETE is non-nil, delete all those overlays."
+  (let ((overlays (org-overlays-at (or pos (point))))
+	ov found)
+    (while (setq ov (pop overlays))
+      (if (org-overlay-get ov prop)
+          (if delete (org-delete-overlay ov) (push ov found))))
+    found))
+
+;; Region compatibility
+
+(defun org-add-hook (hook function &optional append local)
+  "Add-hook, compatible with both Emacsen."
+  (if (and local (featurep 'xemacs))
+      (add-local-hook hook function append)
+    (add-hook hook function append local)))
+
+(defvar org-ignore-region nil
+  "To temporarily disable the active region.")
+
+(defun org-region-active-p ()
+  "Is `transient-mark-mode' on and the region active?
+Works on both Emacs and XEmacs."
+  (if org-ignore-region
+      nil
+    (if (featurep 'xemacs)
+	(and zmacs-regions (region-active-p))
+      (and transient-mark-mode mark-active))))
+
+;; Invisibility compatibility
+
+(defun org-add-to-invisibility-spec (arg)
+  "Add elements to `buffer-invisibility-spec'.
+See documentation for `buffer-invisibility-spec' for the kind of elements
+that can be added."
+  (cond
+   ((fboundp 'add-to-invisibility-spec)
+    (add-to-invisibility-spec arg))
+   ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t))
+	(setq buffer-invisibility-spec (list arg)))
+   (t
+    (setq buffer-invisibility-spec
+	  (cons arg buffer-invisibility-spec)))))
+
+(defun org-remove-from-invisibility-spec (arg)
+  "Remove elements from `buffer-invisibility-spec'."
+  (if (fboundp 'remove-from-invisibility-spec)
+      (remove-from-invisibility-spec arg)
+    (if (consp buffer-invisibility-spec)
+	(setq buffer-invisibility-spec
+	      (delete arg buffer-invisibility-spec)))))
+
+(defun org-in-invisibility-spec-p (arg)
+  "Is ARG a member of `buffer-invisibility-spec'?"
+  (if (consp buffer-invisibility-spec)
+      (member arg buffer-invisibility-spec)
+    nil))
+
+;;;; Define the Org-mode
 
 (if (and (not (keymapp outline-mode-map)) (featurep 'allout))
     (error "Conflict with outdated version of allout.el.  Load org.el before allout.el, or ugrade to newer allout, for example by switching to Emacs 22."))
 
-(defvar org-struct-menu) ; defined later in this file
-(defvar org-org-menu) ; defined later in this file
-(defvar org-tbl-menu) ; defined later in this file
 
 ;; We use a before-change function to check if a table might need
 ;; an update.
@@ -3189,7 +3523,8 @@
   (setq outline-regexp "\\*+")
   ;;(setq outline-regexp "\\(?:\\*+\\|[ \t]*\\(?:[-+*]\\|[0-9]+[.)]\\) \\)")
   (setq outline-level 'org-outline-level)
-  (when (and org-ellipsis (stringp org-ellipsis))
+  (when (and org-ellipsis (stringp org-ellipsis)
+             (fboundp 'set-display-table-slot) (boundp 'buffer-display-table))
     (unless org-display-table
       (setq org-display-table (make-display-table)))
     (set-display-table-slot org-display-table
@@ -3211,10 +3546,21 @@
   ;; Paragraphs and auto-filling
   (org-set-autofill-regexps)
   (org-update-radio-target-regexp)
-  ;; Make isearch reveal context after success
-  (org-set-local 'outline-isearch-open-invisible-function
-		 (lambda (&rest ignore) (org-show-context nil t)))
-
+
+  ;; Comment characters
+;  (org-set-local 'comment-start "#") ;; FIXME: this breaks wrapping
+  (org-set-local 'comment-padding " ")
+
+  ;; Make isearch reveal context
+  (if (or (featurep 'xemacs)
+	  (not (boundp 'outline-isearch-open-invisible-function)))
+      ;; Emacs 21 and XEmacs make use of the hook
+      (org-add-hook 'isearch-mode-end-hook 'org-isearch-end 'append 'local)
+    ;; Emacs 22 deals with this through a special variable
+    (org-set-local 'outline-isearch-open-invisible-function
+		   (lambda (&rest ignore) (org-show-context 'isearch))))
+
+  ;; If empty file that did not turn on org-mode automatically, make it to.
   (if (and org-insert-mode-line-in-empty-file
 	   (interactive-p)
 	   (= (point-min) (point-max)))
@@ -3225,14 +3571,12 @@
       (let ((bmp (buffer-modified-p)))
 	(org-table-map-tables 'org-table-align)
 	(set-buffer-modified-p bmp)))
-    (if org-startup-with-deadline-check
-	(call-interactively 'org-check-deadlines)
-      (cond
-       ((eq org-startup-folded t)
-	(org-cycle '(4)))
-       ((eq org-startup-folded 'content)
-	(let ((this-command 'org-cycle) (last-command 'org-cycle))
-	  (org-cycle '(4)) (org-cycle '(4))))))))
+    (cond
+     ((eq org-startup-folded t)
+      (org-cycle '(4)))
+     ((eq org-startup-folded 'content)
+      (let ((this-command 'org-cycle) (last-command 'org-cycle))
+	(org-cycle '(4)) (org-cycle '(4)))))))
 
 (defsubst org-call-with-arg (command arg)
   "Call COMMAND interactively, but pretend prefix are was ARG."
@@ -3263,7 +3607,7 @@
 (put 'org-add-props 'lisp-indent-function 2)
 
 
-;;; Font-Lock stuff
+;;;; Font-Lock stuff, including the activators
 
 (defvar org-mouse-map (make-sparse-keymap))
 (define-key org-mouse-map
@@ -3331,6 +3675,12 @@
 ; 4: [desc]
 ; 5: desc
 
+(defconst org-any-link-re
+  (concat "\\(" org-bracket-link-regexp "\\)\\|\\("
+	  org-angle-link-re "\\)\\|\\("
+	  org-plain-link-re "\\)")
+  "Regular expression matching any link.")	  
+
 (defconst org-ts-lengths
   (cons (length (format-time-string (car org-time-stamp-formats)))
 	(length (format-time-string (cdr org-time-stamp-formats))))
@@ -3438,10 +3788,6 @@
 
 (defun org-activate-dates (limit)
   "Run through the buffer and add overlays to dates."
-;  (if (re-search-forward org-tsr-regexp limit t)
-;  (if (re-search-forward
-;       (if org-display-custom-times org-ts-regexp-both org-tsr-regexp-both)
-;       limit t)
   (if (re-search-forward org-tsr-regexp-both limit t)
       (progn
 	(add-text-properties (match-beginning 0) (match-end 0)
@@ -3526,19 +3872,6 @@
 	 "\\|")
 	"\\)\\>")))
 
-(defvar org-camel-regexp "\\*?\\<[A-Z]+[a-z]+[A-Z][a-zA-Z]*\\>"
-  "Matches CamelCase words, possibly with a star before it.")
-
-(defun org-activate-camels (limit)
-  "Run through the buffer and add overlays to dates."
-  (if (re-search-forward org-camel-regexp limit t)
-      (progn
-	(add-text-properties (match-beginning 0) (match-end 0)
-			     (list 'mouse-face 'highlight
-				   'rear-nonsticky t
-				   'keymap org-mouse-map))
-	t)))
-
 (defun org-activate-tags (limit)
   (if (re-search-forward "[ \t]\\(:[A-Za-z_@0-9:]+:\\)[ \r\n]" limit t)
       (progn
@@ -3578,16 +3911,14 @@
 	   (if (memq 'bracket lk) '(org-activate-bracket-links (0 'org-link t)))
 	   (if (memq 'radio lk) '(org-activate-target-links (0 'org-link t)))
 	   (if (memq 'date lk) '(org-activate-dates (0 'org-date t)))
-	   (if (memq 'camel lk) '(org-activate-camels (0 'org-link t)))
 	   (if (memq 'tag lk) '(org-activate-tags (1 'org-tag prepend)))
-	   (if org-table-limit-column-width
-	       '(org-hide-wide-columns (0 nil append)))
 	   ;; TODO lines
 	   (list (concat "^\\*+[ \t]*" org-not-done-regexp)
 		 '(1 'org-todo t))
 	   ;; Priorities
 	   (list (concat "\\[#[A-Z]\\]") '(0 'org-special-keyword t))
 	   ;; Special keywords
+	   (list org-repeat-re  '(0 'org-special-keyword t))
 	   (list (concat "\\<" org-deadline-string) '(0 'org-special-keyword t))
 	   (list (concat "\\<" org-scheduled-string) '(0 'org-special-keyword t))
 	   (list (concat "\\<" org-closed-string) '(0 'org-special-keyword t))
@@ -3655,7 +3986,9 @@
 					 rear-nonsticky t
 					 invisible t intangible t))))
 
-;;; Visibility cycling
+;;;; Visibility cycling, including org-goto and indirect buffer
+
+;;; Cycling
 
 (defvar org-cycle-global-status nil)
 (make-variable-buffer-local 'org-cycle-global-status)
@@ -3767,14 +4100,16 @@
 			(get-char-property (1- (point)) 'invisible))
 	      (beginning-of-line 2)) (setq eol (point)))
 	  (outline-end-of-heading)   (setq eoh (point))
-	  (org-end-of-subtree t)     (setq eos (point))
-	  (outline-next-heading))
+	  (org-end-of-subtree t)
+	  (skip-chars-forward " \t\n")
+	  (beginning-of-line 1) ; in case this is an item
+	  (setq eos (1- (point))))
 	;; Find out what to do next and set `this-command'
 	(cond
-	 ((and (= eos eoh)
+	 ((= eos eoh)
 	  ;; Nothing is hidden behind this heading
 	  (message "EMPTY ENTRY")
-	  (setq org-cycle-subtree-status nil)))
+	  (setq org-cycle-subtree-status nil))
 	 ((>= eol eos)
 	  ;; Entire subtree is hidden in one line: open it
 	  (org-show-entry)
@@ -3849,12 +4184,13 @@
 			  (funcall outline-level))
 		      1))))
 
-;; FIXME: allow an argument to give a limiting level for this.
-(defun org-content ()
-  "Show all headlines in the buffer, like a table of contents"
-  (interactive)
+(defun org-content (&optional arg)
+  "Show all headlines in the buffer, like a table of contents.
+With numerical argument N, show content up to level N."
+  (interactive "P")
   (save-excursion
     ;; Visit all headings and show their offspring
+    (and (integerp arg) (org-overview))
     (goto-char (point-max))
     (catch 'exit
       (while (and (progn (condition-case nil
@@ -3862,7 +4198,9 @@
 			   (error (goto-char (point-min))))
 			 t)
 		  (looking-at outline-regexp))
-	(show-branches)
+	(if (integerp arg)
+	    (show-children (1- arg))
+	  (show-branches))
 	(if (bobp) (throw 'exit nil))))))
 
 
@@ -3891,6 +4229,8 @@
     (beginning-of-line)
     (recenter (prefix-numeric-value N))))
 
+;;; Org-goto
+
 (defvar org-goto-window-configuration nil)
 (defvar org-goto-marker nil)
 (defvar org-goto-map (make-sparse-keymap))
@@ -3948,6 +4288,8 @@
 	      (org-show-context 'org-goto)))
       (error "Quit"))))
 
+(defvar org-selected-point nil) ; dynamically scoped parameter
+
 (defun org-get-location (buf help)
   "Let the user select a location in the Org-mode buffer BUF.
 This function uses a recursive edit.  It returns the selected position
@@ -3965,12 +4307,16 @@
 	(insert-buffer-substring buf)
 	(let ((org-startup-truncated t)
 	      (org-startup-folded t)
-	      (org-startup-align-all-tables nil)
-	      (org-startup-with-deadline-check nil))
+	      (org-startup-align-all-tables nil))
 	  (org-mode))
 	(setq buffer-read-only t)
-	(if (boundp 'org-goto-start-pos)
-	    (goto-char org-goto-start-pos)
+	(if (and (boundp 'org-goto-start-pos)
+		 (integer-or-marker-p org-goto-start-pos))
+	    (let ((org-show-hierarchy-above t)
+		  (org-show-siblings t)
+		  (org-show-following-heading t))
+	      (goto-char org-goto-start-pos)
+	      (and (org-invisible-p) (org-show-context)))
 	  (goto-char (point-min)))
 	(org-beginning-of-line)
 	(message "Select location and press RET")
@@ -4022,10 +4368,89 @@
   (setq org-selected-point nil)
   (throw 'exit nil))
 
-;;; Promotion, Demotion, Inserting new headlines
-
-(defvar org-ignore-region nil
-  "To temporarily disable the active region.")
+;;; Indirect buffer display of subtrees
+
+(defvar org-indirect-dedicated-frame nil
+  "This is the frame being used for indirect tree display.")
+(defvar org-last-indirect-buffer nil)
+
+(defun org-tree-to-indirect-buffer (&optional arg)
+  "Create indirect buffer and narrow it to current subtree.
+With numerical prefix ARG, go up to this level and then take that tree.
+If ARG is negative, go up that many levels.
+Normally this command removes the indirect buffer previously made
+with this command.  However, when called with a C-u prefix, the last buffer
+is kept so that you can work with several indirect buffers at the same time.
+If `org-indirect-buffer-display' is `dedicated-frame', the C-u prefix also
+requests that a new frame be made for the new buffer, so that the dedicated
+frame is not changed."
+  (interactive "P")
+  (let ((cbuf (current-buffer))
+	(cwin (selected-window))
+	(pos (point))
+	beg end level heading ibuf)
+    (save-excursion
+      (org-back-to-heading t)
+      (when (numberp arg)
+	(setq level (org-outline-level))
+	(if (< arg 0) (setq arg (+ level arg)))
+	(while (> (setq level (org-outline-level)) arg)
+	  (outline-up-heading 1 t)))
+      (setq beg (point)
+	    heading (org-get-heading))
+      (org-end-of-subtree t) (setq end (point)))
+    (if (and (not arg)
+	     (buffer-live-p org-last-indirect-buffer))
+	(kill-buffer org-last-indirect-buffer))
+    (setq ibuf (org-get-indirect-buffer cbuf)
+	  org-last-indirect-buffer ibuf)
+    (cond
+     ((or (eq org-indirect-buffer-display 'new-frame)
+	  (and arg (eq org-indirect-buffer-display 'dedicated-frame)))
+      (select-frame (make-frame))
+      (delete-other-windows)
+      (switch-to-buffer ibuf)
+      (org-set-frame-title heading))
+     ((eq org-indirect-buffer-display 'dedicated-frame)
+      (raise-frame
+       (select-frame (or (and org-indirect-dedicated-frame
+			      (frame-live-p org-indirect-dedicated-frame)
+			      org-indirect-dedicated-frame)
+			 (setq org-indirect-dedicated-frame (make-frame)))))
+      (delete-other-windows)
+      (switch-to-buffer ibuf)
+      (org-set-frame-title (concat "Indirect: " heading)))
+     ((eq org-indirect-buffer-display 'current-window)
+      (switch-to-buffer ibuf))
+     ((eq org-indirect-buffer-display 'other-window)
+      (pop-to-buffer ibuf))
+     (t (error "Invalid value.")))
+    (if (featurep 'xemacs)
+        (save-excursion (org-mode) (turn-on-font-lock)))
+    (narrow-to-region beg end)
+    (show-all)
+    (goto-char pos)
+    (and (window-live-p cwin) (select-window cwin))))
+
+(defun org-get-indirect-buffer (&optional buffer)
+  (setq buffer (or buffer (current-buffer)))
+  (let ((n 1) (base (buffer-name buffer)) bname)
+    (while (buffer-live-p
+	    (get-buffer (setq bname (concat base "-" (number-to-string n)))))
+      (setq n (1+ n)))
+    (condition-case nil
+        (make-indirect-buffer buffer bname 'clone)
+      (error (make-indirect-buffer buffer bname)))))
+
+(defun org-set-frame-title (title)
+  "Set the title of the current frame to the string TITLE."
+  ;; FIXME: how to name a single frame in XEmacs???
+  (unless (featurep 'xemacs)
+    (modify-frame-parameters (selected-frame) (list (cons 'name title)))))
+
+;;;; Structure editing
+
+;;; Inserting headlines
 
 (defun org-insert-heading (&optional force-heading)
   "Insert a new heading or item with same depth at point.
@@ -4060,49 +4485,6 @@
 	(unless (= (point) pos) (just-one-space) (backward-delete-char 1))
 	(run-hooks 'org-insert-heading-hook)))))
 
-(defun org-in-item-p ()
-  "It the cursor inside a plain list item.
-Does not have to be the first line."
-  (save-excursion
-    (condition-case nil
-	(progn
-	  (org-beginning-of-item)
-	  (org-at-item-p)
-	  t)
-      (error nil))))
-
-(defun org-insert-item (&optional checkbox)
-  "Insert a new item at the current level.
-Return t when things worked, nil when we are not in an item."
-  (when (save-excursion
-	  (condition-case nil
-	      (progn
-		(org-beginning-of-item)
-		(org-at-item-p)
-		(if (org-invisible-p) (error "Invisible item"))
-		t)
-	    (error nil)))
-    (let* ((bul (match-string 0))
-	   (eow (save-excursion (beginning-of-line 1) (looking-at "[ \t]*")
-				(match-end 0)))
-	   (blank (cdr (assq 'plain-list-item org-blank-before-new-entry)))
-	   pos)
-      (cond
-       ((and (org-at-item-p) (<= (point) eow))
-	;; before the bullet
-	(beginning-of-line 1)
-	(open-line (if blank 2 1)))
-       ((<= (point) eow)
-	(beginning-of-line 1))
-       (t (newline (if blank 2 1))))
-      (insert bul (if checkbox "[ ]" ""))
-      (just-one-space)
-      (setq pos (point))
-      (end-of-line 1)
-      (unless (= (point) pos) (just-one-space) (backward-delete-char 1)))
-    (org-maybe-renumber-ordered-list)
-    (and checkbox (org-update-checkbox-count-maybe))
-    t))
 
 (defun org-insert-todo-heading (arg)
   "Insert a new heading with the same level and TODO state as current heading.
@@ -4121,6 +4503,8 @@
 	(insert (car org-todo-keywords) " ")
       (insert (match-string 2) " "))))
 
+;;; Promotion and Demotion
+
 (defun org-promote-subtree ()
   "Promote the entire subtree.
 See also `org-promote'."
@@ -4162,14 +4546,14 @@
 
 (defun org-fix-position-after-promote ()
   "Make sure that after pro/demotion cursor position is right."
-  (if (and (equal (char-after) ?\n)
-	   (save-excursion
-	     (skip-chars-backward "a-zA-Z0-9_@")
-	     (looking-at org-todo-regexp)))
-      (insert " "))
-  (and (equal (char-after) ?\ )
-       (equal (char-before) ?*)
-       (forward-char 1)))
+  (let ((pos (point)))
+    (when (save-excursion
+	    (beginning-of-line 1)
+	    (looking-at org-todo-line-regexp)
+	    (or (equal pos (match-end 1)) (equal pos (match-end 2))))
+      (cond ((eobp) (insert " "))
+	    ((eolp) (insert " "))
+	    ((equal (char-after) ?\ ) (forward-char 1))))))
 
 (defun org-get-legal-level (level &optional change)
   "Rectify a level change under the influence of `org-odd-levels-only'
@@ -4255,6 +4639,47 @@
 	  (indent-to (+ diff col))))
       (move-marker end nil))))
 
+(defun org-convert-to-odd-levels ()
+  "Convert an org-mode file with all levels allowed to one with odd levels.
+This will leave level 1 alone, convert level 2 to level 3, level 3 to
+level 5 etc."
+  (interactive)
+  (when (yes-or-no-p "Are you sure you want to globally change levels to odd? ")
+    (let ((org-odd-levels-only nil) n)
+      (save-excursion
+	(goto-char (point-min))
+	(while (re-search-forward "^\\*\\*+" nil t)
+	  (setq n (1- (length (match-string 0))))
+	  (while (>= (setq n (1- n)) 0)
+	    (org-demote))
+	  (end-of-line 1))))))
+
+
+(defun org-convert-to-oddeven-levels ()
+  "Convert an org-mode file with only odd levels to one with odd and even levels.
+This promotes level 3 to level 2, level 5 to level 3 etc.  If the file contains a
+section with an even level, conversion would destroy the structure of the file.  An error
+is signaled in this case."
+  (interactive)
+  (goto-char (point-min))
+  ;; First check if there are no even levels
+  (when (re-search-forward "^\\(\\*\\*\\)+[^*]" nil t)
+    (org-show-context t)
+    (error "Not all levels are odd in this file.  Conversion not possible."))
+  (when (yes-or-no-p "Are you sure you want to globally change levels to odd-even? ")
+    (let ((org-odd-levels-only nil) n)
+      (save-excursion
+	(goto-char (point-min))
+	(while (re-search-forward "^\\*\\*+" nil t)
+	  (setq n (/ (length (match-string 0)) 2))
+	  (while (>= (setq n (1- n)) 0)
+	    (org-promote))
+	  (end-of-line 1))))))
+
+(defun org-tr-level (n)
+  "Make N odd if required."
+  (if org-odd-levels-only (1+ (/ n 2)) n))
+
 ;;; Vertical tree motion, cutting and pasting of subtrees
 
 (defun org-move-subtree-up (&optional arg)
@@ -4464,6 +4889,138 @@
      (progn (org-back-to-heading) (point))
      (progn (org-end-of-subtree t) (point)))))
 
+
+;;; Outline Sorting
+
+(defun org-sort (with-case)
+  "Call `org-sort-entries' or `org-table-sort-lines', depending on context."
+  (interactive "P")
+  (if (org-at-table-p)
+      (org-call-with-arg 'org-table-sort-lines with-case)
+    (org-call-with-arg 'org-sort-entries with-case)))
+
+(defun org-sort-entries (&optional with-case sorting-type)
+  "Sort entries on a certain level of an outline tree.
+If there is an active region, the entries in the region are sorted.
+Else, if the cursor is before the first entry, sort the top-level items.
+Else, the children of the entry at point are sorted.
+
+Sorting can be alphabetically, numerically, and by date/time as given by
+the first time stamp in the entry.  The command prompts for the sorting
+type unless it has been given to the function through the SORTING-TYPE
+argument, which needs to a character, any of (?n ?N ?a ?A ?t ?T).
+
+Comparing entries ignores case by default.  However, with an optional argument
+WITH-CASE, the sorting considers case as well.  With two prefix arguments
+`C-u C-u', sorting is case-sensitive and duplicate entries will be removed."
+  (interactive "P")
+  (let ((unique (equal with-case '(16)))
+	start beg end entries stars re re2 p nentries (nremoved 0)
+	last txt what)
+    ;; Find beginning and end of region to sort
+    (cond
+     ((org-region-active-p)
+      ;; we will sort the region
+      (setq end (region-end)
+	    what "region")
+      (goto-char (region-beginning))
+      (if (not (org-on-heading-p)) (outline-next-heading))
+      (setq start (point)))
+     ((or (org-on-heading-p)
+	  (condition-case nil (progn (org-back-to-heading) t) (error nil)))
+      ;; we will sort the children of the current headline
+      (org-back-to-heading)
+      (setq start (point) end (org-end-of-subtree) what "children")
+      (goto-char start)
+      (show-subtree)
+      (outline-next-heading))
+     (t
+      ;; we will sort the top-level entries in this file
+      (goto-char (point-min))
+      (or (org-on-heading-p) (outline-next-heading))
+      (setq start (point) end (point-max) what "top-level")
+      (goto-char start)
+      (show-all)))
+    (setq beg (point))
+    (if (>= (point) end) (error "Nothing to sort"))
+    (looking-at "\\(\\*+\\)")
+    (setq stars (match-string 1)
+	  re (concat "^" (regexp-quote stars) " +")
+	  re2 (concat "^" (regexp-quote (substring stars 0 -1)) "[^*]")
+	  txt (buffer-substring beg end))
+    (if (not (equal (substring txt -1) "\n")) (setq txt (concat txt "\n")))
+    (if (and (not (equal stars "*")) (string-match re2 txt))
+	(error "Region to sort contains a level above the first entry"))
+    ;; Make a list that can be sorted.
+    ;; The car is the string for comparison, the cdr is the subtree
+    (message "Sorting entries...")
+    (setq entries
+	  (mapcar
+	   (lambda (x)
+	     (string-match "^.*\\(\n.*\\)?" x) ; take two lines
+	     (cons (match-string 0 x) x))
+	   (org-split-string txt re)))
+
+    ;; Sort the list
+    (save-excursion
+      (goto-char start)
+      (setq entries (org-do-sort entries what with-case sorting-type)))
+
+    ;; Delete the old stuff
+    (goto-char beg)
+    (kill-region beg end)
+    (setq nentries (length entries))
+    ;; Insert the sorted entries, and remove duplicates if this is required
+    (while (setq p (pop entries))
+      (if (and unique (equal last (setq last (org-trim (cdr p)))))
+	  (setq nremoved (1+ nremoved)) ; same entry as before, skip it
+	(insert stars " " (cdr p))))
+    (goto-char start)
+    (message "Sorting entries...done (%d entries%s)"
+	     nentries
+	     (if unique (format ", %d duplicates removed" nremoved) ""))))
+
+(defun org-do-sort (table what &optional with-case sorting-type)
+  "Sort TABLE of WHAT according to SORTING-TYPE.
+The user will be prompted for the SORTING-TYPE if the call to this
+function does not specify it.  WHAT is only for the prompt, to indicate
+what is being sorted.  The sorting key will be extracted from
+the car of the elements of the table.
+If WITH-CASE is non-nil, the sorting will be case-sensitive."
+  (unless sorting-type
+    (message
+     "Sort %s: [a]lphabetically [n]umerically [t]ime. A/N/T means reversed:"
+     what)
+    (setq sorting-type (read-char-exclusive)))
+  (let ((dcst (downcase sorting-type))
+	extractfun comparefun)
+    ;; Define the appropriate functions
+    (cond
+     ((= dcst ?n)
+      (setq extractfun 'string-to-number
+	    comparefun (if (= dcst sorting-type) '< '>)))
+     ((= dcst ?a)
+      (setq extractfun (if with-case 'identity 'downcase)
+	    comparefun (if (= dcst sorting-type)
+			   'string<
+			 (lambda (a b) (and (not (string< a b))
+					    (not (string= a b)))))))
+     ((= dcst ?t)
+      (setq extractfun
+	    (lambda (x)
+	      (if (string-match org-ts-regexp x)
+		  (time-to-seconds
+		   (org-time-string-to-time (match-string 0 x)))
+		0))
+	    comparefun (if (= dcst sorting-type) '< '>)))
+     (t (error "Invalid sorting type `%c'" sorting-type)))
+
+    (sort (mapcar (lambda (x) (cons (funcall extractfun (car x)) (cdr x)))
+		  table)
+	  (lambda (a b) (funcall comparefun (car a) (car b))))))
+
+;;;; Plain list items, including checkboxes
+
 ;;; Plain list items
 
 (defun org-at-item-p ()
@@ -4478,6 +5035,53 @@
 	((= llt ?\)) "\\([ \t]*\\([-+]\\|\\([0-9]+)\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
 	(t (error "Invalid value of `org-plain-list-ordered-item-terminator'")))))))
 
+
+(defun org-in-item-p ()
+  "It the cursor inside a plain list item.
+Does not have to be the first line."
+  (save-excursion
+    (condition-case nil
+	(progn
+	  (org-beginning-of-item)
+	  (org-at-item-p)
+	  t)
+      (error nil))))
+
+(defun org-insert-item (&optional checkbox)
+  "Insert a new item at the current level.
+Return t when things worked, nil when we are not in an item."
+  (when (save-excursion
+	  (condition-case nil
+	      (progn
+		(org-beginning-of-item)
+		(org-at-item-p)
+		(if (org-invisible-p) (error "Invisible item"))
+		t)
+	    (error nil)))
+    (let* ((bul (match-string 0))
+	   (eow (save-excursion (beginning-of-line 1) (looking-at "[ \t]*")
+				(match-end 0)))
+	   (blank (cdr (assq 'plain-list-item org-blank-before-new-entry)))
+	   pos)
+      (cond
+       ((and (org-at-item-p) (<= (point) eow))
+	;; before the bullet
+	(beginning-of-line 1)
+	(open-line (if blank 2 1)))
+       ((<= (point) eow)
+	(beginning-of-line 1))
+       (t (newline (if blank 2 1))))
+      (insert bul (if checkbox "[ ]" ""))
+      (just-one-space)
+      (setq pos (point))
+      (end-of-line 1)
+      (unless (= (point) pos) (just-one-space) (backward-delete-char 1)))
+    (org-maybe-renumber-ordered-list)
+    (and checkbox (org-update-checkbox-count-maybe))
+    t))
+
+;;; Checkboxes
+
 (defun org-at-item-checkbox-p ()
   "Is point at a line starting a plain-list item with a checklet?"
   (and (org-at-item-p)
@@ -4596,10 +5200,11 @@
 	     t t s)))
   s)
 
-;; FIXME: document properly.
 (defun org-fix-indentation (line ind)
-  "If the current indenation is smaller than ind1, leave it alone.
-If it is larger than ind, reduce it by ind."
+  "Fix indentation in LINE.
+IND is a cons cell with target and minimum indentation.
+If the current indenation in LINE is smaller than the minimum,
+leave it alone.  If it is larger than ind, set it to the target."
   (let* ((l (org-remove-tabs line))
 	 (i (org-get-indentation l))
 	 (i1 (car ind)) (i2 (cdr ind)))
@@ -4848,7 +5453,9 @@
 	(indent-to-column (+ ind1 arg))
 	(beginning-of-line 2)))))
 
-;;; Archiving
+;;;; Archiving
+
+(defalias 'org-advertized-archive-subtree 'org-archive-subtree)
 
 (defun org-archive-subtree (&optional find-done)
   "Move the current subtree to the archive.
@@ -4872,8 +5479,17 @@
 	  (tr-org-done-string org-done-string)
 	  (tr-org-todo-regexp org-todo-regexp)
 	  (tr-org-todo-line-regexp org-todo-line-regexp)
+	  (tr-org-odd-levels-only org-odd-levels-only)
 	  (this-buffer (current-buffer))
+	  (org-archive-location org-archive-location)
+	  (re "^#\\+ARCHIVE:[ \t]+\\(\\S-.*\\S-\\)[ \t]*$")
 	  file heading buffer level newfile-p)
+
+      ;; Try to find a local archive location
+      (save-excursion
+	(if (or (re-search-backward re nil t) (re-search-forward re nil t))
+	    (setq org-archive-location (match-string 1))))
+
       (if (string-match "\\(.*\\)::\\(.*\\)" org-archive-location)
 	  (progn
 	    (setq file (format (match-string 1 org-archive-location)
@@ -4911,13 +5527,17 @@
 	      (org-todo-interpretation tr-org-todo-interpretation)
 	      (org-done-string tr-org-done-string)
 	      (org-todo-regexp tr-org-todo-regexp)
-	      (org-todo-line-regexp tr-org-todo-line-regexp))
+	      (org-todo-line-regexp tr-org-todo-line-regexp)
+	      (org-odd-levels-only
+	       (if (local-variable-p 'org-odd-levels-only)
+		   org-odd-levels-only
+		 tr-org-odd-levels-only)))
 	  (goto-char (point-min))
 	  (if heading
 	      (progn
 		(if (re-search-forward
 		     (concat "\\(^\\|\r\\)"
-			     (regexp-quote heading) "[ \t]*\\($\\|\r\\)")
+			     (regexp-quote heading) "[ \t]*\\(:[a-zA-Z0-9_@:]+:\\)?[ \t]*\\($\\|\r\\)")
 		     nil t)
 		    (goto-char (match-end 0))
 		  ;; Heading not found, just insert it at the end
@@ -4934,10 +5554,11 @@
 	    ;; No specific heading, just go to end of file.
 	    (goto-char (point-max)) (insert "\n"))
 	  ;; Paste
-	  (org-paste-subtree (1+ level))
+	  (org-paste-subtree (org-get-legal-level level 1))
 	  ;; Mark the entry as done, i.e. set to last work in org-todo-keywords
 	  (if org-archive-mark-done
-	      (org-todo (length org-todo-keywords)))
+	      (let (org-log-done)
+		(org-todo (length org-todo-keywords))))
 	  ;; Move cursor to right after the TODO keyword
 	  (when org-archive-stamp-time
 	    (beginning-of-line 1)
@@ -5073,116 +5694,4985 @@
       (and set (beginning-of-line 1))
       (message "Subtree %s" (if set "archived" "unarchived")))))
 
-(defvar org-agenda-multi nil)  ; dynammically scoped
-(defvar org-agenda-buffer-name "*Org Agenda*")
-(defvar org-pre-agenda-window-conf nil)
-(defun org-prepare-agenda ()
-  (if org-agenda-multi
-      (progn
-	(setq buffer-read-only nil)
+
+;;;; Tables
+
+;;; The table editor
+
+;; Watch out:  Here we are talking about two different kind of tables.
+;; Most of the code is for the tables created with the Org-mode table editor.
+;; Sometimes, we talk about tables created and edited with the table.el
+;; Emacs package.  We call the former org-type tables, and the latter
+;; table.el-type tables.
+
+(defun org-before-change-function (beg end)
+  "Every change indicates that a table might need an update."
+  (setq org-table-may-need-update t))
+
+(defconst org-table-line-regexp "^[ \t]*|"
+  "Detects an org-type table line.")
+(defconst org-table-dataline-regexp "^[ \t]*|[^-]"
+  "Detects an org-type table line.")
+(defconst org-table-auto-recalculate-regexp "^[ \t]*| *# *\\(|\\|$\\)"
+  "Detects a table line marked for automatic recalculation.")
+(defconst org-table-recalculate-regexp "^[ \t]*| *[#*] *\\(|\\|$\\)"
+  "Detects a table line marked for automatic recalculation.")
+(defconst org-table-calculate-mark-regexp "^[ \t]*| *[!$^_#*] *\\(|\\|$\\)"
+  "Detects a table line marked for automatic recalculation.")
+(defconst org-table-hline-regexp "^[ \t]*|-"
+  "Detects an org-type table hline.")
+(defconst org-table1-hline-regexp "^[ \t]*\\+-[-+]"
+  "Detects a table-type table hline.")
+(defconst org-table-any-line-regexp "^[ \t]*\\(|\\|\\+-[-+]\\)"
+  "Detects an org-type or table-type table.")
+(defconst org-table-border-regexp "^[ \t]*[^| \t]"
+  "Searching from within a table (any type) this finds the first line
+outside the table.")
+(defconst org-table-any-border-regexp "^[ \t]*[^|+ \t]"
+  "Searching from within a table (any type) this finds the first line
+outside the table.")
+
+(defvar org-table-last-highlighted-reference nil)
+(defvar org-table-formula-history nil)
+
+(defvar org-table-column-names nil
+  "Alist with column names, derived from the `!' line.")
+(defvar org-table-column-name-regexp nil
+  "Regular expression matching the current column names.")
+(defvar org-table-local-parameters nil
+  "Alist with parameter names, derived from the `$' line.")
+(defvar org-table-named-field-locations nil
+  "Alist with locations of named fields.")
+
+(defvar org-table-current-line-types nil
+  "Table row types, non-nil only for the duration of a comand.")
+(defvar org-table-current-begin-line nil
+  "Table begin line, non-nil only for the duration of a comand.")
+(defvar org-table-dlines nil
+  "Vector of data line line numbers in the current table.")
+(defvar org-table-hlines nil
+  "Vector of hline line numbers in the current table.")
+
+(defconst org-table-range-regexp
+   "@\\([-+]?I*[-+]?[0-9]*\\)?\\(\\$[-+]?[0-9]+\\)?\\(\\.\\.@?\\([-+]?I*[-+]?[0-9]*\\)?\\(\\$[-+]?[0-9]+\\)?\\)?"
+   ;;   1                        2                    3          4                        5
+  "Regular expression for matching ranges in formulas.")
+
+(defconst org-table-range-regexp2
+   "@\\([-+]?I*[-+]?[0-9]*\\)?\\(\\$[-+]?[a-zA-Z0-9]+\\)?\\(\\.\\.@?\\([-+]?I*[-+]?[0-9]*\\)?\\(\\$[-+]?[a-zA-Z0-9]+\\)?\\)?\\|\\$[a-zA-Z0-9]+\\.\\.\\$[a-zA-Z0-9]+"
+  "Regular expression to recognize ranges in formulas for highlighting.")
+
+(defvar org-inhibit-highlight-removal nil)
+
+
+(defun org-table-create-with-table.el ()
+  "Use the table.el package to insert a new table.
+If there is already a table at point, convert between Org-mode tables
+and table.el tables."
+  (interactive)
+  (require 'table)
+  (cond
+   ((org-at-table.el-p)
+    (if (y-or-n-p "Convert table to Org-mode table? ")
+	(org-table-convert)))
+   ((org-at-table-p)
+    (if (y-or-n-p "Convert table to table.el table? ")
+	(org-table-convert)))
+   (t (call-interactively 'table-insert))))
+
+(defun org-table-create-or-convert-from-region (arg)
+  "Convert region to table, or create an empty table.
+If there is an active region, convert it to a table.  If there is no such
+region, create an empty table."
+  (interactive "P")
+  (if (org-region-active-p)
+      (org-table-convert-region (region-beginning) (region-end) arg)
+    (org-table-create arg)))
+
+(defun org-table-create (&optional size)
+  "Query for a size and insert a table skeleton.
+SIZE is a string Columns x Rows like for example \"3x2\"."
+  (interactive "P")
+  (unless size
+    (setq size (read-string
+		(concat "Table size Columns x Rows [e.g. "
+			org-table-default-size "]: ")
+		"" nil org-table-default-size)))
+
+  (let* ((pos (point))
+	 (indent (make-string (current-column) ?\ ))
+	 (split (org-split-string size " *x *"))
+	 (rows (string-to-number (nth 1 split)))
+	 (columns (string-to-number (car split)))
+	 (line (concat (apply 'concat indent "|" (make-list columns "  |"))
+		       "\n")))
+    (if (string-match "^[ \t]*$" (buffer-substring-no-properties
+				  (point-at-bol) (point)))
+	(beginning-of-line 1)
+      (newline))
+    ;; (mapcar (lambda (x) (insert line)) (make-list rows t))
+    (dotimes (i rows) (insert line))
+    (goto-char pos)
+    (if (> rows 1)
+	;; Insert a hline after the first row.
+	(progn
+	  (end-of-line 1)
+	  (insert "\n|-")
+	  (goto-char pos)))
+    (org-table-align)))
+
+(defun org-table-convert-region (beg0 end0 &optional nspace)
+  "Convert region to a table.
+The region goes from BEG0 to END0, but these borders will be moved
+slightly, to make sure a beginning of line in the first line is included.
+When NSPACE is non-nil, it indicates the minimum number of spaces that
+separate columns (default: just one space)."
+  (interactive "rP")
+  (let* ((beg (min beg0 end0))
+	 (end (max beg0 end0))
+	 (tabsep t)
+	 re)
+    (goto-char beg)
+    (beginning-of-line 1)
+    (setq beg (move-marker (make-marker) (point)))
+    (goto-char end)
+    (if (bolp) (backward-char 1) (end-of-line 1))
+    (setq end (move-marker (make-marker) (point)))
+    ;; Lets see if this is tab-separated material.  If every nonempty line
+    ;; contains a tab, we will assume that it is tab-separated material
+    (if nspace
+	(setq tabsep nil)
+      (goto-char beg)
+      (and (re-search-forward "^[^\n\t]+$" end t) (setq tabsep nil)))
+    (if nspace (setq tabsep nil))
+    (if tabsep
+	(setq re "^\\|\t")
+      (setq re (format "^ *\\| *\t *\\| \\{%d,\\}"
+		       (max 1 (prefix-numeric-value nspace)))))
+    (goto-char beg)
+    (while (re-search-forward re end t)
+      (replace-match "| " t t))
+    (goto-char beg)
+    (insert " ")
+    (org-table-align)))
+
+(defun org-table-import (file arg)
+  "Import FILE as a table.
+The file is assumed to be tab-separated.  Such files can be produced by most
+spreadsheet and database applications.  If no tabs (at least one per line)
+are found, lines will be split on whitespace into fields."
+  (interactive "f\nP")
+  (or (bolp) (newline))
+  (let ((beg (point))
+	(pm (point-max)))
+    (insert-file-contents file)
+    (org-table-convert-region beg (+ (point) (- (point-max) pm)) arg)))
+
+(defun org-table-export ()
+  "Export table as a tab-separated file.
+Such a file can be imported into a spreadsheet program like Excel."
+  (interactive)
+  (let* ((beg (org-table-begin))
+	 (end (org-table-end))
+	 (table (buffer-substring beg end))
+	 (file (read-file-name "Export table to: "))
+	 buf)
+    (unless (or (not (file-exists-p file))
+		(y-or-n-p (format "Overwrite file %s? " file)))
+      (error "Abort"))
+    (with-current-buffer (find-file-noselect file)
+      (setq buf (current-buffer))
+      (erase-buffer)
+      (fundamental-mode)
+      (insert table)
+      (goto-char (point-min))
+      (while (re-search-forward "^[ \t]*|[ \t]*" nil t)
+	(replace-match "" t t)
+	(end-of-line 1))
+      (goto-char (point-min))
+      (while (re-search-forward "[ \t]*|[ \t]*$" nil t)
+	(replace-match "" t t)
+	(goto-char (min (1+ (point)) (point-max))))
+      (goto-char (point-min))
+      (while (re-search-forward "^-[-+]*$" nil t)
+	(replace-match "")
+	(if (looking-at "\n")
+	    (delete-char 1)))
+      (goto-char (point-min))
+      (while (re-search-forward "[ \t]*|[ \t]*" nil t)
+	(replace-match "\t" t t))
+      (save-buffer))
+    (kill-buffer buf)))
+
+(defvar org-table-aligned-begin-marker (make-marker)
+  "Marker at the beginning of the table last aligned.
+Used to check if cursor still is in that table, to minimize realignment.")
+(defvar org-table-aligned-end-marker (make-marker)
+  "Marker at the end of the table last aligned.
+Used to check if cursor still is in that table, to minimize realignment.")
+(defvar org-table-last-alignment nil
+  "List of flags for flushright alignment, from the last re-alignment.
+This is being used to correctly align a single field after TAB or RET.")
+(defvar org-table-last-column-widths nil
+  "List of max width of fields in each column.
+This is being used to correctly align a single field after TAB or RET.")
+(defvar org-table-overlay-coordinates nil
+  "Overlay coordinates after each align of a table.")
+(make-variable-buffer-local 'org-table-overlay-coordinates)
+
+(defvar org-last-recalc-line nil)
+(defconst org-narrow-column-arrow "=>"
+  "Used as display property in narrowed table columns.")
+
+(defun org-table-align ()
+  "Align the table at point by aligning all vertical bars."
+  (interactive)
+  (let* (
+	 ;; Limits of table
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 ;; Current cursor position
+	 (linepos (org-current-line))
+	 (colpos (org-table-current-column))
+	 (winstart (window-start))
+	 (winstartline (org-current-line (min winstart (1- (point-max)))))
+	 lines (new "") lengths l typenums ty fields maxfields i
+	 column
+	 (indent "") cnt frac
+	 rfmt hfmt
+	 (spaces '(1 . 1))
+	 (sp1 (car spaces))
+	 (sp2 (cdr spaces))
+	 (rfmt1 (concat
+		 (make-string sp2 ?\ ) "%%%s%ds" (make-string sp1 ?\ ) "|"))
+	 (hfmt1 (concat
+		 (make-string sp2 ?-) "%s" (make-string sp1 ?-) "+"))
+	 emptystrings links dates narrow fmax f1 len c e)
+    (untabify beg end)
+    (remove-text-properties beg end '(org-cwidth t org-dwidth t display t))
+    ;; Check if we have links or dates
+    (goto-char beg)
+    (setq links (re-search-forward org-bracket-link-regexp end t))
+    (goto-char beg)
+    (setq dates (and org-display-custom-times
+		     (re-search-forward org-ts-regexp-both end t)))
+    ;; Make sure the link properties are right
+    (when links (goto-char beg) (while (org-activate-bracket-links end)))
+    ;; Make sure the date properties are right
+    (when dates (goto-char beg) (while (org-activate-dates end)))
+
+    ;; Check if we are narrowing any columns
+    (goto-char beg)
+    (setq narrow (and org-format-transports-properties-p
+		      (re-search-forward "<[0-9]+>" end t)))
+    ;; Get the rows
+    (setq lines (org-split-string
+		 (buffer-substring beg end) "\n"))
+    ;; Store the indentation of the first line
+    (if (string-match "^ *" (car lines))
+	(setq indent (make-string (- (match-end 0) (match-beginning 0)) ?\ )))
+    ;; Mark the hlines by setting the corresponding element to nil
+    ;; At the same time, we remove trailing space.
+    (setq lines (mapcar (lambda (l)
+			  (if (string-match "^ *|-" l)
+			      nil
+			    (if (string-match "[ \t]+$" l)
+				(substring l 0 (match-beginning 0))
+			      l)))
+			lines))
+    ;; Get the data fields by splitting the lines.
+    (setq fields (mapcar
+		  (lambda (l)
+		      (org-split-string l " *| *"))
+		  (delq nil (copy-sequence lines))))
+    ;; How many fields in the longest line?
+    (condition-case nil
+	(setq maxfields (apply 'max (mapcar 'length fields)))
+      (error
+       (kill-region beg end)
+       (org-table-create org-table-default-size)
+       (error "Empty table - created default table")))
+    ;; A list of empty strings to fill any short rows on output
+    (setq emptystrings (make-list maxfields ""))
+    ;; Check for special formatting.
+    (setq i -1)
+    (while (< (setq i (1+ i)) maxfields)   ;; Loop over all columns
+      (setq column (mapcar (lambda (x) (or (nth i x) "")) fields))
+      ;; Check if there is an explicit width specified
+      (when narrow
+	(setq c column fmax nil)
+	(while c
+	  (setq e (pop c))
+	  (if (and (stringp e) (string-match "^<\\([0-9]+\\)>$" e))
+	      (setq fmax (string-to-number (match-string 1 e)) c nil)))
+	;; Find fields that are wider than fmax, and shorten them
+	(when fmax
+	  (loop for xx in column do
+		(when (and (stringp xx)
+			   (> (org-string-width xx) fmax))
+		  (org-add-props xx nil
+		    'help-echo
+		    (concat "Clipped table field, use C-c ` to edit. Full value is:\n" (org-no-properties (copy-sequence xx))))
+		  (setq f1 (min fmax (or (string-match org-bracket-link-regexp xx) fmax)))
+		  (unless (> f1 1)
+		    (error "Cannot narrow field starting with wide link \"%s\""
+			   (match-string 0 xx)))
+		  (add-text-properties f1 (length xx) (list 'org-cwidth t) xx)
+		  (add-text-properties (- f1 2) f1
+				       (list 'display org-narrow-column-arrow)
+				       xx)))))
+      ;; Get the maximum width for each column
+      (push (apply 'max 1 (mapcar 'org-string-width column)) lengths)
+      ;; Get the fraction of numbers, to decide about alignment of the column
+      (setq cnt 0 frac 0.0)
+      (loop for x in column do
+	    (if (equal x "")
+		nil
+	      (setq frac ( / (+ (* frac cnt)
+				(if (string-match org-table-number-regexp x) 1 0))
+			     (setq cnt (1+ cnt))))))
+      (push (>= frac org-table-number-fraction) typenums))
+    (setq lengths (nreverse lengths) typenums (nreverse typenums))
+
+    ;; Store the alignment of this table, for later editing of single fields
+    (setq org-table-last-alignment typenums
+	  org-table-last-column-widths lengths)
+
+    ;; With invisible characters, `format' does not get the field width right
+    ;; So we need to make these fields wide by hand.
+    (when links
+      (loop for i from 0 upto (1- maxfields) do
+	    (setq len (nth i lengths))
+	    (loop for j from 0 upto (1- (length fields)) do
+		  (setq c (nthcdr i (car (nthcdr j fields))))
+		  (if (and (stringp (car c))
+			   (string-match org-bracket-link-regexp (car c))
+			   (< (org-string-width (car c)) len))
+		      (setcar c (concat (car c) (make-string (- len (org-string-width (car c))) ?\ )))))))
+
+    ;; Compute the formats needed for output of the table
+    (setq rfmt (concat indent "|") hfmt (concat indent "|"))
+    (while (setq l (pop lengths))
+      (setq ty (if (pop typenums) "" "-")) ; number types flushright
+      (setq rfmt (concat rfmt (format rfmt1 ty l))
+	    hfmt (concat hfmt (format hfmt1 (make-string l ?-)))))
+    (setq rfmt (concat rfmt "\n")
+	  hfmt (concat (substring hfmt 0 -1) "|\n"))
+
+    (setq new (mapconcat
+	       (lambda (l)
+		 (if l (apply 'format rfmt
+			      (append (pop fields) emptystrings))
+		   hfmt))
+	       lines ""))
+    ;; Replace the old one
+    (delete-region beg end)
+    (move-marker end nil)
+    (move-marker org-table-aligned-begin-marker (point))
+    (insert new)
+    (move-marker org-table-aligned-end-marker (point))
+    (when (and orgtbl-mode (not (org-mode-p)))
+      (goto-char org-table-aligned-begin-marker)
+      (while (org-hide-wide-columns org-table-aligned-end-marker)))
+    ;; Try to move to the old location
+    (goto-line winstartline)
+    (setq winstart (point-at-bol))
+    (goto-line linepos)
+    (set-window-start (selected-window) winstart 'noforce)
+    (org-table-goto-column colpos)
+    (and org-table-overlay-coordinates (org-table-overlay-coordinates))
+    (setq org-table-may-need-update nil)
+    ))
+
+(defun org-string-width (s)
+  "Compute width of string, ignoring invisible characters.
+This ignores character with invisibility property `org-link', and also
+characters with property `org-cwidth', because these will become invisible
+upon the next fontification round."
+  (let (b l)
+    (when (or (eq t buffer-invisibility-spec)
+	      (assq 'org-link buffer-invisibility-spec))
+      (while (setq b (text-property-any 0 (length s)
+					'invisible 'org-link s))
+	(setq s (concat (substring s 0 b)
+			(substring s (or (next-single-property-change
+					  b 'invisible s) (length s)))))))
+    (while (setq b (text-property-any 0 (length s) 'org-cwidth t s))
+      (setq s (concat (substring s 0 b)
+		      (substring s (or (next-single-property-change
+					b 'org-cwidth s) (length s))))))
+    (setq l (string-width s) b -1)
+    (while (setq b (text-property-any (1+ b) (length s) 'org-dwidth t s))
+      (setq l (- l (get-text-property b 'org-dwidth-n s))))
+    l))
+
+(defun org-table-begin (&optional table-type)
+  "Find the beginning of the table and return its position.
+With argument TABLE-TYPE, go to the beginning of a table.el-type table."
+  (save-excursion
+    (if (not (re-search-backward
+	      (if table-type org-table-any-border-regexp
+		org-table-border-regexp)
+	      nil t))
+	(progn (goto-char (point-min)) (point))
+      (goto-char (match-beginning 0))
+      (beginning-of-line 2)
+      (point))))
+
+(defun org-table-end (&optional table-type)
+  "Find the end of the table and return its position.
+With argument TABLE-TYPE, go to the end of a table.el-type table."
+  (save-excursion
+    (if (not (re-search-forward
+	      (if table-type org-table-any-border-regexp
+		org-table-border-regexp)
+	      nil t))
 	(goto-char (point-max))
-	(unless (= (point) 1)
-	  (insert "\n" (make-string (window-width) ?=) "\n"))
-	(narrow-to-region (point) (point-max)))
-    (org-agenda-maybe-reset-markers 'force)
-    (org-prepare-agenda-buffers (org-agenda-files))
-    (let* ((abuf (get-buffer-create org-agenda-buffer-name))
-	   (awin (get-buffer-window abuf)))
+      (goto-char (match-beginning 0)))
+    (point-marker)))
+
+(defun org-table-justify-field-maybe (&optional new)
+  "Justify the current field, text to left, number to right.
+Optional argument NEW may specify text to replace the current field content."
+  (cond
+   ((and (not new) org-table-may-need-update)) ; Realignment will happen anyway
+   ((org-at-table-hline-p))
+   ((and (not new)
+	 (or (not (equal (marker-buffer org-table-aligned-begin-marker)
+			 (current-buffer)))
+	     (< (point) org-table-aligned-begin-marker)
+	     (>= (point) org-table-aligned-end-marker)))
+    ;; This is not the same table, force a full re-align
+    (setq org-table-may-need-update t))
+   (t ;; realign the current field, based on previous full realign
+    (let* ((pos (point)) s
+	   (col (org-table-current-column))
+	   (num (if (> col 0) (nth (1- col) org-table-last-alignment)))
+	   l f n o e)
+      (when (> col 0)
+	(skip-chars-backward "^|\n")
+	(if (looking-at " *\\([^|\n]*?\\) *\\(|\\|$\\)")
+	    (progn
+	      (setq s (match-string 1)
+		    o (match-string 0)
+		    l (max 1 (- (match-end 0) (match-beginning 0) 3))
+		    e (not (= (match-beginning 2) (match-end 2))))
+	      (setq f (format (if num " %%%ds %s" " %%-%ds %s")
+			      l (if e "|" (setq org-table-may-need-update t) ""))
+		    n (format f s))
+	      (if new
+		  (if (<= (length new) l)      ;; FIXME: length -> str-width?
+		      (setq n (format f new))
+		    (setq n (concat new "|") org-table-may-need-update t)))
+	      (or (equal n o)
+		  (let (org-table-may-need-update)
+		    (replace-match n))))
+	  (setq org-table-may-need-update t))
+	(goto-char pos))))))
+
+(defun org-table-next-field ()
+  "Go to the next field in the current table, creating new lines as needed.
+Before doing so, re-align the table if necessary."
+  (interactive)
+  (org-table-maybe-eval-formula)
+  (org-table-maybe-recalculate-line)
+  (if (and org-table-automatic-realign
+	   org-table-may-need-update)
+      (org-table-align))
+  (let ((end (org-table-end)))
+    (if (org-at-table-hline-p)
+	(end-of-line 1))
+    (condition-case nil
+	(progn
+	  (re-search-forward "|" end)
+	  (if (looking-at "[ \t]*$")
+	      (re-search-forward "|" end))
+	  (if (and (looking-at "-")
+		   org-table-tab-jumps-over-hlines
+		   (re-search-forward "^[ \t]*|\\([^-]\\)" end t))
+	      (goto-char (match-beginning 1)))
+	  (if (looking-at "-")
+	      (progn
+		(beginning-of-line 0)
+		(org-table-insert-row 'below))
+	    (if (looking-at " ") (forward-char 1))))
+      (error
+       (org-table-insert-row 'below)))))
+
+(defun org-table-previous-field ()
+  "Go to the previous field in the table.
+Before doing so, re-align the table if necessary."
+  (interactive)
+  (org-table-justify-field-maybe)
+  (org-table-maybe-recalculate-line)
+  (if (and org-table-automatic-realign
+	   org-table-may-need-update)
+      (org-table-align))
+  (if (org-at-table-hline-p)
+      (end-of-line 1))
+  (re-search-backward "|" (org-table-begin))
+  (re-search-backward "|" (org-table-begin))
+  (while (looking-at "|\\(-\\|[ \t]*$\\)")
+    (re-search-backward "|" (org-table-begin)))
+  (if (looking-at "| ?")
+      (goto-char (match-end 0))))
+
+(defun org-table-next-row ()
+  "Go to the next row (same column) in the current table.
+Before doing so, re-align the table if necessary."
+  (interactive)
+  (org-table-maybe-eval-formula)
+  (org-table-maybe-recalculate-line)
+  (if (or (looking-at "[ \t]*$")
+	  (save-excursion (skip-chars-backward " \t") (bolp)))
+      (newline)
+    (if (and org-table-automatic-realign
+	     org-table-may-need-update)
+	(org-table-align))
+    (let ((col (org-table-current-column)))
+      (beginning-of-line 2)
+      (if (or (not (org-at-table-p))
+	      (org-at-table-hline-p))
+	  (progn
+	    (beginning-of-line 0)
+	    (org-table-insert-row 'below)))
+      (org-table-goto-column col)
+      (skip-chars-backward "^|\n\r")
+      (if (looking-at " ") (forward-char 1)))))
+
+(defun org-table-copy-down (n)
+  "Copy a field down in the current column.
+If the field at the cursor is empty, copy into it the content of the nearest
+non-empty field above.  With argument N, use the Nth non-empty field.
+If the current field is not empty, it is copied down to the next row, and
+the cursor is moved with it.  Therefore, repeating this command causes the
+column to be filled row-by-row.
+If the variable `org-table-copy-increment' is non-nil and the field is an
+integer, it will be incremented while copying."
+  (interactive "p")
+  (let* ((colpos (org-table-current-column))
+	 (field (org-table-get-field))
+	 (non-empty (string-match "[^ \t]" field))
+	 (beg (org-table-begin))
+	 txt)
+    (org-table-check-inside-data-field)
+    (if non-empty
+	(progn
+	  (setq txt (org-trim field))
+	  (org-table-next-row)
+	  (org-table-blank-field))
+      (save-excursion
+	(setq txt
+	      (catch 'exit
+		(while (progn (beginning-of-line 1)
+			      (re-search-backward org-table-dataline-regexp
+						  beg t))
+		  (org-table-goto-column colpos t)
+		  (if (and (looking-at
+			    "|[ \t]*\\([^| \t][^|]*?\\)[ \t]*|")
+			   (= (setq n (1- n)) 0))
+		      (throw 'exit (match-string 1))))))))
+    (if txt
+	(progn
+	  (if (and org-table-copy-increment
+		   (string-match "^[0-9]+$" txt))
+	      (setq txt (format "%d" (+ (string-to-number txt) 1))))
+	  (insert txt)
+	  (org-table-maybe-recalculate-line)
+	  (org-table-align))
+      (error "No non-empty field found"))))
+
+(defun org-table-check-inside-data-field ()
+  "Is point inside a table data field?
+I.e. not on a hline or before the first or after the last column?
+This actually throws an error, so it aborts the current command."
+  (if (or (not (org-at-table-p))
+	  (= (org-table-current-column) 0)
+	  (org-at-table-hline-p)
+	  (looking-at "[ \t]*$"))
+      (error "Not in table data field")))
+
+(defvar org-table-clip nil
+  "Clipboard for table regions.")
+
+(defun org-table-blank-field ()
+  "Blank the current table field or active region."
+  (interactive)
+  (org-table-check-inside-data-field)
+  (if (and (interactive-p) (org-region-active-p))
+      (let (org-table-clip)
+	(org-table-cut-region (region-beginning) (region-end)))
+    (skip-chars-backward "^|")
+    (backward-char 1)
+    (if (looking-at "|[^|\n]+")
+	(let* ((pos (match-beginning 0))
+	       (match (match-string 0))
+	       (len (org-string-width match)))
+	  (replace-match (concat "|" (make-string (1- len) ?\ )))
+	  (goto-char (+ 2 pos))
+	  (substring match 1)))))
+
+(defun org-table-get-field (&optional n replace)
+  "Return the value of the field in column N of current row.
+N defaults to current field.
+If REPLACE is a string, replace field with this value.  The return value
+is always the old value."
+  (and n (org-table-goto-column n))
+  (skip-chars-backward "^|\n")
+  (backward-char 1)
+  (if (looking-at "|[^|\r\n]*")
+      (let* ((pos (match-beginning 0))
+	     (val (buffer-substring (1+ pos) (match-end 0))))
+	(if replace
+	    (replace-match (concat "|" replace) t t))
+	(goto-char (min (point-at-eol) (+ 2 pos)))
+	val)
+    (forward-char 1) ""))
+
+
+(defun org-table-field-info (arg)
+  "Show info about the current field, and highlight any reference at point."
+  (interactive "P") 
+  (org-table-get-specials)
+  (save-excursion
+    (let* ((pos (point))
+	   (col (org-table-current-column))
+	   (cname (car (rassoc (int-to-string col) org-table-column-names)))
+	   (name (car (rassoc (list (org-current-line) col)
+			      org-table-named-field-locations)))
+	   (eql (org-table-get-stored-formulas))
+	   (dline (org-table-current-dline))
+	   (ref (format "@%d$%d" dline col))
+	   (fequation (or (assoc name eql) (assoc ref eql)))
+	   (cequation (assoc (int-to-string col) eql)))
+      (goto-char pos)
+      (condition-case nil
+	  (org-show-reference 'local)
+	(error nil))
+      (message "line @%d, col $%s%s, ref @%d$%d%s%s"
+	       dline col
+	       (if cname (concat " or $" cname) "")
+	       dline col
+	       (if name (concat " or $" name) "")
+	       ;; FIXME: formula info not correct if special table line
+	       (if (or fequation cequation)
+		   (concat ", " (if fequation "field" "column")
+			   " formula applies" "")
+		 "")))))
+
+(defun org-table-current-column ()
+  "Find out which column we are in.
+When called interactively, column is also displayed in echo area."
+  (interactive)
+  (if (interactive-p) (org-table-check-inside-data-field))
+  (save-excursion
+    (let ((cnt 0) (pos (point)))
+      (beginning-of-line 1)
+      (while (search-forward "|" pos t)
+	(setq cnt (1+ cnt)))
+      (if (interactive-p) (message "This is table column %d" cnt))
+      cnt)))
+
+(defun org-table-current-dline ()
+  "Find out what table data line we are in.
+Only datalins count for this."
+  (interactive)
+  (if (interactive-p) (org-table-check-inside-data-field))
+  (save-excursion
+    (let ((cnt 0) (pos (point)))
+      (goto-char (org-table-begin))
+      (while (<= (point) pos)
+	(if (looking-at org-table-dataline-regexp) (setq cnt (1+ cnt)))
+	(beginning-of-line 2))
+      (if (interactive-p) (message "This is table line %d" cnt))
+      cnt)))
+
+(defun org-table-goto-column (n &optional on-delim force)
+  "Move the cursor to the Nth column in the current table line.
+With optional argument ON-DELIM, stop with point before the left delimiter
+of the field.
+If there are less than N fields, just go to after the last delimiter.
+However, when FORCE is non-nil, create new columns if necessary."
+  (interactive "p")
+  (let ((pos (point-at-eol)))
+    (beginning-of-line 1)
+    (when (> n 0)
+      (while (and (> (setq n (1- n)) -1)
+		  (or (search-forward "|" pos t)
+		      (and force
+			   (progn (end-of-line 1)
+				  (skip-chars-backward "^|")
+				  (insert " | "))))))
+;                                  (backward-char 2) t)))))
+      (when (and force (not (looking-at ".*|")))
+	(save-excursion (end-of-line 1) (insert " | ")))
+      (if on-delim
+	  (backward-char 1)
+	(if (looking-at " ") (forward-char 1))))))
+
+(defun org-at-table-p (&optional table-type)
+  "Return t if the cursor is inside an org-type table.
+If TABLE-TYPE is non-nil, also check for table.el-type tables."
+  (if org-enable-table-editor
+      (save-excursion
+	(beginning-of-line 1)
+	(looking-at (if table-type org-table-any-line-regexp
+		      org-table-line-regexp)))
+    nil))
+
+(defun org-at-table.el-p ()
+  "Return t if and only if we are at a table.el table."
+  (and (org-at-table-p 'any)
+       (save-excursion
+	 (goto-char (org-table-begin 'any))
+	 (looking-at org-table1-hline-regexp))))
+
+(defun org-table-recognize-table.el ()
+  "If there is a table.el table nearby, recognize it and move into it."
+  (if org-table-tab-recognizes-table.el
+      (if (org-at-table.el-p)
+	  (progn
+	    (beginning-of-line 1)
+	    (if (looking-at org-table-dataline-regexp)
+		nil
+	      (if (looking-at org-table1-hline-regexp)
+		  (progn
+		    (beginning-of-line 2)
+		    (if (looking-at org-table-any-border-regexp)
+			(beginning-of-line -1)))))
+	    (if (re-search-forward "|" (org-table-end t) t)
+		(progn
+		  (require 'table)
+		  (if (table--at-cell-p (point))
+		      t
+		    (message "recognizing table.el table...")
+		    (table-recognize-table)
+		    (message "recognizing table.el table...done")))
+	      (error "This should not happen..."))
+	    t)
+	nil)
+    nil))
+
+(defun org-at-table-hline-p ()
+  "Return t if the cursor is inside a hline in a table."
+  (if org-enable-table-editor
+      (save-excursion
+	(beginning-of-line 1)
+	(looking-at org-table-hline-regexp))
+    nil))
+
+(defun org-table-insert-column ()
+  "Insert a new column into the table."
+  (interactive)
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (org-table-find-dataline)
+  (let* ((col (max 1 (org-table-current-column)))
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 ;; Current cursor position
+	 (linepos (org-current-line))
+	 (colpos col))
+    (goto-char beg)
+    (while (< (point) end)
+      (if (org-at-table-hline-p)
+	  nil
+	(org-table-goto-column col t)
+	(insert "|   "))
+      (beginning-of-line 2))
+    (move-marker end nil)
+    (goto-line linepos)
+    (org-table-goto-column colpos)
+    (org-table-align)
+    (org-table-fix-formulas "$" nil (1- col) 1)))
+
+(defun org-table-find-dataline ()
+  "Find a dataline in the current table, which is needed for column commands."
+  (if (and (org-at-table-p)
+	   (not (org-at-table-hline-p)))
+      t
+    (let ((col (current-column))
+	  (end (org-table-end)))
+      (move-to-column col)
+      (while (and (< (point) end)
+		  (or (not (= (current-column) col))
+		      (org-at-table-hline-p)))
+	(beginning-of-line 2)
+	(move-to-column col))
+      (if (and (org-at-table-p)
+	       (not (org-at-table-hline-p)))
+	  t
+	(error
+	 "Please position cursor in a data line for column operations")))))
+
+(defun org-table-delete-column ()
+  "Delete a column from the table."
+  (interactive)
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (org-table-find-dataline)
+  (org-table-check-inside-data-field)
+  (let* ((col (org-table-current-column))
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 ;; Current cursor position
+	 (linepos (org-current-line))
+	 (colpos col))
+    (goto-char beg)
+    (while (< (point) end)
+      (if (org-at-table-hline-p)
+	  nil
+	(org-table-goto-column col t)
+	(and (looking-at "|[^|\n]+|")
+	     (replace-match "|")))
+      (beginning-of-line 2))
+    (move-marker end nil)
+    (goto-line linepos)
+    (org-table-goto-column colpos)
+    (org-table-align)
+    (org-table-fix-formulas "$" (list (cons (number-to-string col) "INVALID"))
+			    col -1 col)))
+
+(defun org-table-move-column-right ()
+  "Move column to the right."
+  (interactive)
+  (org-table-move-column nil))
+(defun org-table-move-column-left ()
+  "Move column to the left."
+  (interactive)
+  (org-table-move-column 'left))
+
+(defun org-table-move-column (&optional left)
+  "Move the current column to the right.  With arg LEFT, move to the left."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (org-table-find-dataline)
+  (org-table-check-inside-data-field)
+  (let* ((col (org-table-current-column))
+	 (col1 (if left (1- col) col))
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 ;; Current cursor position
+	 (linepos (org-current-line))
+	 (colpos (if left (1- col) (1+ col))))
+    (if (and left (= col 1))
+	(error "Cannot move column further left"))
+    (if (and (not left) (looking-at "[^|\n]*|[^|\n]*$"))
+	(error "Cannot move column further right"))
+    (goto-char beg)
+    (while (< (point) end)
+      (if (org-at-table-hline-p)
+	  nil
+	(org-table-goto-column col1 t)
+	(and (looking-at "|\\([^|\n]+\\)|\\([^|\n]+\\)|")
+	     (replace-match "|\\2|\\1|")))
+      (beginning-of-line 2))
+    (move-marker end nil)
+    (goto-line linepos)
+    (org-table-goto-column colpos)
+    (org-table-align)
+    (org-table-fix-formulas 
+     "$" (list (cons (number-to-string col) (number-to-string colpos))
+	       (cons (number-to-string colpos) (number-to-string col))))))
+
+(defun org-table-move-row-down ()
+  "Move table row down."
+  (interactive)
+  (org-table-move-row nil))
+(defun org-table-move-row-up ()
+  "Move table row up."
+  (interactive)
+  (org-table-move-row 'up))
+
+(defun org-table-move-row (&optional up)
+  "Move the current table line down.  With arg UP, move it up."
+  (interactive "P")
+  (let* ((col (current-column))
+	 (pos (point))
+	 (hline1p (save-excursion (beginning-of-line 1) 
+				  (looking-at org-table-hline-regexp)))
+	 (dline1 (org-table-current-dline))
+	 (dline2 (+ dline1 (if up -1 1)))
+	 (tonew (if up 0 2))
+	 txt hline2p)
+    (beginning-of-line tonew)
+    (unless (org-at-table-p)
+      (goto-char pos)
+      (error "Cannot move row further"))
+    (setq hline2p (looking-at org-table-hline-regexp))
+    (goto-char pos)
+    (beginning-of-line 1)
+    (setq pos (point))
+    (setq txt (buffer-substring (point) (1+ (point-at-eol))))
+    (delete-region (point) (1+ (point-at-eol)))
+    (beginning-of-line tonew)
+    (insert txt)
+    (beginning-of-line 0)
+    (move-to-column col)
+    (unless (or hline1p hline2p)
+      (org-table-fix-formulas 
+       "@" (list (cons (number-to-string dline1) (number-to-string dline2))
+		 (cons (number-to-string dline2) (number-to-string dline1)))))))
+
+(defun org-table-insert-row (&optional arg)
+  "Insert a new row above the current line into the table.
+With prefix ARG, insert below the current line."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (let* ((line (buffer-substring (point-at-bol) (point-at-eol)))
+	 (new (org-table-clean-line line)))
+    ;; Fix the first field if necessary
+    (if (string-match "^[ \t]*| *[#$] *|" line)
+	(setq new (replace-match (match-string 0 line) t t new)))
+    (beginning-of-line (if arg 2 1))
+    (let (org-table-may-need-update) (insert-before-markers new "\n"))
+    (beginning-of-line 0)
+    (re-search-forward "| ?" (point-at-eol) t)
+    (and (or org-table-may-need-update org-table-overlay-coordinates)
+	 (org-table-align))
+    (org-table-fix-formulas "@" nil (1- (org-table-current-dline)) 1)))
+
+(defun org-table-insert-hline (&optional arg)
+  "Insert a horizontal-line below the current line into the table.
+With prefix ARG, insert above the current line."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (let ((line (org-table-clean-line
+	       (buffer-substring (point-at-bol) (point-at-eol))))
+	(col (current-column)))
+    (while (string-match "|\\( +\\)|" line)
+      (setq line (replace-match
+		  (concat "+" (make-string (- (match-end 1) (match-beginning 1))
+					   ?-) "|") t t line)))
+    (and (string-match "\\+" line) (setq line (replace-match "|" t t line)))
+    (beginning-of-line (if arg 1 2))
+    (insert line "\n")
+    (beginning-of-line (if arg 1 -1))
+    (move-to-column col)
+    (and org-table-overlay-coordinates (org-table-align))))
+
+(defun org-table-clean-line (s)
+  "Convert a table line S into a string with only \"|\" and space.
+In particular, this does handle wide and invisible characters."
+  (if (string-match "^[ \t]*|-" s)
+      ;; It's a hline, just map the characters
+      (setq s (mapconcat (lambda (x) (if (member x '(?| ?+)) "|" " ")) s ""))
+    (while (string-match "|\\([ \t]*?[^ \t\r\n|][^\r\n|]*\\)|" s)
+      (setq s (replace-match
+	       (concat "|" (make-string (org-string-width (match-string 1 s))
+					?\ ) "|")
+	       t t s)))
+    s))
+
+(defun org-table-kill-row ()
+  "Delete the current row or horizontal line from the table."
+  (interactive)
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (let ((col (current-column))
+	(dline (org-table-current-dline)))
+    (kill-region (point-at-bol) (min (1+ (point-at-eol)) (point-max)))
+    (if (not (org-at-table-p)) (beginning-of-line 0))
+    (move-to-column col)
+    (org-table-fix-formulas "@" (list (cons (number-to-string dline) "INVALID"))
+			    dline -1 dline)))
+
+
+(defun org-table-sort-lines (with-case &optional sorting-type)
+  "Sort table lines according to the column at point.
+
+The position of point indicates the column to be used for
+sorting, and the range of lines is the range between the nearest
+horizontal separator lines, or the entire table of no such lines
+exist.  If point is before the first column, you will be prompted
+for the sorting column.  If there is an active region, the mark
+specifies the first line and the sorting column, while point
+should be in the last line to be included into the sorting.
+
+The command then prompts for the sorting type which can be
+alphabetically, numerically, or by time (as given in a time stamp
+in the field).  Sorting in reverse order is also possible.
+
+With prefix argument WITH-CASE, alphabetic sorting will be case-sensitive.
+
+If SORTING-TYPE is specified when this function is called from a Lisp
+program, no prompting will take place.  SORTING-TYPE must be a character,
+any of (?a ?A ?n ?N ?t ?T) where the capital letter indicate that sorting
+should be done in reverse order."
+  (interactive "P")
+  (let* ((thisline (org-current-line))
+	 (thiscol (org-table-current-column))
+	 beg end bcol ecol tend tbeg column lns pos)
+    (when (equal thiscol 0)
+      (if (interactive-p)
+	  (setq thiscol
+		(string-to-number
+		 (read-string "Use column N for sorting: ")))
+	(setq thiscol 1))
+      (org-table-goto-column thiscol))
+    (org-table-check-inside-data-field)
+    (if (org-region-active-p)
+	(progn
+	  (setq beg (region-beginning) end (region-end))
+	  (goto-char beg)
+	  (setq column (org-table-current-column)
+		beg (point-at-bol))
+	  (goto-char end)
+	  (setq end (point-at-bol 2)))
+      (setq column (org-table-current-column)
+	    pos (point)
+	    tbeg (org-table-begin)
+	    tend (org-table-end))
+      (if (re-search-backward org-table-hline-regexp tbeg t)
+	  (setq beg (point-at-bol 2))
+	(goto-char tbeg)
+	(setq beg (point-at-bol 1)))
+      (goto-char pos)
+      (if (re-search-forward org-table-hline-regexp tend t)
+	  (setq beg (point-at-bol 0))
+	(goto-char tend)
+	(setq end (point-at-bol))))
+    (setq beg (move-marker (make-marker) beg)
+	  end (move-marker (make-marker) end))
+    (untabify beg end)
+    (goto-char beg)
+    (org-table-goto-column column)
+    (skip-chars-backward "^|")
+    (setq bcol (current-column))
+    (org-table-goto-column (1+ column))
+    (skip-chars-backward "^|")
+    (setq ecol (1- (current-column)))
+    (org-table-goto-column column)
+    (setq lns (mapcar (lambda(x) (cons (org-trim (substring x bcol ecol)) x))
+		      (org-split-string (buffer-substring beg end) "\n")))
+    (setq lns (org-do-sort lns "Table" with-case sorting-type))
+    (delete-region beg end)
+    (move-marker beg nil)
+    (move-marker end nil)
+    (insert (mapconcat 'cdr lns "\n") "\n")
+    (goto-line thisline)
+    (org-table-goto-column thiscol)
+    (message "%d lines sorted, based on column %d" (length lns) column)))
+
+(defun org-table-cut-region (beg end)
+  "Copy region in table to the clipboard and blank all relevant fields."
+  (interactive "r")
+  (org-table-copy-region beg end 'cut))
+
+(defun org-table-copy-region (beg end &optional cut)
+  "Copy rectangular region in table to clipboard.
+A special clipboard is used which can only be accessed
+with `org-table-paste-rectangle'."
+  (interactive "rP")
+  (let* (l01 c01 l02 c02 l1 c1 l2 c2 ic1 ic2
+	 region cols
+	 (rpl (if cut "  " nil)))
+    (goto-char beg)
+    (org-table-check-inside-data-field)
+    (setq l01 (org-current-line)
+	  c01 (org-table-current-column))
+    (goto-char end)
+    (org-table-check-inside-data-field)
+    (setq l02 (org-current-line)
+	  c02 (org-table-current-column))
+    (setq l1 (min l01 l02) l2 (max l01 l02)
+	  c1 (min c01 c02) c2 (max c01 c02))
+    (catch 'exit
+      (while t
+	(catch 'nextline
+	  (if (> l1 l2) (throw 'exit t))
+	  (goto-line l1)
+	  (if (org-at-table-hline-p) (throw 'nextline (setq l1 (1+ l1))))
+	  (setq cols nil ic1 c1 ic2 c2)
+	  (while (< ic1 (1+ ic2))
+	    (push (org-table-get-field ic1 rpl) cols)
+	    (setq ic1 (1+ ic1)))
+	  (push (nreverse cols) region)
+	  (setq l1 (1+ l1)))))
+    (setq org-table-clip (nreverse region))
+    (if cut (org-table-align))
+    org-table-clip))
+
+(defun org-table-paste-rectangle ()
+  "Paste a rectangular region into a table.
+The upper right corner ends up in the current field.  All involved fields
+will be overwritten.  If the rectangle does not fit into the present table,
+the table is enlarged as needed.  The process ignores horizontal separator
+lines."
+  (interactive)
+  (unless (and org-table-clip (listp org-table-clip))
+    (error "First cut/copy a region to paste!"))
+  (org-table-check-inside-data-field)
+  (let* ((clip org-table-clip)
+	 (line (org-current-line))
+	 (col (org-table-current-column))
+	 (org-enable-table-editor t)
+	 (org-table-automatic-realign nil)
+	 c cols field)
+    (while (setq cols (pop clip))
+      (while (org-at-table-hline-p) (beginning-of-line 2))
+      (if (not (org-at-table-p))
+	  (progn (end-of-line 0) (org-table-next-field)))
+      (setq c col)
+      (while (setq field (pop cols))
+	(org-table-goto-column c nil 'force)
+	(org-table-get-field nil field)
+	(setq c (1+ c)))
+      (beginning-of-line 2))
+    (goto-line line)
+    (org-table-goto-column col)
+    (org-table-align)))
+
+(defun org-table-convert ()
+  "Convert from `org-mode' table to table.el and back.
+Obviously, this only works within limits.  When an Org-mode table is
+converted to table.el, all horizontal separator lines get lost, because
+table.el uses these as cell boundaries and has no notion of horizontal lines.
+A table.el table can be converted to an Org-mode table only if it does not
+do row or column spanning.  Multiline cells will become multiple cells.
+Beware, Org-mode does not test if the table can be successfully converted - it
+blindly applies a recipe that works for simple tables."
+  (interactive)
+  (require 'table)
+  (if (org-at-table.el-p)
+      ;; convert to Org-mode table
+      (let ((beg (move-marker (make-marker) (org-table-begin t)))
+	    (end (move-marker (make-marker) (org-table-end t))))
+	(table-unrecognize-region beg end)
+	(goto-char beg)
+	(while (re-search-forward "^\\([ \t]*\\)\\+-.*\n" end t)
+	  (replace-match ""))
+	(goto-char beg))
+    (if (org-at-table-p)
+	;; convert to table.el table
+	(let ((beg (move-marker (make-marker) (org-table-begin)))
+	      (end (move-marker (make-marker) (org-table-end))))
+	  ;; first, get rid of all horizontal lines
+	  (goto-char beg)
+	  (while (re-search-forward "^\\([ \t]*\\)|-.*\n" end t)
+	    (replace-match ""))
+	  ;; insert a hline before first
+	  (goto-char beg)
+	  (org-table-insert-hline 'above)
+	  (beginning-of-line -1)
+	  ;; insert a hline after each line
+	  (while (progn (beginning-of-line 3) (< (point) end))
+	    (org-table-insert-hline))
+	  (goto-char beg)
+	  (setq end (move-marker end (org-table-end)))
+	  ;; replace "+" at beginning and ending of hlines
+	  (while (re-search-forward "^\\([ \t]*\\)|-" end t)
+	    (replace-match "\\1+-"))
+	  (goto-char beg)
+	  (while (re-search-forward "-|[ \t]*$" end t)
+	    (replace-match "-+"))
+	  (goto-char beg)))))
+
+(defun org-table-wrap-region (arg)
+  "Wrap several fields in a column like a paragraph.
+This is useful if you'd like to spread the contents of a field over several
+lines, in order to keep the table compact.
+
+If there is an active region, and both point and mark are in the same column,
+the text in the column is wrapped to minimum width for the given number of
+lines.  Generally, this makes the table more compact.  A prefix ARG may be
+used to change the number of desired lines.  For example, `C-2 \\[org-table-wrap]'
+formats the selected text to two lines.  If the region was longer than two
+lines, the remaining lines remain empty.  A negative prefix argument reduces
+the current number of lines by that amount.  The wrapped text is pasted back
+into the table.  If you formatted it to more lines than it was before, fields
+further down in the table get overwritten - so you might need to make space in
+the table first.
+
+If there is no region, the current field is split at the cursor position and
+the text fragment to the right of the cursor is prepended to the field one
+line down.
+
+If there is no region, but you specify a prefix ARG, the current field gets
+blank, and the content is appended to the field above."
+  (interactive "P")
+  (org-table-check-inside-data-field)
+  (if (org-region-active-p)
+      ;; There is a region:  fill as a paragraph
+      (let* ((beg (region-beginning))
+	     (cline (save-excursion (goto-char beg) (org-current-line)))
+	     (ccol (save-excursion (goto-char beg) (org-table-current-column)))
+	     nlines)
+	(org-table-cut-region (region-beginning) (region-end))
+	(if (> (length (car org-table-clip)) 1)
+	    (error "Region must be limited to single column"))
+	(setq nlines (if arg
+			 (if (< arg 1)
+			     (+ (length org-table-clip) arg)
+			   arg)
+		       (length org-table-clip)))
+	(setq org-table-clip
+	      (mapcar 'list (org-wrap (mapconcat 'car org-table-clip " ")
+				      nil nlines)))
+	(goto-line cline)
+	(org-table-goto-column ccol)
+	(org-table-paste-rectangle))
+    ;; No region, split the current field at point
+    (if arg
+	;; combine with field above
+	(let ((s (org-table-blank-field))
+	      (col (org-table-current-column)))
+	  (beginning-of-line 0)
+	  (while (org-at-table-hline-p) (beginning-of-line 0))
+	  (org-table-goto-column col)
+	  (skip-chars-forward "^|")
+	  (skip-chars-backward " ")
+	  (insert " " (org-trim s))
+	  (org-table-align))
+      ;;  split field
+      (when (looking-at "\\([^|]+\\)+|")
+	(let ((s (match-string 1)))
+	  (replace-match " |")
+	  (goto-char (match-beginning 0))
+	  (org-table-next-row)
+	  (insert (org-trim s) " ")
+	  (org-table-align))))))
+
+(defvar org-field-marker nil)
+
+(defun org-table-edit-field (arg)
+  "Edit table field in a different window.
+This is mainly useful for fields that contain hidden parts.
+When called with a \\[universal-argument] prefix, just make the full field visible so that
+it can be edited in place."
+  (interactive "P")
+  (if arg
+      (let ((b (save-excursion (skip-chars-backward "^|") (point)))
+	    (e (save-excursion (skip-chars-forward "^|\r\n") (point))))
+	(remove-text-properties b e '(org-cwidth t invisible t
+						 display t intangible t))
+	(if (and (boundp 'font-lock-mode) font-lock-mode)
+	    (font-lock-fontify-block)))
+    (let ((pos (move-marker (make-marker) (point)))
+	  (field (org-table-get-field))
+	  (cw (current-window-configuration))
+	  p)
+      (switch-to-buffer-other-window "*Org tmp*")
+      (erase-buffer)
+      (insert "#\n# Edit field and finish with C-c C-c\n#\n")
+      (org-mode)
+      (goto-char (setq p (point-max)))
+      (insert (org-trim field))
+      (remove-text-properties p (point-max)
+			      '(invisible t org-cwidth t display t
+					  intangible t))
+      (goto-char p)
+      (org-set-local 'org-finish-function
+		     'org-table-finish-edit-field)
+      (org-set-local 'org-window-configuration cw)
+      (org-set-local 'org-field-marker pos)
+      (message "Edit and finish with C-c C-c"))))
+
+(defun org-table-finish-edit-field ()
+  "Finish editing a table data field.
+Remove all newline characters, insert the result into the table, realign
+the table and kill the editing buffer."
+  (let ((pos org-field-marker)
+	(cw org-window-configuration)
+	(cb (current-buffer))
+	text)
+    (goto-char (point-min))
+    (while (re-search-forward "^#.*\n?" nil t) (replace-match ""))
+    (while (re-search-forward "\\([ \t]*\n[ \t]*\\)+" nil t)
+      (replace-match " "))
+    (setq text (org-trim (buffer-string)))
+    (set-window-configuration cw)
+    (kill-buffer cb)
+    (select-window (get-buffer-window (marker-buffer pos)))
+    (goto-char pos)
+    (move-marker pos nil)
+    (org-table-check-inside-data-field)
+    (org-table-get-field nil text)
+    (org-table-align)
+    (message "New field value inserted")))
+
+(defun org-trim (s)
+  "Remove whitespace at beginning and end of string."
+  (if (string-match "^[ \t]+" s) (setq s (replace-match "" t t s)))
+  (if (string-match "[ \t]+$" s) (setq s (replace-match "" t t s)))
+  s)
+
+(defun org-wrap (string &optional width lines)
+  "Wrap string to either a number of lines, or a width in characters.
+If WIDTH is non-nil, the string is wrapped to that width, however many lines
+that costs.  If there is a word longer than WIDTH, the text is actually
+wrapped to the length of that word.
+IF WIDTH is nil and LINES is non-nil, the string is forced into at most that
+many lines, whatever width that takes.
+The return value is a list of lines, without newlines at the end."
+  (let* ((words (org-split-string string "[ \t\n]+"))
+	 (maxword (apply 'max (mapcar 'org-string-width words)))
+	 w ll)
+    (cond (width
+	   (org-do-wrap words (max maxword width)))
+	  (lines
+	   (setq w maxword)
+	   (setq ll (org-do-wrap words maxword))
+	   (if (<= (length ll) lines)
+	       ll
+	     (setq ll words)
+	     (while (> (length ll) lines)
+	       (setq w (1+ w))
+	       (setq ll (org-do-wrap words w)))
+	     ll))
+	  (t (error "Cannot wrap this")))))
+
+
+(defun org-do-wrap (words width)
+  "Create lines of maximum width WIDTH (in characters) from word list WORDS."
+  (let (lines line)
+    (while words
+      (setq line (pop words))
+      (while (and words (< (+ (length line) (length (car words))) width))
+	(setq line (concat line " " (pop words))))
+      (setq lines (push line lines)))
+    (nreverse lines)))
+
+(defun org-split-string (string &optional separators)
+  "Splits STRING into substrings at SEPARATORS.
+No empty strings are returned if there are matches at the beginning
+and end of string."
+  (let ((rexp (or separators "[ \f\t\n\r\v]+"))
+	(start 0)
+	notfirst
+	(list nil))
+    (while (and (string-match rexp string
+			      (if (and notfirst
+				       (= start (match-beginning 0))
+				       (< start (length string)))
+				  (1+ start) start))
+		(< (match-beginning 0) (length string)))
+      (setq notfirst t)
+      (or (eq (match-beginning 0) 0)
+	  (and (eq (match-beginning 0) (match-end 0))
+	       (eq (match-beginning 0) start))
+	  (setq list
+		(cons (substring string start (match-beginning 0))
+		      list)))
+      (setq start (match-end 0)))
+    (or (eq start (length string))
+	(setq list
+	      (cons (substring string start)
+		    list)))
+    (nreverse list)))
+
+(defun org-table-map-tables (function)
+  "Apply FUNCTION to the start of all tables in the buffer."
+  (save-excursion
+    (save-restriction
+      (widen)
+      (goto-char (point-min))
+      (while (re-search-forward org-table-any-line-regexp nil t)
+	(message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size)))
+	(beginning-of-line 1)
+	(if (looking-at org-table-line-regexp)
+	    (save-excursion (funcall function)))
+	(re-search-forward org-table-any-border-regexp nil 1))))
+  (message "Mapping tables: done"))
+
+(defvar org-timecnt) ; dynamically scoped parameter
+
+(defun org-table-sum (&optional beg end nlast)
+  "Sum numbers in region of current table column.
+The result will be displayed in the echo area, and will be available
+as kill to be inserted with \\[yank].
+
+If there is an active region, it is interpreted as a rectangle and all
+numbers in that rectangle will be summed.  If there is no active
+region and point is located in a table column, sum all numbers in that
+column.
+
+If at least one number looks like a time HH:MM or HH:MM:SS, all other
+numbers are assumed to be times as well (in decimal hours) and the
+numbers are added as such.
+
+If NLAST is a number, only the NLAST fields will actually be summed."
+  (interactive)
+  (save-excursion
+    (let (col (org-timecnt 0) diff h m s org-table-clip)
       (cond
-       ((equal (current-buffer) abuf) nil)
-       (awin (select-window awin))
-       ((not (setq org-pre-agenda-window-conf (current-window-configuration))))
-       ((equal org-agenda-window-setup 'current-window)
-	(switch-to-buffer abuf))
-       ((equal org-agenda-window-setup 'other-window)
-	(switch-to-buffer-other-window abuf))
-       ((equal org-agenda-window-setup 'other-frame)
-	(switch-to-buffer-other-frame abuf))
-       ((equal org-agenda-window-setup 'reorganize-frame)
-	(delete-other-windows)
-	(switch-to-buffer-other-window abuf))))
-    (setq buffer-read-only nil)
-    (erase-buffer)
-    (org-agenda-mode))
-  (setq buffer-read-only nil))
-
-(defun org-finalize-agenda ()
-  "Finishing touch for the agenda buffer, called just before displaying it."
-  (unless org-agenda-multi
-    (org-agenda-align-tags)
+       ((and beg end))   ; beg and end given explicitly
+       ((org-region-active-p)
+	(setq beg (region-beginning) end (region-end)))
+       (t
+	(setq col (org-table-current-column))
+	(goto-char (org-table-begin))
+	(unless (re-search-forward "^[ \t]*|[^-]" nil t)
+	  (error "No table data"))
+	(org-table-goto-column col)
+	(setq beg (point))
+	(goto-char (org-table-end))
+	(unless (re-search-backward "^[ \t]*|[^-]" nil t)
+	  (error "No table data"))
+	(org-table-goto-column col)
+	(setq end (point))))
+      (let* ((items (apply 'append (org-table-copy-region beg end)))
+	     (items1 (cond ((not nlast) items)
+			   ((>= nlast (length items)) items)
+			   (t (setq items (reverse items))
+			      (setcdr (nthcdr (1- nlast) items) nil)
+			      (nreverse items))))
+	     (numbers (delq nil (mapcar 'org-table-get-number-for-summing
+					items1)))
+	     (res (apply '+ numbers))
+	     (sres (if (= org-timecnt 0)
+		       (format "%g" res)
+		     (setq diff (* 3600 res)
+			   h (floor (/ diff 3600)) diff (mod diff 3600)
+			   m (floor (/ diff 60)) diff (mod diff 60)
+			   s diff)
+		     (format "%d:%02d:%02d" h m s))))
+	(kill-new sres)
+	(if (interactive-p)
+	    (message "%s"
+		     (substitute-command-keys
+		      (format "Sum of %d items: %-20s     (\\[yank] will insert result into buffer)"
+			      (length numbers) sres))))
+	sres))))
+
+(defun org-table-get-number-for-summing (s)
+  (let (n)
+    (if (string-match "^ *|? *" s)
+	(setq s (replace-match "" nil nil s)))
+    (if (string-match " *|? *$" s)
+	(setq s (replace-match "" nil nil s)))
+    (setq n (string-to-number s))
+    (cond
+     ((and (string-match "0" s)
+	   (string-match "\\`[-+ \t0.edED]+\\'" s)) 0)
+     ((string-match "\\`[ \t]+\\'" s)         nil)
+     ((string-match "\\`\\([0-9]+\\):\\([0-9]+\\)\\(:\\([0-9]+\\)\\)?\\'" s)
+      (let ((h (string-to-number (or (match-string 1 s) "0")))
+	    (m (string-to-number (or (match-string 2 s) "0")))
+	    (s (string-to-number (or (match-string 4 s) "0"))))
+	(if (boundp 'org-timecnt) (setq org-timecnt (1+ org-timecnt)))
+	(* 1.0 (+ h (/ m 60.0) (/ s 3600.0)))))
+     ((equal n 0)                             nil)
+     (t n))))
+
+(defun org-table-current-field-formula ()
+  "Return the formula active for the current field.
+Assumes that specials are in place."
+  (let* ((name (car (rassoc (list (org-current-line)
+				  (org-table-current-column))
+			    org-table-named-field-locations)))
+	 (col (org-table-current-column))
+	 (scol (int-to-string col))
+	 (ref (format "@%d$%d" (org-table-current-dline) col))
+	 (stored-list (org-table-get-stored-formulas))
+	 (ass (or (assoc name stored-list)
+		  (assoc ref stored-list)
+		  (assoc scol stored-list))))
+    (if ass (concat (if (string-match "^[0-9]+$" (car ass)) "=" ":=")
+		    (cdr ass)))))
+
+(defun org-table-get-formula (&optional equation named)
+  "Read a formula from the minibuffer, offer stored formula as default.
+When NAMED is non-nil, look for a named equation."
+  (let* ((stored-list (org-table-get-stored-formulas))
+	 (name (car (rassoc (list (org-current-line)
+				  (org-table-current-column))
+			    org-table-named-field-locations)))
+	 (ref (format "@%d$%d" (org-table-current-dline)
+		      (org-table-current-column)))
+	 (refass (assoc ref stored-list))
+	 (scol (if named
+		   (if name name ref)
+		 (int-to-string (org-table-current-column))))
+	 (dummy (and (or name refass) (not named)
+		     (not (y-or-n-p "Replace field formula with column formula? " ))
+		     (error "Abort")))
+	 (name (or name ref))
+	 (org-table-may-need-update nil)
+	 (stored (cdr (assoc scol stored-list)))
+	 (eq (cond
+	      ((and stored equation (string-match "^ *=? *$" equation))
+	       stored)
+	      ((stringp equation)
+	       equation)
+	      (t (read-string
+		  (format "%s formula $%s=" (if named "Field" "Column") scol)
+		  (or stored "") 'org-table-formula-history
+		  ;stored
+		  ))))
+	 mustsave)
+    (when (not (string-match "\\S-" eq))
+      ;; remove formula
+      (setq stored-list (delq (assoc scol stored-list) stored-list))
+      (org-table-store-formulas stored-list)
+      (error "Formula removed"))
+    (if (string-match "^ *=?" eq) (setq eq (replace-match "" t t eq)))
+    (if (string-match " *$" eq) (setq eq (replace-match "" t t eq)))
+    (if (and name (not named))
+	;; We set the column equation, delete the named one.
+	(setq stored-list (delq (assoc name stored-list) stored-list)
+	      mustsave t))
+    (if stored
+	(setcdr (assoc scol stored-list) eq)
+      (setq stored-list (cons (cons scol eq) stored-list)))
+    (if (or mustsave (not (equal stored eq)))
+	(org-table-store-formulas stored-list))
+    eq))
+
+(defun org-table-store-formulas (alist)
+  "Store the list of formulas below the current table."
+  (setq alist (sort alist (lambda (a b) (string< (car a) (car b)))))
+  (save-excursion
+    (goto-char (org-table-end))
+    (if (looking-at "\\([ \t]*\n\\)*#\\+TBLFM:\\(.*\n?\\)")
+	(progn
+	  ;; don't overwrite TBLFM, we might use text properties to store stuff
+	  (goto-char (match-beginning 2))
+	  (delete-region (match-beginning 2) (match-end 0)))
+      (insert "#+TBLFM:"))
+    (insert " "
+	    (mapconcat (lambda (x)
+			 (concat
+			  (if (equal (string-to-char (car x)) ?@) "" "$")
+			  (car x) "=" (cdr x)))
+		       alist "::")
+	    "\n")))
+
+(defun org-table-get-stored-formulas ()
+  "Return an alist with the stored formulas directly after current table."
+  (interactive)
+  (let (scol eq eq-alist strings string seen)
     (save-excursion
-      (let ((buffer-read-only))
-	(goto-char (point-min))
-	(while (org-activate-bracket-links (point-max))
-	  (add-text-properties (match-beginning 0) (match-end 0)
-			       '(face org-link))))
-      (run-hooks 'org-finalize-agenda-hook))))
-
-(defun org-prepare-agenda-buffers (files)
-  "Create buffers for all agenda files, protect archived trees and comments."
-  (interactive)
-  (let ((pa '(:org-archived t))
-	(pc '(:org-comment t))
-	(pall '(:org-archived t :org-comment t))
-	(rea (concat ":" org-archive-tag ":"))
-	     bmp file re)
+      (goto-char (org-table-end))
+      (when (looking-at "\\([ \t]*\n\\)*#\\+TBLFM: *\\(.*\\)")
+	(setq strings (org-split-string (match-string 2) " *:: *"))
+	(while (setq string (pop strings))
+	  (when (string-match "\\(@[0-9]+\\$[0-9]+\\|\\$\\([a-zA-Z0-9]+\\)\\) *= *\\(.*[^ \t]\\)" string)
+	    (setq scol (if (match-end 2) 
+			   (match-string 2 string) 
+			 (match-string 1 string))
+		  eq (match-string 3 string)
+		  eq-alist (cons (cons scol eq) eq-alist))
+	    (if (member scol seen)
+		(error "Double definition `$%s=' in TBLFM line, please fix by hand" scol)
+	      (push scol seen))))))
+    (nreverse eq-alist)))
+
+(defun org-table-fix-formulas (key replace &optional limit delta remove)
+  "Modify the equations after the table structure has been edited.
+KEY is \"@\" or \"$\".  REPLACE is an alist of numbers to replace.
+For all numbers larger than LIMIT, shift them by DELTA."
+  (save-excursion
+    (goto-char (org-table-end))
+    (when (looking-at "#\\+TBLFM:")
+      (let ((re (concat key "\\([0-9]+\\)"))
+	    (re2
+	     (when remove
+	       (if (equal key "$")
+		   (format "\\(@[0-9]+\\)?\\$%d=.*?\\(::\\|$\\)" remove)
+		 (format "@%d\\$[0-9]+=.*?\\(::\\|$\\)" remove))))
+	    s n a)
+	(when remove
+	  (while (re-search-forward re2 (point-at-eol) t)
+	    (replace-match "")))
+	(while (re-search-forward re (point-at-eol) t)
+	  (setq s (match-string 1) n (string-to-number s))
+	  (cond
+	   ((setq a (assoc s replace))
+	    (replace-match (concat key (cdr a)) t t))
+	   ((and limit (> n limit))
+	    (replace-match (concat key (int-to-string (+ n delta))) t t))))))))
+
+(defun org-table-get-specials ()
+  "Get the column names and local parameters for this table."
+  (save-excursion
+    (let ((beg (org-table-begin)) (end (org-table-end))
+	  names name fields fields1 field cnt
+	  c v l line col types dlines hlines)
+      (setq org-table-column-names nil
+	    org-table-local-parameters nil
+	    org-table-named-field-locations nil
+	    org-table-current-begin-line nil
+	    org-table-current-line-types nil)	    
+      (goto-char beg)
+      (when (re-search-forward "^[ \t]*| *! *\\(|.*\\)" end t)
+	(setq names (org-split-string (match-string 1) " *| *")
+	      cnt 1)
+	(while (setq name (pop names))
+	  (setq cnt (1+ cnt))
+	  (if (string-match "^[a-zA-Z][a-zA-Z0-9]*$" name)
+	      (push (cons name (int-to-string cnt)) org-table-column-names))))
+      (setq org-table-column-names (nreverse org-table-column-names))
+      (setq org-table-column-name-regexp
+	    (concat "\\$\\(" (mapconcat 'car org-table-column-names "\\|") "\\)\\>"))
+      (goto-char beg)
+      (while (re-search-forward "^[ \t]*| *\\$ *\\(|.*\\)" end t)
+	(setq fields (org-split-string (match-string 1) " *| *"))
+	(while (setq field (pop fields))
+	  (if (string-match "^\\([a-zA-Z][a-zA-Z0-9]*\\|%\\) *= *\\(.*\\)" field)
+	      (push (cons (match-string 1 field) (match-string 2 field))
+		    org-table-local-parameters))))
+      (goto-char beg)
+      (while (re-search-forward "^[ \t]*| *\\([_^]\\) *\\(|.*\\)" end t)
+	(setq c (match-string 1)
+	      fields (org-split-string (match-string 2) " *| *"))
+	(save-excursion
+	  (beginning-of-line (if (equal c "_") 2 0))
+	  (setq line (org-current-line) col 1)
+	  (and (looking-at "^[ \t]*|[^|]*\\(|.*\\)")
+	       (setq fields1 (org-split-string (match-string 1) " *| *"))))
+	(while (and fields1 (setq field (pop fields)))
+	  (setq v (pop fields1) col (1+ col))
+	  (when (and (stringp field) (stringp v)
+		     (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field))
+	      (push (cons field v) org-table-local-parameters)
+	      (push (list field line col) org-table-named-field-locations))))
+      ;; Analyse the line types
+      (goto-char beg)
+      (setq org-table-current-begin-line (org-current-line)
+	    l org-table-current-begin-line)      
+      (while (looking-at "[ \t]*|\\(-\\)?")
+	(push (if (match-end 1) 'hline 'dline) types)
+	(if (match-end 1) (push l hlines) (push l dlines))
+	(beginning-of-line 2)
+	(setq l (1+ l)))
+      (setq org-table-current-line-types (apply 'vector (nreverse types))
+	    org-table-dlines (apply 'vector (cons nil (nreverse dlines)))
+	    org-table-hlines (apply 'vector (cons nil (nreverse hlines)))))))
+
+(defun org-this-word ()
+  ;; Get the current word
+  (save-excursion
+    (let ((beg (progn (skip-chars-backward "^ \t\n") (point)))
+	  (end (progn (skip-chars-forward "^ \t\n") (point))))
+      (buffer-substring-no-properties beg end))))
+
+(defun org-table-maybe-eval-formula ()
+  "Check if the current field starts with \"=\" or \":=\".
+If yes, store the formula and apply it."
+  ;; We already know we are in a table.  Get field will only return a formula
+  ;; when appropriate.  It might return a separator line, but no problem.
+  (when org-table-formula-evaluate-inline
+    (let* ((field (org-trim (or (org-table-get-field) "")))
+	   named eq)
+      (when (string-match "^:?=\\(.*\\)" field)
+	(setq named (equal (string-to-char field) ?:)
+	      eq (match-string 1 field))
+	(if (or (fboundp 'calc-eval)
+		(equal (substring eq 0 (min 2 (length eq))) "'("))
+	    (org-table-eval-formula (if named '(4) nil) eq)
+	  (error "Calc does not seem to be installed, and is needed to evaluate the formula"))))))
+
+(defvar org-recalc-commands nil
+  "List of commands triggering the recalculation of a line.
+Will be filled automatically during use.")
+
+(defvar org-recalc-marks
+  '((" " . "Unmarked: no special line, no automatic recalculation")
+    ("#" . "Automatically recalculate this line upon TAB, RET, and C-c C-c in the line")
+    ("*" . "Recalculate only when entire table is recalculated with `C-u C-c *'")
+    ("!" . "Column name definition line. Reference in formula as $name.")
+    ("$" . "Parameter definition line name=value. Reference in formula as $name.")
+    ("_" . "Names for values in row below this one.")
+    ("^" . "Names for values in row above this one.")))
+
+(defun org-table-rotate-recalc-marks (&optional newchar)
+  "Rotate the recalculation mark in the first column.
+If in any row, the first field is not consistent with a mark,
+insert a new column for the markers.
+When there is an active region, change all the lines in the region,
+after prompting for the marking character.
+After each change, a message will be displayed indicating the meaning
+of the new mark."
+  (interactive)
+  (unless (org-at-table-p) (error "Not at a table"))
+  (let* ((marks (append (mapcar 'car org-recalc-marks) '(" ")))
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 (l (org-current-line))
+	 (l1 (if (org-region-active-p) (org-current-line (region-beginning))))
+	 (l2 (if (org-region-active-p) (org-current-line (region-end))))
+	 (have-col
+	  (save-excursion
+	    (goto-char beg)
+	    (not (re-search-forward "^[ \t]*|[^-|][^|]*[^#!$*_^| \t][^|]*|" end t))))
+	 (col (org-table-current-column))
+	 (forcenew (car (assoc newchar org-recalc-marks)))
+	 epos new)
+    (when l1
+      (message "Change region to what mark?  Type # * ! $ or SPC: ")
+      (setq newchar (char-to-string (read-char-exclusive))
+	    forcenew (car (assoc newchar org-recalc-marks))))
+    (if (and newchar (not forcenew))
+	(error "Invalid NEWCHAR `%s' in `org-table-rotate-recalc-marks'"
+	       newchar))
+    (if l1 (goto-line l1))
+    (save-excursion
+      (beginning-of-line 1)
+      (unless (looking-at org-table-dataline-regexp)
+	(error "Not at a table data line")))
+    (unless have-col
+      (org-table-goto-column 1)
+      (org-table-insert-column)
+      (org-table-goto-column (1+ col)))
+    (setq epos (point-at-eol))
     (save-excursion
-      (while (setq file (pop files))
-	(org-check-agenda-file file)
-	(set-buffer (org-get-agenda-file-buffer file))
-	(widen)
-	(setq bmp (buffer-modified-p))
+      (beginning-of-line 1)
+      (org-table-get-field
+       1 (if (looking-at "^[ \t]*| *\\([#!$*^_ ]\\) *|")
+	     (concat " "
+		     (setq new (or forcenew
+				   (cadr (member (match-string 1) marks))))
+		     " ")
+	   " # ")))
+    (if (and l1 l2)
+	(progn
+	  (goto-line l1)
+	  (while (progn (beginning-of-line 2) (not (= (org-current-line) l2)))
+	    (and (looking-at org-table-dataline-regexp)
+		 (org-table-get-field 1 (concat " " new " "))))
+	  (goto-line l1)))
+    (if (not (= epos (point-at-eol))) (org-table-align))
+    (goto-line l)
+    (and (interactive-p) (message (cdr (assoc new org-recalc-marks))))))
+
+(defun org-table-maybe-recalculate-line ()
+  "Recompute the current line if marked for it, and if we haven't just done it."
+  (interactive)
+  (and org-table-allow-automatic-line-recalculation
+       (not (and (memq last-command org-recalc-commands)
+		 (equal org-last-recalc-line (org-current-line))))
+       (save-excursion (beginning-of-line 1)
+		       (looking-at org-table-auto-recalculate-regexp))
+       (org-table-recalculate) t))
+
+(defvar org-table-formula-debug nil
+  "Non-nil means, debug table formulas.
+When nil, simply write \"#ERROR\" in corrupted fields.")
+(make-variable-buffer-local 'org-table-formula-debug)
+
+(defvar modes)
+(defsubst org-set-calc-mode (var &optional value)
+  (if (stringp var)
+      (setq var (assoc var '(("D" calc-angle-mode deg)
+			     ("R" calc-angle-mode rad)
+			     ("F" calc-prefer-frac t)
+			     ("S" calc-symbolic-mode t)))
+	    value (nth 2 var) var (nth 1 var)))
+  (if (memq var modes)
+      (setcar (cdr (memq var modes)) value)
+    (cons var (cons value modes)))
+  modes)
+
+(defun org-table-eval-formula (&optional arg equation
+					 suppress-align suppress-const
+					 suppress-store suppress-analysis)
+  "Replace the table field value at the cursor by the result of a calculation.
+
+This function makes use of Dave Gillespie's Calc package, in my view the
+most exciting program ever written for GNU Emacs.  So you need to have Calc
+installed in order to use this function.
+
+In a table, this command replaces the value in the current field with the
+result of a formula.  It also installs the formula as the \"current\" column
+formula, by storing it in a special line below the table.  When called
+with a `C-u' prefix, the current field must ba a named field, and the
+formula is installed as valid in only this specific field.
+
+When called with two `C-u' prefixes, insert the active equation
+for the field back into the current field, so that it can be
+edited there.  This is useful in order to use \\[org-show-reference]
+to check the referenced fields.
+
+When called, the command first prompts for a formula, which is read in
+the minibuffer.  Previously entered formulas are available through the
+history list, and the last used formula is offered as a default.
+These stored formulas are adapted correctly when moving, inserting, or
+deleting columns with the corresponding commands.
+
+The formula can be any algebraic expression understood by the Calc package.
+For details, see the Org-mode manual.
+
+This function can also be called from Lisp programs and offers
+additional arguments: EQUATION can be the formula to apply.  If this
+argument is given, the user will not be prompted.  SUPPRESS-ALIGN is
+used to speed-up recursive calls by by-passing unnecessary aligns.
+SUPPRESS-CONST suppresses the interpretation of constants in the
+formula, assuming that this has been done already outside the function.
+SUPPRESS-STORE means the formula should not be stored, either because
+it is already stored, or because it is a modified equation that should
+not overwrite the stored one."
+  (interactive "P")
+  (org-table-check-inside-data-field)
+  (or suppress-analysis (org-table-get-specials))
+  (if (equal arg '(16))
+      (let ((eq (org-table-current-field-formula)))
+	(or eq (error "No equation active for current field"))
+	(org-table-get-field nil eq)
+	(org-table-align)
+	(setq org-table-may-need-update t))
+    (let* (fields
+	   (ndown (if (integerp arg) arg 1))
+	   (org-table-automatic-realign nil)
+	   (case-fold-search nil)
+	   (down (> ndown 1))
+	   (formula (if (and equation suppress-store)
+			equation
+		      (org-table-get-formula equation (equal arg '(4)))))
+	   (n0 (org-table-current-column))
+	   (modes (copy-sequence org-calc-default-modes))
+	   (numbers nil) ; was a variable, now fixed default
+	   (keep-empty nil)
+	   n form form0 bw fmt x ev orig c lispp)
+      ;; Parse the format string.  Since we have a lot of modes, this is
+      ;; a lot of work.  However, I think calc still uses most of the time.
+      (if (string-match ";" formula)
+	  (let ((tmp (org-split-string formula ";")))
+	    (setq formula (car tmp)
+		  fmt (concat (cdr (assoc "%" org-table-local-parameters))
+			      (nth 1 tmp)))
+	    (while (string-match "\\([pnfse]\\)\\(-?[0-9]+\\)" fmt)
+	      (setq c (string-to-char (match-string 1 fmt))
+		    n (string-to-number (match-string 2 fmt)))
+	      (if (= c ?p)
+		  (setq modes (org-set-calc-mode 'calc-internal-prec n))
+		(setq modes (org-set-calc-mode
+			     'calc-float-format
+			     (list (cdr (assoc c '((?n . float) (?f . fix)
+						   (?s . sci) (?e . eng))))
+				   n))))
+	      (setq fmt (replace-match "" t t fmt)))
+	    (if (string-match "[NT]" fmt)
+		(setq numbers (equal (match-string 0 fmt) "N")
+		      fmt (replace-match "" t t fmt)))
+	    (if (string-match "E" fmt)
+		(setq keep-empty t
+		      fmt (replace-match "" t t fmt)))
+	    (while (string-match "[DRFS]" fmt)
+	      (setq modes (org-set-calc-mode (match-string 0 fmt)))
+	      (setq fmt (replace-match "" t t fmt)))
+	    (unless (string-match "\\S-" fmt)
+	      (setq fmt nil))))
+      (if (and (not suppress-const) org-table-formula-use-constants)
+	  (setq formula (org-table-formula-substitute-names formula)))
+      (setq orig (or (get-text-property 1 :orig-formula formula) "?"))
+      (while (> ndown 0)
+	(setq fields (org-split-string
+		      (org-no-properties
+		       (buffer-substring (point-at-bol) (point-at-eol)))
+		      " *| *"))
+	(if numbers
+	    (setq fields (mapcar
+			  (lambda (x) (number-to-string (string-to-number x)))
+			  fields)))
+	(setq ndown (1- ndown))
+	(setq form (copy-sequence formula)
+	      lispp (and (> (length form) 2)(equal (substring form 0 2) "'(")))
+	;; Check for old vertical references
+	(setq form (org-rewrite-old-row-references form))
+	;; Insert complex ranges
+	(while (string-match org-table-range-regexp form)
+	  (setq form
+		(replace-match 
+		 (save-match-data
+		   (org-table-make-reference
+		    (org-table-get-range (match-string 0 form) nil n0)
+		    keep-empty numbers lispp))
+		 t t form)))
+	;; Insert simple ranges
+	(while (string-match "\\$\\([0-9]+\\)\\.\\.\\$\\([0-9]+\\)"  form)
+	  (setq form 
+		(replace-match
+		 (save-match-data
+		   (org-table-make-reference
+		    (org-sublist
+		     fields (string-to-number (match-string 1 form))
+		     (string-to-number (match-string 2 form)))
+		    keep-empty numbers lispp))
+		 t t form)))
+	(setq form0 form)
+	;; Insert the references to fields in same row
+	(while (string-match "\\$\\([0-9]+\\)?" form)
+	  (setq n (if (match-beginning 1)
+		      (string-to-number (match-string 1 form))
+		    n0)
+		x (nth (1- n) fields))
+	  (unless x (error "Invalid field specifier \"%s\""
+			   (match-string 0 form)))
+	  (setq form (replace-match
+		      (save-match-data
+			(org-table-make-reference x nil numbers lispp))
+		      t t form)))
+	(if lispp
+	    (setq ev (condition-case nil
+			 (eval (eval (read form)))
+		       (error "#ERROR"))
+		  ev (if (numberp ev) (number-to-string ev) ev))
+	  (or (fboundp 'calc-eval)
+	      (error "Calc does not seem to be installed, and is needed to evaluate the formula"))
+	  (setq ev (calc-eval (cons form modes)
+			      (if numbers 'num))))
+	
+	(when org-table-formula-debug
+	  (with-output-to-temp-buffer "*Substitution History*"
+	    (princ (format "Substitution history of formula
+Orig:   %s
+$xyz->  %s
+@r$c->  %s
+$1->    %s\n" orig formula form0 form))
+	    (if (listp ev)
+		(princ (format "       %s^\nError:  %s"
+			       (make-string (car ev) ?\-) (nth 1 ev)))
+	      (princ (format "Result: %s\nFormat: %s\nFinal:  %s"
+			     ev (or fmt "NONE")
+			     (if fmt (format fmt (string-to-number ev)) ev)))))
+	  (setq bw (get-buffer-window "*Substitution History*"))
+	  (shrink-window-if-larger-than-buffer bw)
+	  (unless (and (interactive-p) (not ndown))
+	    (unless (let (inhibit-redisplay)
+		      (y-or-n-p "Debugging Formula. Continue to next? "))
+	      (org-table-align)
+	      (error "Abort"))
+	    (delete-window bw)
+	    (message "")))
+	(if (listp ev) (setq fmt nil ev "#ERROR"))
+	(org-table-justify-field-maybe
+	 (if fmt (format fmt (string-to-number ev)) ev))
+	(if (and down (> ndown 0) (looking-at ".*\n[ \t]*|[^-]"))
+	    (call-interactively 'org-return)
+	  (setq ndown 0)))
+      (and down (org-table-maybe-recalculate-line))
+      (or suppress-align (and org-table-may-need-update
+			      (org-table-align))))))
+
+(defun org-table-get-range (desc &optional tbeg col highlight)
+  "Get a calc vector from a column, accorting to descriptor DESC.
+Optional arguments TBEG and COL can give the beginning of the table and
+the current column, to avoid unnecessary parsing.
+HIGHLIGHT means, just highlight the range."
+  (if (not (equal (string-to-char desc) ?@))
+      (setq desc (concat "@" desc)))
+  (save-excursion
+    (or tbeg (setq tbeg (org-table-begin)))
+    (or col (setq col (org-table-current-column)))
+    (let ((thisline (org-current-line))
+	  beg end c1 c2 r1 r2 rangep tmp)
+      (unless (string-match org-table-range-regexp desc)
+	(error "Invalid table range specifier `%s'" desc))
+      (setq rangep (match-end 3)
+	    r1 (and (match-end 1) (match-string 1 desc))
+	    r2 (and (match-end 4) (match-string 4 desc))
+	    c1 (and (match-end 2) (substring (match-string 2 desc) 1))
+	    c2 (and (match-end 5) (substring (match-string 5 desc) 1)))
+
+      (and c1 (setq c1 (+ (string-to-number c1)
+			  (if (memq (string-to-char c1) '(?- ?+)) col 0))))
+      (and c2 (setq c2 (+ (string-to-number c2)
+			  (if (memq (string-to-char c2) '(?- ?+)) col 0))))
+      (if (equal r1 "") (setq r1 nil))
+      (if (equal r2 "") (setq r2 nil))
+      (if r1 (setq r1 (org-table-get-descriptor-line r1)))
+      (if r2 (setq r2 (org-table-get-descriptor-line r2)))
+;      (setq r2 (or r2 r1) c2 (or c2 c1))
+      (if (not r1) (setq r1 thisline))
+      (if (not r2) (setq r2 thisline))
+      (if (not c1) (setq c1 col))
+      (if (not c2) (setq c2 col))
+      (if (or (not rangep) (and (= r1 r2) (= c1 c2)))
+	  ;; just one field
+	  (progn
+	    (goto-line r1)
+	    (while (not (looking-at org-table-dataline-regexp))
+	      (beginning-of-line 2))
+	    (prog1 (org-table-get-field c1)
+	      (if highlight (org-table-highlight-rectangle (point) (point)))))
+	;; A range, return a vector
+	;; First sort the numbers to get a regular ractangle
+	(if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp))
+	(if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp))
+	(goto-line r1)
+	(while (not (looking-at org-table-dataline-regexp))
+	  (beginning-of-line 2))
+	(org-table-goto-column c1)
+	(setq beg (point))
+	(goto-line r2)
+	(while (not (looking-at org-table-dataline-regexp))
+	  (beginning-of-line 0))
+	(org-table-goto-column c2)
+	(setq end (point))
+	(if highlight
+	    (org-table-highlight-rectangle
+	     beg (progn (skip-chars-forward "^|\n") (point))))
+	;; return string representation of calc vector
+	(apply 'append (org-table-copy-region beg end))))))
+
+(defun org-table-get-descriptor-line (desc &optional cline bline table)
+  "Analyze descriptor DESC and retrieve the corresponding line number.
+The cursor is currently in line CLINE, the table begins in line BLINE,
+and TABLE is a vector with line types."
+  (if (string-match "^[0-9]+$" desc)
+      (aref org-table-dlines (string-to-number desc))
+    (setq cline (or cline (org-current-line))
+	  bline (or bline org-table-current-begin-line)
+	  table (or table org-table-current-line-types))
+    (if (or
+	 (not (string-match "^\\(\\([-+]\\)?\\(I+\\)\\)?\\(\\([-+]\\)?\\([0-9]+\\)\\)?" desc))
+	 ;;                     1  2          3           4  5          6
+	 (and (not (match-end 3)) (not (match-end 6)))
+	 (and (match-end 3) (match-end 6) (not (match-end 5))))
+	(error "invalid row descriptor `%s'" desc))
+    (let* ((hdir (and (match-end 2) (match-string 2 desc)))
+	   (hn (if (match-end 3) (- (match-end 3) (match-beginning 3)) nil))
+	   (odir (and (match-end 5) (match-string 5 desc)))
+	   (on (if (match-end 6) (string-to-number (match-string 6 desc))))
+	   (i (- cline bline))
+	   (rel (and (match-end 6)
+		     (or (and (match-end 1) (not (match-end 3)))
+			 (match-end 5)))))
+      (if (and hn (not hdir))
+	  (progn
+	    (setq i 0 hdir "+")
+	    (if (eq (aref table 0) 'hline) (setq hn (1- hn)))))
+      (if (and (not hn) on (not odir))
+	  (error "should never happen");;(aref org-table-dlines on) FIXME
+	(if (and hn (> hn 0))
+	    (setq i (org-find-row-type table i 'hline (equal hdir "-") nil hn)))
+	(if on
+	    (setq i (org-find-row-type table i 'dline (equal odir "-") rel on)))
+	(+ bline i)))))
+
+(defun org-find-row-type (table i type backwards relative n)
+  (let ((l (length table)))
+    (while (> n 0)
+      (while (and (setq i (+ i (if backwards -1 1)))
+		  (>= i 0) (< i l)
+		  (not (eq (aref table i) type))
+		  (if (and relative (eq (aref table i) 'hline))
+		      (progn (setq i (- i (if backwards -1 1)) n 1) nil)
+		    t)))
+      (setq n (1- n)))
+    (if (or (< i 0) (>= i l))
+	(error "Row descriptior leads outside table")
+      i)))
+
+(defun org-rewrite-old-row-references (s)
+  (if (string-match "&[-+0-9I]" s)
+      (error "Formula contains old &row reference, please rewrite using @-syntax")
+    s))
+
+(defun org-table-make-reference (elements keep-empty numbers lispp)
+  "Convert list ELEMENTS to something appropriate to insert into formula.
+KEEP-EMPTY indicated to keep empty fields, default is to skip them.
+NUMBERS indicates that everything should be converted to numbers.
+LISPP means to return something appropriate for a Lisp list."
+  (if (stringp elements) ; just a single val
+      (if lispp
+	  (prin1-to-string (if numbers (string-to-number elements) elements))
+	(if (equal elements "") (setq elements "0"))
+	(if numbers (number-to-string (string-to-number elements)) elements))
+    (unless keep-empty
+      (setq elements
+	    (delq nil
+		  (mapcar (lambda (x) (if (string-match "\\S-" x) x nil))
+			  elements))))
+    (setq elements (or elements '("0")))
+    (if lispp
+	(mapconcat 'prin1-to-string
+		   (if numbers (mapcar 'string-to-number elements) elements)
+		   " ")
+      (concat "[" (mapconcat
+		   (lambda (x)
+		     (if numbers (number-to-string (string-to-number x)) x))
+		   elements
+		   ",") "]"))))
+
+(defun org-table-recalculate (&optional all noalign)
+  "Recalculate the current table line by applying all stored formulas.
+With prefix arg ALL, do this for all lines in the table."
+  (interactive "P")
+  (or (memq this-command org-recalc-commands)
+      (setq org-recalc-commands (cons this-command org-recalc-commands)))
+  (unless (org-at-table-p) (error "Not at a table"))
+  (if (equal all '(16))
+      (org-table-iterate)
+    (org-table-get-specials)
+    (let* ((eqlist (sort (org-table-get-stored-formulas)
+			 (lambda (a b) (string< (car a) (car b)))))
+	   (inhibit-redisplay (not debug-on-error))
+	   (line-re org-table-dataline-regexp)
+	   (thisline (org-current-line))
+	   (thiscol (org-table-current-column))
+	   beg end entry eqlnum eqlname eql (cnt 0) eq a name)
+      ;; Insert constants in all formulas
+      (setq eqlist
+	    (mapcar (lambda (x)
+		      (setcdr x (org-table-formula-substitute-names (cdr x)))
+		      x)
+		    eqlist))
+      ;; Split the equation list
+      (while (setq eq (pop eqlist))
+	(if (<= (string-to-char (car eq)) ?9)
+	    (push eq eqlnum)
+	  (push eq eqlname)))
+      (setq eqlnum (nreverse eqlnum) eqlname (nreverse eqlname))
+      (if all
+	  (progn
+	    (setq end (move-marker (make-marker) (1+ (org-table-end))))
+	    (goto-char (setq beg (org-table-begin)))
+	    (if (re-search-forward org-table-calculate-mark-regexp end t)
+		;; This is a table with marked lines, compute selected lines
+		(setq line-re org-table-recalculate-regexp)
+	      ;; Move forward to the first non-header line
+	      (if (and (re-search-forward org-table-dataline-regexp end t)
+		       (re-search-forward org-table-hline-regexp end t)
+		       (re-search-forward org-table-dataline-regexp end t))
+		  (setq beg (match-beginning 0))
+		nil))) ;; just leave beg where it is
+	(setq beg (point-at-bol)
+	      end (move-marker (make-marker) (1+ (point-at-eol)))))
+      (goto-char beg)
+      (and all (message "Re-applying formulas to full table..."))
+      (while (re-search-forward line-re end t)
+	(unless (string-match "^ *[_^!$] *$" (org-table-get-field 1))
+	  ;; Unprotected line, recalculate
+	  (and all (message "Re-applying formulas to full table...(line %d)"
+			    (setq cnt (1+ cnt))))
+	  (setq org-last-recalc-line (org-current-line))
+	  (setq eql eqlnum)
+	  (while (setq entry (pop eql))
+	    (goto-line org-last-recalc-line)
+	    (org-table-goto-column (string-to-number (car entry)) nil 'force)
+	    (org-table-eval-formula nil (cdr entry)
+				    'noalign 'nocst 'nostore 'noanalysis))))
+      (goto-line thisline)
+      (org-table-goto-column thiscol)
+      (or noalign (and org-table-may-need-update (org-table-align))
+	  (and all (message "Re-applying formulas to %d lines...done" cnt)))
+      ;; Now do the named fields
+      (while (setq eq (pop eqlname))
+	(setq name (car eq)
+	      a (assoc name org-table-named-field-locations))
+	(and (not a)
+	     (string-match "@\\([0-9]+\\)\\$\\([0-9]+\\)" name)
+	     (setq a 
+		   (list
+		    name
+		    (aref org-table-dlines
+			  (string-to-number (match-string 1 name)))
+		    (string-to-number (match-string 2 name)))))
+	(when (and a (or all (equal (nth 1 a) thisline)))
+	  (message "Re-applying formula to field: %s" name)
+	  (goto-line (nth 1 a))
+	  (org-table-goto-column (nth 2 a))
+	  (org-table-eval-formula nil (cdr eq) 'noalign 'nocst
+				  'nostore 'noanalysis)))
+      ;; back to initial position
+      (message "Re-applying formulas...done")
+      (goto-line thisline)
+      (org-table-goto-column thiscol)
+      (or noalign (and org-table-may-need-update (org-table-align))
+	  (and all (message "Re-applying formulas...done"))))))
+  
+(defun org-table-iterate (&optional arg)
+  "Recalculate the table until it does not change anymore."
+  (interactive "P")
+  (let ((imax (if arg (prefix-numeric-value arg) 10))
+	(i 0)	      
+	(lasttbl (buffer-substring (org-table-begin) (org-table-end)))
+	thistbl)
+    (catch 'exit
+      (while (< i imax)
+	(setq i (1+ i))
+	(org-table-recalculate 'all)
+	(setq thistbl (buffer-substring (org-table-begin) (org-table-end)))
+	(if (not (string= lasttbl thistbl))
+	    (setq lasttbl thistbl)
+	  (if (> i 1)
+	      (message "Convergence after %d iterations" i)
+	    (message "Table was already stable"))
+	  (throw 'exit t)))
+      (error "No convergence after %d iterations" i))))
+
+(defun org-table-formula-substitute-names (f)
+  "Replace $const with values in string F."
+  (let ((start 0) a (f1 f))
+    ;; First, check for column names
+    (while (setq start (string-match org-table-column-name-regexp f start))
+      (setq start (1+ start))
+      (setq a (assoc (match-string 1 f) org-table-column-names))
+      (setq f (replace-match (concat "$" (cdr a)) t t f)))
+    ;; Parameters and constants
+    (setq start 0)
+    (while (setq start (string-match "\\$\\([a-zA-Z][a-zA-Z0-9]*\\)" f start))
+      (setq start (1+ start))
+      (if (setq a (save-match-data
+		    (org-table-get-constant (match-string 1 f))))
+	  (setq f (replace-match (concat "(" a ")") t t f))))
+    (if org-table-formula-debug
+	(put-text-property 0 (length f) :orig-formula f1 f))
+    f))
+
+(defun org-table-get-constant (const)
+  "Find the value for a parameter or constant in a formula.
+Parameters get priority."
+  (or (cdr (assoc const org-table-local-parameters))
+      (cdr (assoc const org-table-formula-constants))
+      (and (fboundp 'constants-get) (constants-get const))
+      "#UNDEFINED_NAME"))
+
+(defvar org-edit-formulas-map (make-sparse-keymap))
+(define-key org-edit-formulas-map "\C-c\C-c"      'org-finish-edit-formulas)
+(define-key org-edit-formulas-map "\C-c\C-q"      'org-abort-edit-formulas)
+(define-key org-edit-formulas-map "\C-c?"         'org-show-reference)
+(define-key org-edit-formulas-map [(shift up)]    'org-table-edit-line-up)
+(define-key org-edit-formulas-map [(shift down)]  'org-table-edit-line-down)
+(define-key org-edit-formulas-map [(shift left)] 'org-table-edit-backward-field)
+(define-key org-edit-formulas-map [(shift right)] 'org-table-edit-next-field)
+(define-key org-edit-formulas-map [(meta up)]     'org-table-edit-scroll-down)
+(define-key org-edit-formulas-map [(meta down)]   'org-table-edit-scroll)
+(define-key org-edit-formulas-map [(meta tab)]    'lisp-complete-symbol)
+(define-key org-edit-formulas-map "\M-\C-i"       'lisp-complete-symbol)
+(define-key org-edit-formulas-map [(tab)]         'org-edit-formula-lisp-indent)
+(define-key org-edit-formulas-map "\C-i"          'org-edit-formula-lisp-indent)
+
+(defvar org-pos)
+
+(defun org-table-edit-formulas ()
+  "Edit the formulas of the current table in a separate buffer."
+  (interactive)
+  (unless (org-at-table-p) (error "Not at a table"))
+  (org-table-get-specials)
+  (let ((eql (org-table-get-stored-formulas))
+	(pos (move-marker (make-marker) (point)))
+	(wc (current-window-configuration))
+	entry s)
+    (switch-to-buffer-other-window "*Edit Formulas*")
+    (erase-buffer)
+    (fundamental-mode)
+    (org-set-local 'org-pos pos)
+    (org-set-local 'org-window-configuration wc)
+    (use-local-map org-edit-formulas-map)
+    (org-add-hook 'post-command-hook 'org-table-edit-formulas-post-command t t)
+    (setq s "# `C-c C-c' to finish, `C-u C-c C-c' to also apply, `C-c C-q' to abort.
+# `TAB' to pretty-print Lisp expressions, `M-TAB' to complete List symbols
+# `M-up/down' to scroll table, `S-up/down' to change line for column formulas\n\n")
+
+    (put-text-property 0 (length s) 'face 'font-lock-comment-face s)
+    (insert s)
+    (while (setq entry (pop eql))
+      (setq s (concat (if (equal (string-to-char (car entry)) ?@) "" "$")
+		      (car entry) " = " (cdr entry) "\n"))
+      (remove-text-properties 0 (length s) '(face nil) s)
+      (insert s))
+    (goto-char (point-min))
+    (message "Edit formulas and finish with `C-c C-c'.")))
+
+(defun org-table-edit-formulas-post-command ()
+  (when (not (memq this-command '(lisp-complete-symbol)))
+    (let ((win (selected-window)))
+      (save-excursion
+	(condition-case nil
+	    (org-show-reference)
+	  (error nil))
+	(select-window win)))))
+
+(defun org-finish-edit-formulas (&optional arg)
+  "Parse the buffer for formula definitions and install them.
+With prefix ARG, apply the new formulas to the table."
+  (interactive "P")
+  (org-table-remove-rectangle-highlight)
+  (let ((pos org-pos) eql var form)
+    (setq org-pos nil)
+    (goto-char (point-min))
+    (while (re-search-forward
+	    "^\\(@[0-9]+\\$[0-9]+\\|\\$\\([a-zA-Z0-9]+\\)\\) *= *\\(.*\\(\n[ \t]+.*$\\)*\\)"
+	    nil t)
+      (setq var (if (match-end 2) (match-string 2) (match-string 1))
+	    form (match-string 3))
+      (setq form (org-trim form))
+      (while (string-match "[ \t]*\n[ \t]*" form)
+	(setq form (replace-match " " t t form)))
+      (push (cons var form) eql))
+    (set-window-configuration org-window-configuration)
+    (select-window (get-buffer-window (marker-buffer pos)))
+    (goto-char pos)
+    (unless (org-at-table-p)
+      (error "Lost table position - cannot install formulae"))
+    (org-table-store-formulas eql)
+    (move-marker pos nil)
+    (kill-buffer "*Edit Formulas*")
+    (if arg
+	(org-table-recalculate 'all)
+      (message "New formulas installed - press C-u C-c C-c to apply."))))
+
+(defun org-abort-edit-formulas ()
+  "Abort editing formulas, without installing the changes."
+  (interactive)
+  (org-table-remove-rectangle-highlight)
+  (let ((pos org-pos))
+    (set-window-configuration org-window-configuration)
+    (select-window (get-buffer-window (marker-buffer pos)))
+    (goto-char pos)
+    (move-marker pos nil)
+    (message "Formula editing aborted without installing changes")))
+
+(defun org-edit-formula-lisp-indent ()
+  "Pretty-print and re-indent Lisp expressions in the Formula Editor."
+  (interactive)
+  (let ((pos (point)) beg end ind)
+    (beginning-of-line 1)
+    (cond
+     ((looking-at "[ \t]")
+      (goto-char pos)
+      (call-interactively 'lisp-indent-line))
+     ((looking-at "[$@0-9a-zA-Z]+ *= *[^ \t\n']") (goto-char pos))
+     ((not (fboundp 'pp-buffer))
+      (error "Cannot pretty-print.  Command `pp-buffer' is not available."))
+     ((looking-at "[$@0-9a-zA-Z]+ *= *'(")
+      (goto-char (- (match-end 0) 2))
+      (setq beg (point))
+      (setq ind (make-string (current-column) ?\ ))
+      (condition-case nil (forward-sexp 1)
+	(error
+	 (error "Cannot pretty-print Lisp expression: Unbalanced parenthesis")))
+      (setq end (point))
+      (save-restriction
+	(narrow-to-region beg end)
+	(if (eq last-command this-command)
+	    (progn
+	      (goto-char (point-min))
+	      (setq this-command nil)
+	      (while (re-search-forward "[ \t]*\n[ \t]*" nil t)
+		(replace-match " ")))
+	  (pp-buffer)
+	  (untabify (point-min) (point-max))
+	  (goto-char (1+ (point-min)))
+	  (while (re-search-forward "^." nil t)
+	    (beginning-of-line 1)
+	    (insert ind))
+	  (goto-char (point-max))
+	  (backward-delete-char 1)))
+      (goto-char beg))
+     (t nil))))
+
+(defvar org-show-positions nil)
+
+(defun org-show-reference (&optional local)
+  "Show the location/value of the $ expression at point."
+  (interactive)
+  (org-table-remove-rectangle-highlight)
+  (catch 'exit
+    (let ((pos (if local (point) org-pos))
+          (face2 'highlight)
+          (org-inhibit-highlight-removal t)
+	  (win (selected-window))
+	  (org-show-positions nil)
+	  var name e what match dest)
+      (if local (org-table-get-specials))
+      (setq what (cond
+		  ((org-at-regexp-p org-table-range-regexp2) 'range)
+		  ((org-at-regexp-p "\\$[a-zA-Z][a-zA-Z0-9]*") 'name)
+		  ((org-at-regexp-p "\\$[0-9]+") 'column)
+		  ((not local) nil)
+		  (t (error "No reference at point")))
+	    match (and what (match-string 0)))
+      (when (and  match (not (equal (match-beginning 0) (point-at-bol))))
+	(org-table-add-rectangle-overlay (match-beginning 0) (match-end 0)
+					 'secondary-selection))
+      (org-add-hook 'before-change-functions
+		    'org-table-remove-rectangle-highlight)
+      (if (eq what 'name) (setq var (substring match 1)))
+      (when (eq what 'range)
+	(or (equal (string-to-char match) ?@) (setq match (concat "@" match)))
+	(setq match (org-table-formula-substitute-names match)))
+      (unless local
 	(save-excursion
-	  (remove-text-properties (point-min) (point-max) pall)
-	  (when org-agenda-skip-archived-trees
-	    (goto-char (point-min))
-	    (while (re-search-forward rea nil t)
-	      (if (org-on-heading-p)
-		  (add-text-properties (point-at-bol) (org-end-of-subtree t) pa))))
+	  (beginning-of-line 1)
+	  (when (looking-at "\\(\\$[0-9a-zA-Z]+\\|@[0-9]+\\$[0-9]+\\)=")
+	    (setq dest (match-string 1))
+	    (org-table-add-rectangle-overlay
+	     (match-beginning 1) (match-end 1) face2))))
+      (if (and (markerp pos) (marker-buffer pos))
+	  (if (get-buffer-window (marker-buffer pos))
+	      (select-window (get-buffer-window (marker-buffer pos)))
+	    (switch-to-buffer-other-window (get-buffer-window
+					    (marker-buffer pos)))))
+      (goto-char pos)
+      (org-table-force-dataline)
+      (when dest
+	(setq name (substring dest 1))
+	(cond
+	 ((string-match "^\\$[a-zA-Z][a-zA-Z0-9]*" dest)
+	  (setq e (assoc name org-table-named-field-locations))
+	  (goto-line (nth 1 e))
+	  (org-table-goto-column (nth 2 e)))
+	 ((string-match "^@\\([0-9]+\\)\\$\\([0-9]+\\)" dest)
+	  (let ((l (string-to-number (match-string 1 dest)))
+		(c (string-to-number (match-string 2 dest))))
+	    (goto-line (aref org-table-dlines l))
+	    (org-table-goto-column c)))
+	 (t (org-table-goto-column (string-to-number name))))
+	(move-marker pos (point))
+	(org-table-highlight-rectangle nil nil face2))
+      (cond
+       ((equal dest match))
+       ((not match))
+       ((eq what 'range)
+	(condition-case nil
+	    (save-excursion
+	      (org-table-get-range match nil nil 'highlight))
+	  (error nil)))
+       ((setq e (assoc var org-table-named-field-locations))
+	(goto-line (nth 1 e))
+	(org-table-goto-column (nth 2 e))
+	(org-table-highlight-rectangle (point) (point))
+	(message "Named field, column %d of line %d" (nth 2 e) (nth 1 e)))
+       ((setq e (assoc var org-table-column-names))
+	(org-table-goto-column (string-to-number (cdr e)))
+	(org-table-highlight-rectangle (point) (point))
+	(goto-char (org-table-begin))
+	(if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|")
+			       (org-table-end) t)
+	    (progn
+	      (goto-char (match-beginning 1))
+	      (org-table-highlight-rectangle)
+	      (message "Named column (column %s)" (cdr e)))
+	  (error "Column name not found")))
+       ((eq what 'column)
+	;; column number
+	(org-table-goto-column (string-to-number (substring match 1)))
+	(org-table-highlight-rectangle (point) (point))
+	(message "Column %s" (substring match 1)))
+       ((setq e (assoc var org-table-local-parameters))
+	(goto-char (org-table-begin))
+	(if (re-search-forward (concat "^[ \t]*| *\\$ *.*?| *\\(" var "=\\)") nil t)
+	    (progn
+	      (goto-char (match-beginning 1))
+	      (org-table-highlight-rectangle)
+	      (message "Local parameter."))
+	  (error "Parameter not found")))
+       (t
+	(cond
+	 ((not var) (error "No reference at point"))
+	 ((setq e (assoc var org-table-formula-constants))
+	  (message "Constant: $%s=%s in `org-table-formula-constants'."
+		   var (cdr e)))
+	 ((setq e (and (fboundp 'constants-get) (constants-get var)))
+	  (message "Constant: $%s=%s, retrieved from `constants.el'." var e))
+	 (t (error "Undefined name $%s" var)))))
+      (goto-char pos)
+      (when org-show-positions
+	(push pos org-show-positions)
+	(let ((min (apply 'min org-show-positions))
+	      (max (apply 'max org-show-positions)))
+	  (when (or (not (pos-visible-in-window-p min))
+		    (not (pos-visible-in-window-p max)))
+	    (goto-char min)
+	    (set-window-start (selected-window) (point-at-bol))
+	    (goto-char pos))))
+      (select-window win))))
+
+(defun org-table-force-dataline ()
+  "Make sure the cursor is in a dataline in a table."
+  (unless (save-excursion
+	    (beginning-of-line 1)
+	    (looking-at org-table-dataline-regexp))
+    (let* ((re org-table-dataline-regexp)
+	   (p1 (save-excursion (re-search-forward re nil 'move)))
+	   (p2 (save-excursion (re-search-backward re nil 'move))))
+      (cond ((and p1 p2)
+	     (goto-char (if (< (abs (- p1 (point))) (abs (- p2 (point))))
+			    p1 p2)))
+	    ((or p1 p2) (goto-char (or p1 p2)))
+	    (t (error "No table dataline around here"))))))
+
+(defun org-table-edit-line-up ()
+  "Move cursor one line up in the window showing the table."
+  (interactive)
+  (org-table-edit-move 'previous-line))
+
+(defun org-table-edit-line-down ()
+  "Move cursor one line down in the window showing the table."
+  (interactive)
+ (org-table-edit-move 'next-line))
+
+(defun org-table-edit-backward-field ()
+  "Move cursor one field backward in the window showing the table."
+  (interactive)
+  (org-table-edit-move 'org-table-previous-field))
+
+(defun org-table-edit-next-field ()
+  "Move cursor one field forward in the window showing the table."
+  (interactive)
+  (org-table-edit-move 'org-table-next-field))
+
+(defun org-table-edit-move (command)
+  "Move the cursor in the window shoinw the table.
+Use COMMAND to do the motion, repeat if necessary to end up in a data line."
+  (let ((org-table-allow-automatic-line-recalculation nil)
+	(pos org-pos) (win (selected-window)) p)
+    (select-window (get-buffer-window (marker-buffer org-pos)))
+    (setq p (point))
+    (call-interactively command)
+    (while (and (org-at-table-p)
+		(org-at-table-hline-p))
+      (call-interactively command))
+    (or (org-at-table-p) (goto-char p))
+    (move-marker pos (point))
+    (select-window win)))
+
+(defun org-table-edit-scroll (N)
+  (interactive "p")
+  (let ((other-window-scroll-buffer (marker-buffer org-pos)))
+    (scroll-other-window N)))
+
+(defun org-table-edit-scroll-down (N)
+  (interactive "p")
+  (org-table-edit-scroll (- N)))
+
+(defvar org-table-rectangle-overlays nil)
+	
+(defun org-table-add-rectangle-overlay (beg end &optional face)
+  "Add a new overlay."
+  (let ((ov (org-make-overlay beg end)))
+    (org-overlay-put ov 'face (or face 'secondary-selection))
+    (push ov org-table-rectangle-overlays)))
+
+(defun org-table-highlight-rectangle (&optional beg end face)
+  "Highlight rectangular region in a table."
+  (setq beg (or beg (point)) end (or end (point)))
+  (let ((b (min beg end))
+	(e (max beg end))
+	l1 c1 l2 c2 tmp)
+    (and (boundp 'org-show-positions)
+	 (setq org-show-positions (cons b (cons e org-show-positions))))
+    (goto-char (min beg end))
+    (setq l1 (org-current-line)
+	  c1 (org-table-current-column))
+    (goto-char (max beg end))
+    (setq l2 (org-current-line)
+	  c2 (org-table-current-column))
+    (if (> c1 c2) (setq tmp c1 c1 c2 c2 tmp))
+    (goto-line l1)
+    (beginning-of-line 1)
+    (loop for line from l1 to l2 do
+	  (when (looking-at org-table-dataline-regexp)
+	    (org-table-goto-column c1)
+	    (skip-chars-backward "^|\n") (setq beg (point))
+	    (org-table-goto-column c2)
+	    (skip-chars-forward "^|\n")  (setq end (point))
+	    (org-table-add-rectangle-overlay beg end face))
+	  (beginning-of-line 2))
+    (goto-char b))
+  (add-hook 'before-change-functions 'org-table-remove-rectangle-highlight))
+
+(defun org-table-remove-rectangle-highlight (&rest ignore)
+  "Remove the rectangle overlays."
+  (unless org-inhibit-highlight-removal
+    (remove-hook 'before-change-functions 'org-table-remove-rectangle-highlight)
+    (mapc 'org-delete-overlay org-table-rectangle-overlays)
+    (setq org-table-rectangle-overlays nil)))
+
+(defvar org-table-coordinate-overlays nil
+  "Collects the cooordinate grid overlays, so that they can be removed.")
+(make-variable-buffer-local 'org-table-coordinate-overlays)
+
+(defun org-table-overlay-coordinates ()
+  "Add overlays to the table at point, to show row/column coordinates."
+  (interactive)
+  (mapc 'org-delete-overlay org-table-coordinate-overlays)
+  (setq org-table-coordinate-overlays nil)
+  (save-excursion
+    (let ((id 0) (ih 0) hline eol str ic ov beg)
+      (goto-char (org-table-begin))
+      (while (org-at-table-p)
+	(setq eol (point-at-eol))
+	(setq ov (org-make-overlay (point-at-bol) (1+ (point-at-bol))))
+	(push ov org-table-coordinate-overlays)
+	(setq hline (looking-at org-table-hline-regexp))
+	(setq str (if hline (format "I*%-2d" (setq ih (1+ ih)))
+		    (format "%4d" (setq id (1+ id)))))
+	(org-overlay-before-string ov str 'org-formula 'evaporate)
+	(when hline
+	  (setq ic 0)
+	  (while (re-search-forward "[+|]-+" eol t)
+	    (setq beg (1+ (match-beginning 0))
+		  str (concat "$" (int-to-string (setq ic (1+ ic)))))
+	    (setq ov (org-make-overlay beg (+ beg (length str))))
+	    (push ov org-table-coordinate-overlays)
+	    (org-overlay-display ov str 'org-formula 'evaporate)))
+	(beginning-of-line 2)))))
+
+(defun org-table-toggle-coordinate-overlays ()
+  "Toggle the display of Row/Column numbers in tables."
+  (interactive)
+  (setq org-table-overlay-coordinates (not org-table-overlay-coordinates))
+  (message "Row/Column number display turned %s"
+	   (if org-table-overlay-coordinates "on" "off"))
+  (if (and (org-at-table-p) org-table-overlay-coordinates)
+      (org-table-align))
+  (unless org-table-overlay-coordinates
+    (mapc 'org-delete-overlay org-table-coordinate-overlays)
+    (setq org-table-coordinate-overlays nil)))
+
+(defun org-table-toggle-formula-debugger ()
+  "Toggle the formula debugger in tables."
+  (interactive)
+  (setq org-table-formula-debug (not org-table-formula-debug))
+  (message "Formula debugging has been turned %s"
+	   (if org-table-formula-debug "on" "off")))
+
+;;; The orgtbl minor mode
+
+;; Define a minor mode which can be used in other modes in order to
+;; integrate the org-mode table editor.
+
+;; This is really a hack, because the org-mode table editor uses several
+;; keys which normally belong to the major mode, for example the TAB and
+;; RET keys.  Here is how it works: The minor mode defines all the keys
+;; necessary to operate the table editor, but wraps the commands into a
+;; function which tests if the cursor is currently inside a table.  If that
+;; is the case, the table editor command is executed.  However, when any of
+;; those keys is used outside a table, the function uses `key-binding' to
+;; look up if the key has an associated command in another currently active
+;; keymap (minor modes, major mode, global), and executes that command.
+;; There might be problems if any of the keys used by the table editor is
+;; otherwise used as a prefix key.
+
+;; Another challenge is that the key binding for TAB can be tab or \C-i,
+;; likewise the binding for RET can be return or \C-m.  Orgtbl-mode
+;; addresses this by checking explicitly for both bindings.
+
+;; The optimized version (see variable `orgtbl-optimized') takes over
+;; all keys which are bound to `self-insert-command' in the *global map*.
+;; Some modes bind other commands to simple characters, for example
+;; AUCTeX binds the double quote to `Tex-insert-quote'.  With orgtbl-mode
+;; active, this binding is ignored inside tables and replaced with a
+;; modified self-insert.
+
+(defvar orgtbl-mode nil
+  "Variable controlling `orgtbl-mode', a minor mode enabling the `org-mode'
+table editor in arbitrary modes.")
+(make-variable-buffer-local 'orgtbl-mode)
+
+(defvar orgtbl-mode-map (make-keymap)
+  "Keymap for `orgtbl-mode'.")
+
+;;;###autoload
+(defun turn-on-orgtbl ()
+  "Unconditionally turn on `orgtbl-mode'."
+  (orgtbl-mode 1))
+
+(defvar org-old-auto-fill-inhibit-regexp nil
+  "Local variable used by `orgtbl-mode'")
+
+(defconst orgtbl-line-start-regexp "[ \t]*\\(|\\|#\\+\\(TBLFM\\|ORGTBL\\):\\)"
+  "Matches a line belonging to an orgtbl.")
+
+(defconst orgtbl-extra-font-lock-keywords
+  (list (list (concat "^" orgtbl-line-start-regexp ".*")
+	      0 (quote 'org-table) 'prepend))
+  "Extra font-lock-keywords to be added when orgtbl-mode is active.")
+
+;;;###autoload
+(defun orgtbl-mode (&optional arg)
+  "The `org-mode' table editor as a minor mode for use in other modes."
+  (interactive)
+  (if (org-mode-p)
+      ;; Exit without error, in case some hook functions calls this
+      ;; by accident in org-mode.
+      (message "Orgtbl-mode is not useful in org-mode, command ignored")
+    (setq orgtbl-mode
+	  (if arg (> (prefix-numeric-value arg) 0) (not orgtbl-mode)))
+    (if orgtbl-mode
+	(progn
+	  (and (orgtbl-setup) (defun orgtbl-setup () nil))
+	  ;; Make sure we are first in minor-mode-map-alist
+	  (let ((c (assq 'orgtbl-mode minor-mode-map-alist)))
+	    (and c (setq minor-mode-map-alist
+			 (cons c (delq c minor-mode-map-alist)))))
+	  (org-set-local (quote org-table-may-need-update) t)
+	  (org-add-hook 'before-change-functions 'org-before-change-function
+			nil 'local)
+	  (org-set-local 'org-old-auto-fill-inhibit-regexp
+			 auto-fill-inhibit-regexp)
+	  (org-set-local 'auto-fill-inhibit-regexp
+			 (if auto-fill-inhibit-regexp
+			     (concat orgtbl-line-start-regexp "\\|"
+				     auto-fill-inhibit-regexp)
+			   orgtbl-line-start-regexp))
+	  (org-add-to-invisibility-spec '(org-cwidth))
+	  (when (fboundp 'font-lock-add-keywords)
+	    (font-lock-add-keywords nil orgtbl-extra-font-lock-keywords)
+	    (org-restart-font-lock))
+	  (easy-menu-add orgtbl-mode-menu)
+	  (run-hooks 'orgtbl-mode-hook))
+      (setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp)
+      (org-cleanup-narrow-column-properties)
+      (org-remove-from-invisibility-spec '(org-cwidth))
+      (remove-hook 'before-change-functions 'org-before-change-function t)
+      (when (fboundp 'font-lock-remove-keywords)
+	(font-lock-remove-keywords nil orgtbl-extra-font-lock-keywords)
+	(org-restart-font-lock))
+      (easy-menu-remove orgtbl-mode-menu)
+      (force-mode-line-update 'all))))
+
+(defun org-cleanup-narrow-column-properties ()
+  "Remove all properties related to narrow-column invisibility."
+  (let ((s 1))
+    (while (setq s (text-property-any s (point-max)
+				      'display org-narrow-column-arrow))
+      (remove-text-properties s (1+ s) '(display t)))
+    (setq s 1)
+    (while (setq s (text-property-any s (point-max) 'org-cwidth 1))
+      (remove-text-properties s (1+ s) '(org-cwidth t)))
+    (setq s 1)
+    (while (setq s (text-property-any s (point-max) 'invisible 'org-cwidth))
+      (remove-text-properties s (1+ s) '(invisible t)))))
+
+;; Install it as a minor mode.
+(put 'orgtbl-mode :included t)
+(put 'orgtbl-mode :menu-tag "Org Table Mode")
+(add-minor-mode 'orgtbl-mode " OrgTbl" orgtbl-mode-map)
+
+(defun orgtbl-make-binding (fun n &rest keys)
+  "Create a function for binding in the table minor mode.
+FUN is the command to call inside a table.  N is used to create a unique
+command name.  KEYS are keys that should be checked in for a command
+to execute outside of tables."
+  (eval
+   (list 'defun
+	 (intern (concat "orgtbl-hijacker-command-" (int-to-string n)))
+	 '(arg)
+	 (concat "In tables, run `" (symbol-name fun) "'.\n"
+		 "Outside of tables, run the binding of `"
+		 (mapconcat (lambda (x) (format "%s" x)) keys "' or `")
+		 "'.")
+	 '(interactive "p")
+	 (list 'if
+	       '(org-at-table-p)
+	       (list 'call-interactively (list 'quote fun))
+	       (list 'let '(orgtbl-mode)
+		     (list 'call-interactively
+			   (append '(or)
+				   (mapcar (lambda (k)
+					     (list 'key-binding k))
+					   keys)
+				   '('orgtbl-error))))))))
+
+(defun orgtbl-error ()
+  "Error when there is no default binding for a table key."
+  (interactive)
+  (error "This key is has no function outside tables"))
+
+(defun orgtbl-setup ()
+  "Setup orgtbl keymaps."
+  (let ((nfunc 0)
+	(bindings
+	 (list
+	  '([(meta shift left)]  org-table-delete-column)
+	  '([(meta left)]        org-table-move-column-left)
+	  '([(meta right)]       org-table-move-column-right)
+	  '([(meta shift right)] org-table-insert-column)
+	  '([(meta shift up)]    org-table-kill-row)
+	  '([(meta shift down)]  org-table-insert-row)
+	  '([(meta up)]          org-table-move-row-up)
+	  '([(meta down)]        org-table-move-row-down)
+	  '("\C-c\C-w"           org-table-cut-region)
+	  '("\C-c\M-w"           org-table-copy-region)
+	  '("\C-c\C-y"           org-table-paste-rectangle)
+	  '("\C-c-"              org-table-insert-hline)
+	  '("\C-c}"              org-table-toggle-coordinate-overlays)
+	  '("\C-c{"              org-table-toggle-formula-debugger)
+	  '("\C-m"               org-table-next-row)
+	  (list (org-key 'S-return) 'org-table-copy-down)
+	  '("\C-c\C-q"           org-table-wrap-region)
+	  '("\C-c?"              org-table-field-info)
+	  '("\C-c "              org-table-blank-field)
+	  '("\C-c+"              org-table-sum)
+	  '("\C-c="              org-table-eval-formula)
+	  '("\C-c'"              org-table-edit-formulas)
+	  '("\C-c`"              org-table-edit-field)
+	  '("\C-c*"              org-table-recalculate)
+	  '("\C-c|"              org-table-create-or-convert-from-region)
+	  '("\C-c^"              org-table-sort-lines)
+	  '([(control ?#)]       org-table-rotate-recalc-marks)))
+	elt key fun cmd)
+    (while (setq elt (pop bindings))
+      (setq nfunc (1+ nfunc))
+      (setq key (car elt)
+	    fun (nth 1 elt)
+	    cmd (orgtbl-make-binding fun nfunc key))
+      (define-key orgtbl-mode-map key cmd))
+
+    ;; Special treatment needed for TAB and RET
+    (define-key orgtbl-mode-map [(return)]
+      (orgtbl-make-binding 'orgtbl-ret 100 [(return)] "\C-m"))
+    (define-key orgtbl-mode-map "\C-m"
+      (orgtbl-make-binding 'orgtbl-ret 101 "\C-m" [(return)]))
+
+    (define-key orgtbl-mode-map [(tab)]
+      (orgtbl-make-binding 'orgtbl-tab 102 [(tab)] "\C-i"))
+    (define-key orgtbl-mode-map "\C-i"
+      (orgtbl-make-binding 'orgtbl-tab 103 "\C-i" [(tab)]))
+
+    (define-key orgtbl-mode-map [(shift tab)]
+      (orgtbl-make-binding 'org-table-previous-field 104
+			   [(shift tab)] [(tab)] "\C-i"))
+
+    (define-key orgtbl-mode-map "\M-\C-m"
+      (orgtbl-make-binding 'org-table-wrap-region 105
+			   "\M-\C-m" [(meta return)]))
+    (define-key orgtbl-mode-map [(meta return)]
+      (orgtbl-make-binding 'org-table-wrap-region 106
+			   [(meta return)] "\M-\C-m"))
+
+    (define-key orgtbl-mode-map "\C-c\C-c" 'orgtbl-ctrl-c-ctrl-c)
+    (when orgtbl-optimized
+      ;; If the user wants maximum table support, we need to hijack
+      ;; some standard editing functions
+      (org-remap orgtbl-mode-map
+		 'self-insert-command 'orgtbl-self-insert-command
+		 'delete-char 'org-delete-char
+		 'delete-backward-char 'org-delete-backward-char)
+      (define-key orgtbl-mode-map "|" 'org-force-self-insert))
+    (easy-menu-define orgtbl-mode-menu orgtbl-mode-map "OrgTbl menu"
+      '("OrgTbl"
+	["Align" org-ctrl-c-ctrl-c :active (org-at-table-p) :keys "C-c C-c"]
+	["Next Field" org-cycle :active (org-at-table-p) :keys "TAB"]
+	["Previous Field" org-shifttab :active (org-at-table-p) :keys "S-TAB"]
+	["Next Row" org-return :active (org-at-table-p) :keys "RET"]
+	"--"
+	["Blank Field" org-table-blank-field :active (org-at-table-p) :keys "C-c SPC"]
+	["Edit Field" org-table-edit-field :active (org-at-table-p) :keys "C-c ` "]
+	["Copy Field from Above"
+	 org-table-copy-down :active (org-at-table-p) :keys "S-RET"]
+	"--"
+	("Column"
+	 ["Move Column Left" org-metaleft :active (org-at-table-p) :keys "M-<left>"]
+	 ["Move Column Right" org-metaright :active (org-at-table-p) :keys "M-<right>"]
+	 ["Delete Column" org-shiftmetaleft :active (org-at-table-p) :keys "M-S-<left>"]
+	 ["Insert Column" org-shiftmetaright :active (org-at-table-p) :keys "M-S-<right>"])
+	("Row"
+	 ["Move Row Up" org-metaup :active (org-at-table-p) :keys "M-<up>"]
+	 ["Move Row Down" org-metadown :active (org-at-table-p) :keys "M-<down>"]
+	 ["Delete Row" org-shiftmetaup :active (org-at-table-p) :keys "M-S-<up>"]
+	 ["Insert Row" org-shiftmetadown :active (org-at-table-p) :keys "M-S-<down>"]
+	 ["Sort lines in region" org-table-sort-lines (org-at-table-p) :keys "C-c ^"]
+	 "--"
+	 ["Insert Hline" org-table-insert-hline :active (org-at-table-p) :keys "C-c -"])
+	("Rectangle"
+	 ["Copy Rectangle" org-copy-special :active (org-at-table-p)]
+	 ["Cut Rectangle" org-cut-special :active (org-at-table-p)]
+	 ["Paste Rectangle" org-paste-special :active (org-at-table-p)]
+	 ["Fill Rectangle" org-table-wrap-region :active (org-at-table-p)])
+	"--"
+	("Radio tables"
+	 ["Insert table template" orgtbl-insert-radio-table
+	  (assq major-mode orgtbl-radio-table-templates)]
+	 ["Comment/uncomment table" orgtbl-toggle-comment t])
+	"--"
+	["Set Column Formula" org-table-eval-formula :active (org-at-table-p) :keys "C-c ="]
+	["Set Field Formula" (org-table-eval-formula '(4)) :active (org-at-table-p) :keys "C-u C-c ="]
+	["Edit Formulas" org-table-edit-formulas :active (org-at-table-p) :keys "C-c '"]
+	["Recalculate line" org-table-recalculate :active (org-at-table-p) :keys "C-c *"]
+	["Recalculate all" (org-table-recalculate '(4)) :active (org-at-table-p) :keys "C-u C-c *"]
+	["Iterate all" (org-table-recalculate '(16)) :active (org-at-table-p) :keys "C-u C-u C-c *"]
+	["Toggle Recalculate Mark" org-table-rotate-recalc-marks :active (org-at-table-p) :keys "C-c #"]
+	["Sum Column/Rectangle" org-table-sum
+	 :active (or (org-at-table-p) (org-region-active-p)) :keys "C-c +"]
+	["Which Column?" org-table-current-column :active (org-at-table-p) :keys "C-c ?"]
+	["Debug Formulas"
+	 org-table-toggle-formula-debugger :active (org-at-table-p)
+	 :keys "C-c {"
+	 :style toggle :selected org-table-formula-debug]
+	["Show Col/Row Numbers"
+	 org-table-toggle-coordinate-overlays :active (org-at-table-p)
+	 :keys "C-c }"
+	 :style toggle :selected org-table-overlay-coordinates]
+	))
+    t))
+
+(defun orgtbl-ctrl-c-ctrl-c (arg)
+  "If the cursor is inside a table, realign the table.
+It it is a table to be sent away to a receiver, do it.
+With prefix arg, also recompute table."
+  (interactive "P")
+  (let ((pos (point)) action)
+    (save-excursion
+      (beginning-of-line 1)
+      (setq action (cond ((looking-at "#\\+ORGTBL:.*\n[ \t]*|") (match-end 0))
+			 ((looking-at "[ \t]*|") pos)
+			 ((looking-at "#\\+TBLFM:") 'recalc))))
+    (cond
+     ((integerp action)
+      (goto-char action)
+      (org-table-maybe-eval-formula)
+      (if arg
+	  (call-interactively 'org-table-recalculate)
+	(org-table-maybe-recalculate-line))
+      (call-interactively 'org-table-align)
+      (orgtbl-send-table 'maybe))
+     ((eq action 'recalc)
+      (save-excursion
+	(beginning-of-line 1)
+	(skip-chars-backward " \r\n\t")
+	(if (org-at-table-p)
+	    (org-call-with-arg 'org-table-recalculate t))))
+     (t (let (orgtbl-mode)
+	  (call-interactively (key-binding "\C-c\C-c")))))))
+
+(defun orgtbl-tab (arg)
+  "Justification and field motion for `orgtbl-mode'."
+  (interactive "P")
+  (if arg (org-table-edit-field t)
+    (org-table-justify-field-maybe)
+    (org-table-next-field)))
+
+(defun orgtbl-ret ()
+  "Justification and field motion for `orgtbl-mode'."
+  (interactive)
+  (org-table-justify-field-maybe)
+  (org-table-next-row))
+
+(defun orgtbl-self-insert-command (N)
+  "Like `self-insert-command', use overwrite-mode for whitespace in tables.
+If the cursor is in a table looking at whitespace, the whitespace is
+overwritten, and the table is not marked as requiring realignment."
+  (interactive "p")
+  (if (and (org-at-table-p)
+	   (or
+	    (and org-table-auto-blank-field
+		 (member last-command
+			 '(orgtbl-hijacker-command-100
+			   orgtbl-hijacker-command-101
+			   orgtbl-hijacker-command-102
+			   orgtbl-hijacker-command-103
+			   orgtbl-hijacker-command-104
+			   orgtbl-hijacker-command-105))
+		 (org-table-blank-field))
+	    t)
+	   (eq N 1)
+	   (looking-at "[^|\n]*  +|"))
+      (let (org-table-may-need-update)
+	(goto-char (1- (match-end 0)))
+	(delete-backward-char 1)
+	(goto-char (match-beginning 0))
+	(self-insert-command N))
+    (setq org-table-may-need-update t)
+    (let (orgtbl-mode)
+      (call-interactively (key-binding (vector last-input-event))))))
+
+(defun org-force-self-insert (N)
+  "Needed to enforce self-insert under remapping."
+  (interactive "p")
+  (self-insert-command N))
+
+(defvar orgtbl-exp-regexp "^\\([-+]?[0-9][0-9.]*\\)[eE]\\([-+]?[0-9]+\\)$"
+  "Regula expression matching exponentials as produced by calc.")
+
+(defvar org-table-clean-did-remove-column-1 nil)
+
+(defun orgtbl-send-table (&optional maybe)
+  "Send a tranformed version of this table to the receiver position.
+With argument MAYBE, fail quietly if no transformation is defined for
+this table."
+  (interactive)
+  (catch 'exit
+    (unless (org-at-table-p) (error "Not at a table"))
+    ;; when non-interactive, we assume align has just happened.
+    (when (interactive-p) (org-table-align))
+    (save-excursion
+      (goto-char (org-table-begin))
+      (beginning-of-line 0)
+      (unless (looking-at "#\\+ORGTBL: *SEND +\\([a-zA-Z0-9_]+\\) +\\([^ \t\r\n]+\\)\\( +.*\\)?")
+	(if maybe
+	    (throw 'exit nil)
+	  (error "Don't know how to transform this table."))))
+    (let* ((name (match-string 1))
+	   beg
+	   (transform (intern (match-string 2)))
+	   (params (if (match-end 3) (read (concat "(" (match-string 3) ")"))))
+	   (skip (plist-get params :skip))
+	   (skipcols (plist-get params :skipcols))
+	   (txt (buffer-substring-no-properties
+		 (org-table-begin) (org-table-end)))
+	   (lines (nthcdr (or skip 0) (org-split-string txt "[ \t]*\n[ \t]*")))
+	   (lines (org-table-clean-before-export lines))
+	   (i0 (if org-table-clean-did-remove-column-1 2 1))
+	   (table (mapcar
+		   (lambda (x)
+		     (if (string-match org-table-hline-regexp x)
+			 'hline
+		       (org-remove-by-index
+			(org-split-string (org-trim x) "\\s-*|\\s-*")
+			skipcols i0)))
+		   lines))
+	   (fun (if (= i0 2) 'cdr 'identity))
+	   (org-table-last-alignment
+	    (org-remove-by-index (funcall fun org-table-last-alignment)
+				 skipcols i0))
+	   (org-table-last-column-widths
+	    (org-remove-by-index (funcall fun org-table-last-column-widths)
+				 skipcols i0)))
+      
+      (unless (fboundp transform)
+	(error "No such transformation function %s" transform))
+      (setq txt (funcall transform table params))
+      ;; Find the insertion place
+      (save-excursion
+	(goto-char (point-min))
+	(unless (re-search-forward
+		 (concat "BEGIN RECEIVE ORGTBL +" name "\\([ \t]\\|$\\)") nil t)
+	  (error "Don't know where to insert translated table"))
+	(goto-char (match-beginning 0))
+	(beginning-of-line 2)
+	(setq beg (point))
+	(unless (re-search-forward (concat "END RECEIVE ORGTBL +" name) nil t)
+	  (error "Cannot find end of insertion region"))
+	(beginning-of-line 1)
+	(delete-region beg (point))
+	(goto-char beg)
+	(insert txt "\n"))
+      (message "Table converted and installed at receiver location"))))
+
+(defun org-remove-by-index (list indices &optional i0)
+  "Remove the elements in LIST with indices in INDICES.
+First element has index 0, or I0 if given."
+  (if (not indices)
+      list
+    (if (integerp indices) (setq indices (list indices)))
+    (setq i0 (1- (or i0 0)))
+    (delq :rm (mapcar (lambda (x)
+			(setq i0 (1+ i0))
+			(if (memq i0 indices) :rm x))
+		      list))))
+				
+(defun orgtbl-toggle-comment ()
+  "Comment or uncomment the orgtbl at point."
+  (interactive)
+  (let* ((re1 (concat "^" (regexp-quote comment-start) orgtbl-line-start-regexp))
+	 (re2 (concat "^" orgtbl-line-start-regexp))
+	 (commented (save-excursion (beginning-of-line 1)
+			     (cond ((looking-at re1) t)
+				   ((looking-at re2) nil)
+				   (t (error "Not at an org table")))))
+	 (re (if commented re1 re2))
+	 beg end)
+    (save-excursion
+      (beginning-of-line 1)
+      (while (looking-at re) (beginning-of-line 0))
+      (beginning-of-line 2)
+      (setq beg (point))
+      (while (looking-at re) (beginning-of-line 2))
+      (setq end (point)))
+    (comment-region beg end (if commented '(4) nil))))
+
+(defun orgtbl-insert-radio-table ()
+  "Insert a radio table template appropriate for this major mode."
+  (interactive)
+  (let* ((e (assq major-mode orgtbl-radio-table-templates))
+	 (txt (nth 1 e))
+	 name pos)
+    (unless e (error "No radio table setup defined for %s" major-mode))
+    (setq name (read-string "Table name: "))
+    (while (string-match "%n" txt)
+      (setq txt (replace-match name t t txt)))
+    (or (bolp) (insert "\n"))
+    (setq pos (point))
+    (insert txt)
+    (goto-char pos)))
+
+(defun org-get-param (params header i sym &optional hsym)
+  "Get parameter value for symbol SYM.
+If this is a header line, actually get the value for the symbol with an
+additional \"h\" inserted after the colon.
+If the value is a protperty list, get the element for the current column.
+Assumes variables VAL, PARAMS, HEAD and I to be scoped into the function."
+  (let ((val (plist-get params sym)))
+    (and hsym header (setq val (or (plist-get params hsym) val)))
+    (if (consp val) (plist-get val i) val)))
+
+(defun orgtbl-to-generic (table params)
+  "Convert the orgtbl-mode TABLE to some other format.
+This generic routine can be used for many standard cases.
+TABLE is a list, each entry either the symbol `hline' for a horizontal
+separator line, or a list of fields for that line.
+PARAMS is a property list of parameters that can influence the conversion.
+For the generic converter, some parameters are obligatory:  You need to
+specify either :lfmt, or all of (:lstart :lend :sep).  If you do not use
+:splice, you must have :tstart and :tend.
+
+Valid parameters are
+
+:tstart     String to start the table.  Ignored when :splice is t.
+:tend       String to end the table.  Ignored when :splice is t.
+
+:splice     When set to t, return only table body lines, don't wrap
+            them into :tstart and :tend.  Default is nil.
+
+:hline      String to be inserted on horizontal separation lines.
+            May be nil to ignore hlines.
+
+:lstart     String to start a new table line.
+:lend       String to end a table line
+:sep        Separator between two fields
+:lfmt       Format for entire line, with enough %s to capture all fields.
+            If this is present, :lstart, :lend, and :sep are ignored.
+:fmt        A format to be used to wrap the field, should contain
+            %s for the original field value.  For example, to wrap
+            everything in dollars, you could use :fmt \"$%s$\".
+            This may also be a property list with column numbers and
+            formats. for example :fmt (2 \"$%s$\" 4 \"%s%%\")
+
+:hlstart :hlend :hlsep :hlfmt :hfmt
+            Same as above, specific for the header lines in the table.
+            All lines before the first hline are treated as header.
+            If any of these is not present, the data line value is used.
+
+:efmt       Use this format to print numbers with exponentials.
+            The format should have %s twice for inserting mantissa
+            and exponent, for example \"%s\\\\times10^{%s}\".  This
+            may also be a property list with column numbers and
+            formats.  :fmt will still be applied after :efmt.
+
+In addition to this, the parameters :skip and :skipcols are always handled
+directly by `orgtbl-send-table'.  See manual."
+  (interactive)
+  (let* ((p params)
+	 (splicep (plist-get p :splice))
+	 (hline (plist-get p :hline))
+	 rtn line i fm efm lfmt h)
+    
+    ;; Do we have a header?
+    (if (and (not splicep) (listp (car table)) (memq 'hline table))
+	(setq h t))
+
+    ;; Put header
+    (unless splicep
+      (push (or (plist-get p :tstart) "ERROR: no :tstart") rtn))
+    
+    ;; Now loop over all lines
+    (while (setq line (pop table))
+      (if (eq line 'hline)
+	  ;; A horizontal separator line
+	  (progn (if hline (push hline rtn))
+		 (setq h nil))               ; no longer in header
+	;; A normal line.  Convert the fields, push line onto the result list
+	(setq i 0)
+	(setq line
+	      (mapcar
+	       (lambda (f)
+		 (setq i (1+ i)
+		       fm (org-get-param p h i :fmt :hfmt)
+		       efm (org-get-param p h i :efmt))
+		 (if (and efm (string-match orgtbl-exp-regexp f))
+		     (setq f (format
+			      efm (match-string 1 f) (match-string 2 f))))
+		 (if fm (setq f (format fm f)))
+		 f)
+	       line))
+	(if (setq lfmt (org-get-param p h i :lfmt :hlfmt))
+	    (push (apply 'format lfmt line) rtn)
+	  (push (concat
+		 (org-get-param p h i :lstart :hlstart)
+		 (mapconcat 'identity line (org-get-param p h i :sep :hsep))
+		 (org-get-param p h i :lend :hlend))
+		rtn))))
+    
+    (unless splicep 
+      (push (or (plist-get p :tend) "ERROR: no :tend") rtn))
+    
+    (mapconcat 'identity (nreverse rtn) "\n")))
+
+(defun orgtbl-to-latex (table params)
+  "Convert the orgtbl-mode TABLE to LaTeX.
+TABLE is a list, each entry either the symbol `hline' for a horizontal
+separator line, or a list of fields for that line.
+PARAMS is a property list of parameters that can influence the conversion.
+Supports all parameters from `orgtbl-to-generic'.  Most important for
+LaTeX are:
+
+:splice    When set to t, return only table body lines, don't wrap
+           them into a tabular environment.  Default is nil.
+
+:fmt       A format to be used to wrap the field, should contain %s for the
+           original field value.  For example, to wrap everything in dollars,
+           use :fmt \"$%s$\".  This may also be a property list with column
+           numbers and formats. for example :fmt (2 \"$%s$\" 4 \"%s%%\")
+
+:efmt      Format for transforming numbers with exponentials.  The format
+           should have %s twice for inserting mantissa and exponent, for
+           example \"%s\\\\times10^{%s}\".  LaTeX default is \"%s\\\\,(%s)\".
+           This may also be a property list with column numbers and formats.
+
+The general parameters :skip and :skipcols have already been applied when
+this function is called."
+  (let* ((alignment (mapconcat (lambda (x) (if x "r" "l"))
+			       org-table-last-alignment ""))
+	 (params2
+	  (list
+	   :tstart (concat "\\begin{tabular}{" alignment "}")
+	   :tend "\\end{tabular}"
+	   :lstart "" :lend " \\\\" :sep " & "
+	   :efmt "%s\\,(%s)" :hline "\\hline")))
+    (orgtbl-to-generic table (org-combine-plists params2 params))))
+
+(defun orgtbl-to-html (table params)
+  "Convert the orgtbl-mode TABLE to LaTeX.
+TABLE is a list, each entry either the symbol `hline' for a horizontal
+separator line, or a list of fields for that line.
+PARAMS is a property list of parameters that can influence the conversion.
+Currently this function recognizes the following parameters:
+
+:splice    When set to t, return only table body lines, don't wrap
+           them into a <table> environment.  Default is nil.
+
+The general parameters :skip and :skipcols have already been applied when
+this function is called.  The function does *not* use `orgtbl-to-generic',
+so you cannot specify parameters for it."
+  (let* ((splicep (plist-get params :splice))
+	 html)
+    ;; Just call the formatter we already have
+    ;; We need to make text lines for it, so put the fields back together.
+    (setq html (org-format-org-table-html
+		(mapcar
+		 (lambda (x)
+		   (if (eq x 'hline)
+		       "|----+----|"
+		     (concat "| " (mapconcat 'identity x " | ") " |")))
+		 table)
+		splicep))
+    (if (string-match "\n+\\'" html)
+	(setq html (replace-match "" t t html)))
+    html))
+
+(defun orgtbl-to-texinfo (table params)
+  "Convert the orgtbl-mode TABLE to TeXInfo.
+TABLE is a list, each entry either the symbol `hline' for a horizontal
+separator line, or a list of fields for that line.
+PARAMS is a property list of parameters that can influence the conversion.
+Supports all parameters from `orgtbl-to-generic'.  Most important for
+TeXInfo are:
+
+:splice nil/t      When set to t, return only table body lines, don't wrap
+                   them into a multitable environment.  Default is nil.
+
+:fmt fmt           A format to be used to wrap the field, should contain
+                   %s for the original field value.  For example, to wrap
+                   everything in @kbd{}, you could use :fmt \"@kbd{%s}\".
+                   This may also be a property list with column numbers and
+                   formats. for example :fmt (2 \"@kbd{%s}\" 4 \"@code{%s}\").
+
+:cf \"f1 f2..\"    The column fractions for the table.  Bye default these
+                   are computed automatically from the width of the columns
+                   under org-mode.
+
+The general parameters :skip and :skipcols have already been applied when
+this function is called."
+  (let* ((total (float (apply '+ org-table-last-column-widths)))
+	 (colfrac (or (plist-get params :cf)
+		      (mapconcat
+		       (lambda (x) (format "%.3f" (/ (float x) total)))
+		       org-table-last-column-widths " ")))
+	 (params2
+	  (list
+	   :tstart (concat "@multitable @columnfractions " colfrac)
+	   :tend "@end multitable"
+	   :lstart "@item " :lend "" :sep " @tab "
+	   :hlstart "@headitem ")))
+    (orgtbl-to-generic table (org-combine-plists params2 params))))
+
+;;;; Link Stuff
+
+;;; Link abbreviations
+
+(defun org-link-expand-abbrev (link)
+  "Apply replacements as defined in `org-link-abbrev-alist."
+  (if (string-match "^\\([a-zA-Z]+\\)\\(::?\\(.*\\)\\)?$" link)
+      (let* ((key (match-string 1 link))
+	     (as (or (assoc key org-link-abbrev-alist-local)
+		     (assoc key org-link-abbrev-alist)))
+	     (tag (and (match-end 2) (match-string 3 link)))
+	     rpl)
+	(if (not as)
+	    link
+	  (setq rpl (cdr as))
+	  (cond
+	   ((symbolp rpl) (funcall rpl tag))
+	   ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
+	   (t (concat rpl tag)))))
+    link))
+
+;;; Storing and inserting links
+
+(defvar org-insert-link-history nil
+  "Minibuffer history for links inserted with `org-insert-link'.")
+
+(defvar org-stored-links nil
+  "Contains the links stored with `org-store-link'.")
+
+(defvar org-store-link-plist nil
+  "Plist with info about the most recently link created with `org-store-link'.")
+
+;;;###autoload
+(defun org-store-link (arg)
+  "\\<org-mode-map>Store an org-link to the current location.
+This link can later be inserted into an org-buffer with
+\\[org-insert-link].
+For some link types, a prefix arg is interpreted:
+For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
+For file links, arg negates `org-context-in-file-links'."
+  (interactive "P")
+  (setq org-store-link-plist nil)  ; reset
+  (let (link cpltxt desc description search txt)
+    (cond
+
+     ((eq major-mode 'bbdb-mode)
+      (let ((name (bbdb-record-name (bbdb-current-record)))
+	    (company (bbdb-record-company (bbdb-current-record))))
+	(setq cpltxt (concat "bbdb:" (or name company))
+	      link (org-make-link cpltxt))
+	(org-store-link-props :type "bbdb" :name name :company company)))
+     
+     ((eq major-mode 'Info-mode)
+      (setq link (org-make-link "info:"
+				(file-name-nondirectory Info-current-file)
+				":" Info-current-node))
+      (setq cpltxt (concat (file-name-nondirectory Info-current-file)
+			   ":" Info-current-node))
+      (org-store-link-props :type "info" :file Info-current-file
+			    :node Info-current-node))
+
+     ((eq major-mode 'calendar-mode)
+      (let ((cd (calendar-cursor-to-date)))
+	(setq link
+	      (format-time-string
+	       (car org-time-stamp-formats)
+	       (apply 'encode-time
+		      (list 0 0 0 (nth 1 cd) (nth 0 cd) (nth 2 cd)
+			    nil nil nil))))
+	(org-store-link-props :type "calendar" :date cd)))
+
+     ((or (eq major-mode 'vm-summary-mode)
+	  (eq major-mode 'vm-presentation-mode))
+      (and (eq major-mode 'vm-presentation-mode) (vm-summarize))
+      (vm-follow-summary-cursor)
+      (save-excursion
+       (vm-select-folder-buffer)
+       (let* ((message (car vm-message-pointer))
+	      (folder buffer-file-name)
+	      (subject (vm-su-subject message))
+	      (to (vm-get-header-contents message "To"))
+	      (from (vm-get-header-contents message "From"))
+	      (message-id (vm-su-message-id message)))
+	 (org-store-link-props :type "vm" :from from :to to :subject subject
+			       :message-id message-id)
+	 (setq message-id (org-remove-angle-brackets message-id))
+	 (setq folder (abbreviate-file-name folder))
+	 (if (string-match (concat "^" (regexp-quote vm-folder-directory))
+			   folder)
+	     (setq folder (replace-match "" t t folder)))
+	 (setq cpltxt (org-email-link-description))
+	 (setq link (org-make-link "vm:" folder "#" message-id)))))
+
+     ((eq major-mode 'wl-summary-mode)
+      (let* ((msgnum (wl-summary-message-number))
+	     (message-id (elmo-message-field wl-summary-buffer-elmo-folder
+					     msgnum 'message-id))
+	     (wl-message-entity
+	      (if (fboundp 'elmo-message-entity)
+		  (elmo-message-entity
+		   wl-summary-buffer-elmo-folder msgnum)
+		  (elmo-msgdb-overview-get-entity
+		   msgnum (wl-summary-buffer-msgdb))))
+	     (from (wl-summary-line-from))
+	     (to (car (elmo-message-entity-field wl-message-entity 'to)))
+	     (subject (let (wl-thr-indent-string wl-parent-message-entity)
+			(wl-summary-line-subject))))
+	(org-store-link-props :type "wl" :from from :to to
+			      :subject subject :message-id message-id)
+	(setq message-id (org-remove-angle-brackets message-id))
+	(setq cpltxt (org-email-link-description))
+	(setq link (org-make-link "wl:" wl-summary-buffer-folder-name
+				  "#" message-id))))
+
+     ((or (equal major-mode 'mh-folder-mode)
+	  (equal major-mode 'mh-show-mode))
+      (let ((from (org-mhe-get-header "From:"))
+	    (to (org-mhe-get-header "To:"))
+	    (message-id (org-mhe-get-header "Message-Id:"))
+	    (subject (org-mhe-get-header "Subject:")))
+	(org-store-link-props :type "mh" :from from :to to
+			      :subject subject :message-id message-id)
+	(setq cpltxt (org-email-link-description))
+	(setq link (org-make-link "mhe:" (org-mhe-get-message-real-folder) "#"
+				  (org-remove-angle-brackets message-id)))))
+
+     ((eq major-mode 'rmail-mode)
+      (save-excursion
+	(save-restriction
+	  (rmail-narrow-to-non-pruned-header)
+	  (let ((folder buffer-file-name)
+		(message-id (mail-fetch-field "message-id"))
+		(from (mail-fetch-field "from"))
+		(to (mail-fetch-field "to"))
+		(subject (mail-fetch-field "subject")))
+	    (org-store-link-props
+	     :type "rmail" :from from :to to
+	     :subject subject :message-id message-id)
+	    (setq message-id (org-remove-angle-brackets message-id))
+	    (setq cpltxt (org-email-link-description))
+	    (setq link (org-make-link "rmail:" folder "#" message-id))))))
+
+     ((eq major-mode 'gnus-group-mode)
+      (let ((group (cond ((fboundp 'gnus-group-group-name) ; depending on Gnus
+			  (gnus-group-group-name))         ; version
+			 ((fboundp 'gnus-group-name)
+			  (gnus-group-name))
+			 (t "???"))))
+	(unless group (error "Not on a group"))
+	(org-store-link-props :type "gnus" :group group)
+	(setq cpltxt (concat
+		      (if (org-xor arg org-usenet-links-prefer-google)
+			  "http://groups.google.com/groups?group="
+			"gnus:")
+		      group)
+	      link (org-make-link cpltxt))))
+
+     ((memq major-mode '(gnus-summary-mode gnus-article-mode))
+      (and (eq major-mode 'gnus-article-mode) (gnus-article-show-summary))
+      (let* ((group gnus-newsgroup-name)
+	     (article (gnus-summary-article-number))
+	     (header (gnus-summary-article-header article))
+	     (from (mail-header-from header))
+	     (message-id (mail-header-id header))
+	     (date (mail-header-date header))
+	     (subject (gnus-summary-subject-string)))
+	(org-store-link-props :type "gnus" :from from :subject subject
+			      :message-id message-id :group group)
+	(setq cpltxt (org-email-link-description))
+	(if (org-xor arg org-usenet-links-prefer-google)
+	    (setq link
+		  (concat
+		   cpltxt "\n  "
+		   (format "http://groups.google.com/groups?as_umsgid=%s"
+			   (org-fixup-message-id-for-http message-id))))
+	  (setq link (org-make-link "gnus:" group
+				    "#" (number-to-string article))))))
+
+     ((eq major-mode 'w3-mode)
+      (setq cpltxt (url-view-url t)
+	    link (org-make-link cpltxt))
+      (org-store-link-props :type "w3" :url (url-view-url t)))
+
+     ((eq major-mode 'w3m-mode)
+      (setq cpltxt (or w3m-current-title w3m-current-url)
+	    link (org-make-link w3m-current-url))
+      (org-store-link-props :type "w3m" :url (url-view-url t)))
+
+     ((setq search (run-hook-with-args-until-success
+		    'org-create-file-search-functions))
+      (setq link (concat "file:" (abbreviate-file-name buffer-file-name)
+			 "::" search))
+      (setq cpltxt (or description link)))
+
+     ((eq major-mode 'image-mode)
+      (setq cpltxt (concat "file:"
+			   (abbreviate-file-name buffer-file-name))
+	    link (org-make-link cpltxt))
+      (org-store-link-props :type "image" :file buffer-file-name))
+
+     ((eq major-mode 'dired-mode)
+      ;; link to the file in the current line
+      (setq cpltxt (concat "file:"
+			   (abbreviate-file-name
+			    (expand-file-name
+			     (dired-get-filename nil t))))
+	    link (org-make-link cpltxt)))
+
+     ((and buffer-file-name (org-mode-p))
+      ;; Just link to current headline
+      (setq cpltxt (concat "file:"
+			   (abbreviate-file-name buffer-file-name)))
+      ;; Add a context search string
+      (when (org-xor org-context-in-file-links arg)
+	;; Check if we are on a target
+	(if (org-in-regexp "<<\\(.*?\\)>>")
+	    (setq cpltxt (concat cpltxt "::" (match-string 1)))
+	  (setq txt (cond
+		     ((org-on-heading-p) nil)
+		     ((org-region-active-p)
+		      (buffer-substring (region-beginning) (region-end)))
+		     (t (buffer-substring (point-at-bol) (point-at-eol)))))
+	  (when (or (null txt) (string-match "\\S-" txt))
+	    (setq cpltxt
+		  (concat cpltxt "::" (org-make-org-heading-search-string txt))
+		  desc "NONE"))))
+      (if (string-match "::\\'" cpltxt)
+	  (setq cpltxt (substring cpltxt 0 -2)))
+      (setq link (org-make-link cpltxt)))
+     
+     (buffer-file-name
+      ;; Just link to this file here.
+      (setq cpltxt (concat "file:"
+			   (abbreviate-file-name buffer-file-name)))
+      ;; Add a context string
+      (when (org-xor org-context-in-file-links arg)
+	(setq txt (if (org-region-active-p)
+		      (buffer-substring (region-beginning) (region-end))
+		    (buffer-substring (point-at-bol) (point-at-eol))))
+	;; Only use search option if there is some text.
+	(when (string-match "\\S-" txt)
+	  (setq cpltxt
+		(concat cpltxt "::" (org-make-org-heading-search-string txt))
+		desc "NONE")))
+      (setq link (org-make-link cpltxt)))
+
+     ((interactive-p)
+      (error "Cannot link to a buffer which is not visiting a file"))
+
+     (t (setq link nil)))
+
+    (if (consp link) (setq cpltxt (car link) link (cdr link)))
+    (setq link (or link cpltxt)
+	  desc (or desc cpltxt))
+    (if (equal desc "NONE") (setq desc nil))
+
+    (if (and (interactive-p) link)
+	(progn
+	  (setq org-stored-links
+		(cons (list cpltxt link desc) org-stored-links))
+	  (message "Stored: %s" (or cpltxt link)))
+      (org-make-link-string link desc))))
+
+(defun org-store-link-props (&rest plist)
+  "Store link properties, extract names and addresses."
+  (let (x adr)
+    (when (setq x (plist-get plist :from))
+      (setq adr (mail-extract-address-components x))
+      (plist-put plist :fromname (car adr))
+      (plist-put plist :fromaddress (nth 1 adr)))
+    (when (setq x (plist-get plist :to))
+      (setq adr (mail-extract-address-components x))
+      (plist-put plist :toname (car adr))
+      (plist-put plist :toaddress (nth 1 adr))))
+  (let ((from (plist-get plist :from))
+	(to (plist-get plist :to)))
+    (when (and from to org-from-is-user-regexp)
+      (plist-put plist :fromto
+		 (if (string-match org-from-is-user-regexp from)
+		     (concat "to %t")
+		   (concat "from %f")))))
+  (setq org-store-link-plist plist))
+
+(defun org-email-link-description (&optional fmt)
+  "Return the description part of an email link.
+This takes information from `org-store-link-plist' and formats it
+according to FMT (default from `org-email-link-description-format')."
+  (setq fmt (or fmt org-email-link-description-format))
+  (let* ((p org-store-link-plist)
+	 (to (plist-get p :toaddress))
+	 (from (plist-get p :fromaddress))
+	 (table
+	  (list
+	   (cons "%c" (plist-get p :fromto))
+	   (cons "%F" (plist-get p :from))
+	   (cons "%f" (or (plist-get p :fromname) (plist-get p :fromaddress) "?"))
+	   (cons "%T" (plist-get p :to))
+	   (cons "%t" (or (plist-get p :toname) (plist-get p :toaddress) "?"))
+	   (cons "%s" (plist-get p :subject))
+	   (cons "%m" (plist-get p :message-id)))))
+    (when (string-match "%c" fmt)
+      ;; Check if the user wrote this message
+      (if (and org-from-is-user-regexp from to
+	       (save-match-data (string-match org-from-is-user-regexp from)))
+	  (setq fmt (replace-match "to %t" t t fmt))
+	(setq fmt (replace-match "from %f" t t fmt))))
+    (org-replace-escapes fmt table)))
+
+(defun org-make-org-heading-search-string (&optional string heading)
+  "Make search string for STRING or current headline."
+  (interactive)
+  (let ((s (or string (org-get-heading))))
+    (unless (and string (not heading))
+      ;; We are using a headline, clean up garbage in there.
+      (if (string-match org-todo-regexp s)
+	  (setq s (replace-match "" t t s)))
+      (if (string-match ":[a-zA-Z_@0-9:]+:[ \t]*$" s)
+	  (setq s (replace-match "" t t s)))
+      (setq s (org-trim s))
+      (if (string-match (concat "^\\(" org-quote-string "\\|"
+				org-comment-string "\\)") s)
+	  (setq s (replace-match "" t t s)))
+      (while (string-match org-ts-regexp s)
+	(setq s (replace-match "" t t s))))
+    (while (string-match "[^a-zA-Z_0-9 \t]+" s)
+      (setq s (replace-match " " t t s)))
+    (or string (setq s (concat "*" s)))  ; Add * for headlines
+    (mapconcat 'identity (org-split-string s "[ \t]+") " ")))
+
+(defun org-make-link (&rest strings)
+  "Concatenate STRINGS, format resulting string with `org-link-format'."
+  (apply 'concat strings))
+
+(defun org-make-link-string (link &optional description)
+  "Make a link with brackets, consisting of LINK and DESCRIPTION."
+  (when (stringp description)
+    ;; Remove brackets from the description, they are fatal.
+    (while (string-match "\\[\\|\\]" description)
+      (setq description (replace-match "" t t description))))
+  (when (equal (org-link-escape link) description)
+    ;; No description needed, it is identical
+    (setq description nil))
+  (when (and (not description)
+	     (not (equal link (org-link-escape link))))
+    (setq description link))
+  (concat "[[" (org-link-escape link) "]"
+	  (if description (concat "[" description "]") "")
+	  "]"))
+
+(defconst org-link-escape-chars '(("[" . "%5B") ("]" . "%5D") (" " . "%20"))
+  "Association list of escapes for some characters problematic in links.")
+
+(defun org-link-escape (text)
+  "Escape charaters in TEXT that are problematic for links."
+  (when text
+    (let ((re (mapconcat (lambda (x) (regexp-quote (car x)))
+			 org-link-escape-chars "\\|")))
+      (while (string-match re text)
+	(setq text
+	      (replace-match
+	       (cdr (assoc (match-string 0 text) org-link-escape-chars))
+	       t t text)))
+      text)))
+
+(defun org-link-unescape (text)
+  "Reverse the action of `org-link-escape'."
+  (when text
+    (let ((re (mapconcat (lambda (x) (regexp-quote (cdr x)))
+			 org-link-escape-chars "\\|")))
+      (while (string-match re text)
+	(setq text
+	      (replace-match
+	       (car (rassoc (match-string 0 text) org-link-escape-chars))
+	       t t text)))
+      text)))
+
+(defun org-xor (a b)
+  "Exclusive or."
+  (if a (not b) b))
+
+(defun org-get-header (header)
+  "Find a header field in the current buffer."
+  (save-excursion
+    (goto-char (point-min))
+    (let ((case-fold-search t) s)
+      (cond
+       ((eq header 'from)
+	(if (re-search-forward "^From:\\s-+\\(.*\\)" nil t)
+	    (setq s (match-string 1)))
+	(while (string-match "\"" s)
+	  (setq s (replace-match "" t t s)))
+	(if (string-match "[<(].*" s)
+	    (setq s (replace-match "" t t s))))
+       ((eq header 'message-id)
+	(if (re-search-forward "^message-id:\\s-+\\(.*\\)" nil t)
+	    (setq s (match-string 1))))
+       ((eq header 'subject)
+	(if (re-search-forward "^subject:\\s-+\\(.*\\)" nil t)
+	    (setq s (match-string 1)))))
+      (if (string-match "\\`[ \t\]+" s) (setq s (replace-match "" t t s)))
+      (if (string-match "[ \t\]+\\'" s) (setq s (replace-match "" t t s)))
+      s)))
+
+
+(defun org-fixup-message-id-for-http (s)
+  "Replace special characters in a message id, so it can be used in an http query."
+  (while (string-match "<" s)
+    (setq s (replace-match "%3C" t t s)))
+  (while (string-match ">" s)
+    (setq s (replace-match "%3E" t t s)))
+  (while (string-match "@" s)
+    (setq s (replace-match "%40" t t s)))
+  s)
+
+(defun org-insert-link (&optional complete-file)
+  "Insert a link.  At the prompt, enter the link.
+
+Completion can be used to select a link previously stored with
+`org-store-link'.  When the empty string is entered (i.e. if you just
+press RET at the prompt), the link defaults to the most recently
+stored link.  As SPC triggers completion in the minibuffer, you need to
+use M-SPC or C-q SPC to force the insertion of a space character.
+
+You will also be prompted for a description, and if one is given, it will
+be displayed in the buffer instead of the link.
+
+If there is already a link at point, this command will allow you to edit link
+and description parts.
+
+With a \\[universal-argument] prefix, prompts for a file to link to.  The file name can be
+selected using completion.  The path to the file will be relative to
+the current directory if the file is in the current directory or a
+subdirectory.  Otherwise, the link will be the absolute path as
+completed in the minibuffer (i.e. normally ~/path/to/file).
+
+With two \\[universal-argument] prefixes, enforce an absolute path even if the file
+is in the current directory or below.
+With three \\[universal-argument] prefixes, negate the meaning of
+`org-keep-stored-link-after-insertion'."
+  (interactive "P")
+  (let ((region (if (org-region-active-p)
+		    (prog1 (buffer-substring (region-beginning) (region-end))
+		      (delete-region (region-beginning) (region-end)))))
+        tmphist ; byte-compile incorrectly complains about this
+	link desc entry remove file)
+    (cond
+     ((org-in-regexp org-bracket-link-regexp 1)
+      ;; We do have a link at point, and we are going to edit it.
+      (setq remove (list (match-beginning 0) (match-end 0)))
+      (setq desc (if (match-end 3) (org-match-string-no-properties 3)))
+      (setq link (read-string "Link: "
+			      (org-link-unescape
+			       (org-match-string-no-properties 1)))))
+     ((or (org-in-regexp org-angle-link-re)
+	  (org-in-regexp org-plain-link-re))
+      ;; Convert to bracket link
+      (setq remove (list (match-beginning 0) (match-end 0))
+	    link (read-string "Link: "
+			      (org-remove-angle-brackets (match-string 0)))))
+     ((equal complete-file '(4))
+      ;; Completing read for file names.
+      (setq file (read-file-name "File: "))
+      (let ((pwd (file-name-as-directory (expand-file-name ".")))
+	    (pwd1 (file-name-as-directory (abbreviate-file-name
+					   (expand-file-name ".")))))
+	(cond
+	 ((equal complete-file '(16))
+	  (setq link (org-make-link
+		      "file:"
+		      (abbreviate-file-name (expand-file-name file)))))
+	 ((string-match (concat "^" (regexp-quote pwd1) "\\(.+\\)") file)
+	  (setq link  (org-make-link "file:" (match-string 1 file))))
+	 ((string-match (concat "^" (regexp-quote pwd) "\\(.+\\)")
+			(expand-file-name file))
+	  (setq link  (org-make-link
+		       "file:" (match-string 1 (expand-file-name file)))))
+	 (t (setq link (org-make-link "file:" file))))))
+     (t
+      ;; Read link, with completion for stored links.
+      ;; Fake a link history
+      (setq tmphist (append (mapcar 'car org-stored-links)
+			    org-insert-link-history))
+      (setq link (org-completing-read
+		  "Link: " org-stored-links nil nil nil
+		  'tmphist
+		  (or (car (car org-stored-links)))))
+      (setq entry (assoc link org-stored-links))
+      (or entry (push link org-insert-link-history))
+      (if (funcall (if (equal complete-file '(64)) 'not 'identity)
+		   (not org-keep-stored-link-after-insertion))
+	  (setq org-stored-links (delq (assoc link org-stored-links)
+				       org-stored-links)))
+      (setq link (if entry (nth 1 entry) link)
+	    desc (or region desc (nth 2 entry)))))
+
+    (if (string-match org-plain-link-re link)
+	;; URL-like link, normalize the use of angular brackets.
+	(setq link (org-make-link (org-remove-angle-brackets link))))
+
+    ;; Check if we are linking to the current file with a search option
+    ;; If yes, simplify the link by using only the search option.
+    (when (and buffer-file-name
+	       (string-match "\\<file:\\(.+?\\)::\\([^>]+\\)" link))
+      (let* ((path (match-string 1 link))
+	     (case-fold-search nil)
+	     (search (match-string 2 link)))
+	(save-match-data
+	  (if (equal (file-truename buffer-file-name) (file-truename path))
+	      ;; We are linking to this same file, with a search option
+	      (setq link search)))))
+
+    ;; Check if we can/should use a relative path.  If yes, simplify the link
+    (when (string-match "\\<file:\\(.*\\)" link)
+      (let* ((path (match-string 1 link))
+	     (case-fold-search nil))
+	(cond
+	 ((eq org-link-file-path-type 'absolute)
+	  (setq path (abbreviate-file-name (expand-file-name path))))
+	 ((eq org-link-file-path-type 'noabbrev)
+	  (setq path (expand-file-name path)))
+	 ((eq org-link-file-path-type 'relative)
+	  (setq path (file-relative-name path)))
+	 (t
+	  (save-match-data
+	    (if (string-match (concat "^" (regexp-quote
+					   (file-name-as-directory
+					    (expand-file-name "."))))
+			      (expand-file-name path))
+		;; We are linking a file with relative path name.
+		(setq path (substring (expand-file-name path)
+				      (match-end 0)))))))
+	(setq link (concat "file:" path))))
+
+    (setq desc (read-string "Description: " desc))
+    (unless (string-match "\\S-" desc) (setq desc nil))
+    (if remove (apply 'delete-region remove))
+    (insert (org-make-link-string link desc))))
+
+(defun org-completing-read (&rest args)
+  (let ((minibuffer-local-completion-map
+	 (copy-keymap minibuffer-local-completion-map)))
+    (define-key minibuffer-local-completion-map " " 'self-insert-command)
+    (apply 'completing-read args)))
+
+;;; Opening/following a link
+(defvar org-link-search-failed nil)
+
+(defun org-next-link ()
+  "Move forward to the next link.
+If the link is in hidden text, expose it."
+  (interactive)
+  (when (and org-link-search-failed (eq this-command last-command))
+    (goto-char (point-min))
+    (message "Link search wrapped back to beginning of buffer"))
+  (setq org-link-search-failed nil)
+  (let* ((pos (point))
+	 (ct (org-context))
+	 (a (assoc :link ct)))
+    (if a (goto-char (nth 2 a)))
+    (if (re-search-forward org-any-link-re nil t)
+	(progn
+	  (goto-char (match-beginning 0))
+	  (if (org-invisible-p) (org-show-context)))
+      (goto-char pos)
+      (setq org-link-search-failed t)
+      (error "No further link found"))))
+
+(defun org-previous-link ()
+  "Move backward to the previous link.
+If the link is in hidden text, expose it."
+  (interactive)
+  (when (and org-link-search-failed (eq this-command last-command))
+    (goto-char (point-max))
+    (message "Link search wrapped back to end of buffer"))
+  (setq org-link-search-failed nil)
+  (let* ((pos (point))
+	 (ct (org-context))
+	 (a (assoc :link ct)))
+    (if a (goto-char (nth 1 a)))
+    (if (re-search-backward org-any-link-re nil t)
+	(progn
+	  (goto-char (match-beginning 0))
+	  (if (org-invisible-p) (org-show-context)))
+      (goto-char pos)
+      (setq org-link-search-failed t)
+      (error "No further link found"))))
+
+(defun org-find-file-at-mouse (ev)
+  "Open file link or URL at mouse."
+  (interactive "e")
+  (mouse-set-point ev)
+  (org-open-at-point 'in-emacs))
+
+(defun org-open-at-mouse (ev)
+  "Open file link or URL at mouse."
+  (interactive "e")
+  (mouse-set-point ev)
+  (org-open-at-point))
+
+(defvar org-window-config-before-follow-link nil
+  "The window configuration before following a link.
+This is saved in case the need arises to restore it.")
+
+(defvar org-open-link-marker (make-marker)
+  "Marker pointing to the location where `org-open-at-point; was called.")
+
+(defun org-open-at-point (&optional in-emacs)
+  "Open link at or after point.
+If there is no link at point, this function will search forward up to
+the end of the current subtree.
+Normally, files will be opened by an appropriate application.  If the
+optional argument IN-EMACS is non-nil, Emacs will visit the file."
+  (interactive "P")
+  (move-marker org-open-link-marker (point))
+  (setq org-window-config-before-follow-link (current-window-configuration))
+  (org-remove-occur-highlights nil nil t)
+  (if (org-at-timestamp-p t)
+      (org-follow-timestamp-link)
+    (let (type path link line search (pos (point)))
+      (catch 'match
+	(save-excursion
+	  (skip-chars-forward "^]\n\r")
+	  (when (org-in-regexp org-bracket-link-regexp)
+	    (setq link (org-link-unescape (org-match-string-no-properties 1)))
+	    (while (string-match " *\n *" link)
+	      (setq link (replace-match " " t t link)))
+	    (setq link (org-link-expand-abbrev link))
+	    (if (string-match org-link-re-with-space2 link)
+		(setq type (match-string 1 link) path (match-string 2 link))
+	      (setq type "thisfile" path link))
+	    (throw 'match t)))
+
+	(when (get-text-property (point) 'org-linked-text)
+	  (setq type "thisfile"
+		pos (if (get-text-property (1+ (point)) 'org-linked-text)
+			(1+ (point)) (point))
+		path (buffer-substring
+		      (previous-single-property-change pos 'org-linked-text)
+		      (next-single-property-change pos 'org-linked-text)))
+	  (throw 'match t))
+
+	(save-excursion
+	  (when (or (org-in-regexp org-angle-link-re)
+		    (org-in-regexp org-plain-link-re))
+	    (setq type (match-string 1) path (match-string 2))
+	    (throw 'match t)))
+	(save-excursion
+	  (when (org-in-regexp "\\(:[A-Za-z_@0-9:]+\\):[ \t\r\n]")
+	    (setq type "tags"
+		  path (match-string 1))
+	    (while (string-match ":" path)
+	      (setq path (replace-match "+" t t path)))
+	    (throw 'match t))))
+      (unless path
+	(error "No link found"))
+      ;; Remove any trailing spaces in path
+      (if (string-match " +\\'" path)
+	  (setq path (replace-match "" t t path)))
+
+      (cond
+
+       ((equal type "mailto")
+	(let ((cmd (car org-link-mailto-program))
+	      (args (cdr org-link-mailto-program)) args1
+	      (address path) (subject "") a)
+	  (if (string-match "\\(.*\\)::\\(.*\\)" path)
+	      (setq address (match-string 1 path)
+		    subject (org-link-escape (match-string 2 path))))
+	  (while args
+	    (cond
+	     ((not (stringp (car args))) (push (pop args) args1))
+	     (t (setq a (pop args))
+		(if (string-match "%a" a)
+		    (setq a (replace-match address t t a)))
+		(if (string-match "%s" a)
+		    (setq a (replace-match subject t t a)))
+		(push a args1))))
+	  (apply cmd (nreverse args1))))
+
+       ((member type '("http" "https" "ftp" "news"))
+	(browse-url (concat type ":" path)))
+
+       ((string= type "tags")
+	(org-tags-view in-emacs path))
+       ((string= type "thisfile")
+	(if in-emacs
+	    (switch-to-buffer-other-window
+	     (org-get-buffer-for-internal-link (current-buffer)))
+	  (org-mark-ring-push))
+	(org-link-search
+	 path
+	 (cond ((equal in-emacs '(4)) 'occur)
+	       ((equal in-emacs '(16)) 'org-occur)
+	       (t nil))
+	 pos))
+
+       ((string= type "file")
+	(if (string-match "::\\([0-9]+\\)\\'" path)
+	    (setq line (string-to-number (match-string 1 path))
+		  path (substring path 0 (match-beginning 0)))
+	  (if (string-match "::\\(.+\\)\\'" path)
+	      (setq search (match-string 1 path)
+		    path (substring path 0 (match-beginning 0)))))
+	(org-open-file path in-emacs line search))
+
+       ((string= type "news")
+	(org-follow-gnus-link path))
+
+       ((string= type "bbdb")
+	(org-follow-bbdb-link path))
+
+       ((string= type "info")
+	(org-follow-info-link path))
+
+       ((string= type "gnus")
+	(let (group article)
+	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+	      (error "Error in Gnus link"))
+	  (setq group (match-string 1 path)
+		article (match-string 3 path))
+	  (org-follow-gnus-link group article)))
+
+       ((string= type "vm")
+	(let (folder article)
+	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+	      (error "Error in VM link"))
+	  (setq folder (match-string 1 path)
+		article (match-string 3 path))
+	  ;; in-emacs is the prefix arg, will be interpreted as read-only
+	  (org-follow-vm-link folder article in-emacs)))
+
+       ((string= type "wl")
+	(let (folder article)
+	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+	      (error "Error in Wanderlust link"))
+	  (setq folder (match-string 1 path)
+		article (match-string 3 path))
+	  (org-follow-wl-link folder article)))
+
+       ((string= type "mhe")
+	(let (folder article)
+	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+	      (error "Error in MHE link"))
+	  (setq folder (match-string 1 path)
+		article (match-string 3 path))
+	  (org-follow-mhe-link folder article)))
+
+       ((string= type "rmail")
+	(let (folder article)
+	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+	      (error "Error in RMAIL link"))
+	  (setq folder (match-string 1 path)
+		article (match-string 3 path))
+	  (org-follow-rmail-link folder article)))
+
+       ((string= type "shell")
+	(let ((cmd path))
+	  ;; FIXME: the following is only for backward compatibility
+	  (while (string-match "@{" cmd) (setq cmd (replace-match "<" t t cmd)))
+	  (while (string-match "@}" cmd) (setq cmd (replace-match ">" t t cmd)))
+	  (if (or (not org-confirm-shell-link-function)
+		  (funcall org-confirm-shell-link-function
+			   (format "Execute \"%s\" in shell? "
+				   (org-add-props cmd nil
+				     'face 'org-warning))))
+	      (progn
+		(message "Executing %s" cmd)
+		(shell-command cmd))
+	    (error "Abort"))))
+
+       ((string= type "elisp")
+	(let ((cmd path))
+	  (if (or (not org-confirm-elisp-link-function)
+		  (funcall org-confirm-elisp-link-function
+			   (format "Execute \"%s\" as elisp? "
+				   (org-add-props cmd nil
+						  'face 'org-warning))))
+              (message "%s => %s" cmd (eval (read cmd)))
+	    (error "Abort"))))
+
+       (t
+	(browse-url-at-point)))))
+  (move-marker org-open-link-marker nil))
+
+
+;;; File search
+
+(defvar org-create-file-search-functions nil
+  "List of functions to construct the right search string for a file link.
+These functions are called in turn with point at the location to
+which the link should point.
+
+A function in the hook should first test if it would like to
+handle this file type, for example by checking the major-mode or
+the file extension.  If it decides not to handle this file, it
+should just return nil to give other functions a chance.  If it
+does handle the file, it must return the search string to be used
+when following the link.  The search string will be part of the
+file link, given after a double colon, and `org-open-at-point'
+will automatically search for it.  If special measures must be
+taken to make the search successful, another function should be
+added to the companion hook `org-execute-file-search-functions',
+which see.
+
+A function in this hook may also use `setq' to set the variable
+`description' to provide a suggestion for the descriptive text to
+be used for this link when it gets inserted into an Org-mode
+buffer with \\[org-insert-link].")
+
+(defvar org-execute-file-search-functions nil
+  "List of functions to execute a file search triggered by a link.
+
+Functions added to this hook must accept a single argument, the
+search string that was part of the file link, the part after the
+double colon.  The function must first check if it would like to
+handle this search, for example by checking the major-mode or the
+file extension.  If it decides not to handle this search, it
+should just return nil to give other functions a chance.  If it
+does handle the search, it must return a non-nil value to keep
+other functions from trying.
+
+Each function can access the current prefix argument through the
+variable `current-prefix-argument'.  Note that a single prefix is
+used to force opening a link in Emacs, so it may be good to only
+use a numeric or double prefix to guide the search function.
+
+In case this is needed, a function in this hook can also restore
+the window configuration before `org-open-at-point' was called using:
+
+    (set-window-configuration org-window-config-before-follow-link)")
+
+(defun org-link-search (s &optional type avoid-pos)
+  "Search for a link search option.
+If S is surrounded by forward slashes, it is interpreted as a
+regular expression.  In org-mode files, this will create an `org-occur'
+sparse tree.  In ordinary files, `occur' will be used to list matches.
+If the current buffer is in `dired-mode', grep will be used to search
+in all files.  If AVOID-POS is given, ignore matches near that position."
+  (let ((case-fold-search t)
+	(s0 (mapconcat 'identity (org-split-string s "[ \t\r\n]+") " "))
+	(pos (point))
+	(pre "") (post "")
+	words re0 re1 re2 re3 re4 re5 re2a reall)
+    (cond
+     ;; First check if there are any special
+     ((run-hook-with-args-until-success 'org-execute-file-search-functions s))
+     ;; Now try the builtin stuff
+     ((save-excursion
+	(goto-char (point-min))
+	(and
+	 (re-search-forward
+	  (concat "<<" (regexp-quote s0) ">>") nil t)
+	 (setq pos (match-beginning 0))))
+      ;; There is an exact target for this
+      (goto-char pos))
+     ((string-match "^/\\(.*\\)/$" s)
+      ;; A regular expression
+      (cond
+       ((org-mode-p)
+	(org-occur (match-string 1 s)))
+       ;;((eq major-mode 'dired-mode)
+       ;; (grep (concat "grep -n -e '" (match-string 1 s) "' *")))
+       (t (org-do-occur (match-string 1 s)))))
+     (t
+      ;; A normal search string
+      (when (equal (string-to-char s) ?*)
+	;; Anchor on headlines, post may include tags.
+	(setq pre "^\\*+[ \t]*\\(?:\\sw+\\)?[ \t]*"
+	      post "[ \t]*\\(?:[ \t]+:[a-zA-Z_@0-9:+]:[ \t]*\\)?$"
+	      s (substring s 1)))
+      (remove-text-properties
+       0 (length s)
+       '(face nil mouse-face nil keymap nil fontified nil) s)
+      ;; Make a series of regular expressions to find a match
+      (setq words (org-split-string s "[ \n\r\t]+")
+	    re0 (concat "\\(<<" (regexp-quote s0) ">>\\)")
+	    re2 (concat "[ \t\r\n]\\(" (mapconcat 'downcase words "[ \t]+") "\\)[ \t\r\n]")
+	    re2a (concat "[ \t\r\n]\\(" (mapconcat 'downcase words "[ \t\r\n]+") "\\)[ \t\r\n]")
+	    re4 (concat "[^a-zA-Z_]\\(" (mapconcat 'downcase words "[^a-zA-Z_\r\n]+") "\\)[^a-zA-Z_]")
+	    re1 (concat pre re2 post)
+	    re3 (concat pre re4 post)
+	    re5 (concat pre ".*" re4)
+	    re2 (concat pre re2)
+	    re2a (concat pre re2a)
+	    re4 (concat pre re4)
+	    reall (concat "\\(" re0 "\\)\\|\\(" re1 "\\)\\|\\(" re2
+			  "\\)\\|\\(" re3 "\\)\\|\\(" re4 "\\)\\|\\("
+			  re5 "\\)"
+			  ))
+      (cond
+       ((eq type 'org-occur) (org-occur reall))
+       ((eq type 'occur) (org-do-occur (downcase reall) 'cleanup))
+       (t (goto-char (point-min))
+	  (if (or (org-search-not-self 1 re0 nil t)
+		  (org-search-not-self 1 re1 nil t)
+		  (org-search-not-self 1 re2 nil t)
+		  (org-search-not-self 1 re2a nil t)
+		  (org-search-not-self 1 re3 nil t)
+		  (org-search-not-self 1 re4 nil t)
+		  (org-search-not-self 1 re5 nil t)
+		  )
+	      (goto-char (match-beginning 1))
+	    (goto-char pos)
+	    (error "No match")))))
+     (t
+      ;; Normal string-search
+      (goto-char (point-min))
+      (if (search-forward s nil t)
+	  (goto-char (match-beginning 0))
+	(error "No match"))))
+    (and (org-mode-p) (org-show-context 'link-search))))
+
+(defun org-search-not-self (group &rest args)
+  "Execute `re-search-forward', but only accept matches that do not
+enclose the position of `org-open-link-marker'."
+  (let ((m org-open-link-marker))
+    (catch 'exit
+      (while (apply 're-search-forward args)
+	(goto-char (match-end group))
+	(if (and (or (not (eq (marker-buffer m) (current-buffer)))
+		     (> (match-beginning 0) (marker-position m))
+		     (< (match-end 0) (marker-position m)))
+		 (save-match-data
+		   (or (not (org-in-regexp org-bracket-link-analytic-regexp 1))
+		       (not (match-end 4))  ; no description
+		       (and (<= (match-beginning 4) (point))
+			    (>= (match-end 4) (point))))))
+		 (throw 'exit (point)))))))
+
+(defun org-get-buffer-for-internal-link (buffer)
+  "Return a buffer to be used for displaying the link target of internal links."
+  (cond
+   ((not org-display-internal-link-with-indirect-buffer)
+    buffer)
+   ((string-match "(Clone)$" (buffer-name buffer))
+    (message "Buffer is already a clone, not making another one")
+    ;; we also do not modify visibility in this case
+    buffer)
+   (t ; make a new indirect buffer for displaying the link
+    (let* ((bn (buffer-name buffer))
+	   (ibn (concat bn "(Clone)"))
+	   (ib (or (get-buffer ibn) (make-indirect-buffer buffer ibn 'clone))))
+      (with-current-buffer ib (org-overview))
+      ib))))
+
+(defun org-do-occur (regexp &optional cleanup)
+  "Call the Emacs command `occur'.
+If CLEANUP is non-nil, remove the printout of the regular expression
+in the *Occur* buffer.  This is useful if the regex is long and not useful
+to read."
+  (occur regexp)
+  (when cleanup
+    (let ((cwin (selected-window)) win beg end)
+      (when (setq win (get-buffer-window "*Occur*"))
+	(select-window win))
+      (goto-char (point-min))
+      (when (re-search-forward "match[a-z]+" nil t)
+	(setq beg (match-end 0))
+	(if (re-search-forward "^[ \t]*[0-9]+" nil t)
+	    (setq end (1- (match-beginning 0)))))
+      (and beg end (let ((buffer-read-only)) (delete-region beg end)))
+      (goto-char (point-min))
+      (select-window cwin))))
+
+;;; The mark ring for links jumps
+
+(defvar org-mark-ring nil
+  "Mark ring for positions before jumps in Org-mode.")
+(defvar org-mark-ring-last-goto nil
+  "Last position in the mark ring used to go back.")
+;; Fill and close the ring
+(setq org-mark-ring nil org-mark-ring-last-goto nil) ;; in case file is reloaded
+(loop for i from 1 to org-mark-ring-length do
+      (push (make-marker) org-mark-ring))
+(setcdr (nthcdr (1- org-mark-ring-length) org-mark-ring)
+	org-mark-ring)
+
+(defun org-mark-ring-push (&optional pos buffer)
+  "Put the current position or POS into the mark ring and rotate it."
+  (interactive)
+  (setq pos (or pos (point)))
+  (setq org-mark-ring (nthcdr (1- org-mark-ring-length) org-mark-ring))
+  (move-marker (car org-mark-ring)
+	       (or pos (point))
+	       (or buffer (current-buffer)))
+  (message
+   (substitute-command-keys
+    "Position saved to mark ring, go back with \\[org-mark-ring-goto].")))
+
+(defun org-mark-ring-goto (&optional n)
+  "Jump to the previous position in the mark ring.
+With prefix arg N, jump back that many stored positions.  When
+called several times in succession, walk through the entire ring.
+Org-mode commands jumping to a different position in the current file,
+or to another Org-mode file, automatically push the old position
+onto the ring."
+  (interactive "p")
+  (let (p m)
+    (if (eq last-command this-command)
+	(setq p (nthcdr n (or org-mark-ring-last-goto org-mark-ring)))
+      (setq p org-mark-ring))
+    (setq org-mark-ring-last-goto p)
+    (setq m (car p))
+    (switch-to-buffer (marker-buffer m))
+    (goto-char m)
+    (if (or (org-invisible-p) (org-invisible-p2)) (org-show-context 'mark-goto))))
+
+(defun org-remove-angle-brackets (s)
+  (if (equal (substring s 0 1) "<") (setq s (substring s 1)))
+  (if (equal (substring s -1) ">") (setq s (substring s 0 -1)))
+  s)
+(defun org-add-angle-brackets (s)
+  (if (equal (substring s 0 1) "<") nil (setq s (concat "<" s)))
+  (if (equal (substring s -1) ">") nil (setq s (concat s ">")))
+  s)
+
+;;; Following specific links
+
+(defun org-follow-timestamp-link ()
+  (cond
+   ((org-at-date-range-p t)
+    (let ((org-agenda-start-on-weekday)
+	  (t1 (match-string 1))
+	  (t2 (match-string 2)))
+      (setq t1 (time-to-days (org-time-string-to-time t1))
+	    t2 (time-to-days (org-time-string-to-time t2)))
+      (org-agenda-list nil t1 (1+ (- t2 t1)))))
+   ((org-at-timestamp-p t)
+    (org-agenda-list nil (time-to-days (org-time-string-to-time
+					(substring (match-string 1) 0 10)))
+		     1))
+   (t (error "This should not happen"))))
+
+
+(defun org-follow-bbdb-link (name)
+  "Follow a BBDB link to NAME."
+  (require 'bbdb)
+  (let ((inhibit-redisplay (not debug-on-error))
+	(bbdb-electric-p nil))
+    (catch 'exit
+      ;; Exact match on name
+      (bbdb-name (concat "\\`" name "\\'") nil)
+      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
+      ;; Exact match on name
+      (bbdb-company (concat "\\`" name "\\'") nil)
+      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
+      ;; Partial match on name
+      (bbdb-name name nil)
+      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
+      ;; Partial match on company
+      (bbdb-company name nil)
+      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
+      ;; General match including network address and notes
+      (bbdb name nil)
+      (when (= 0 (buffer-size (get-buffer "*BBDB*")))
+	(delete-window (get-buffer-window "*BBDB*"))
+	(error "No matching BBDB record")))))
+
+(defun org-follow-info-link (name)
+  "Follow an info file & node link  to NAME."
+  (if (or (string-match "\\(.*\\)::?\\(.*\\)" name)
+          (string-match "\\(.*\\)" name))
+      (progn
+	(require 'info)
+        (if (match-string 2 name) ; If there isn't a node, choose "Top"
+            (Info-find-node (match-string 1 name) (match-string 2 name))
+          (Info-find-node (match-string 1 name) "Top")))
+    (message (concat "Could not open: " name))))
+
+(defun org-follow-gnus-link (&optional group article)
+  "Follow a Gnus link to GROUP and ARTICLE."
+  (require 'gnus)
+  (funcall (cdr (assq 'gnus org-link-frame-setup)))
+  (if gnus-other-frame-object (select-frame gnus-other-frame-object))
+  (cond ((and group article)
+	 (gnus-group-read-group 0 nil group)
+	 (gnus-summary-goto-article (string-to-number article) nil t))
+	(group (gnus-group-jump-to-group group))))
+
+(defun org-follow-vm-link (&optional folder article readonly)
+  "Follow a VM link to FOLDER and ARTICLE."
+  (require 'vm)
+  (setq article (org-add-angle-brackets article))
+  (if (string-match "^//\\([a-zA-Z]+@\\)?\\([^:]+\\):\\(.*\\)" folder)
+      ;; ange-ftp or efs or tramp access
+      (let ((user (or (match-string 1 folder) (user-login-name)))
+	    (host (match-string 2 folder))
+	    (file (match-string 3 folder)))
+	(cond
+	 ((featurep 'tramp)
+	  ;; use tramp to access the file
+	  (if (featurep 'xemacs)
+	      (setq folder (format "[%s@%s]%s" user host file))
+	    (setq folder (format "/%s@%s:%s" user host file))))
+	 (t
+	  ;; use ange-ftp or efs
+	  (require (if (featurep 'xemacs) 'efs 'ange-ftp))
+	  (setq folder (format "/%s@%s:%s" user host file))))))
+  (when folder
+    (funcall (cdr (assq 'vm org-link-frame-setup)) folder readonly)
+    (sit-for 0.1)
+    (when article
+      (vm-select-folder-buffer)
+      (widen)
+      (let ((case-fold-search t))
+	(goto-char (point-min))
+	(if (not (re-search-forward
+		  (concat "^" "message-id: *" (regexp-quote article))))
+	    (error "Could not find the specified message in this folder"))
+	(vm-isearch-update)
+	(vm-isearch-narrow)
+	(vm-beginning-of-message)
+	(vm-summarize)))))
+
+(defun org-follow-wl-link (folder article)
+  "Follow a Wanderlust link to FOLDER and ARTICLE."
+  (if (and (string= folder "%")
+	   article
+	   (string-match "^\\([^#]+\\)\\(#\\(.*\\)\\)?" article))
+      ;; XXX: imap-uw supports folders starting with '#' such as "#mh/inbox".
+      ;; Thus, we recompose folder and article ids.
+      (setq folder (format "%s#%s" folder (match-string 1 article))
+	    article (match-string 3 article)))
+  (if (not (elmo-folder-exists-p (wl-folder-get-elmo-folder folder)))
+      (error "No such folder: %s" folder))
+  (wl-summary-goto-folder-subr folder 'no-sync t nil t nil nil)
+  (and article
+       (wl-summary-jump-to-msg-by-message-id (org-add-angle-brackets article))
+       (wl-summary-redisplay)))
+
+(defun org-follow-rmail-link (folder article)
+  "Follow an RMAIL link to FOLDER and ARTICLE."
+  (setq article (org-add-angle-brackets article))
+  (let (message-number)
+    (save-excursion
+      (save-window-excursion
+	(rmail (if (string= folder "RMAIL") rmail-file-name folder))
+	(setq message-number
+	      (save-restriction
+		(widen)
+		(goto-char (point-max))
+		(if (re-search-backward
+		     (concat "^Message-ID:\\s-+" (regexp-quote
+						  (or article "")))
+		     nil t)
+		    (rmail-what-message))))))
+    (if message-number
+	(progn
+	  (rmail (if (string= folder "RMAIL") rmail-file-name folder))
+	  (rmail-show-message message-number)
+	  message-number)
+      (error "Message not found"))))
+
+;;; mh-e integration based on planner-mode
+(defun org-mhe-get-message-real-folder ()
+  "Return the name of the current message real folder, so if you use
+sequences, it will now work."
+  (save-excursion
+    (let* ((folder
+            (if (equal major-mode 'mh-folder-mode)
+                mh-current-folder
+              ;; Refer to the show buffer
+              mh-show-folder-buffer))
+           (end-index
+            (if (boundp 'mh-index-folder)
+                (min (length mh-index-folder) (length folder))))
+           )
+      ;; a simple test on mh-index-data does not work, because
+      ;; mh-index-data is always nil in a show buffer.
+      (if (and (boundp 'mh-index-folder)
+               (string= mh-index-folder (substring folder 0 end-index)))
+          (if (equal major-mode 'mh-show-mode)
+              (save-window-excursion
+                (when (buffer-live-p (get-buffer folder))
+                  (progn
+                    (pop-to-buffer folder)
+                    (org-mhe-get-message-folder-from-index)
+                    )
+                  ))
+            (org-mhe-get-message-folder-from-index)
+            )
+        folder
+        )
+      )))
+
+(defun org-mhe-get-message-folder-from-index ()
+  "Returns the name of the message folder in a index folder buffer."
+  (save-excursion
+    (mh-index-previous-folder)
+    (re-search-forward "^\\(+.*\\)$" nil t)
+    (message (match-string 1))))
+
+(defun org-mhe-get-message-folder ()
+  "Return the name of the current message folder.  Be careful if you
+use sequences."
+  (save-excursion
+    (if (equal major-mode 'mh-folder-mode)
+        mh-current-folder
+      ;; Refer to the show buffer
+      mh-show-folder-buffer)))
+
+(defun org-mhe-get-message-num ()
+  "Return the number of the current message.  Be careful if you
+use sequences."
+  (save-excursion
+    (if (equal major-mode 'mh-folder-mode)
+        (mh-get-msg-num nil)
+      ;; Refer to the show buffer
+      (mh-show-buffer-message-number))))
+
+(defun org-mhe-get-header (header)
+  "Return a header of the message in folder mode. This will create a
+show buffer for the corresponding message. If you have a more clever
+idea..."
+  (let* ((folder (org-mhe-get-message-folder))
+         (num (org-mhe-get-message-num))
+         (buffer (get-buffer-create (concat "show-" folder)))
+         (header-field))
+  (with-current-buffer buffer
+    (mh-display-msg num folder)
+    (if (equal major-mode 'mh-folder-mode)
+        (mh-header-display)
+      (mh-show-header-display))
+    (set-buffer buffer)
+    (setq header-field (mh-get-header-field header))
+    (if (equal major-mode 'mh-folder-mode)
+        (mh-show)
+      (mh-show-show))
+    header-field)))
+
+(defun org-follow-mhe-link (folder article)
+  "Follow an MHE link to FOLDER and ARTICLE.
+If ARTICLE is nil FOLDER is shown.  If the configuration variable
+`org-mhe-search-all-folders' is t and `mh-searcher' is pick,
+ARTICLE is searched in all folders.  Indexed searches (swish++,
+namazu, and others supported by MH-E) will always search in all
+folders."
+  (require 'mh-e)
+  (require 'mh-search)
+  (require 'mh-utils)
+  (mh-find-path)
+  (if (not article)
+      (mh-visit-folder (mh-normalize-folder-name folder))
+    (setq article (org-add-angle-brackets article))
+    (mh-search-choose)
+    (if (equal mh-searcher 'pick)
+        (progn
+          (mh-search folder (list "--message-id" article))
+          (when (and org-mhe-search-all-folders
+                     (not (org-mhe-get-message-real-folder)))
+            (kill-this-buffer)
+            (mh-search "+" (list "--message-id" article))))
+      (mh-search "+" article))
+    (if (org-mhe-get-message-real-folder)
+        (mh-show-msg 1)
+      (kill-this-buffer)
+      (error "Message not found"))))
+
+;;; BibTeX links
+
+;; Use the custom search meachnism to construct and use search strings for
+;; file links to BibTeX database entries.
+
+(defun org-create-file-search-in-bibtex ()
+  "Create the search string and description for a BibTeX database entry."
+  (when (eq major-mode 'bibtex-mode)
+    ;; yes, we want to construct this search string.
+    ;; Make a good description for this entry, using names, year and the title
+    ;; Put it into the `description' variable which is dynamically scoped.
+    (let ((bibtex-autokey-names 1)
+	  (bibtex-autokey-names-stretch 1)
+	  (bibtex-autokey-name-case-convert-function 'identity)
+	  (bibtex-autokey-name-separator " & ")
+	  (bibtex-autokey-additional-names " et al.")
+	  (bibtex-autokey-year-length 4)
+	  (bibtex-autokey-name-year-separator " ")
+	  (bibtex-autokey-titlewords 3)
+	  (bibtex-autokey-titleword-separator " ")
+	  (bibtex-autokey-titleword-case-convert-function 'identity)
+	  (bibtex-autokey-titleword-length 'infty)
+	  (bibtex-autokey-year-title-separator ": "))
+      (setq description (bibtex-generate-autokey)))
+    ;; Now parse the entry, get the key and return it.
+    (save-excursion
+      (bibtex-beginning-of-entry)
+      (cdr (assoc "=key=" (bibtex-parse-entry))))))
+
+(defun org-execute-file-search-in-bibtex (s)
+  "Find the link search string S as a key for a database entry."
+  (when (eq major-mode 'bibtex-mode)
+    ;; Yes, we want to do the search in this file.
+    ;; We construct a regexp that searches for "@entrytype{" followed by the key
+    (goto-char (point-min))
+    (and (re-search-forward (concat "@[a-zA-Z]+[ \t\n]*{[ \t\n]*"
+				    (regexp-quote s) "[ \t\n]*,") nil t)
+	 (goto-char (match-beginning 0)))
+    (if (and (match-beginning 0) (equal current-prefix-arg '(16)))
+	;; Use double prefix to indicate that any web link should be browsed
+	(let ((b (current-buffer)) (p (point)))
+	  ;; Restore the window configuration because we just use the web link
+	  (set-window-configuration org-window-config-before-follow-link)
+	  (save-excursion (set-buffer b) (goto-char p)
+	    (bibtex-url)))
+      (recenter 0))  ; Move entry start to beginning of window
+  ;; return t to indicate that the search is done.
+    t))
+
+;; Finally add the functions to the right hooks.
+(add-hook 'org-create-file-search-functions 'org-create-file-search-in-bibtex)
+(add-hook 'org-execute-file-search-functions 'org-execute-file-search-in-bibtex)
+
+;; end of Bibtex link setup
+
+;;; Following file links
+
+(defun org-open-file (path &optional in-emacs line search)
+  "Open the file at PATH.
+First, this expands any special file name abbreviations.  Then the
+configuration variable `org-file-apps' is checked if it contains an
+entry for this file type, and if yes, the corresponding command is launched.
+If no application is found, Emacs simply visits the file.
+With optional argument IN-EMACS, Emacs will visit the file.
+Optional LINE specifies a line to go to, optional SEARCH a string to
+search for.  If LINE or SEARCH is given, the file will always be
+opened in Emacs.
+If the file does not exist, an error is thrown."
+  (setq in-emacs (or in-emacs line search))
+  (let* ((file (if (equal path "")
+		   buffer-file-name
+		 (substitute-in-file-name (expand-file-name path))))
+	 (apps (append org-file-apps (org-default-apps)))
+	 (remp (and (assq 'remote apps) (org-file-remote-p file)))
+	 (dirp (if remp nil (file-directory-p file)))
+	 (dfile (downcase file))
+	 (old-buffer (current-buffer))
+	 (old-pos (point))
+	 (old-mode major-mode)
+	 ext cmd)
+    (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\.gz\\)$" dfile)
+	(setq ext (match-string 1 dfile))
+      (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\)$" dfile)
+	  (setq ext (match-string 1 dfile))))
+    (if in-emacs
+	(setq cmd 'emacs)
+      (setq cmd (or (and remp (cdr (assoc 'remote apps)))
+		    (and dirp (cdr (assoc 'directory apps)))
+		    (cdr (assoc ext apps))
+		    (cdr (assoc t apps)))))
+    (when (eq cmd 'mailcap)
+      (require 'mailcap)
+      (mailcap-parse-mailcaps)
+      (let* ((mime-type (mailcap-extension-to-mime (or ext "")))
+	     (command (mailcap-mime-info mime-type)))
+	(if (stringp command)
+	    (setq cmd command)
+	  (setq cmd 'emacs))))
+    (if (and (not (eq cmd 'emacs)) ; Emacs has not problems with non-ex files
+	     (not (file-exists-p file))
+	     (not org-open-non-existing-files))
+	(error "No such file: %s" file))
+    (cond
+     ((and (stringp cmd) (not (string-match "^\\s-*$" cmd)))
+      ;; Remove quotes around the file name - we'll use shell-quote-argument.
+      (if (string-match "['\"]%s['\"]" cmd)
+	  (setq cmd (replace-match "%s" t t cmd)))
+      (setq cmd (format cmd (shell-quote-argument file)))
+      (save-window-excursion
+	(shell-command (concat cmd " &"))))
+     ((or (stringp cmd)
+	  (eq cmd 'emacs))
+      (funcall (cdr (assq 'file org-link-frame-setup)) file)
+      (if line (goto-line line)
+	(if search (org-link-search search))))
+     ((consp cmd)
+      (eval cmd))
+     (t (funcall (cdr (assq 'file org-link-frame-setup)) file)))
+    (and (org-mode-p) (eq old-mode 'org-mode)
+	 (or (not (equal old-buffer (current-buffer)))
+	     (not (equal old-pos (point))))
+	 (org-mark-ring-push old-pos old-buffer))))
+
+(defun org-default-apps ()
+  "Return the default applications for this operating system."
+  (cond
+   ((eq system-type 'darwin)
+    org-file-apps-defaults-macosx)
+   ((eq system-type 'windows-nt)
+    org-file-apps-defaults-windowsnt)
+   (t org-file-apps-defaults-gnu)))
+
+(defun org-expand-file-name (path)
+  "Replace special path abbreviations and expand the file name."
+  (expand-file-name path))
+
+(defvar ange-ftp-name-format) ; to silence the XEmacs compiler.
+(defun org-file-remote-p (file)
+  "Test whether FILE specifies a location on a remote system.
+Return non-nil if the location is indeed remote.
+
+For example, the filename \"/user@host:/foo\" specifies a location
+on the system \"/user@host:\"."
+  (cond ((fboundp 'file-remote-p)
+         (file-remote-p file))
+        ((fboundp 'tramp-handle-file-remote-p)
+         (tramp-handle-file-remote-p file))
+        ((and (boundp 'ange-ftp-name-format)
+              (string-match (car ange-ftp-name-format) file))
+         t)
+        (t nil)))
+
+
+;;;; Hooks for remember.el
+
+;;;###autoload
+(defun org-remember-annotation ()
+  "Return a link to the current location as an annotation for remember.el.
+If you are using Org-mode files as target for data storage with
+remember.el, then the annotations should include a link compatible with the
+conventions in Org-mode.  This function returns such a link."
+  (org-store-link nil))
+
+(defconst org-remember-help
+"Select a destination location for the note.
+UP/DOWN=headline   TAB=cycle visibility  [Q]uit   RET/<left>/<right>=Store
+RET at beg-of-buf -> Append to file as level 2 headline
+RET on headline   -> Store as sublevel entry to current headline
+<left>/<right>    -> before/after current headline, same headings level")
+
+;;;###autoload
+(defun org-remember-apply-template (&optional use-char skip-interactive)
+  "Initialize *remember* buffer with template, invoke `org-mode'.
+This function should be placed into `remember-mode-hook' and in fact requires
+to be run from that hook to fucntion properly."
+  (if org-remember-templates
+
+      (let* ((char (or use-char
+		       (if (= (length org-remember-templates) 1)
+			   (caar org-remember-templates)
+			 (message "Select template: %s"
+				  (mapconcat
+				   (lambda (x) (char-to-string (car x)))
+				   org-remember-templates " "))
+			 (read-char-exclusive))))
+	     (entry (cdr (assoc char org-remember-templates)))
+	     (tpl (car entry))
+	     (plist-p (if org-store-link-plist t nil))
+	     (file (if (and (nth 1 entry) (stringp (nth 1 entry))
+			    (string-match "\\S-" (nth 1 entry)))
+		       (nth 1 entry)
+		     org-default-notes-file))
+	     (headline (nth 2 entry))
+	     (v-t (format-time-string (car org-time-stamp-formats) (org-current-time)))
+	     (v-T (format-time-string (cdr org-time-stamp-formats) (org-current-time)))
+	     (v-u (concat "[" (substring v-t 1 -1) "]"))
+	     (v-U (concat "[" (substring v-T 1 -1) "]"))
+	     (v-i initial)      ; defined in `remember-mode'
+	     (v-a (if (equal annotation "[[]]") "" annotation)) ; likewise
+	     (v-n user-full-name)
+	     (org-startup-folded nil)
+	     org-time-was-given x prompt char time)
+	(setq org-store-link-plist
+	      (append (list :annotation v-a :initial v-i)))
+	(unless tpl (setq tpl "")	(message "No template") (ding))
+	(erase-buffer)
+	(insert (substitute-command-keys
+		 (format
+		  "## `C-c C-c' to file interactively, `C-u C-c C-c' to file directly.
+## Target file \"%s\", headline \"%s\"
+## To switch templates, use `\\[org-remember]'.\n\n"
+		  (abbreviate-file-name (or file org-default-notes-file))
+		  (or headline ""))))
+	(insert tpl) (goto-char (point-min))
+	;; Simple %-escapes
+	(while (re-search-forward "%\\([tTuUai]\\)" nil t)
+	  (when (and initial (equal (match-string 0) "%i"))
+	    (save-match-data
+	      (let* ((lead (buffer-substring
+			    (point-at-bol) (match-beginning 0))))
+		(setq v-i (mapconcat 'identity
+				     (org-split-string initial "\n")
+				     (concat "\n" lead))))))
+	  (replace-match
+	   (or (eval (intern (concat "v-" (match-string 1)))) "")
+	   t t))
+	;; From the property list
+	(when plist-p
 	  (goto-char (point-min))
-	  (setq re (concat "^\\*+ +" org-comment-string "\\>"))
-	  (while (re-search-forward re nil t)
-	    (add-text-properties
-	     (match-beginning 0) (org-end-of-subtree t) pc)))
-	(set-buffer-modified-p bmp)))))
-
-(defun org-agenda-skip ()
-  "Throw to `:skip' in places that should be skipped."
-  (let ((p (point-at-bol)))
-    (and org-agenda-skip-archived-trees
-	 (get-text-property p :org-archived)
-	 (org-end-of-subtree t)
-	 (throw :skip t))
-    (and (get-text-property p :org-comment)
-	 (org-end-of-subtree t)
-	 (throw :skip t))
-    (if (equal (char-after p) ?#) (throw :skip t))))
-
-(defun org-agenda-toggle-archive-tag ()
-  "Toggle the archive tag for the current entry."
-  (interactive)
-  (org-agenda-check-no-diary)
-  (org-agenda-show)   ;;; FIXME This is a stupid hack and should not be needed
-  (let* ((hdmarker (or (get-text-property (point) 'org-hd-marker)
-                       (org-agenda-error)))
-	 (buffer (marker-buffer hdmarker))
-	 (pos (marker-position hdmarker))
-	 (buffer-read-only nil)
-	 newhead)
-    (with-current-buffer buffer
-      (widen)
-      (goto-char pos)
-      (org-show-context 'agenda)
-      (save-excursion
-	(and (outline-next-heading)
-	     (org-flag-heading nil)))   ; show the next heading
-      (call-interactively 'org-toggle-archive-tag)
-      (end-of-line 1)
-      (setq newhead (org-get-heading)))
-    (org-agenda-change-all-lines newhead hdmarker)
-    (beginning-of-line 1)))
-
-;;; Dynamic blocks
+	  (while (re-search-forward "%\\(:[-a-zA-Z]+\\)" nil t)
+	    (and (setq x (plist-get org-store-link-plist
+				    (intern (match-string 1))))
+		 (replace-match x t t))))
+	;; Turn on org-mode in the remember buffer, set local variables
+	(org-mode)
+	(org-set-local 'org-finish-function 'remember-buffer)
+	(if (and file (string-match "\\S-" file) (not (file-directory-p file)))
+	    (org-set-local 'org-default-notes-file file))
+	(if (and headline (stringp headline) (string-match "\\S-" headline))
+	    (org-set-local 'org-remember-default-headline headline))
+	;; Interactive template entries
+	(goto-char (point-min))
+	(while (re-search-forward "%^\\({\\([^}]*\\)}\\)?\\([uUtT]\\)?" nil t)
+	  (setq char (if (match-end 3) (match-string 3))
+		prompt (if (match-end 2) (match-string 2)))
+	  (goto-char (match-beginning 0))
+	  (replace-match "")
+	  (if char
+	      (progn
+		(setq org-time-was-given (equal (upcase char) char))
+		(setq time (org-read-date (equal (upcase char) "U") t nil
+					  prompt))
+		(org-insert-time-stamp time org-time-was-given
+				       (member char '("u" "U"))))
+	    (insert (read-string
+		     (if prompt (concat prompt ": ") "Enter string")))))
+	(goto-char (point-min))
+	(if (re-search-forward "%\\?" nil t)
+	    (replace-match "")
+	  (and (re-search-forward "^[^#\n]" nil t) (backward-char 1))))
+    (org-mode)
+    (org-set-local 'org-finish-function 'remember-buffer)))
+
+;;;###autoload
+(defun org-remember ()
+  "Call `remember'.  If this is already a remember buffer, re-apply template.
+If there is an active region, make sure remember uses it as initial content
+of the remember buffer."
+  (interactive)
+  (if (eq org-finish-function 'remember-buffer)
+      (progn
+	(when (< (length org-remember-templates) 2)
+	  (error "No other template available"))
+	(erase-buffer)
+	(let ((annotation (plist-get org-store-link-plist :annotation))
+	      (initial (plist-get org-store-link-plist :initial)))
+	  (org-remember-apply-template))
+	(message "Press C-c C-c to remember data"))
+    (if (org-region-active-p)
+	(remember (buffer-substring (point) (mark)))
+      (call-interactively 'remember))))
+
+;;;###autoload
+(defun org-remember-handler ()
+  "Store stuff from remember.el into an org file.
+First prompts for an org file.  If the user just presses return, the value
+of `org-default-notes-file' is used.
+Then the command offers the headings tree of the selected file in order to
+file the text at a specific location.
+You can either immediately press RET to get the note appended to the
+file, or you can use vertical cursor motion and visibility cycling (TAB) to
+find a better place.  Then press RET or <left> or <right> in insert the note.
+
+Key      Cursor position   Note gets inserted
+-----------------------------------------------------------------------------
+RET      buffer-start      as level 2 heading at end of file
+RET      on headline       as sublevel of the heading at cursor
+RET      no heading        at cursor position, level taken from context.
+			   Or use prefix arg to specify level manually.
+<left>   on headline       as same level, before current heading
+<right>  on headline       as same level, after current heading
+
+So the fastest way to store the note is to press RET RET to append it to
+the default file.  This way your current train of thought is not
+interrupted, in accordance with the principles of remember.el.  But with
+little extra effort, you can push it directly to the correct location.
+
+Before being stored away, the function ensures that the text has a
+headline, i.e. a first line that starts with a \"*\".  If not, a headline
+is constructed from the current date and some additional data.
+
+If the variable `org-adapt-indentation' is non-nil, the entire text is
+also indented so that it starts in the same column as the headline
+\(i.e. after the stars).
+
+See also the variable `org-reverse-note-order'."
+  (goto-char (point-min))
+  (while (looking-at "^[ \t]*\n\\|^##.*\n")
+    (replace-match ""))
+  (catch 'quit
+    (let* ((txt (buffer-substring (point-min) (point-max)))
+	   (fastp current-prefix-arg)
+	   (file (if fastp org-default-notes-file (org-get-org-file)))
+	   (heading org-remember-default-headline)
+	   (visiting (org-find-base-buffer-visiting file))
+	   (org-startup-folded nil)
+	   (org-startup-align-all-tables nil)
+	   (org-goto-start-pos 1)
+	   spos level indent reversed)
+      ;; Modify text so that it becomes a nice subtree which can be inserted
+      ;; into an org tree.
+      (let* ((lines (split-string txt "\n"))
+	     first)
+	(setq first (car lines) lines (cdr lines))
+	(if (string-match "^\\*+" first)
+	    ;; Is already a headline
+	    (setq indent nil)
+	  ;; We need to add a headline:  Use time and first buffer line
+	  (setq lines (cons first lines)
+		first (concat "* " (current-time-string)
+			      " (" (remember-buffer-desc) ")")
+		indent "  "))
+	(if (and org-adapt-indentation indent)
+	    (setq lines (mapcar (lambda (x) (concat indent x)) lines)))
+	(setq txt (concat first "\n"
+			  (mapconcat 'identity lines "\n"))))
+      ;; Find the file
+      (if (not visiting) (find-file-noselect file))
+      (with-current-buffer (or visiting (get-file-buffer file))
+	(save-excursion (and (goto-char (point-min))
+			     (not (re-search-forward "^\\* " nil t))
+			     (insert "\n* Notes\n")))
+	(setq reversed (org-notes-order-reversed-p))
+	(save-excursion
+	  (save-restriction
+	    (widen)
+
+	    ;; Find the default location
+	    (when (and heading (stringp heading) (string-match "\\S-" heading))
+	      (goto-char (point-min))
+	      (if (re-search-forward
+		   (concat "^\\*+[ \t]+" (regexp-quote heading)
+			   "\\([ \t]+:[@a-zA-Z0-9_:]*\\)?[ \t]*$")
+		   nil t)
+		  (setq org-goto-start-pos (match-beginning 0))))
+
+	    ;; Ask the User for a location
+	    (setq spos (if fastp
+			   org-goto-start-pos
+			 (org-get-location (current-buffer) org-remember-help)))
+	    (if (not spos) (throw 'quit nil)) ; return nil to show we did
+					      ; not handle this note
+	    (goto-char spos)
+	    (cond ((and (bobp) (not reversed))
+		   ;; Put it at the end, one level below level 1
+		   (save-restriction
+		     (widen)
+		     (goto-char (point-max))
+		     (if (not (bolp)) (newline))
+		     (org-paste-subtree (org-get-legal-level 1 1) txt)))
+		  ((and (bobp) reversed)
+		   ;; Put it at the start, as level 1
+		   (save-restriction
+		     (widen)
+		     (goto-char (point-min))
+		     (re-search-forward "^\\*" nil t)
+		     (beginning-of-line 1)
+		     (org-paste-subtree 1 txt)))
+		  ((and (org-on-heading-p nil) (not current-prefix-arg))
+		   ;; Put it below this entry, at the beg/end of the subtree
+		   (org-back-to-heading t)
+		   (setq level (funcall outline-level))
+		   (if reversed
+		       (outline-end-of-heading)
+		     (org-end-of-subtree t))
+		   (if (not (bolp)) (newline))
+		   (beginning-of-line 1)
+		   (org-paste-subtree (org-get-legal-level level 1) txt))
+		  (t
+		   ;; Put it right there, with automatic level determined by
+		   ;; org-paste-subtree or from prefix arg
+		   (org-paste-subtree current-prefix-arg txt)))
+	    (when remember-save-after-remembering
+	      (save-buffer)
+	      (if (not visiting) (kill-buffer (current-buffer)))))))))
+  t)    ;; return t to indicate that we took care of this note.
+
+(defun org-get-org-file ()
+  "Read a filename, with default directory `org-directory'."
+  (let ((default (or org-default-notes-file remember-data-file)))
+    (read-file-name (format "File name [%s]: " default)
+		    (file-name-as-directory org-directory)
+		    default)))
+
+(defun org-notes-order-reversed-p ()
+  "Check if the current file should receive notes in reversed order."
+  (cond
+   ((not org-reverse-note-order) nil)
+   ((eq t org-reverse-note-order) t)
+   ((not (listp org-reverse-note-order)) nil)
+   (t (catch 'exit
+	(let  ((all org-reverse-note-order)
+	       entry)
+	  (while (setq entry (pop all))
+	    (if (string-match (car entry) buffer-file-name)
+		(throw 'exit (cdr entry))))
+	  nil)))))
+
+;;;; Dynamic blocks
 
 (defun org-find-dblock (name)
   "Find the first dynamic block with name NAME in the buffer.
@@ -5292,7 +10782,7 @@
     (org-map-dblocks 'org-update-dblock)))
 
 
-;;; Completion
+;;;; Completion
 
 (defun org-complete (&optional arg)
   "Perform completion on word at point.
@@ -5314,7 +10804,7 @@
 		  (skip-chars-backward "a-zA-Z0-9_:$")
 		  (point)))
 	   (confirm (lambda (x) (stringp (car x))))
-	   (camel (equal (char-before beg) ?*))
+	   (searchhead (equal (char-before beg) ?*))
 	   (tag (equal (char-before beg1) ?:))
 	   (texp (equal (char-before beg) ?\\))
 	   (link (equal (char-before beg) ?\[))
@@ -5345,16 +10835,14 @@
 				  (buffer-substring (point-at-bol) beg))
 		    (setq type :todo)
 		    (mapcar 'list org-todo-keywords))
-		   (camel
-		    (setq type :camel)
+		   (searchhead
+		    (setq type :searchhead)
 		    (save-excursion
 		      (goto-char (point-min))
 		      (while (re-search-forward org-todo-line-regexp nil t)
 			(push (list
-			       (if org-file-link-context-use-camel-case
-				   (org-make-org-heading-camel (match-string 3) t)
-				 (org-make-org-heading-search-string
-				  (match-string 3) t)))
+			       (org-make-org-heading-search-string
+				  (match-string 3) t))
 			      tbl)))
 		    tbl)
 		   (tag (setq type :tag beg beg1)
@@ -5365,7 +10853,8 @@
       (cond ((eq completion t)
 	     (if (equal type :opt)
 		 (insert (substring (cdr (assoc (upcase pattern) table))
-				    (length pattern)))))
+				    (length pattern)))
+	       (if (equal type :tag) (insert ":"))))
 	    ((null completion)
 	     (message "Can't find completion for \"%s\"" pattern)
 	     (ding))
@@ -5393,7 +10882,7 @@
 		   (error (display-completion-list list)))))
 	     (message "Making completion list...%s" "done"))))))
 
-;;; Comments, TODO and DEADLINE
+;;;; TODO, DEADLINE, Comments
 
 (defun org-toggle-comment ()
   "Change the COMMENT state of an entry."
@@ -5426,8 +10915,15 @@
 When it starts with DONE, the DONE is removed.  And when neither TODO nor
 DONE are present, add TODO at the beginning of the heading.
 
-With prefix arg, use completion to determine the new state.  With numeric
-prefix arg, switch to that state."
+With C-u prefix arg, use completion to determine the new state.
+With numeric prefix arg, switch to that state.
+
+For calling through lisp, arg is also interpreted in the following way:
+'none             -> empty state
+\"\"(empty string)  -> switch to empty state
+'done             -> switch to DONE
+\"WAITING\"         -> switch to the specified keyword, but only if it
+                     really is a member of `org-todo-keywords'."
   (interactive "P")
   (save-excursion
     (org-back-to-heading)
@@ -5435,6 +10931,7 @@
     (or (looking-at (concat " +" org-todo-regexp " *"))
 	(looking-at " *"))
     (let* ((this (match-string 1))
+	   (last-state (or this ""))
 	   (completion-ignore-case t)
 	   (member (member this org-todo-keywords))
 	   (tail (cdr member))
@@ -5457,8 +10954,13 @@
 			org-done-string)))
 		   (arg
 		    ;; user requests a specific state
-		    (nth (1- (prefix-numeric-value arg))
-			 org-todo-keywords))
+		    (cond
+		     ((equal arg "") nil)
+		     ((eq arg 'none) nil)
+		     ((eq arg 'done) (org-last org-todo-keywords))
+		     ((car (member arg org-todo-keywords)))
+		     ((nth (1- (prefix-numeric-value arg))
+			     org-todo-keywords))))
 		   ((null member) (car org-todo-keywords))
 		   ((null tail) nil) ;; -> first entry
 		   ((eq org-todo-interpretation 'sequence)
@@ -5468,18 +10970,30 @@
 			(car tail)
 		      (if (> (length tail) 0) org-done-string nil)))
 		   (t nil)))
-	   (next (if state (concat " " state " ") " ")))
+	   (next (if state (concat " " state " ") " "))
+	   dostates)
       (replace-match next t t)
       (setq org-last-todo-state-is-todo
 	    (not (equal state org-done-string)))
       (when org-log-done
-	(if (equal state org-done-string)
-	    (org-add-planning-info 'closed (org-current-time) 'scheduled)
-	  (if (not this)
-	      (org-add-planning-info nil nil 'closed))))
+	(setq dostates (and (eq org-todo-interpretation 'sequence)
+			    (listp org-log-done) (memq 'state org-log-done)))
+	(cond
+	 ((and state (not this))
+	  (org-add-planning-info nil nil 'closed)
+	  (and dostates (org-add-log-maybe 'state state 'findpos)))
+	 ((and state dostates)
+	  (org-add-log-maybe 'state state 'findpos))
+	 ((equal state org-done-string)
+	  ;; Planning info calls the note-setting command.
+	  (org-add-planning-info 'closed (org-current-time)
+				 (if (org-get-repeat) nil 'scheduled))
+	  (org-add-log-maybe 'done state 'findpos))))
       ;; Fixup tag positioning
       (and org-auto-align-tags (org-set-tags nil t))
-      (run-hooks 'org-after-todo-state-change-hook)))
+      (run-hooks 'org-after-todo-state-change-hook)
+      (and (equal state org-done-string) (org-auto-repeat-maybe))
+      ))
   ;; Fixup cursor location if close to the keyword
   (if (and (outline-on-heading-p)
 	   (not (bolp))
@@ -5490,6 +11004,54 @@
 	(goto-char (or (match-end 2) (match-end 1)))
 	(just-one-space))))
 
+(defun org-get-repeat ()
+  "Return the REPEAT statement of this entry."
+  (save-match-data
+    (save-excursion
+      (org-back-to-heading t)
+      (if (re-search-forward
+	   org-repeat-re (save-excursion (outline-next-heading) (point)) t)
+	  (match-string 1)))))
+
+(defvar org-last-changed-timestamp)
+(defvar org-log-post-message)
+(defun org-auto-repeat-maybe ()
+  "Check if the current headline contains a REPEAT key.
+If yes, set TODO state back to what it was and change any SCHEDULED
+or DEADLINE times the new date.
+This function should be run in the `org-after-todo-state-change-hook'."
+  ;; last-state is dynamically scoped into this function
+  (let ((repeat (org-get-repeat))
+	(whata '(("d" . day) ("m" . month) ("y" . year)))
+	(msg "Entry repeats: ")
+	(org-log-done)
+	re type n what start)
+    (when repeat
+      (org-todo (if (eq 'org-todo-interpretation 'type)
+		    last-state
+		  (car org-todo-keywords)))
+      (unless (memq 'org-add-log-note (default-value 'post-command-hook))
+	;; Make sure a note is taken
+	(let ((org-log-done '(done)))
+	  (org-add-log-maybe 'done org-done-string 'findpos)))
+      (org-back-to-heading t)
+      (org-add-planning-info nil nil 'closed)
+      (setq re (concat "\\(" org-scheduled-time-regexp "\\)\\|\\("
+		       org-deadline-time-regexp "\\)"))
+      (while (re-search-forward
+	      re (save-excursion (outline-next-heading) (point)) t)
+	(setq type (if (match-end 1) org-scheduled-string org-deadline-string)
+	      start 0)
+	(while (string-match "\\([-+]?[0-9]+\\)\\([dwmy]\\)" repeat start)
+	  (setq start (match-end 0)
+		n (string-to-number (match-string 1 repeat))
+		what (match-string 2 repeat))
+	  (if (equal what "w") (setq n (* n 7) what "d"))
+	  (org-timestamp-change n (cdr (assoc what whata))))
+	(setq msg (concat msg type org-last-changed-timestamp " ")))
+      (setq org-log-post-message msg)
+      (message msg))))
+
 (defun org-show-todo-tree (arg)
   "Make a compact tree which shows all headlines marked with TODO.
 The tree will show the lines where the regexp matches, and all higher
@@ -5530,85 +11092,103 @@
 REMOVE indicates what kind of entries to remove.  An old WHAT entry will also
 be removed."
   (interactive)
-  (when what (setq time (or time (org-read-date nil 'to-time))))
-  (when (and org-insert-labeled-timestamps-at-point
-	     (member what '(scheduled deadline)))
-    (insert
-     (if (eq what 'scheduled) org-scheduled-string org-deadline-string) " ")
-    (org-insert-time-stamp time)
-    (setq what nil))
-  (save-excursion
-    (save-restriction
-      (let (col list elt ts buffer-invisibility-spec)
-	(org-back-to-heading t)
-	(looking-at (concat outline-regexp "\\( *\\)[^\r\n]*"))
-	(goto-char (match-end 1))
-	(setq col (current-column))
-	(goto-char (1+ (match-end 0)))
-	(if (and (not (looking-at outline-regexp))
-		 (looking-at (concat "[^\r\n]*?" org-keyword-time-regexp
-				     "[^\r\n]*"))
-		 (not (equal (match-string 1) org-clock-string)))
-	    (narrow-to-region (match-beginning 0) (match-end 0))
-	  (insert "\n")
-	  (backward-char 1)
-	  (narrow-to-region (point) (point))
-	  (indent-to-column col))
-	;; Check if we have to remove something.
-	(setq list (cons what remove))
-	(while list
-	  (setq elt (pop list))
+  (let (org-time-was-given)
+    (when what (setq time (or time (org-read-date nil 'to-time))))
+    (when (and org-insert-labeled-timestamps-at-point
+	       (member what '(scheduled deadline)))
+      (insert
+       (if (eq what 'scheduled) org-scheduled-string org-deadline-string) " ")
+      (org-insert-time-stamp time org-time-was-given)
+      (setq what nil))
+    (save-excursion
+      (save-restriction
+	(let (col list elt ts buffer-invisibility-spec)
+	  (org-back-to-heading t)
+	  (looking-at (concat outline-regexp "\\( *\\)[^\r\n]*"))
+	  (goto-char (match-end 1))
+	  (setq col (current-column))
+	  (goto-char (1+ (match-end 0)))
+	  (if (and (not (looking-at outline-regexp))
+		   (looking-at (concat "[^\r\n]*?" org-keyword-time-regexp
+				       "[^\r\n]*"))
+		   (not (equal (match-string 1) org-clock-string)))
+	      (narrow-to-region (match-beginning 0) (match-end 0))
+	    (insert "\n")
+	    (backward-char 1)
+	    (narrow-to-region (point) (point))
+	    (indent-to-column col))
+	  ;; Check if we have to remove something.
+	  (setq list (cons what remove))
+	  (while list
+	    (setq elt (pop list))
+	    (goto-char (point-min))
+	    (when (or (and (eq elt 'scheduled)
+			   (re-search-forward org-scheduled-time-regexp nil t))
+		      (and (eq elt 'deadline)
+			   (re-search-forward org-deadline-time-regexp nil t))
+		      (and (eq elt 'closed)
+			   (re-search-forward org-closed-time-regexp nil t)))
+	      (replace-match "")
+	      (if (looking-at "--+<[^>]+>") (replace-match ""))
+	      (if (looking-at " +") (replace-match ""))))
+	  (goto-char (point-max))
+	  (when what
+	    (insert
+	     (if (not (equal (char-before) ?\ )) " " "")
+	     (cond ((eq what 'scheduled) org-scheduled-string)
+		   ((eq what 'deadline) org-deadline-string)
+		   ((eq what 'closed) org-closed-string))
+	     " ")
+	    (org-insert-time-stamp time 
+				   (or org-time-was-given (eq what 'closed))
+				   (eq what 'closed))
+	    (end-of-line 1))
 	  (goto-char (point-min))
-	  (when (or (and (eq elt 'scheduled)
-			 (re-search-forward org-scheduled-time-regexp nil t))
-		    (and (eq elt 'deadline)
-			 (re-search-forward org-deadline-time-regexp nil t))
-		    (and (eq elt 'closed)
-			 (re-search-forward org-closed-time-regexp nil t)))
-	    (replace-match "")
-	    (if (looking-at " +") (replace-match ""))))
-	(goto-char (point-max))
-	(when what
-	  (insert
-	   (if (not (equal (char-before) ?\ )) " " "")
-	   (cond ((eq what 'scheduled) org-scheduled-string)
-		 ((eq what 'deadline) org-deadline-string)
-		 ((eq what 'closed) org-closed-string))
-	   " ")
-	  (org-insert-time-stamp time nil (eq what 'closed))
-	  (end-of-line 1)
-	  (org-add-log-maybe 'done))
-	(goto-char (point-min))
-	(widen)
-	(if (looking-at "[ \t]+\r?\n")
-	    (replace-match ""))
-	ts))))
+	  (widen)
+	  (if (looking-at "[ \t]+\r?\n")
+	      (replace-match ""))
+	  ts)))))
 
 (defvar org-log-note-marker (make-marker))
 (defvar org-log-note-purpose nil)
+(defvar org-log-note-state nil)
 (defvar org-log-note-window-configuration nil)
-
-(defun org-add-log-maybe (&optional purpose)
-  (when (and (listp org-log-done)
-	     (memq purpose org-log-done))
-    (move-marker org-log-note-marker (point))
-    (setq org-log-note-purpose purpose)
-    (add-hook 'post-command-hook 'org-add-log-note 'append)))
+(defvar org-log-note-return-to (make-marker))
+(defvar org-log-post-message nil
+  "Message to be displayed after a log note has been stored.
+The auto-repeater uses this.")
+
+(defun org-add-log-maybe (&optional purpose state findpos)
+  (save-excursion
+    (when (and (listp org-log-done)
+	       (memq purpose org-log-done))
+      (when findpos
+	(org-back-to-heading t)
+	(looking-at (concat outline-regexp "\\( *\\)[^\r\n]*"
+			    "\\(\n[^\r\n]*?" org-keyword-time-not-clock-regexp
+			    "[^\r\n]*\\)?"))
+	(goto-char (match-end 0)))
+      (move-marker org-log-note-marker (point))
+      (setq org-log-note-purpose purpose)
+      (setq org-log-note-state state)
+      (add-hook 'post-command-hook 'org-add-log-note 'append))))
 
 (defun org-add-log-note (&optional purpose)
   "Pop up a window for taking a note, and add this note later at point."
   (remove-hook 'post-command-hook 'org-add-log-note)
   (setq org-log-note-window-configuration (current-window-configuration))
   (delete-other-windows)
+  (move-marker org-log-note-return-to (point))
   (switch-to-buffer (marker-buffer org-log-note-marker))
   (goto-char org-log-note-marker)
   (switch-to-buffer-other-window "*Org Note*")
   (erase-buffer)
-  (org-mode)
+  (let ((org-inhibit-startup t)) (org-mode))
   (insert (format "# Insert note for %s, finish with C-c C-c.\n\n"
 		  (cond
 		   ((eq org-log-note-purpose 'clock-out) "stopped clock")
 		   ((eq org-log-note-purpose 'done)  "closed todo item")
+		   ((eq org-log-note-purpose 'state) "state change")
 		   (t (error "This should not happen")))))
   (org-set-local 'org-finish-function 'org-store-log-note))
 
@@ -5618,24 +11198,41 @@
 	(note (cdr (assq org-log-note-purpose org-log-note-headings)))
 	lines ind)
     (kill-buffer (current-buffer))
-    (if (string-match "^#.*\n[ \t\\n]*" txt)
+    (if (string-match "^#.*\n[ \t\n]*" txt)
+	(setq txt (replace-match "" t t txt)))
+    (if (string-match "\\s-+\\'" txt)
 	(setq txt (replace-match "" t t txt)))
-    (when (string-match "\\S-" txt)
-      (if (string-match "\\s-+\\'" txt)
-	  (setq txt (replace-match "" t t txt)))
-      (setq lines (org-split-string txt "\n"))
-      (and note (string-match "\\S-" note) (push note lines))
+    (setq lines (org-split-string txt "\n"))
+    (when (and note (string-match "\\S-" note))
+      (setq note
+	    (org-replace-escapes
+	     note
+	     (list (cons "%u" (user-login-name))
+		   (cons "%U" user-full-name)
+		   (cons "%t" (format-time-string
+			       (org-time-stamp-format 'long 'inactive)
+			       (current-time)))
+		   (cons "%s" (if org-log-note-state
+				  (concat "\"" org-log-note-state "\"")
+				"")))))
+      (if lines (setq note (concat note " \\\\")))
+      (push note lines))
+    (save-excursion
+      (set-buffer (marker-buffer org-log-note-marker))
       (save-excursion
-	(set-buffer (marker-buffer org-log-note-marker))
-	(save-excursion
-	  (goto-char org-log-note-marker)
-	  (if (not (bolp)) (newline))
-	  (indent-relative t)
-	  (setq ind (concat (buffer-substring (point-at-bol) (point)) "    "))
-	  (insert "  - " (pop lines))
-	  (while lines
-	    (insert "\n" ind (pop lines))))))
-    (set-window-configuration org-log-note-window-configuration)))
+	(goto-char org-log-note-marker)
+	(move-marker org-log-note-marker nil)
+	(end-of-line 1)
+	(if (not (bolp)) (insert "\n")) (indent-relative nil)
+	(setq ind (concat (buffer-substring (point-at-bol) (point)) "    "))
+	(insert "  - " (pop lines))
+	(while lines
+	  (insert "\n" ind (pop lines))))))
+  (set-window-configuration org-log-note-window-configuration)
+  (with-current-buffer (marker-buffer org-log-note-return-to)
+    (goto-char org-log-note-return-to))
+  (move-marker org-log-note-return-to nil)
+  (and org-log-post-message (message org-log-post-message)))
 
 (defvar org-occur-highlights nil)
 (make-variable-buffer-local 'org-occur-highlights)
@@ -5675,14 +11272,15 @@
 	(message "%d match(es) for regexp %s" cnt regexp))
     cnt))
 
-(defun org-show-context (&optional key siblings)
+(defun org-show-context (&optional key)
   "Make sure point and context and visible.
 How much context is shown depends upon the variables
-`org-show-hierarchy-above' and `org-show-following-heading'.
-When SIBLINGS is non-nil, show all siblings on each hierarchy level."
-  (let ((heading-p (org-on-heading-p t))
+`org-show-hierarchy-above', `org-show-following-heading'. and
+`org-show-siblings'."
+  (let ((heading-p   (org-on-heading-p t))
 	(hierarchy-p (org-get-alist-option org-show-hierarchy-above key))
-	(following-p (org-get-alist-option org-show-following-heading key)))
+	(following-p (org-get-alist-option org-show-following-heading key))
+	(siblings-p  (org-get-alist-option org-show-siblings key)))
     (catch 'exit
       ;; Show heading or entry text
       (if heading-p
@@ -5694,7 +11292,7 @@
 	(save-excursion
 	  (and (if heading-p (org-goto-sibling) (outline-next-heading))
 	       (org-flag-heading nil))))
-      (when siblings (org-show-siblings))
+      (when siblings-p (org-show-siblings))
       (when hierarchy-p
 	;; show all higher headings, possibly with siblings
 	(save-excursion
@@ -5703,15 +11301,7 @@
 			(error nil))
 		      (not (bobp)))
 	    (org-flag-heading nil)
-	    (when siblings (org-show-siblings))))))))
-
-(defun org-show-siblings ()
-  "Show all siblings of the current headline."
-  (save-excursion
-    (while (org-goto-sibling) (org-flag-heading nil)))
-  (save-excursion
-    (while (org-goto-sibling 'previous)
-      (org-flag-heading nil))))
+	    (when siblings-p (org-show-siblings))))))))
 
 (defun org-reveal (&optional siblings)
   "Show current entry, hierarchy above it, and the following headline.
@@ -5720,53 +11310,13 @@
 not t for the search context.
 
 With optional argument SIBLINGS, on each level of the hierarchy all
-siblings are shown.  This repairs the tree structure so what it would
-look like when opend with successive calls to `org-cycle'."
+siblings are shown.  This repairs the tree structure to what it would
+look like when opened with hierarchical calls to `org-cycle'."
   (interactive "P")
   (let ((org-show-hierarchy-above t)
-	(org-show-following-heading t))
-    (org-show-context nil siblings)))
-
-;; Overlay compatibility functions
-(defun org-make-overlay (beg end &optional buffer)
-  (if (featurep 'xemacs)
-      (make-extent beg end buffer)
-    (make-overlay beg end buffer)))
-(defun org-delete-overlay (ovl)
-  (if (featurep 'xemacs) (delete-extent ovl) (delete-overlay ovl)))
-(defun org-detach-overlay (ovl)
-  (if (featurep 'xemacs) (detach-extent ovl) (delete-overlay ovl)))
-(defun org-move-overlay (ovl beg end &optional buffer)
-  (if (featurep 'xemacs)
-      (set-extent-endpoints ovl beg end (or buffer (current-buffer)))
-    (move-overlay ovl beg end buffer)))
-(defun org-overlay-put (ovl prop value)
-  (if (featurep 'xemacs)
-      (set-extent-property ovl prop value)
-    (overlay-put ovl prop value)))
-(defun org-overlay-display (ovl text &optional face)
-  "Make overlay OVL display TEXT with face FACE."
-  (if (featurep 'xemacs)
-      (let ((gl (make-glyph text)))
-	(and face (set-glyph-face gl face))
-	(set-extent-property ovl 'invisible t)
-	(set-extent-property ovl 'end-glyph gl))
-    (overlay-put ovl 'display text)
-    (if face (overlay-put ovl 'face face))))
-(defun org-overlay-get (ovl prop)
-  (if (featurep 'xemacs)
-      (extent-property ovl prop)
-    (overlay-get ovl prop)))
-(defun org-overlays-at (pos)
-  (if (featurep 'xemacs) (extents-at pos) (overlays-at pos)))
-(defun org-overlays-in (&optional start end)
-  (if (featurep 'xemacs)
-      (extent-list nil start end)
-    (overlays-in start end)))
-(defun org-overlay-start (o)
-  (if (featurep 'xemacs) (extent-start-position o) (overlay-start o)))
-(defun org-overlay-end (o)
-  (if (featurep 'xemacs) (extent-end-position o) (overlay-end o)))
+	(org-show-following-heading t)
+	(org-show-siblings (if siblings t org-show-siblings)))
+    (org-show-context nil)))
 
 (defun org-highlight-new-match (beg end)
   "Highlight from BEG to END and mark the highlight is an occur headline."
@@ -5774,7 +11324,6 @@
     (org-overlay-put ov 'face 'secondary-selection)
     (push ov org-occur-highlights)))
 
-(defvar org-inhibit-highlight-removal nil)
 (defun org-remove-occur-highlights (&optional beg end noremove)
   "Remove the occur highlights from the buffer.
 BEG and END are ignored.  If NOREMOVE is nil, remove this function
@@ -5787,7 +11336,7 @@
       (remove-hook 'before-change-functions
 		   'org-remove-occur-highlights 'local))))
 
-;;; Priorities
+;;;; Priorities
 
 (defvar org-priority-regexp ".*?\\(\\[#\\([A-Z]\\)\\] ?\\)"
   "Regular expression matching the priority indicator.")
@@ -5857,9 +11406,505 @@
       (* 1000 (- org-lowest-priority
 		 (string-to-char (match-string 2 s)))))))
 
-;;; Timestamps
+;;;; Tags
+
+(defun org-scan-tags (action matcher &optional todo-only)
+  "Scan headline tags with inheritance and produce output ACTION.
+ACTION can be `sparse-tree' or `agenda'.  MATCHER is a Lisp form to be
+evaluated, testing if a given set of tags qualifies a headline for
+inclusion.  When TODO-ONLY is non-nil, only lines with a TODO keyword
+are included in the output."
+  (let* ((re (concat "[\n\r]" outline-regexp " *\\(\\<\\("
+		     (mapconcat 'regexp-quote
+				(nreverse (cdr (reverse org-todo-keywords)))
+				"\\|")
+		     "\\>\\)\\)? *\\(.*?\\)\\(:[A-Za-z_@0-9:]+:\\)?[ \t]*$"))
+	 (props (list 'face nil
+		      'done-face 'org-done
+		      'undone-face nil
+		      'mouse-face 'highlight
+		      'org-not-done-regexp org-not-done-regexp
+		      'keymap org-agenda-keymap
+		      'help-echo
+		      (format "mouse-2 or RET jump to org file %s"
+			      (abbreviate-file-name buffer-file-name))))
+	 (case-fold-search nil)
+         lspos
+	 tags tags-list tags-alist (llast 0) rtn level category i txt
+	 todo marker entry)
+    (save-excursion
+      (goto-char (point-min))
+      (when (eq action 'sparse-tree) (org-overview))
+      (while (re-search-forward re nil t)
+	(catch :skip
+	  (setq todo (if (match-end 1) (match-string 2))
+		tags (if (match-end 4) (match-string 4)))
+	  (goto-char (setq lspos (1+ (match-beginning 0))))
+	  (setq level (funcall outline-level)
+		category (org-get-category))
+	  (setq i llast llast level)
+	  ;; remove tag lists from same and sublevels
+	  (while (>= i level)
+	    (when (setq entry (assoc i tags-alist))
+	      (setq tags-alist (delete entry tags-alist)))
+	    (setq i (1- i)))
+	  ;; add the nex tags
+	  (when tags
+	    (setq tags (mapcar 'downcase (org-split-string tags ":"))
+		  tags-alist
+		  (cons (cons level tags) tags-alist)))
+	  ;; compile tags for current headline
+	  (setq tags-list
+		(if org-use-tag-inheritance
+		    (apply 'append (mapcar 'cdr tags-alist))
+		  tags))
+	  (when (and (or (not todo-only) todo)
+		     (eval matcher)
+		     (or (not org-agenda-skip-archived-trees)
+			 (not (member org-archive-tag tags-list))))
+	    (and (eq action 'agenda) (org-agenda-skip))
+	    ;; list this headline
+	    (if (eq action 'sparse-tree)
+		(progn
+		  (org-show-context 'tags-tree))
+	      (setq txt (org-format-agenda-item
+			 ""
+			 (concat
+			  (if org-tags-match-list-sublevels
+			      (make-string (1- level) ?.) "")
+			  (org-get-heading))
+			 category tags-list))
+	      (goto-char lspos)
+	      (setq marker (org-agenda-new-marker))
+	      (org-add-props txt props
+		'org-marker marker 'org-hd-marker marker 'org-category category)
+	      (push txt rtn))
+	    ;; if we are to skip sublevels, jump to end of subtree
+	    (or org-tags-match-list-sublevels (org-end-of-subtree t))))))
+    (when (and (eq action 'sparse-tree)
+	       (not org-sparse-tree-open-archived-trees))
+      (org-hide-archived-subtrees (point-min) (point-max)))
+    (nreverse rtn)))
+
+(defvar todo-only) ;; dynamically scoped
+
+(defun org-tags-sparse-tree (&optional todo-only match)
+  "Create a sparse tree according to tags  string MATCH.
+MATCH can contain positive and negative selection of tags, like
+\"+WORK+URGENT-WITHBOSS\".
+If optional argument TODO_ONLY is non-nil, only select lines that are
+also TODO lines."
+  (interactive "P")
+  (org-scan-tags 'sparse-tree (cdr (org-make-tags-matcher match)) todo-only))
+
+(defun org-make-tags-matcher (match)
+  "Create the TAGS//TODO matcher form for the selection string MATCH."
+  ;; todo-only is scoped dynamically into this function, and the function
+  ;; may change it it the matcher asksk for it.
+  (unless match
+    ;; Get a new match request, with completion
+    (setq org-last-tags-completion-table
+	  (or org-tag-alist
+	      org-last-tags-completion-table))
+    (setq match (completing-read
+		 "Match: " 'org-tags-completion-function nil nil nil
+		 'org-tags-history)))
+
+  ;; Parse the string and create a lisp form
+  (let ((match0 match)
+	(re "^&?\\([-+:]\\)?\\({[^}]+}\\|LEVEL=\\([0-9]+\\)\\|[A-Za-z_@0-9]+\\)")
+	minus tag mm
+	tagsmatch todomatch tagsmatcher todomatcher kwd matcher
+	orterms term orlist re-p level-p)
+    (if (string-match "/+" match)
+	;; match contains also a todo-matching request
+	(progn
+	  (setq tagsmatch (substring match 0 (match-beginning 0))
+		todomatch (substring match (match-end 0)))
+	  (if (string-match "^!" todomatch)
+	      (setq todo-only t todomatch (substring todomatch 1)))
+	  (if (string-match "^\\s-*$" todomatch)
+	      (setq todomatch nil)))
+      ;; only matching tags
+      (setq tagsmatch match todomatch nil))
+
+    ;; Make the tags matcher
+    (if (or (not tagsmatch) (not (string-match "\\S-" tagsmatch)))
+	(setq tagsmatcher t)
+      (setq orterms (org-split-string tagsmatch "|") orlist nil)
+      (while (setq term (pop orterms))
+	(while (and (equal (substring term -1) "\\") orterms)
+	  (setq term (concat term "|" (pop orterms)))) ; repair bad split
+	(while (string-match re term)
+	  (setq minus (and (match-end 1)
+			   (equal (match-string 1 term) "-"))
+		tag (match-string 2 term)
+		re-p (equal (string-to-char tag) ?{)
+		level-p (match-end 3)
+		mm (cond
+		    (re-p `(org-match-any-p ,(substring tag 1 -1) tags-list))
+		    (level-p `(= level ,(string-to-number
+					 (match-string 3 term))))
+		    (t `(member ,(downcase tag) tags-list)))
+		mm (if minus (list 'not mm) mm)
+		term (substring term (match-end 0)))
+	  (push mm tagsmatcher))
+	(push (if (> (length tagsmatcher) 1)
+		  (cons 'and tagsmatcher)
+		(car tagsmatcher))
+	      orlist)
+	(setq tagsmatcher nil))
+      (setq tagsmatcher (if (> (length orlist) 1) (cons 'or orlist) (car orlist))))
+
+    ;; Make the todo matcher
+    (if (or (not todomatch) (not (string-match "\\S-" todomatch)))
+	(setq todomatcher t)
+      (setq orterms (org-split-string todomatch "|") orlist nil)
+      (while (setq term (pop orterms))
+	(while (string-match re term)
+	  (setq minus (and (match-end 1)
+			   (equal (match-string 1 term) "-"))
+		kwd (match-string 2 term)
+		re-p (equal (string-to-char kwd) ?{)
+		term (substring term (match-end 0))
+		mm (if re-p
+		       `(string-match  ,(substring kwd 1 -1) todo)
+		     (list 'equal 'todo kwd))
+		mm (if minus (list 'not mm) mm))
+	  (push mm todomatcher))
+	(push (if (> (length todomatcher) 1)
+		  (cons 'and todomatcher)
+		(car todomatcher))
+	      orlist)
+	(setq todomatcher nil))
+      (setq todomatcher (if (> (length orlist) 1)
+			    (cons 'or orlist) (car orlist))))
+
+    ;; Return the string and lisp forms of the matcher
+    (setq matcher (if todomatcher
+		      (list 'and tagsmatcher todomatcher)
+		    tagsmatcher))
+    (cons match0 matcher)))
+
+(defun org-match-any-p (re list)
+  "Does re match any element of list?"
+  (setq list (mapcar (lambda (x) (string-match re x)) list))
+  (delq nil list))
+
+(defvar org-add-colon-after-tag-completion nil)  ;; dynamically skoped param
+(defvar org-tags-overlay (org-make-overlay 1 1))
+(org-detach-overlay org-tags-overlay)
+
+(defun org-set-tags (&optional arg just-align)
+  "Set the tags for the current headline.
+With prefix ARG, realign all tags in headings in the current buffer."
+  (interactive "P")
+  (let* ((re (concat "^" outline-regexp))
+	 (current (org-get-tags))
+	 table current-tags inherited-tags ; computed below when needed
+	 tags p0 c0 c1 rpl)
+    (if arg
+	(save-excursion
+	  (goto-char (point-min))
+	  (let (buffer-invisibility-spec)  ; Emacs 21 compatibility
+	    (while (re-search-forward re nil t)
+	      (org-set-tags nil t)
+	      (end-of-line 1)))
+	  (message "All tags realigned to column %d" org-tags-column))
+      (if just-align
+	  (setq tags current)
+	;; Get a new set of tags from the user
+	(save-excursion
+	  (setq table (or org-tag-alist (org-get-buffer-tags))
+		org-last-tags-completion-table table
+		current-tags (org-split-string current ":")
+		inherited-tags (nreverse
+				(nthcdr (length current-tags)
+					(nreverse (org-get-tags-at))))
+		tags
+		(if (or (eq t org-use-fast-tag-selection)
+			(and org-use-fast-tag-selection
+			     (delq nil (mapcar 'cdr table))))
+		    (org-fast-tag-selection current-tags inherited-tags table)
+		  (let ((org-add-colon-after-tag-completion t))
+		    (org-trim
+		     (completing-read "Tags: " 'org-tags-completion-function
+				      nil nil current 'org-tags-history))))))
+	(while (string-match "[-+&]+" tags)
+	  ;; No boolean logic, just a list
+	  (setq tags (replace-match ":" t t tags))))
+      (if (string-match "\\`[\t ]*\\'" tags)
+          (setq tags "")
+	(unless (string-match ":$" tags) (setq tags (concat tags ":")))
+	(unless (string-match "^:" tags) (setq tags (concat ":" tags))))
+      
+      ;; Insert new tags at the correct column
+      (beginning-of-line 1)
+      (if (re-search-forward
+	   (concat "\\([ \t]*" (regexp-quote current) "\\)[ \t]*$")
+	   (point-at-eol) t)
+	  (progn
+	    (if (equal tags "")
+		(setq rpl "")
+	      (goto-char (match-beginning 0))
+	      (setq c0 (current-column) p0 (point)
+		    c1 (max (1+ c0) (if (> org-tags-column 0)
+					org-tags-column
+				      (- (- org-tags-column) (length tags))))
+		    rpl (concat (make-string (max 0 (- c1 c0)) ?\ ) tags)))
+	    (replace-match rpl t t)
+	    (and (not (featurep 'xemacs)) c0 (tabify p0 (point)))
+	    tags)
+	(error "Tags alignment failed")))))
+
+(defun org-tags-completion-function (string predicate &optional flag)
+  (let (s1 s2 rtn (ctable org-last-tags-completion-table)
+	   (confirm (lambda (x) (stringp (car x)))))
+    (if (string-match "^\\(.*[-+:&|]\\)\\([^-+:&|]*\\)$" string)
+        (setq s1 (match-string 1 string)
+              s2 (match-string 2 string))
+      (setq s1 "" s2 string))
+    (cond
+     ((eq flag nil)
+      ;; try completion
+      (setq rtn (try-completion s2 ctable confirm))
+      (if (stringp rtn)
+	  (concat s1 s2 (substring rtn (length s2))
+		  (if (and org-add-colon-after-tag-completion
+			   (assoc rtn ctable))
+		      ":" "")))
+      )
+     ((eq flag t)
+      ;; all-completions
+      (all-completions s2 ctable confirm)
+      )
+     ((eq flag 'lambda)
+      ;; exact match?
+      (assoc s2 ctable)))
+    ))
+
+(defun org-fast-tag-insert (kwd tags face &optional end)
+  "Insert KDW, and the TAGS, the latter with face FACE.  Also inser END."
+  (insert (format "%-12s" (concat kwd ":"))
+	  (org-add-props (mapconcat 'identity tags " ") nil 'face face)
+	  (or end "")))
+
+(defun org-fast-tag-show-exit (flag)
+  (save-excursion
+    (goto-line 3)
+    (if (re-search-forward "[ \t]+Next change exits" (point-at-eol) t)
+	(replace-match ""))
+    (when flag
+      (end-of-line 1)
+      (move-to-column (- (window-width) 19) t)
+      (insert (org-add-props " Next change exits" nil 'face 'org-warning)))))
+
+(defun org-set-current-tags-overlay (current prefix)
+  (let ((s (concat ":" (mapconcat 'identity current ":") ":")))
+    (if (featurep 'xemacs)
+	(org-overlay-display org-tags-overlay (concat prefix s)
+			     'secondary-selection)
+      (put-text-property 0 (length s) 'face '(secondary-selection org-tag) s)
+      (org-overlay-display org-tags-overlay (concat prefix s)))))
+
+(defun org-fast-tag-selection (current inherited table)
+  "Fast tag selection with single keys.
+CURRENT is the current list of tags in the headline, INHERITED is the
+list of inherited tags, and TABLE is an alist of tags and corresponding keys,
+possibly with grouping information.
+If the keys are nil, a-z are automatically assigned.
+Returns the new tags string, or nil to not change the current settings."
+  (let* ((maxlen (apply 'max (mapcar
+			      (lambda (x)
+				(if (stringp (car x)) (string-width (car x)) 0))
+			      table)))
+	 (buf (current-buffer))
+	 (expert (eq org-fast-tag-selection-single-key 'expert))
+	 (buffer-tags nil)
+	 (fwidth (+ maxlen 3 1 3))
+	 (ncol (/ (- (window-width) 4) fwidth))
+	 (i-face 'org-done)
+	 (c-face 'org-tag)
+	 tg cnt e c char c1 c2 ntable tbl rtn
+	 ov-start ov-end ov-prefix
+	 (exit-after-next org-fast-tag-selection-single-key)
+	 groups ingroup)
+    (save-excursion
+      (beginning-of-line 1)
+      (if (looking-at ".*[ \t]\\(:[A-Za-z_@0-9:]+:\\)[ \t]*\\(\r\\|$\\)")
+	  (setq ov-start (match-beginning 1)
+		ov-end (match-end 1)
+		ov-prefix "")
+	(setq ov-start (1- (point-at-eol))
+	      ov-end (1+ ov-start))
+	(skip-chars-forward "^\n\r")
+	(setq ov-prefix
+	      (concat
+	       (buffer-substring (1- (point)) (point))
+	       (if (> (current-column) org-tags-column)
+		   " "
+		 (make-string (- org-tags-column (current-column)) ?\ ))))))
+    (org-move-overlay org-tags-overlay ov-start ov-end)
+    (save-window-excursion
+      (if expert
+	  (set-buffer (get-buffer-create " *Org tags*"))
+	(delete-other-windows)
+	(split-window-vertically)
+	(switch-to-buffer-other-window (get-buffer-create " *Org tags*")))
+      (erase-buffer)
+      (org-fast-tag-insert "Inherited" inherited i-face "\n")
+      (org-fast-tag-insert "Current" current c-face "\n\n")
+      (org-fast-tag-show-exit exit-after-next)
+      (org-set-current-tags-overlay current ov-prefix)
+      (setq tbl table char ?a cnt 0)
+      (while (setq e (pop tbl))
+	(cond
+	 ((equal e '(:startgroup))
+	  (push '() groups) (setq ingroup t)
+	  (when (not (= cnt 0))
+	    (setq cnt 0)
+	    (insert "\n"))
+	  (insert "{ "))
+	 ((equal e '(:endgroup))
+	  (setq ingroup nil cnt 0)
+	  (insert "}\n"))
+	 (t
+	  (setq tg (car e) c2 nil)
+	  (if (cdr e)
+	      (setq c (cdr e))
+	    ;; automatically assign a character.
+	    (setq c1 (string-to-char
+		      (downcase (substring
+				 tg (if (= (string-to-char tg) ?@) 1 0)))))
+	    (if (or (rassoc c1 ntable) (rassoc c1 table))
+		(while (or (rassoc char ntable) (rassoc char table))
+		  (setq char (1+ char)))
+	      (setq c2 c1))
+	    (setq c (or c2 char)))
+	  (if ingroup (push tg (car groups)))
+	  (setq tg (org-add-props tg nil 'face
+				  (cond
+				   ((member tg current) c-face)
+				   ((member tg inherited) i-face)
+				   (t nil))))
+	  (if (and (= cnt 0) (not ingroup)) (insert "  "))
+	  (insert "[" c "] " tg (make-string
+				 (- fwidth 4 (length tg)) ?\ ))
+	  (push (cons tg c) ntable)
+	  (when (= (setq cnt (1+ cnt)) ncol)
+	    (insert "\n")
+	    (if ingroup (insert "  "))
+	    (setq cnt 0)))))
+      (setq ntable (nreverse ntable))
+      (insert "\n")
+      (goto-char (point-min))
+      (if (and (not expert) (fboundp 'fit-window-to-buffer))
+	  (fit-window-to-buffer))
+      (setq rtn
+	    (catch 'exit
+	      (while t
+		(message "[a-z..]:Toggle [SPC]:clear [RET]:accept [TAB]:free%s%s"
+			 (if groups " [!] no groups" " [!]groups")
+			 (if expert " [C-c]:window" (if exit-after-next " [C-c]:single" " [C-c]:multi")))
+		(setq c (let ((inhibit-quit t)) (read-char-exclusive)))
+		(cond
+		 ((= c ?\r) (throw 'exit t))
+		 ((= c ?!)
+		  (setq groups (not groups))
+		  (goto-char (point-min))
+		  (while (re-search-forward "[{}]" nil t) (replace-match " ")))
+		 ((= c ?\C-c)
+		  (if (not expert)
+		      (org-fast-tag-show-exit
+		       (setq exit-after-next (not exit-after-next)))
+		    (setq expert nil)
+		    (delete-other-windows)
+		    (split-window-vertically)
+		    (switch-to-buffer-other-window " *Org tags*")
+		    (and (fboundp 'fit-window-to-buffer)
+			 (fit-window-to-buffer))))
+		 ((or (= c ?\C-g)
+		      (and (= c ?q) (not (rassoc c ntable))))
+		  (org-detach-overlay org-tags-overlay)
+		  (setq quit-flag t))
+		 ((= c ?\ )
+		  (setq current nil)
+		  (if exit-after-next (setq exit-after-next 'now)))
+		 ((= c ?\t)
+		  (condition-case nil
+		      (setq tg (completing-read
+				"Tag: "
+				(or buffer-tags
+				    (with-current-buffer buf
+				      (org-get-buffer-tags)))))
+		    (quit (setq tg "")))
+		  (when (string-match "\\S-" tg)
+		    (add-to-list 'buffer-tags (list tg))
+		    (if (member tg current)
+			(setq current (delete tg current))
+		      (push tg current)))
+		  (if exit-after-next (setq exit-after-next 'now)))
+		 ((setq e (rassoc c ntable) tg (car e))
+		  (if (member tg current)
+		      (setq current (delete tg current))
+		    (loop for g in groups do
+			  (if (member tg g)
+			      (mapcar (lambda (x)
+					(setq current (delete x current)))
+				      g)))
+		    (push tg current))
+		  (if exit-after-next (setq exit-after-next 'now))))
+
+		;; Create a sorted list
+		(setq current
+		      (sort current
+			    (lambda (a b)
+			      (assoc b (cdr (memq (assoc a ntable) ntable))))))
+		(if (eq exit-after-next 'now) (throw 'exit t))
+		(goto-char (point-min))
+		(beginning-of-line 2)
+		(delete-region (point) (point-at-eol))
+		(org-fast-tag-insert "Current" current c-face)
+		(org-set-current-tags-overlay current ov-prefix)
+		(while (re-search-forward "\\[.\\] \\([a-zA-Z0-9_@]+\\)" nil t)
+		  (setq tg (match-string 1))
+		  (add-text-properties (match-beginning 1) (match-end 1)
+				       (list 'face
+					     (cond
+					      ((member tg current) c-face)
+					      ((member tg inherited) i-face)
+					      (t nil)))))
+		(goto-char (point-min)))))
+      (org-detach-overlay org-tags-overlay)
+      (if rtn
+	  (mapconcat 'identity current ":")
+	nil))))
+
+(defun org-get-tags ()
+  "Get the TAGS string in the current headline."
+  (unless (org-on-heading-p t)
+    (error "Not on a heading"))
+  (save-excursion
+    (beginning-of-line 1)
+    (if (looking-at ".*[ \t]\\(:[A-Za-z_@0-9:]+:\\)[ \t]*\\(\r\\|$\\)")
+	(org-match-string-no-properties 1)
+      "")))
+
+(defun org-get-buffer-tags ()
+  "Get a table of all tags used in the buffer, for completion."
+  (let (tags)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward "[ \t]:\\([A-Za-z_@0-9:]+\\):[ \t\r\n]" nil t)
+	(mapc (lambda (x) (add-to-list 'tags x))
+	      (org-split-string (org-match-string-no-properties 1) ":"))))
+    (mapcar 'list tags)))
+
+;;;; Timestamps
 
 (defvar org-last-changed-timestamp nil)
+(defvar org-time-was-given) ; dynamically scoped parameter
+(defvar org-ts-what) ; dynamically scoped parameter
 
 (defun org-time-stamp (arg)
   "Prompt for a date/time and insert a time stamp.
@@ -5908,7 +11953,10 @@
 (org-overlay-put org-date-ovl 'face 'org-warning)
 (org-detach-overlay org-date-ovl)
 
-(defun org-read-date (&optional with-time to-time from-string)
+(defvar org-ans1) ; dynamically scoped parameter
+(defvar org-ans2) ; dynamically scoped parameter
+
+(defun org-read-date (&optional with-time to-time from-string prompt)
   "Read a date and make things smooth for the user.
 The prompt will suggest to enter an ISO date, but you can also enter anything
 which will at least partially be understood by `parse-time-string'.
@@ -5921,6 +11969,7 @@
   22 sept 0:34  --> currentyear-09-22 0:34
   12            --> currentyear-currentmonth-12
   Fri           --> nearest Friday (today or later)
+  +4            --> four days from today (only if +N is the only thing given)
   etc.
 The function understands only English month and weekday abbreviations,
 but this can be configured with the variables `parse-time-months' and
@@ -5960,8 +12009,9 @@
 	 (view-calendar-holidays-initially nil)
 	 (timestr (format-time-string
 		   (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time))
-	 (prompt (format "YYYY-MM-DD [%s]: " timestr))
-	 ans ans1 ans2
+	 (prompt (concat (if prompt (concat prompt " ") "")
+			 (format "YYYY-MM-DD [%s]: " timestr)))
+	 ans (org-ans0 "") org-ans1 org-ans2 (deltadays 0)
 	 second minute hour day month year tl wday wday1)
 
     (cond
@@ -6009,14 +12059,20 @@
 	    (unwind-protect
 		(progn
 		  (use-local-map map)
-		  (setq ans (read-string prompt "" nil nil))
-		  (if (not (string-match "\\S-" ans)) (setq ans nil))
-		  (setq ans (or ans1 ans ans2)))
+		  (setq org-ans0 (read-string prompt "" nil nil))
+;		  (if (not (string-match "\\S-" org-ans0)) (setq org-ans0 nil))
+		  ;; org-ans0: from prompt
+		  ;; org-ans1: from mouse click
+		  ;; org-ans2: from calendar motion
+		  (setq ans (concat org-ans0 " " (or org-ans1 org-ans2))))
 	      (use-local-map old-map))))))
      (t ; Naked prompt only
       (setq ans (read-string prompt "" nil timestr))))
     (org-detach-overlay org-date-ovl)
 
+    (if (string-match "^[ \t]*[-+][0-9]+[ \t]*$" org-ans0)
+	(setq deltadays (string-to-number ans) ans ""))
+
     (if (string-match
 	 "^ *\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\([^-0-9]\\|$\\)" ans)
 	(progn
@@ -6036,6 +12092,7 @@
 	  minute (or (nth 1 tl) (string-to-number (format-time-string "%M" ct)))
 	  second (or (nth 0 tl) 0)
 	  wday (nth 6 tl))
+    (setq day (+ day deltadays))
     (when (and wday (not (nth 3 tl)))
       ;; Weekday was given, but no day, so pick that day in the week
       ;; on or after the derived date.
@@ -6054,14 +12111,14 @@
 
 (defun org-eval-in-calendar (form)
   "Eval FORM in the calendar window and return to current window.
-Also, store the cursor date in variable ans2."
+Also, store the cursor date in variable org-ans2."
   (let ((sw (selected-window)))
     (select-window (get-buffer-window "*Calendar*"))
     (eval form)
     (when (calendar-cursor-to-date)
       (let* ((date (calendar-cursor-to-date))
 	     (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
-	(setq ans2 (format-time-string "%Y-%m-%d" time))))
+	(setq org-ans2 (format-time-string "%Y-%m-%d" time))))
     (org-move-overlay org-date-ovl (1- (point)) (1+ (point)) (current-buffer))
     (select-window sw)))
 
@@ -6072,7 +12129,7 @@
   (when (calendar-cursor-to-date)
     (let* ((date (calendar-cursor-to-date))
 	   (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
-      (setq ans1 (format-time-string "%Y-%m-%d" time)))
+      (setq org-ans1 (format-time-string "%Y-%m-%d" time)))
     (if (active-minibuffer-window) (exit-minibuffer))))
 
 (defun org-insert-time-stamp (time &optional with-hm inactive pre post)
@@ -6118,10 +12175,8 @@
 	       (org-parse-time-string (buffer-substring beg end) t)))
 	 (w1 (- end beg))
 	 (with-hm (and (nth 1 t1) (nth 2 t1)))
-	 (inactive (= (char-before (1- beg)) ?\[))
 	 (tf (funcall (if with-hm 'cdr 'car) org-time-stamp-custom-formats))
 	 (time (org-fix-decoded-time t1))
-	 (time (mapcar (lambda (x) (or x 0)) t1))
 	 (str (org-add-props
 		  (format-time-string
 		   (substring tf 1 -1) (apply 'encode-time time))
@@ -6136,6 +12191,33 @@
 	  (put-text-property beg end 'end-glyph (make-glyph str)))
       (put-text-property beg end 'display str))))
 
+(defun org-translate-time (string)
+  "Translate all timestamps in STRING to custom format.
+But do this only if the variable `org-display-custom-times' is set."
+  (when org-display-custom-times
+    (save-match-data
+      (let* ((start 0)
+	     (re org-ts-regexp-both)
+	     t1 with-hm inactive tf time str beg end)
+	(while (setq start (string-match re string start))
+	  (setq beg (match-beginning 0)
+		end (match-end 0)
+		t1 (save-match-data
+		     (org-parse-time-string (substring string beg end) t))
+		with-hm (and (nth 1 t1) (nth 2 t1))
+		inactive (equal (substring string beg (1+ beg)) "[")
+		tf (funcall (if with-hm 'cdr 'car)
+			    org-time-stamp-custom-formats)
+		time (org-fix-decoded-time t1)
+		str (format-time-string
+		     (concat
+		      (if inactive "[" "<") (substring tf 1 -1)
+		      (if inactive "]" ">"))
+		     (apply 'encode-time time))
+		string (replace-match str t t string)
+		start (+ start (length str)))))))
+  string)
+
 (defun org-fix-decoded-time (time)
   "Set 0 instead of nil for the first 6 elements of time.
 Don't touch the rest."
@@ -6161,7 +12243,7 @@
   (when (calendar-cursor-to-date)
     (let* ((date (calendar-cursor-to-date))
 	   (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
-      (setq ans1 (format-time-string "%Y-%m-%d" time)))
+      (setq org-ans1 (format-time-string "%Y-%m-%d" time)))
     (if (active-minibuffer-window) (exit-minibuffer))))
 
 (defun org-check-deadlines (ndays)
@@ -6451,14 +12533,16 @@
     (save-excursion
       (org-back-to-heading t)
       (beginning-of-line 2)
-      (if (and (looking-at (concat "[ \t]*" org-keyword-time-regexp))
-	       (not (equal (match-string 1) org-clock-string)))
-	  (beginning-of-line 1))
+      (when (and (looking-at (concat "[ \t]*" org-keyword-time-regexp))
+		 (not (equal (match-string 1) org-clock-string)))
+	;; First line hast scheduling info, move one further
+	(beginning-of-line 2)
+	(or (bolp) (newline)))
       (insert "\n") (backward-char 1)
       (indent-relative)
       (insert org-clock-string " ")
       (setq ts (org-insert-time-stamp (current-time) 'with-hm 'inactive))
-      (move-marker org-clock-marker (point))
+      (move-marker org-clock-marker (point) (buffer-base-buffer))
       (message "Clock started at %s" ts))))
 
 (defun org-clock-out (&optional fail-quietly)
@@ -6752,7 +12836,6 @@
 		     (apply 'encode-time (org-parse-time-string te)))))
     (move-marker ins (point))
     (setq ipos (point))
-    ;; FIXME: does not yet use org-insert-time-stamp
     (insert-before-markers "Clock summary at ["
 			   (substring
 			    (format-time-string (cdr org-time-stamp-formats))
@@ -6796,6 +12879,7 @@
     (skip-chars-forward "^|")
     (org-table-align)))
 
+;; FIXME: I don't think anybody uses this, ask David
 (defun org-collect-clock-time-entries ()
   "Return an internal list with clocking information.
 This list has one entry for each CLOCK interval.
@@ -6834,9 +12918,9 @@
 	(goto-char cont)))
     (nreverse rtn)))
 
-;;; Agenda, and Diary Integration
-
-;;; Define the mode
+;;;; Agenda, and Diary Integration
+
+;;; Define the Org-agenda-mode
 
 (defvar org-agenda-mode-map (make-sparse-keymap)
   "Keymap for `org-agenda-mode'.")
@@ -6857,6 +12941,8 @@
 \\{org-agenda-mode-map}"
   (interactive)
   (kill-all-local-variables)
+  (setq org-agenda-undo-list nil
+	org-agenda-pending-undo-list nil)
   (setq major-mode 'org-agenda-mode)
   (setq mode-name "Org-Agenda")
   (use-local-map org-agenda-mode-map)
@@ -6864,6 +12950,12 @@
   (if org-startup-truncated (setq truncate-lines t))
   (org-add-hook 'post-command-hook 'org-agenda-post-command-hook nil 'local)
   (org-add-hook 'pre-command-hook 'org-unhighlight nil 'local)
+  ;; Make sure properties are removed when copying text
+  (when (boundp 'buffer-substring-filters)
+    (org-set-local 'buffer-substring-filters
+		   (cons (lambda (x)
+                           (set-text-properties 0 (length x) nil x) x)
+			 buffer-substring-filters)))
   (unless org-agenda-keep-modes
     (setq org-agenda-follow-mode org-agenda-start-with-follow-mode
 	  org-agenda-show-log nil))
@@ -6884,12 +12976,20 @@
    (if (fboundp 'run-mode-hooks) 'run-mode-hooks 'run-hooks)
    (list 'org-agenda-mode-hook)))
 
+(substitute-key-definition 'undo 'org-agenda-undo
+			   org-agenda-mode-map global-map)
 (define-key org-agenda-mode-map "\C-i"     'org-agenda-goto)
 (define-key org-agenda-mode-map [(tab)]    'org-agenda-goto)
 (define-key org-agenda-mode-map "\C-m"     'org-agenda-switch-to)
 (define-key org-agenda-mode-map "\C-k"     'org-agenda-kill)
+(define-key org-agenda-mode-map "\C-c$"    'org-agenda-archive)
+(define-key org-agenda-mode-map "\C-c\C-x\C-s" 'org-agenda-archive)
+(define-key org-agenda-mode-map "$"        'org-agenda-archive)
+(define-key org-agenda-mode-map "\C-c\C-o" 'org-agenda-open-link)
 (define-key org-agenda-mode-map " "        'org-agenda-show)
 (define-key org-agenda-mode-map "\C-c\C-t" 'org-agenda-todo)
+(define-key org-agenda-mode-map "\C-c\C-xb" 'org-agenda-tree-to-indirect-buffer)
+(define-key org-agenda-mode-map "b"        'org-agenda-tree-to-indirect-buffer)
 (define-key org-agenda-mode-map "o"        'delete-other-windows)
 (define-key org-agenda-mode-map "L"        'org-agenda-recenter)
 (define-key org-agenda-mode-map "t"        'org-agenda-todo)
@@ -6939,8 +13039,8 @@
 (define-key org-agenda-mode-map "H" 'org-agenda-holidays)
 (define-key org-agenda-mode-map "+" 'org-agenda-priority-up)
 (define-key org-agenda-mode-map "I" 'org-agenda-clock-in)
-(define-key org-agenda-mode-map "O" 'org-clock-out)
-(define-key org-agenda-mode-map "X" 'org-clock-cancel)
+(define-key org-agenda-mode-map "O" 'org-agenda-clock-out)
+(define-key org-agenda-mode-map "X" 'org-agenda-clock-cancel)
 (define-key org-agenda-mode-map "-" 'org-agenda-priority-down)
 (define-key org-agenda-mode-map (org-key 'S-up) 'org-agenda-priority-up)
 (define-key org-agenda-mode-map (org-key 'S-down) 'org-agenda-priority-down)
@@ -6967,57 +13067,145 @@
     ["Go To (this window)" org-agenda-switch-to t]
     ["Follow Mode" org-agenda-follow-mode
      :style toggle :selected org-agenda-follow-mode :active t]
+    ["Tree to indirect frame" org-agenda-tree-to-indirect-buffer t]
     "--"
     ["Cycle TODO" org-agenda-todo t]
+    ["Archive subtree" org-agenda-archive t]
+    ["Delete subtree" org-agenda-kill t]
+    "--"
+    ["Goto Today" org-agenda-goto-today (org-agenda-check-type nil 'agenda 'timeline)]
+    ["Next Dates" org-agenda-later (org-agenda-check-type nil 'agenda)]
+    ["Previous Dates" org-agenda-earlier (org-agenda-check-type nil 'agenda)]
+    "--"
     ("Tags"
      ["Show all Tags" org-agenda-show-tags t]
      ["Set Tags" org-agenda-set-tags t])
-    ("Schedule"
+    ("Date/Schedule"
      ["Schedule" org-agenda-schedule t]
      ["Set Deadline" org-agenda-deadline t]
      "--"
-     ["Reschedule +1 day" org-agenda-date-later (org-agenda-check-type nil 'agenda 'timeline)]
-     ["Reschedule -1 day" org-agenda-date-earlier (org-agenda-check-type nil 'agenda 'timeline)]
-     ["Reschedule to ..." org-agenda-date-prompt (org-agenda-check-type nil 'agenda 'timeline)])
+     ["Change date +1 day" org-agenda-date-later (org-agenda-check-type nil 'agenda 'timeline)]
+     ["Change date -1 day" org-agenda-date-earlier (org-agenda-check-type nil 'agenda 'timeline)]
+     ["Change date to ..." org-agenda-date-prompt (org-agenda-check-type nil 'agenda 'timeline)])
     ("Priority"
      ["Set Priority" org-agenda-priority t]
      ["Increase Priority" org-agenda-priority-up t]
      ["Decrease Priority" org-agenda-priority-down t]
      ["Show Priority" org-agenda-show-priority t])
-    "--"
-    ;; ["New agenda command" org-agenda t]
-    ["Rebuild buffer" org-agenda-redo t]
-    ["Save all Org-mode Buffers" org-save-all-org-buffers t]
-    "--"
-    ["Goto Today" org-agenda-goto-today (org-agenda-check-type nil 'agenda 'timeline)]
-    ["Next Dates" org-agenda-later (org-agenda-check-type nil 'agenda)]
-    ["Previous Dates" org-agenda-earlier (org-agenda-check-type nil 'agenda)]
-    "--"
-    ["Day View" org-agenda-day-view :active (org-agenda-check-type nil 'agenda)
-     :style radio :selected (equal org-agenda-ndays 1)]
-    ["Week View" org-agenda-week-view :active (org-agenda-check-type nil 'agenda)
-     :style radio :selected (equal org-agenda-ndays 7)]
-    "--"
-    ["Show Logbook entries" org-agenda-log-mode
-     :style toggle :selected org-agenda-show-log :active (org-agenda-check-type nil 'agenda 'timeline)]
-    ["Include Diary" org-agenda-toggle-diary
-     :style toggle :selected org-agenda-include-diary :active (org-agenda-check-type nil 'agenda)]
-    ["Use Time Grid" org-agenda-toggle-time-grid
-     :style toggle :selected org-agenda-use-time-grid :active (org-agenda-check-type nil 'agenda)]
-    "--"
-    ["New Diary Entry" org-agenda-diary-entry (org-agenda-check-type nil 'agenda 'timeline)]
-    ("Calendar Commands"
+    ("Calendar/Diary"
+     ["New Diary Entry" org-agenda-diary-entry (org-agenda-check-type nil 'agenda 'timeline)]
      ["Goto Calendar" org-agenda-goto-calendar (org-agenda-check-type nil 'agenda 'timeline)]
      ["Phases of the Moon" org-agenda-phases-of-moon (org-agenda-check-type nil 'agenda 'timeline)]
      ["Sunrise/Sunset" org-agenda-sunrise-sunset (org-agenda-check-type nil 'agenda 'timeline)]
      ["Holidays" org-agenda-holidays (org-agenda-check-type nil 'agenda 'timeline)]
-     ["Convert" org-agenda-convert-date (org-agenda-check-type nil 'agenda 'timeline)])
-    ["Create iCalendar file" org-export-icalendar-combine-agenda-files t]
+     ["Convert" org-agenda-convert-date (org-agenda-check-type nil 'agenda 'timeline)]
+     "--"
+     ["Create iCalendar file" org-export-icalendar-combine-agenda-files t])
+    "--"
+    ("View"
+     ["Day View" org-agenda-day-view :active (org-agenda-check-type nil 'agenda)
+      :style radio :selected (equal org-agenda-ndays 1)]
+     ["Week View" org-agenda-week-view :active (org-agenda-check-type nil 'agenda)
+      :style radio :selected (equal org-agenda-ndays 7)]
+     "--"
+     ["Show Logbook entries" org-agenda-log-mode
+      :style toggle :selected org-agenda-show-log :active (org-agenda-check-type nil 'agenda 'timeline)]
+     ["Include Diary" org-agenda-toggle-diary
+      :style toggle :selected org-agenda-include-diary :active (org-agenda-check-type nil 'agenda)]
+     ["Use Time Grid" org-agenda-toggle-time-grid
+      :style toggle :selected org-agenda-use-time-grid :active (org-agenda-check-type nil 'agenda)])
+    ["Rebuild buffer" org-agenda-redo t]
+    ["Save all Org-mode Buffers" org-save-all-org-buffers t]
+    "--"
+    ["Undo Remote Editing" org-agenda-undo org-agenda-undo-list]
     "--"
     ["Quit" org-agenda-quit t]
     ["Exit and Release Buffers" org-agenda-exit t]
     ))
 
+;;; Agenda undo
+
+(defvar org-agenda-allow-remote-undo t
+  "Non-nil means, allow remote undo from the agenda buffer.")
+(defvar org-agenda-undo-list nil
+  "List of undoable operations in the agenda since last refresh.")
+(defvar org-agenda-undo-has-started-in nil
+  "Buffers that have already seen `undo-start' in the current undo sequence.")
+(defvar org-agenda-pending-undo-list nil
+  "In a series of undo commands, this is the list of remaning undo items.")
+
+(defmacro org-if-unprotected (&rest body)
+  "Execute BODY if ther is no `org-protected' text property at point."
+  (declare (debug t))
+  `(unless (get-text-property (point) 'org-protected)
+     ,@body))
+
+(defmacro org-with-remote-undo (_buffer &rest _body)
+  "Execute BODY while recording undo information in two buffers."
+  (declare (indent 1) (debug t))
+  `(let ((_cline (org-current-line))
+	 (_cmd this-command)
+	 (_buf1 (current-buffer))
+	 (_buf2 ,_buffer)
+	 (_undo1 buffer-undo-list)
+	 (_undo2 (with-current-buffer ,_buffer buffer-undo-list))
+	 _c1 _c2)
+     ,@_body
+     (when org-agenda-allow-remote-undo
+       (setq _c1 (org-verify-change-for-undo
+		  _undo1 (with-current-buffer _buf1 buffer-undo-list))
+	     _c2 (org-verify-change-for-undo
+		  _undo2 (with-current-buffer _buf2 buffer-undo-list)))
+       (when (or _c1 _c2)
+	 ;; make sure there are undo boundaries
+	 (and _c1 (with-current-buffer _buf1 (undo-boundary)))
+	 (and _c2 (with-current-buffer _buf2 (undo-boundary)))
+	 ;; remember which buffer to undo
+	 (push (list _cmd _cline _buf1 _c1 _buf2 _c2)
+	       org-agenda-undo-list)))))
+
+(defun org-agenda-undo ()
+  "Undo a remote editing step in the agenda.
+This undoes changes both in the agenda buffer and in the remote buffer
+that have been changed along."
+  (interactive)
+  (or org-agenda-allow-remote-undo
+      (error "Check the variable `org-agenda-allow-remote-undo' to activate remote undo."))
+  (if (not (eq this-command last-command))
+      (setq org-agenda-undo-has-started-in nil
+	    org-agenda-pending-undo-list org-agenda-undo-list))
+  (if (not org-agenda-pending-undo-list)
+      (error "No further undo information"))
+  (let* ((entry (pop org-agenda-pending-undo-list))
+	 buf line cmd rembuf)
+    (setq cmd (pop entry) line (pop entry))
+    (setq rembuf (nth 2 entry))
+    (org-with-remote-undo rembuf
+      (while (bufferp (setq buf (pop entry)))
+	(if (pop entry)
+	    (with-current-buffer buf
+	      (let ((last-undo-buffer buf)
+                    buffer-read-only)
+		(unless (memq buf org-agenda-undo-has-started-in)
+		  (push buf org-agenda-undo-has-started-in)
+		  (make-local-variable 'pending-undo-list)
+		  (undo-start))
+		(while (and pending-undo-list
+			    (listp pending-undo-list)
+			    (not (car pending-undo-list)))
+		  (pop pending-undo-list))
+		(undo-more 1))))))
+    (goto-line line)
+    (message "`%s' undone (buffer %s)" cmd (buffer-name rembuf))))
+
+(defun org-verify-change-for-undo (l1 l2)
+  "Verify that a real change occurred between the undo lists L1 and L2."
+  (while (and l1 (listp l1) (null (car l1))) (pop l1))
+  (while (and l2 (listp l2) (null (car l2))) (pop l2))
+  (not (eq l1 l2)))
+
+;;; Agenda dispatch
+
 (defvar org-agenda-restrict nil)
 (defvar org-agenda-restrict-begin (make-marker))
 (defvar org-agenda-restrict-end (make-marker))
@@ -7063,32 +13251,42 @@
 	(delete-other-windows)
 	(switch-to-buffer-other-window " *Agenda Commands*")
 	(erase-buffer)
-	(insert
-	 "Press key for an agenda command:
---------------------------------
+	(insert (eval-when-compile
+		  (let ((header
+"Press key for an agenda command:
+--------------------------------         C   Configure custom agenda commands
 a   Agenda for current week or day
 t   List of all TODO entries             T   Entries with special TODO kwd
 m   Match a TAGS query                   M   Like m, but only TODO entries
-L   Timeline for current buffer          C   Configure custom agenda commands")
+L   Timeline for current buffer          #   List stuck projects (!=configure)
+")
+			(start 0))
+		    (while (string-match "\\(^\\|   \\|(\\)\\(\\S-\\)\\( \\|=\\)" header start)
+		      (setq start (match-end 0))
+		      (add-text-properties (match-beginning 2) (match-end 2)
+					   '(face bold) header))
+		    header)))
 	(while (setq entry (pop custom))
 	  (setq key (car entry) type (nth 1 entry) match (nth 2 entry))
 	  (insert (format "\n%-4s%-14s: %s"
-			  key
+			  (org-add-props (copy-sequence key)
+			      '(face bold))
 			  (cond
 			   ((stringp type) type)
+			   ((eq type 'todo) "TODO keyword")
 			   ((eq type 'tags) "Tags query")
-			   ((eq type 'todo) "TODO keyword")
+			   ((eq type 'tags-todo) "Tags (TODO)")
 			   ((eq type 'tags-tree) "Tags tree")
 			   ((eq type 'todo-tree) "TODO kwd tree")
 			   ((eq type 'occur-tree) "Occur tree")
+			   ((functionp type) (symbol-name type))
 			   (t "???"))
 			  (if (stringp match)
 			      (org-add-props match nil 'face 'org-warning)
-			    (format "set of %d commands" (+ -2 (length entry)))))))
+			    (format "set of %d commands" (length match))))))
 	(if restrict-ok
 	    (insert "\n"
 		    (org-add-props "1   Restrict call to current buffer      0   Restrict call to region or subtree" nil 'face 'org-table)))
-
 	(goto-char (point-min))
 	(if (fboundp 'fit-window-to-buffer) (fit-window-to-buffer))
 	(message "Press key for agenda command%s"
@@ -7123,16 +13321,6 @@
       (require 'calendar)  ; FIXME: can we avoid this for some commands?
       ;; For example the todo list should not need it (but does...)
       (cond
-       ((equal c ?C) (customize-variable 'org-agenda-custom-commands))
-       ((equal c ?a) (call-interactively 'org-agenda-list))
-       ((equal c ?t) (call-interactively 'org-todo-list))
-       ((equal c ?T) (org-call-with-arg 'org-todo-list (or arg '(4))))
-       ((equal c ?m) (call-interactively 'org-tags-view))
-       ((equal c ?M) (org-call-with-arg 'org-tags-view (or arg '(4))))
-       ((equal c ?L)
-	(unless restrict-ok
-	  (error "This is not an Org-mode file"))
-	(org-call-with-arg 'org-timeline arg))
        ((setq entry (assoc (char-to-string c) org-agenda-custom-commands))
 	(if (symbolp (nth 1 entry))
 	    (progn
@@ -7156,16 +13344,28 @@
 	       ((eq type 'occur-tree)
 		(org-check-for-org-mode)
 		(org-let lprops '(org-occur match)))
+	       ((fboundp type)
+		(org-let lprops '(funcall type match)))
 	       (t (error "Invalid custom agenda command type %s" type))))
 	  (org-run-agenda-series (cddr entry))))
+       ((equal c ?C) (customize-variable 'org-agenda-custom-commands))
+       ((equal c ?a) (call-interactively 'org-agenda-list))
+       ((equal c ?t) (call-interactively 'org-todo-list))
+       ((equal c ?T) (org-call-with-arg 'org-todo-list (or arg '(4))))
+       ((equal c ?m) (call-interactively 'org-tags-view))
+       ((equal c ?M) (org-call-with-arg 'org-tags-view (or arg '(4))))
+       ((equal c ?L)
+	(unless restrict-ok
+	  (error "This is not an Org-mode file"))
+	(org-call-with-arg 'org-timeline arg))
+       ((equal c ?#) (call-interactively 'org-agenda-list-stuck-projects))
+       ((equal c ?!) (customize-variable 'org-stuck-projects))
        (t (error "Invalid key"))))))
 
-;; FIXME: what is the meaning of WINDOW?????
-(defun org-run-agenda-series (series &optional window)
+(defun org-run-agenda-series (series)
   (org-prepare-agenda)
   (let* ((org-agenda-multi t)
 	 (redo (list 'org-run-agenda-series (list 'quote series)))
-	 (org-select-agenda-window t)
 	 (cmds (car series))
 	 (gprops (nth 1 series))
 	 match ;; The byte compiler incorrectly complains about this.  Keep it!
@@ -7177,6 +13377,8 @@
 	(call-interactively 'org-agenda-list))
        ((eq type 'alltodo)
 	(call-interactively 'org-todo-list))
+       ((eq type 'stuck)
+	(call-interactively 'org-agenda-list-stuck-projects))
        ((eq type 'tags)
 	(org-let2 gprops lprops
 		  '(org-tags-view current-prefix-arg match)))
@@ -7186,6 +13388,9 @@
        ((eq type 'todo)
 	(org-let2 gprops lprops
 		  '(org-todo-list match)))
+       ((fboundp type)
+	(org-let2 gprops lprops
+	  '(funcall type match)))
        (t (error "Invalid type in command series"))))
     (widen)
     (setq org-agenda-redo-command redo)
@@ -7218,12 +13423,13 @@
 
 (defun org-fit-agenda-window ()
   "Fit the window to the buffer size."
-  (and org-fit-agenda-window
-       (memq org-agenda-window-setup '(reorganize-frame))
+  (and (memq org-agenda-window-setup '(reorganize-frame))
        (fboundp 'fit-window-to-buffer)
        (fit-window-to-buffer nil (/ (* (frame-height) 3) 4)
                              (/ (frame-height) 2))))
 
+;;; Agenda file list
+
 (defun org-agenda-files (&optional unrestricted)
   "Get the list of agenda files.
 Optional UNRESTRICTED means return the full list even if a restriction
@@ -7234,8 +13440,6 @@
    ((listp org-agenda-files) org-agenda-files)
    (t (error "Invalid value of `org-agenda-files'"))))
 
-(defvar org-window-configuration)
-
 (defun org-edit-agenda-file-list ()
   "Edit the list of agenda files.
 Depending on setup, this either uses customize to edit the variable
@@ -7277,6 +13481,197 @@
       (insert-file-contents org-agenda-files)
       (org-split-string (buffer-string) "[ \t\r\n]*?[\r\n][ \t\r\n]*"))))
 
+
+;;;###autoload
+(defun org-cycle-agenda-files ()
+  "Cycle through the files in `org-agenda-files'.
+If the current buffer visits an agenda file, find the next one in the list.
+If the current buffer does not, find the first agenda file."
+  (interactive)
+  (let* ((fs (org-agenda-files t))
+	 (files (append fs (list (car fs))))
+	 (tcf (if buffer-file-name (file-truename buffer-file-name)))
+	 file)
+    (unless files (error "No agenda files"))
+    (catch 'exit
+      (while (setq file (pop files))
+	(if (equal (file-truename file) tcf)
+	    (when (car files)
+	      (find-file (car files))
+	      (throw 'exit t))))
+      (find-file (car fs)))
+    (if (buffer-base-buffer) (switch-to-buffer (buffer-base-buffer)))))
+
+(defun org-agenda-file-to-end ()
+  "Move/add the current file to the end of the agenda file list.
+If the file is not present in the list, it is appended to the list.  If it is
+present, it is moved there."
+  (interactive)
+  (org-agenda-file-to-front 'to-end))
+
+(defun org-agenda-file-to-front (&optional to-end)
+  "Move/add the current file to the top of the agenda file list.
+If the file is not present in the list, it is added to the front.  If it is
+present, it is moved there.  With optional argument TO-END, add/move to the
+end of the list."
+  (interactive "P")
+  (let ((file-alist (mapcar (lambda (x)
+			      (cons (file-truename x) x))
+			    (org-agenda-files t)))
+	(ctf (file-truename buffer-file-name))
+	x had)
+    (setq x (assoc ctf file-alist) had x)
+
+    (if (not x) (setq x (cons ctf (abbreviate-file-name buffer-file-name))))
+    (if to-end
+	(setq file-alist (append (delq x file-alist) (list x)))
+      (setq file-alist (cons x (delq x file-alist))))
+    (org-store-new-agenda-file-list (mapcar 'cdr file-alist))
+    (org-install-agenda-files-menu)
+    (message "File %s to %s of agenda file list"
+	     (if had "moved" "added") (if to-end "end" "front"))))
+
+(defun org-remove-file (&optional file)
+  "Remove current file from the list of files in variable `org-agenda-files'.
+These are the files which are being checked for agenda entries.
+Optional argument FILE means, use this file instead of the current."
+  (interactive)
+  (let* ((file (or file buffer-file-name))
+	 (true-file (file-truename file))
+	 (afile (abbreviate-file-name file))
+	 (files (delq nil (mapcar
+			   (lambda (x)
+			     (if (equal true-file
+					(file-truename x))
+				 nil x))
+			   (org-agenda-files t)))))
+    (if (not (= (length files) (length (org-agenda-files t))))
+	(progn
+	  (org-store-new-agenda-file-list files)
+	  (org-install-agenda-files-menu)
+	  (message "Removed file: %s" afile))
+      (message "File was not in list: %s" afile))))
+
+(defun org-file-menu-entry (file)
+  (vector file (list 'find-file file) t))
+
+(defun org-check-agenda-file (file)
+  "Make sure FILE exists.  If not, ask user what to do."
+  (when (not (file-exists-p file))
+    (message "non-existent file %s. [R]emove from list or [A]bort?"
+	     (abbreviate-file-name file))
+    (let ((r (downcase (read-char-exclusive))))
+      (cond
+       ((equal r ?r)
+	(org-remove-file file)
+	(throw 'nextfile t))
+       (t (error "Abort"))))))
+
+;;; Agenda prepare and finalize
+
+(defvar org-agenda-multi nil)  ; dynammically scoped
+(defvar org-agenda-buffer-name "*Org Agenda*")
+(defvar org-pre-agenda-window-conf nil)
+(defun org-prepare-agenda ()
+  (if org-agenda-multi
+      (progn
+	(setq buffer-read-only nil)
+	(goto-char (point-max))
+	(unless (= (point) 1)
+	  (insert "\n" (make-string (window-width) ?=) "\n"))
+	(narrow-to-region (point) (point-max)))
+    (org-agenda-maybe-reset-markers 'force)
+    (org-prepare-agenda-buffers (org-agenda-files))
+    (let* ((abuf (get-buffer-create org-agenda-buffer-name))
+	   (awin (get-buffer-window abuf)))
+      (cond
+       ((equal (current-buffer) abuf) nil)
+       (awin (select-window awin))
+       ((not (setq org-pre-agenda-window-conf (current-window-configuration))))
+       ((equal org-agenda-window-setup 'current-window)
+	(switch-to-buffer abuf))
+       ((equal org-agenda-window-setup 'other-window)
+	(switch-to-buffer-other-window abuf))
+       ((equal org-agenda-window-setup 'other-frame)
+	(switch-to-buffer-other-frame abuf))
+       ((equal org-agenda-window-setup 'reorganize-frame)
+	(delete-other-windows)
+	(switch-to-buffer-other-window abuf))))
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (org-agenda-mode))
+  (setq buffer-read-only nil))
+
+(defun org-finalize-agenda ()
+  "Finishing touch for the agenda buffer, called just before displaying it."
+  (unless org-agenda-multi
+    (org-agenda-align-tags)
+    (save-excursion
+      (let ((buffer-read-only))
+	(goto-char (point-min))
+	(while (org-activate-bracket-links (point-max))
+	  (add-text-properties (match-beginning 0) (match-end 0)
+			       '(face org-link))))
+      (run-hooks 'org-finalize-agenda-hook))))
+
+(defun org-prepare-agenda-buffers (files)
+  "Create buffers for all agenda files, protect archived trees and comments."
+  (interactive)
+  (let ((pa '(:org-archived t))
+	(pc '(:org-comment t))
+	(pall '(:org-archived t :org-comment t))
+	(rea (concat ":" org-archive-tag ":"))
+	     bmp file re)
+    (save-excursion
+      (save-restriction
+	(while (setq file (pop files))
+	  (org-check-agenda-file file)
+	  (set-buffer (org-get-agenda-file-buffer file))
+	  (widen)
+	  (setq bmp (buffer-modified-p))
+	  (save-excursion
+	    (remove-text-properties (point-min) (point-max) pall)
+	    (when org-agenda-skip-archived-trees
+	      (goto-char (point-min))
+	      (while (re-search-forward rea nil t)
+		(if (org-on-heading-p t)
+		    (add-text-properties (point-at-bol) (org-end-of-subtree t) pa))))
+	    (goto-char (point-min))
+	    (setq re (concat "^\\*+ +" org-comment-string "\\>"))
+	    (while (re-search-forward re nil t)
+	      (add-text-properties
+	       (match-beginning 0) (org-end-of-subtree t) pc)))
+	  (set-buffer-modified-p bmp))))))
+  
+(defvar org-agenda-skip-function nil
+  "Function to be called at each match during agenda construction.
+If this function return nil, the current match should not be skipped.
+Otherwise, the function must return a position from where the search
+should be continued.
+Never set this variable using `setq' or so, because then it will apply
+to all future agenda commands.  Instead, bind it with `let' to scope
+it dynamically into the agenda-constructing command.")
+
+(defun org-agenda-skip ()
+  "Throw to `:skip' in places that should be skipped.
+Also moves point to the end of the skipped region, so that search can
+continue from there."
+  (let ((p (point-at-bol)) to)
+    (and org-agenda-skip-archived-trees
+	 (get-text-property p :org-archived)
+	 (org-end-of-subtree t)
+	 (throw :skip t))
+    (and (get-text-property p :org-comment)
+	 (org-end-of-subtree t)
+	 (throw :skip t))
+    (if (equal (char-after p) ?#) (throw :skip t))
+    (when (and (functionp org-agenda-skip-function)
+	       (setq to (save-excursion
+			  (save-match-data
+			    (funcall org-agenda-skip-function)))))
+      (goto-char to)
+      (throw :skip t))))
+
 (defvar org-agenda-markers nil
   "List of all currently active markers created by `org-agenda'.")
 (defvar org-agenda-last-marker-time (time-to-seconds (current-time))
@@ -7306,9 +13701,9 @@
 (defun org-get-agenda-file-buffer (file)
   "Get a buffer visiting FILE.  If the buffer needs to be created, add
 it to the list of buffers which might be released later."
-  (let ((buf (find-buffer-visiting file)))
+  (let ((buf (org-find-base-buffer-visiting file)))
     (if buf
-	buf  ; just return it
+	buf ; just return it
       ;; Make a new buffer and remember it
       (setq buf (find-file-noselect file))
       (if buf (push buf org-agenda-new-buffers))
@@ -7327,6 +13722,36 @@
 	(with-current-buffer buf (save-buffer)))
       (kill-buffer buf))))
 
+(defvar org-category-table nil)
+(defun org-get-category-table ()
+  "Get the table of categories and positions in current buffer."
+  (let (tbl)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward "\\(^\\|\r\\)#\\+CATEGORY:[ \t]*\\(.*\\)" nil t)
+	(push (cons (point) (org-trim (match-string 2))) tbl)))
+    tbl))
+
+(defun org-get-category (&optional pos)
+  "Get the category applying to position POS."
+  (if (not org-category-table)
+      (cond
+       ((null org-category)
+	(setq org-category
+	      (if buffer-file-name
+		  (file-name-sans-extension
+		   (file-name-nondirectory buffer-file-name))
+		"???")))
+       ((symbolp org-category) (symbol-name org-category))
+       (t org-category))
+    (let ((tbl org-category-table)
+	  (pos (or pos (point))))
+      (while (and tbl (> (caar tbl) pos))
+	(pop tbl))
+      (or (cdar tbl) (cdr (nth (1- (length org-category-table))
+			       org-category-table))))))
+;;; Agenda timeline
+
 (defun org-timeline (&optional include-all)
   "Show a time-sorted view of the entries in the current org file.
 Only entries with a time stamp of today or later will be listed.  With
@@ -7343,8 +13768,6 @@
 	 (doclosed org-agenda-show-log)
 	 (entry buffer-file-name)
 	 (date (calendar-current-date))
-	 (win (selected-window))
-	 (pos1 (point))
 	 (beg (if (org-region-active-p) (region-beginning) (point-min)))
 	 (end (if (org-region-active-p) (region-end) (point-max)))
 	 (day-numbers (org-get-all-dates beg end 'no-ranges
@@ -7391,8 +13814,12 @@
 		      (number-to-string (extract-calendar-day date)) " "
 		      (calendar-month-name (extract-calendar-month date)) " "
 		      (number-to-string (extract-calendar-year date)) "\n")
-	      (put-text-property s (1- (point)) 'face
-				 'org-level-3)
+; FIXME: this gives a timezone problem
+;	      (insert (format-time-string org-agenda-date-format
+;					  (calendar-time-from-absolute d 0))
+;		      "\n")
+	      (put-text-property s (1- (point)) 'face 'org-level-3)
+	      (put-text-property s (1- (point)) 'org-date-line t)
 	      (if (equal d today)
 		  (put-text-property s (1- (point)) 'org-today t))
 	      (and rtn (insert (org-finalize-agenda-entries rtn) "\n"))
@@ -7402,14 +13829,56 @@
 		   (point-min)))
     (add-text-properties (point-min) (point-max) '(org-agenda-type timeline))
     (org-finalize-agenda)
-    (setq buffer-read-only t)
-    (when (not org-select-agenda-window)
-      (select-window win)
-      (goto-char pos1))))
+    (setq buffer-read-only t)))
+
+(defun org-get-all-dates (beg end &optional no-ranges force-today inactive empty)
+  "Return a list of all relevant day numbers from BEG to END buffer positions.
+If NO-RANGES is non-nil, include only the start and end dates of a range,
+not every single day in the range.  If FORCE-TODAY is non-nil, make
+sure that TODAY is included in the list.  If INACTIVE is non-nil, also
+inactive time stamps (those in square brackets) are included.
+When EMPTY is non-nil, also include days without any entries."
+  (let ((re (if inactive org-ts-regexp-both org-ts-regexp))
+	 dates dates1 date day day1 day2 ts1 ts2)
+    (if force-today
+	(setq dates (list (time-to-days (current-time)))))
+    (save-excursion
+      (goto-char beg)
+      (while (re-search-forward re end t)
+	(setq day (time-to-days (org-time-string-to-time
+				 (substring (match-string 1) 0 10))))
+	(or (memq day dates) (push day dates)))
+      (unless no-ranges
+	(goto-char beg)
+	(while (re-search-forward org-tr-regexp end t)
+	  (setq ts1 (substring (match-string 1) 0 10)
+		ts2 (substring (match-string 2) 0 10)
+		day1 (time-to-days (org-time-string-to-time ts1))
+		day2 (time-to-days (org-time-string-to-time ts2)))
+	  (while (< (setq day1 (1+ day1)) day2)
+	    (or (memq day1 dates) (push day1 dates)))))
+      (setq dates (sort dates '<))
+      (when empty
+	(while (setq day (pop dates))
+	  (setq day2 (car dates))
+	  (push day dates1)
+	  (when (and day2 empty)
+	    (if (or (eq empty t)
+		    (and (numberp empty) (<= (- day2 day) empty)))
+		(while (< (setq day (1+ day)) day2)
+		  (push (list day) dates1))
+	      (push (cons :omitted (- day2 day)) dates1))))
+	(setq dates (nreverse dates1)))
+      dates)))
+
+;;; Agenda Daily/Weekly
 
 (defvar org-agenda-overriding-arguments nil) ; dynamically scoped parameter
 (defvar org-agenda-last-arguments nil
   "The arguments of the previous call to org-agenda")
+(defvar org-starting-day nil) ; local variable in the agenda buffer
+(defvar org-include-all-loc nil) ; local variable
+
 
 ;;;###autoload
 (defun org-agenda-list (&optional include-all start-day ndays)
@@ -7439,7 +13908,6 @@
 	      nil org-agenda-start-on-weekday))
 	 (thefiles (org-agenda-files))
 	 (files thefiles)
-	 (win (selected-window))
 	 (today (time-to-days (current-time)))
 	 (sd (or start-day today))
 	 (start (if (or (null org-agenda-start-on-weekday)
@@ -7451,7 +13919,7 @@
 			 (d (- nt n1)))
 		    (- sd (+ (if (< d 0) 7 0) d)))))
 	 (day-numbers (list start))
-	 (inhibit-redisplay t)
+	 (inhibit-redisplay (not debug-on-error))
 	 s e rtn rtnall file date d start-pos end-pos todayp nd)
     (setq org-agenda-redo-command
 	  (list 'org-agenda-list (list 'quote include-all) start-day ndays))
@@ -7463,8 +13931,8 @@
       (setq ndays (1- ndays)))
     (setq day-numbers (nreverse day-numbers))
     (org-prepare-agenda)
-    (org-set-local 'starting-day (car day-numbers))
-    (org-set-local 'include-all-loc include-all)
+    (org-set-local 'org-starting-day (car day-numbers))
+    (org-set-local 'org-include-all-loc include-all)
     (when (and (or include-all org-agenda-include-all-todo)
 	       (member today day-numbers))
       (setq files thefiles
@@ -7517,10 +13985,12 @@
 			    (extract-calendar-day date)
 			    (calendar-month-name (extract-calendar-month date))
 			    (extract-calendar-year date)))
-	    (put-text-property s (1- (point)) 'face
-			       'org-level-3)
+; FIXME: this gives a timezone problem
+;	    (insert (format-time-string org-agenda-date-format
+;					(calendar-time-from-absolute d 0)) "\n")
+	    (put-text-property s (1- (point)) 'face 'org-level-3)
+	    (put-text-property s (1- (point)) 'org-date-line t)
 	    (if todayp (put-text-property s (1- (point)) 'org-today t))
-
 	    (if rtnall (insert
 			(org-finalize-agenda-entries
 			 (org-agenda-add-time-grid-maybe
@@ -7541,10 +14011,12 @@
     (add-text-properties (point-min) (point-max) '(org-agenda-type agenda))
     (org-finalize-agenda)
     (setq buffer-read-only t)
-    (if (not org-select-agenda-window) (select-window win))
     (message "")))
 
+;;; Agenda TODO list
+
 (defvar org-select-this-todo-keyword nil)
+(defvar org-last-arg nil)
 
 ;;;###autoload
 (defun org-todo-list (arg)
@@ -7559,7 +14031,6 @@
   (org-set-sorting-strategy 'todo)
   (let* ((today (time-to-days (current-time)))
 	 (date (calendar-gregorian-from-absolute today))
-	 (win (selected-window))
 	 (kwds org-todo-keywords)
 	 (completion-ignore-case t)
 	 (org-select-this-todo-keyword
@@ -7573,10 +14044,10 @@
 			     nil t)))
     (and (equal 0 arg) (setq org-select-this-todo-keyword nil))
     (org-prepare-agenda)
-    (org-set-local 'last-arg arg)
+    (org-set-local 'org-last-arg arg)
     (org-set-local 'org-todo-keywords kwds)
     (setq org-agenda-redo-command
-	  '(org-todo-list (or current-prefix-arg last-arg)))
+	  '(org-todo-list (or current-prefix-arg org-last-arg)))
     (setq files (org-agenda-files)
 	  rtnall nil)
     (while (setq file (pop files))
@@ -7584,262 +14055,154 @@
 	(org-check-agenda-file file)
 	(setq rtn (org-agenda-get-day-entries file date :todo))
 	(setq rtnall (append rtnall rtn))))
-    (insert "Global list of TODO items of type: ")
-    (add-text-properties (point-min) (1- (point))
-			 (list 'face 'org-level-3))
-    (setq pos (point))
-    (insert (or org-select-this-todo-keyword "ALL") "\n")
-    (add-text-properties pos (1- (point)) (list 'face 'org-warning))
-    (setq pos (point))
-    (unless org-agenda-multi
-      (insert
-       "Available with `N r': (0)ALL "
-       (let ((n 0))
-	 (mapconcat (lambda (x)
-		      (format "(%d)%s" (setq n (1+ n)) x))
-		    org-todo-keywords " "))
-       "\n"))
-    (add-text-properties pos (1- (point)) (list 'face 'org-level-3))
+    (if org-agenda-overriding-header
+	(insert (org-add-props (copy-sequence org-agenda-overriding-header)
+		    nil 'face 'org-level-3) "\n")
+      (insert "Global list of TODO items of type: ")
+      (add-text-properties (point-min) (1- (point))
+			   (list 'face 'org-level-3))
+      (setq pos (point))
+      (insert (or org-select-this-todo-keyword "ALL") "\n")
+      (add-text-properties pos (1- (point)) (list 'face 'org-warning))
+      (setq pos (point))
+      (unless org-agenda-multi
+	(insert
+	 "Available with `N r': (0)ALL "
+	 (let ((n 0))
+	   (mapconcat (lambda (x)
+			(format "(%d)%s" (setq n (1+ n)) x))
+		      org-todo-keywords " "))
+	 "\n"))
+      (add-text-properties pos (1- (point)) (list 'face 'org-level-3)))
     (when rtnall
       (insert (org-finalize-agenda-entries rtnall) "\n"))
     (goto-char (point-min))
     (org-fit-agenda-window)
     (add-text-properties (point-min) (point-max) '(org-agenda-type todo))
     (org-finalize-agenda)
-    (setq buffer-read-only t)
-    (if (not org-select-agenda-window) (select-window win))))
-
-(defun org-check-agenda-file (file)
-  "Make sure FILE exists.  If not, ask user what to do."
-  (when (not (file-exists-p file))
-    (message "non-existent file %s. [R]emove from list or [A]bort?"
-	     (abbreviate-file-name file))
-    (let ((r (downcase (read-char-exclusive))))
-      (cond
-       ((equal r ?r)
-	(org-remove-file file)
-	(throw 'nextfile t))
-       (t (error "Abort"))))))
-
-(defun org-agenda-check-type (error &rest types)
-  "Check if agenda buffer is of allowed type.
-If ERROR is non-nil, throw an error, otherwise just return nil."
-  (if (memq org-agenda-type types)
-      t
-    (if error
-	(error "Not allowed in %s-type agenda buffers" org-agenda-type)
-      nil)))
-
-(defun org-agenda-quit ()
-  "Exit agenda by removing the window or the buffer."
-  (interactive)
-  (let ((buf (current-buffer)))
-    (if (not (one-window-p)) (delete-window))
-    (kill-buffer buf)
-    (org-agenda-maybe-reset-markers 'force))
-  ;; Maybe restore the pre-agenda window configuration.
-  (and org-agenda-restore-windows-after-quit
-       (not (eq org-agenda-window-setup 'other-frame))
-       org-pre-agenda-window-conf
-       (set-window-configuration org-pre-agenda-window-conf)))
-
-(defun org-agenda-exit ()
-  "Exit agenda by removing the window or the buffer.
-Also kill all Org-mode buffers which have been loaded by `org-agenda'.
-Org-mode buffers visited directly by the user will not be touched."
-  (interactive)
-  (org-release-buffers org-agenda-new-buffers)
-  (setq org-agenda-new-buffers nil)
-  (org-agenda-quit))
-
-(defun org-save-all-org-buffers ()
-  "Save all Org-mode buffers without user confirmation."
-  (interactive)
-  (message "Saving all Org-mode buffers...")
-  (save-some-buffers t 'org-mode-p)
-  (message "Saving all Org-mode buffers... done"))
-
-(defun org-agenda-redo ()
-  "Rebuild Agenda.
-When this is the global TODO list, a prefix argument will be interpreted."
-  (interactive)
-  (let* ((org-agenda-keep-modes t)
-	 (line (org-current-line))
-	 (window-line (- line (org-current-line (window-start)))))
-    (message "Rebuilding agenda buffer...")
-    (eval org-agenda-redo-command)
-    (message "Rebuilding agenda buffer...done")
-    (goto-line line)
-    (recenter window-line)))
-
-(defun org-agenda-goto-today ()
-  "Go to today."
-  (interactive)
-  (org-agenda-check-type t 'timeline 'agenda)
-  (let ((tdpos (text-property-any (point-min) (point-max) 'org-today t)))
-    (cond
-     (tdpos (goto-char tdpos))
-     ((eq org-agenda-type 'agenda)
-      (let ((org-agenda-overriding-arguments org-agenda-last-arguments))
-	(setf (nth 1 org-agenda-overriding-arguments) nil)
-	(org-agenda-redo)
-	(org-agenda-find-today-or-agenda)))
-     (t (error "Cannot find today")))))
-
-(defun org-agenda-find-today-or-agenda ()
-  (goto-char
-   (or (text-property-any (point-min) (point-max) 'org-today t)
-       (text-property-any (point-min) (point-max) 'org-agenda-type 'agenda)
-       (point-min))))
-
-(defun org-agenda-later (arg)
-  "Go forward in time by `org-agenda-ndays' days.
-With prefix ARG, go forward that many times `org-agenda-ndays'."
-  (interactive "p")
-  (org-agenda-check-type t 'agenda)
-  (let ((org-agenda-overriding-arguments
-	 (list (car org-agenda-last-arguments)
-	       (+ starting-day (* arg org-agenda-ndays))
-	       nil t)))
-    (org-agenda-redo)
-    (org-agenda-find-today-or-agenda)))
-
-(defun org-agenda-earlier (arg)
-  "Go back in time by `org-agenda-ndays' days.
-With prefix ARG, go back that many times `org-agenda-ndays'."
-  (interactive "p")
-  (org-agenda-check-type t 'agenda)
-  (let ((org-agenda-overriding-arguments
-	 (list (car org-agenda-last-arguments)
-	       (- starting-day (* arg org-agenda-ndays))
-	       nil t)))
-    (org-agenda-redo)
-    (org-agenda-find-today-or-agenda)))
-
-(defun org-agenda-week-view ()
-  "Switch to weekly view for agenda."
-  (interactive)
-  (org-agenda-check-type t 'agenda)
-  (if (= org-agenda-ndays 7)
-      (error "This is already the week view"))
-  (setq org-agenda-ndays 7)
-  (let ((org-agenda-overriding-arguments
-	 (list (car org-agenda-last-arguments)
-	       (or (get-text-property (point) 'day)
-		       starting-day)
-	       nil t)))
-    (org-agenda-redo)
-    (org-agenda-find-today-or-agenda))
-  (org-agenda-set-mode-name)
-  (message "Switched to week view"))
-
-(defun org-agenda-day-view ()
-  "Switch to daily view for agenda."
-  (interactive)
-  (org-agenda-check-type t 'agenda)
-  (if (= org-agenda-ndays 1)
-      (error "This is already the day view"))
-  (setq org-agenda-ndays 1)
-  (let ((org-agenda-overriding-arguments
-	 (list (car org-agenda-last-arguments)
-	       (or (get-text-property (point) 'day)
-		       starting-day)
-	       nil t)))
-    (org-agenda-redo)
-    (org-agenda-find-today-or-agenda))
-  (org-agenda-set-mode-name)
-  (message "Switched to day view"))
-
-(defun org-agenda-next-date-line (&optional arg)
-  "Jump to the next line indicating a date in agenda buffer."
-  (interactive "p")
-  (org-agenda-check-type t 'agenda 'timeline)
-  (beginning-of-line 1)
-  (if (looking-at "^\\S-") (forward-char 1))
-  (if (not (re-search-forward "^\\S-" nil t arg))
-      (progn
-	(backward-char 1)
-	(error "No next date after this line in this buffer")))
-  (goto-char (match-beginning 0)))
-
-(defun org-agenda-previous-date-line (&optional arg)
-  "Jump to the previous line indicating a date in agenda buffer."
-  (interactive "p")
-  (org-agenda-check-type t 'agenda 'timeline)
-  (beginning-of-line 1)
-  (if (not (re-search-backward "^\\S-" nil t arg))
-      (error "No previous date before this line in this buffer")))
-
-;; Initialize the highlight
-(defvar org-hl (org-make-overlay 1 1))
-(org-overlay-put org-hl 'face 'highlight)
-
-(defun org-highlight (begin end &optional buffer)
-  "Highlight a region with overlay."
-  (funcall (if (featurep 'xemacs) 'set-extent-endpoints 'move-overlay)
-	   org-hl begin end (or buffer (current-buffer))))
-
-(defun org-unhighlight ()
-  "Detach overlay INDEX."
-  (funcall (if (featurep 'xemacs) 'detach-extent 'delete-overlay) org-hl))
-
-
-(defun org-agenda-follow-mode ()
-  "Toggle follow mode in an agenda buffer."
-  (interactive)
-  (setq org-agenda-follow-mode (not org-agenda-follow-mode))
-  (org-agenda-set-mode-name)
-  (message "Follow mode is %s"
-	   (if org-agenda-follow-mode "on" "off")))
-
-(defun org-agenda-log-mode ()
-  "Toggle log mode in an agenda buffer."
-  (interactive)
-  (org-agenda-check-type t 'agenda 'timeline)
-  (setq org-agenda-show-log (not org-agenda-show-log))
-  (org-agenda-set-mode-name)
-  (org-agenda-redo)
-  (message "Log mode is %s"
-	   (if org-agenda-show-log "on" "off")))
-
-(defun org-agenda-toggle-diary ()
-  "Toggle diary inclusion in an agenda buffer."
-  (interactive)
-  (org-agenda-check-type t 'agenda)
-  (setq org-agenda-include-diary (not org-agenda-include-diary))
-  (org-agenda-redo)
-  (org-agenda-set-mode-name)
-  (message "Diary inclusion turned %s"
-	   (if org-agenda-include-diary "on" "off")))
-
-(defun org-agenda-toggle-time-grid ()
-  "Toggle time grid in an agenda buffer."
-  (interactive)
-  (org-agenda-check-type t 'agenda)
-  (setq org-agenda-use-time-grid (not org-agenda-use-time-grid))
-  (org-agenda-redo)
-  (org-agenda-set-mode-name)
-  (message "Time-grid turned %s"
-	   (if org-agenda-use-time-grid "on" "off")))
-
-(defun org-agenda-set-mode-name ()
-  "Set the mode name to indicate all the small mode settings."
-  (setq mode-name
-	(concat "Org-Agenda"
-		(if (equal org-agenda-ndays 1) " Day"    "")
-		(if (equal org-agenda-ndays 7) " Week"   "")
-		(if org-agenda-follow-mode     " Follow" "")
-		(if org-agenda-include-diary   " Diary"  "")
-		(if org-agenda-use-time-grid   " Grid"   "")
-		(if org-agenda-show-log        " Log"    "")))
-  (force-mode-line-update))
-
-(defun org-agenda-post-command-hook ()
-  (and (eolp) (not (bolp)) (backward-char 1))
-  (setq org-agenda-type (get-text-property (point) 'org-agenda-type))
-  (if (and org-agenda-follow-mode
-	   (get-text-property (point) 'org-marker))
-      (org-agenda-show)))
+    (setq buffer-read-only t)))
+
+;;; Agenda tags match
+
+;;;###autoload
+(defun org-tags-view (&optional todo-only match)
+  "Show all headlines for all `org-agenda-files' matching a TAGS criterion.
+The prefix arg TODO-ONLY limits the search to TODO entries."
+  (interactive "P")
+  (org-compile-prefix-format 'tags)
+  (org-set-sorting-strategy 'tags)
+  (let* ((org-tags-match-list-sublevels
+	  (if todo-only t org-tags-match-list-sublevels))
+	 (completion-ignore-case t)
+	 rtn rtnall files file pos matcher
+	 buffer)
+    (setq matcher (org-make-tags-matcher match)
+	  match (car matcher) matcher (cdr matcher))
+    (org-prepare-agenda)
+    (setq org-agenda-redo-command
+	  (list 'org-tags-view (list 'quote todo-only)
+		(list 'if 'current-prefix-arg nil match)))
+    (setq files (org-agenda-files)
+	  rtnall nil)
+    (while (setq file (pop files))
+      (catch 'nextfile
+	(org-check-agenda-file file)
+	(setq buffer (if (file-exists-p file)
+			 (org-get-agenda-file-buffer file)
+		       (error "No such file %s" file)))
+	(if (not buffer)
+	    ;; If file does not exist, merror message to agenda
+	    (setq rtn (list
+		       (format "ORG-AGENDA-ERROR: No such org-file %s" file))
+		  rtnall (append rtnall rtn))
+	  (with-current-buffer buffer
+	    (unless (org-mode-p)
+	      (error "Agenda file %s is not in `org-mode'" file))
+	    (setq org-category-table (org-get-category-table))
+	    (save-excursion
+	      (save-restriction
+		(if org-agenda-restrict
+		    (narrow-to-region org-agenda-restrict-begin
+				      org-agenda-restrict-end)
+		  (widen))
+		(setq rtn (org-scan-tags 'agenda matcher todo-only))
+		(setq rtnall (append rtnall rtn))))))))
+    (if org-agenda-overriding-header
+	(insert (org-add-props (copy-sequence org-agenda-overriding-header)
+		    nil 'face 'org-level-3) "\n")
+      (insert "Headlines with TAGS match: ")
+      (add-text-properties (point-min) (1- (point))
+			   (list 'face 'org-level-3))
+      (setq pos (point))
+      (insert match "\n")
+      (add-text-properties pos (1- (point)) (list 'face 'org-warning))
+      (setq pos (point))
+      (unless org-agenda-multi
+	(insert "Press `C-u r' to search again with new search string\n"))
+      (add-text-properties pos (1- (point)) (list 'face 'org-level-3)))
+    (when rtnall
+      (insert (org-finalize-agenda-entries rtnall) "\n"))
+    (goto-char (point-min))
+    (org-fit-agenda-window)
+    (add-text-properties (point-min) (point-max) '(org-agenda-type tags))
+    (org-finalize-agenda)
+    (setq buffer-read-only t)))
+
+;;; Agenda Finding stuck projects
+
+(defvar org-agenda-skip-regexp nil
+  "Regular expression used in skipping subtrees for the agenda.
+This is basically a temporary global variable that can be set and then
+used by user-defined selections using `org-agenda-skip-function'.")
+
+(defvar org-agenda-overriding-header nil
+  "When this is set during todo and tags searches, will replace header.")
+
+(defun org-agenda-skip-subtree-when-regexp-matches ()
+  "Checks if the current subtree contains match for `org-agenda-skip-regexp'.
+If yes, it returns the end position of this tree, causing agenda commands
+to skip this subtree.  This is a function that can be put into
+`org-agenda-skip-function' for the duration of a command."
+  (save-match-data
+    (let ((end (save-excursion (org-end-of-subtree t)))
+	  skip)
+      (save-excursion
+	(setq skip (re-search-forward org-agenda-skip-regexp end t)))
+      (and skip end))))
+
+(defun org-agenda-list-stuck-projects (&rest ignore)
+  "Create agenda view for projects that are stuck.
+Stuck projects are project that have no next actions.  For the definitions
+of what a project is and how to check if it stuck, customize the variable
+`org-stuck-projects'.
+MATCH is being ignored."
+  (interactive)
+  (let* ((org-agenda-skip-function 'org-agenda-skip-subtree-when-regexp-matches)
+	 (org-agenda-overriding-header "List of stuck projects: ")
+	 (matcher (nth 0 org-stuck-projects))
+	 (todo (nth 1 org-stuck-projects))
+	 (tags (nth 2 org-stuck-projects))
+	 (todo-re (concat "^\\*+[ \t]+\\("
+			  (mapconcat 'identity todo "\\|")
+			  "\\)\\>"))
+	 (tags-re (concat "^\\*+.*:\\("
+			  (mapconcat 'identity tags "\\|")
+			  "\\):[a-zA-Z0-9_@:]*[ \t]*$")))
+
+    (setq org-agenda-skip-regexp
+	  (cond
+	   ((and todo tags)
+	    (concat todo-re "\\|" tags-re))
+	   (todo todo-re)
+	   (tags tags-re)
+	   (t (error "No information how to identify unstuck projects"))))
+    (org-tags-view nil matcher)
+    (with-current-buffer org-agenda-buffer-name
+      (setq org-agenda-redo-command
+	    '(org-agenda-list-stuck-projects
+	      (or current-prefix-arg org-last-arg))))))
+
+;;; Diary integration
 
 (defvar org-disable-agenda-to-diary nil)          ;Dynamically-scoped param.
 
@@ -7936,118 +14299,6 @@
        (add-to-diary-list original-date  "Org-mode dummy" "" nil)))))
 
 ;;;###autoload
-(defun org-cycle-agenda-files ()
-  "Cycle through the files in `org-agenda-files'.
-If the current buffer visits an agenda file, find the next one in the list.
-If the current buffer does not, find the first agenda file."
-  (interactive)
-  (let* ((fs (org-agenda-files t))
-	 (files (append fs (list (car fs))))
-	 (tcf (if buffer-file-name (file-truename buffer-file-name)))
-	 file)
-    (unless files (error "No agenda files"))
-    (catch 'exit
-      (while (setq file (pop files))
-	(if (equal (file-truename file) tcf)
-	    (when (car files)
-	      (find-file (car files))
-	      (throw 'exit t))))
-      (find-file (car fs)))))
-
-(defun org-agenda-file-to-end ()
-  "Move/add the current file to the end of the agenda file list.
-If the file is not present in the list, it is appended to the list.  If it is
-present, it is moved there."
-  (interactive)
-  (org-agenda-file-to-front 'to-end))
-
-(defun org-agenda-file-to-front (&optional to-end)
-  "Move/add the current file to the top of the agenda file list.
-If the file is not present in the list, it is added to the front.  If it is
-present, it is moved there.  With optional argument TO-END, add/move to the
-end of the list."
-  (interactive "P")
-  (let ((file-alist (mapcar (lambda (x)
-			      (cons (file-truename x) x))
-			    (org-agenda-files t)))
-	(ctf (file-truename buffer-file-name))
-	x had)
-    (setq x (assoc ctf file-alist) had x)
-
-    (if (not x) (setq x (cons ctf (abbreviate-file-name buffer-file-name))))
-    (if to-end
-	(setq file-alist (append (delq x file-alist) (list x)))
-      (setq file-alist (cons x (delq x file-alist))))
-    (org-store-new-agenda-file-list (mapcar 'cdr file-alist))
-    (org-install-agenda-files-menu)
-    (message "File %s to %s of agenda file list"
-	     (if had "moved" "added") (if to-end "end" "front"))))
-
-(defun org-remove-file (&optional file)
-  "Remove current file from the list of files in variable `org-agenda-files'.
-These are the files which are being checked for agenda entries.
-Optional argument FILE means, use this file instead of the current."
-  (interactive)
-  (let* ((file (or file buffer-file-name))
-	 (true-file (file-truename file))
-	 (afile (abbreviate-file-name file))
-	 (files (delq nil (mapcar
-			   (lambda (x)
-			     (if (equal true-file
-					(file-truename x))
-				 nil x))
-			   (org-agenda-files t)))))
-    (if (not (= (length files) (length (org-agenda-files t))))
-	(progn
-	  (org-store-new-agenda-file-list files)
-	  (org-install-agenda-files-menu)
-	  (message "Removed file: %s" afile))
-      (message "File was not in list: %s" afile))))
-
-(defun org-file-menu-entry (file)
-  (vector file (list 'find-file file) t))
-
-(defun org-get-all-dates (beg end &optional no-ranges force-today inactive empty)
-  "Return a list of all relevant day numbers from BEG to END buffer positions.
-If NO-RANGES is non-nil, include only the start and end dates of a range,
-not every single day in the range.  If FORCE-TODAY is non-nil, make
-sure that TODAY is included in the list.  If INACTIVE is non-nil, also
-inactive time stamps (those in square brackets) are included.
-When EMPTY is non-nil, also include days without any entries."
-  (let ((re (if inactive org-ts-regexp-both org-ts-regexp))
-	 dates dates1 date day day1 day2 ts1 ts2)
-    (if force-today
-	(setq dates (list (time-to-days (current-time)))))
-    (save-excursion
-      (goto-char beg)
-      (while (re-search-forward re end t)
-	(setq day (time-to-days (org-time-string-to-time
-				 (substring (match-string 1) 0 10))))
-	(or (memq day dates) (push day dates)))
-      (unless no-ranges
-	(goto-char beg)
-	(while (re-search-forward org-tr-regexp end t)
-	  (setq ts1 (substring (match-string 1) 0 10)
-		ts2 (substring (match-string 2) 0 10)
-		day1 (time-to-days (org-time-string-to-time ts1))
-		day2 (time-to-days (org-time-string-to-time ts2)))
-	  (while (< (setq day1 (1+ day1)) day2)
-	    (or (memq day1 dates) (push day1 dates)))))
-      (setq dates (sort dates '<))
-      (when empty
-	(while (setq day (pop dates))
-	  (setq day2 (car dates))
-	  (push day dates1)
-	  (when (and day2 empty)
-	    (if (or (eq empty t)
-		    (and (numberp empty) (<= (- day2 day) empty)))
-		(while (< (setq day (1+ day)) day2)
-		  (push (list day) dates1))
-	      (push (cons :omitted (- day2 day)) dates1))))
-	(setq dates (nreverse dates1)))
-      dates)))
-
-;;;###autoload
 (defun org-diary (&rest args)
   "Return diary information from org-files.
 This function can be used in a \"sexp\" diary entry in the Emacs calendar.
@@ -8107,33 +14358,8 @@
       (setq results (append results rtn)))
     (if results
 	(concat (org-finalize-agenda-entries results) "\n"))))
-(defvar org-category-table nil)
-(defun org-get-category-table ()
-  "Get the table of categories and positions in current buffer."
-  (let (tbl)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward "\\(^\\|\r\\)#\\+CATEGORY:[ \t]*\\(.*\\)" nil t)
-	(push (cons (point) (org-trim (match-string 2))) tbl)))
-    tbl))
-(defun org-get-category (&optional pos)
-  "Get the category applying to position POS."
-  (if (not org-category-table)
-      (cond
-       ((null org-category)
-	(setq org-category
-	      (if buffer-file-name
-		  (file-name-sans-extension
-		   (file-name-nondirectory buffer-file-name))
-		"???")))
-       ((symbolp org-category) (symbol-name org-category))
-       (t org-category))
-    (let ((tbl org-category-table)
-	  (pos (or pos (point))))
-      (while (and tbl (> (caar tbl) pos))
-	(pop tbl))
-      (or (cdar tbl) (cdr (nth (1- (length org-category-table))
-			       org-category-table))))))
+
+;;; Agenda entry finders
 
 (defun org-agenda-get-day-entries (file date &rest args)
   "Does the work for `org-diary' and `org-agenda'.
@@ -8142,8 +14368,7 @@
 which kind of entries should be extracted.  For details about these, see
 the documentation of `org-diary'."
   (setq args (or args '(:deadline :scheduled :timestamp)))
-  (let* ((org-startup-with-deadline-check nil)
-	 (org-startup-folded nil)
+  (let* ((org-startup-folded nil)
 	 (org-startup-align-all-tables nil)
 	 (buffer (if (file-exists-p file)
 		     (org-get-agenda-file-buffer file)
@@ -8227,25 +14452,23 @@
 				     "\\)\\>")
 			   org-not-done-regexp)
 			 "[^\n\r]*\\)"))
-	 (deadline-re (concat ".*\\(\n[^*].*\\)?" org-deadline-time-regexp))
-	 (sched-re (concat ".*\\(\n[^*].*\\)?" org-scheduled-time-regexp))
-; FIXME why was this wrong?	 (sched-re (concat ".*\n?.*?" org-scheduled-time-regexp))
 	 marker priority category tags
-	 ee txt)
+	 ee txt beg end)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
 	(save-match-data
 	  (beginning-of-line)
-	  (when (or (and org-agenda-todo-ignore-scheduled
-			 (looking-at sched-re))
-		    (and org-agenda-todo-ignore-deadlines
-			 (looking-at deadline-re)
-			 (org-deadline-close (match-string 2))))
-
-	    ;; FIXME: the following test also happens below, but we need it here
+	  (setq beg (point) end (progn (outline-next-heading) (point)))
+	  (when (or (and org-agenda-todo-ignore-scheduled (goto-char beg)
+			 (re-search-forward org-scheduled-time-regexp end t))
+		    (and org-agenda-todo-ignore-deadlines (goto-char beg)
+			 (re-search-forward org-deadline-time-regexp end t)
+			 (org-deadline-close (match-string 1))))
+	    (goto-char beg)
 	    (or org-agenda-todo-list-sublevels (org-end-of-subtree 'invisible))
 	    (throw :skip nil)))
+	(goto-char beg)
 	(org-agenda-skip)
 	(goto-char (match-beginning 1))
 	(setq marker (org-agenda-new-marker (1+ (match-beginning 0)))
@@ -8304,6 +14527,9 @@
 	      deadlinep (string-match org-deadline-regexp tmp)
 	      scheduledp (string-match org-scheduled-regexp tmp)
 	      donep (org-entry-is-done-p))
+	(and org-agenda-skip-scheduled-if-done
+	     scheduledp donep
+	     (throw :skip t))
 	(if (string-match ">" timestr)
 	    ;; substring should only run to end of time stamp
 	    (setq timestr (substring timestr 0 (match-end 0))))
@@ -8545,6 +14771,9 @@
     ;; Sort the entries by expiration date.
     (nreverse ee)))
 
+;;; Agenda presentation and sorting
+
+;; FIXME: should I allow spaces around the dash?
 (defconst org-plain-time-of-day-regexp
   (concat
    "\\(\\<[012]?[0-9]"
@@ -8603,7 +14832,7 @@
 			      (file-name-nondirectory buffer-file-name))
 			   "")))
 	   (tag (if tags (nth (1- (length tags)) tags) ""))
-	   time              ;; needed for the eval of the prefix format
+	   time    ; time and tag are needed for the eval of the prefix format
 	   (ts (if dotime (concat (if (stringp dotime) dotime "") txt)))
 	   (time-of-day (and dotime (org-get-time-of-day ts)))
 	   stamp plain s0 s1 s2 rtn)
@@ -8827,6 +15056,7 @@
 (defun org-entries-lessp (a b)
   "Predicate for sorting agenda entries."
   ;; The following variables will be used when the form is evaluated.
+  ;; So even though the compiler complains, keep them.
   (let* ((time-up (org-cmp-time a b))
 	 (time-down (if time-up (- time-up) nil))
 	 (priority-up (org-cmp-priority a b))
@@ -8840,6 +15070,238 @@
 	  (eval (cons 'or org-agenda-sorting-strategy-selected))
 	  '((-1 . t) (1 . nil) (nil . nil))))))
 
+;;; Agenda commands
+
+(defun org-agenda-check-type (error &rest types)
+  "Check if agenda buffer is of allowed type.
+If ERROR is non-nil, throw an error, otherwise just return nil."
+  (if (memq org-agenda-type types)
+      t
+    (if error
+	(error "Not allowed in %s-type agenda buffers" org-agenda-type)
+      nil)))
+
+(defun org-agenda-quit ()
+  "Exit agenda by removing the window or the buffer."
+  (interactive)
+  (let ((buf (current-buffer)))
+    (if (not (one-window-p)) (delete-window))
+    (kill-buffer buf)
+    (org-agenda-maybe-reset-markers 'force))
+  ;; Maybe restore the pre-agenda window configuration.
+  (and org-agenda-restore-windows-after-quit
+       (not (eq org-agenda-window-setup 'other-frame))
+       org-pre-agenda-window-conf
+       (set-window-configuration org-pre-agenda-window-conf)))
+
+(defun org-agenda-exit ()
+  "Exit agenda by removing the window or the buffer.
+Also kill all Org-mode buffers which have been loaded by `org-agenda'.
+Org-mode buffers visited directly by the user will not be touched."
+  (interactive)
+  (org-release-buffers org-agenda-new-buffers)
+  (setq org-agenda-new-buffers nil)
+  (org-agenda-quit))
+
+(defun org-save-all-org-buffers ()
+  "Save all Org-mode buffers without user confirmation."
+  (interactive)
+  (message "Saving all Org-mode buffers...")
+  (save-some-buffers t 'org-mode-p)
+  (message "Saving all Org-mode buffers... done"))
+
+(defun org-agenda-redo ()
+  "Rebuild Agenda.
+When this is the global TODO list, a prefix argument will be interpreted."
+  (interactive)
+  (let* ((org-agenda-keep-modes t)
+	 (line (org-current-line))
+	 (window-line (- line (org-current-line (window-start)))))
+    (message "Rebuilding agenda buffer...")
+    (eval org-agenda-redo-command)
+    (setq org-agenda-undo-list nil
+	  org-agenda-pending-undo-list nil)
+    (message "Rebuilding agenda buffer...done")
+    (goto-line line)
+    (recenter window-line)))
+
+(defun org-agenda-goto-today ()
+  "Go to today."
+  (interactive)
+  (org-agenda-check-type t 'timeline 'agenda)
+  (let ((tdpos (text-property-any (point-min) (point-max) 'org-today t)))
+    (cond
+     (tdpos (goto-char tdpos))
+     ((eq org-agenda-type 'agenda)
+      (let ((org-agenda-overriding-arguments org-agenda-last-arguments))
+	(setf (nth 1 org-agenda-overriding-arguments) nil)
+	(org-agenda-redo)
+	(org-agenda-find-today-or-agenda)))
+     (t (error "Cannot find today")))))
+
+(defun org-agenda-find-today-or-agenda ()
+  (goto-char
+   (or (text-property-any (point-min) (point-max) 'org-today t)
+       (text-property-any (point-min) (point-max) 'org-agenda-type 'agenda)
+       (point-min))))
+
+(defun org-agenda-later (arg)
+  "Go forward in time by `org-agenda-ndays' days.
+With prefix ARG, go forward that many times `org-agenda-ndays'."
+  (interactive "p")
+  (org-agenda-check-type t 'agenda)
+  (let ((org-agenda-overriding-arguments
+	 (list (car org-agenda-last-arguments)
+	       (+ org-starting-day (* arg org-agenda-ndays))
+	       nil t)))
+    (org-agenda-redo)
+    (org-agenda-find-today-or-agenda)))
+
+(defun org-agenda-earlier (arg)
+  "Go back in time by `org-agenda-ndays' days.
+With prefix ARG, go back that many times `org-agenda-ndays'."
+  (interactive "p")
+  (org-agenda-check-type t 'agenda)
+  (let ((org-agenda-overriding-arguments
+	 (list (car org-agenda-last-arguments)
+	       (- org-starting-day (* arg org-agenda-ndays))
+	       nil t)))
+    (org-agenda-redo)
+    (org-agenda-find-today-or-agenda)))
+
+(defun org-agenda-week-view ()
+  "Switch to weekly view for agenda."
+  (interactive)
+  (org-agenda-check-type t 'agenda)
+  (if (= org-agenda-ndays 7)
+      (error "This is already the week view"))
+  (setq org-agenda-ndays 7)
+  (let ((org-agenda-overriding-arguments
+	 (list (car org-agenda-last-arguments)
+	       (or (get-text-property (point) 'day)
+		       org-starting-day)
+	       nil t)))
+    (org-agenda-redo)
+    (org-agenda-find-today-or-agenda))
+  (org-agenda-set-mode-name)
+  (message "Switched to week view"))
+
+(defun org-agenda-day-view ()
+  "Switch to daily view for agenda."
+  (interactive)
+  (org-agenda-check-type t 'agenda)
+  (if (= org-agenda-ndays 1)
+      (error "This is already the day view"))
+  (setq org-agenda-ndays 1)
+  (let ((org-agenda-overriding-arguments
+	 (list (car org-agenda-last-arguments)
+	       (or (get-text-property (point) 'day)
+		       org-starting-day)
+	       nil t)))
+    (org-agenda-redo)
+    (org-agenda-find-today-or-agenda))
+  (org-agenda-set-mode-name)
+  (message "Switched to day view"))
+
+;; FIXME: this no longer works if user make date format that starts with a blank
+(defun org-agenda-next-date-line (&optional arg)
+  "Jump to the next line indicating a date in agenda buffer."
+  (interactive "p")
+  (org-agenda-check-type t 'agenda 'timeline)
+  (beginning-of-line 1)
+  (if (looking-at "^\\S-") (forward-char 1))
+  (if (not (re-search-forward "^\\S-" nil t arg))
+      (progn
+	(backward-char 1)
+	(error "No next date after this line in this buffer")))
+  (goto-char (match-beginning 0)))
+
+(defun org-agenda-previous-date-line (&optional arg)
+  "Jump to the previous line indicating a date in agenda buffer."
+  (interactive "p")
+  (org-agenda-check-type t 'agenda 'timeline)
+  (beginning-of-line 1)
+  (if (not (re-search-backward "^\\S-" nil t arg))
+      (error "No previous date before this line in this buffer")))
+
+;; Initialize the highlight
+(defvar org-hl (org-make-overlay 1 1))
+(org-overlay-put org-hl 'face 'highlight)
+
+(defun org-highlight (begin end &optional buffer)
+  "Highlight a region with overlay."
+  (funcall (if (featurep 'xemacs) 'set-extent-endpoints 'move-overlay)
+	   org-hl begin end (or buffer (current-buffer))))
+
+(defun org-unhighlight ()
+  "Detach overlay INDEX."
+  (funcall (if (featurep 'xemacs) 'detach-extent 'delete-overlay) org-hl))
+
+(defun org-highlight-until-next-command (beg end &optional buffer)
+  (org-highlight beg end buffer)
+  (add-hook 'pre-command-hook 'org-unhighlight-once))
+
+(defun org-unhighlight-once ()
+  (remove-hook 'pre-command-hook 'org-unhighlight-once)
+  (org-unhighlight))
+
+(defun org-agenda-follow-mode ()
+  "Toggle follow mode in an agenda buffer."
+  (interactive)
+  (setq org-agenda-follow-mode (not org-agenda-follow-mode))
+  (org-agenda-set-mode-name)
+  (message "Follow mode is %s"
+	   (if org-agenda-follow-mode "on" "off")))
+
+(defun org-agenda-log-mode ()
+  "Toggle log mode in an agenda buffer."
+  (interactive)
+  (org-agenda-check-type t 'agenda 'timeline)
+  (setq org-agenda-show-log (not org-agenda-show-log))
+  (org-agenda-set-mode-name)
+  (org-agenda-redo)
+  (message "Log mode is %s"
+	   (if org-agenda-show-log "on" "off")))
+
+(defun org-agenda-toggle-diary ()
+  "Toggle diary inclusion in an agenda buffer."
+  (interactive)
+  (org-agenda-check-type t 'agenda)
+  (setq org-agenda-include-diary (not org-agenda-include-diary))
+  (org-agenda-redo)
+  (org-agenda-set-mode-name)
+  (message "Diary inclusion turned %s"
+	   (if org-agenda-include-diary "on" "off")))
+
+(defun org-agenda-toggle-time-grid ()
+  "Toggle time grid in an agenda buffer."
+  (interactive)
+  (org-agenda-check-type t 'agenda)
+  (setq org-agenda-use-time-grid (not org-agenda-use-time-grid))
+  (org-agenda-redo)
+  (org-agenda-set-mode-name)
+  (message "Time-grid turned %s"
+	   (if org-agenda-use-time-grid "on" "off")))
+
+(defun org-agenda-set-mode-name ()
+  "Set the mode name to indicate all the small mode settings."
+  (setq mode-name
+	(concat "Org-Agenda"
+		(if (equal org-agenda-ndays 1) " Day"    "")
+		(if (equal org-agenda-ndays 7) " Week"   "")
+		(if org-agenda-follow-mode     " Follow" "")
+		(if org-agenda-include-diary   " Diary"  "")
+		(if org-agenda-use-time-grid   " Grid"   "")
+		(if org-agenda-show-log        " Log"    "")))
+  (force-mode-line-update))
+
+(defun org-agenda-post-command-hook ()
+  (and (eolp) (not (bolp)) (backward-char 1))
+  (setq org-agenda-type (get-text-property (point) 'org-agenda-type))
+  (if (and org-agenda-follow-mode
+	   (get-text-property (point) 'org-marker))
+      (org-agenda-show)))
+
 (defun org-agenda-show-priority ()
   "Show the priority of the current item.
 This priority is composed of the main priority given with the [#A] cookies,
@@ -8877,36 +15339,88 @@
 (defun org-agenda-kill ()
   "Kill the entry or subtree belonging to the current agenda entry."
   (interactive)
+  (or (eq major-mode 'org-agenda-mode) (error "Not in agenda"))
   (let* ((marker (or (get-text-property (point) 'org-marker)
 		     (org-agenda-error)))
-	 (hdmarker (get-text-property (point) 'org-hd-marker))
 	 (buffer (marker-buffer marker))
 	 (pos (marker-position marker))
-	 dbeg dend txt n conf)
-    (with-current-buffer buffer
-      (save-excursion
-	(goto-char pos)
+	 dbeg dend (n 0) conf)
+    (org-with-remote-undo buffer
+     (with-current-buffer buffer
+       (save-excursion
+	 (goto-char pos)
+	 (if (org-mode-p)
+	     (setq dbeg (progn (org-back-to-heading t) (point))
+		   dend (org-end-of-subtree t))
+	   (setq dbeg (point-at-bol)
+		 dend (min (point-max) (1+ (point-at-eol)))))
+	 (goto-char dbeg)
+	 (while (re-search-forward "^[ \t]*\\S-" dend t) (setq n (1+ n)))))
+     (setq conf (or (eq t org-agenda-confirm-kill)
+		    (and (numberp org-agenda-confirm-kill)
+			 (> n org-agenda-confirm-kill))))
+     (and conf
+	  (not (y-or-n-p
+		(format "Delete entry with %d lines in buffer \"%s\"? "
+			n (buffer-name buffer))))
+	  (error "Abort"))
+     (org-remove-subtree-entries-from-agenda buffer dbeg dend)
+     (with-current-buffer buffer (delete-region dbeg dend))
+     (message "Agenda item and source killed"))))
+
+(defun org-agenda-archive ()
+  "Kill the entry or subtree belonging to the current agenda entry."
+  (interactive)
+  (or (eq major-mode 'org-agenda-mode) (error "Not in agenda"))
+  (let* ((marker (or (get-text-property (point) 'org-marker)
+		     (org-agenda-error)))
+	 (buffer (marker-buffer marker))
+	 (pos (marker-position marker)))
+    (org-with-remote-undo buffer
+      (with-current-buffer buffer
 	(if (org-mode-p)
-	    (setq dbeg (progn (org-back-to-heading t) (point))
-		  dend (org-end-of-subtree t))
-	  (setq dbeg (point-at-bol)
-		dend (min (point-max) (1+ (point-at-eol)))))
-	(setq txt (buffer-substring dbeg dend))))
-    (while (string-match "^[ \t]*\n" txt) (setq txt (replace-match "" t t txt)))
-    (setq n (length (split-string txt "\n"))
-	  conf (or (eq t org-agenda-confirm-kill)
-		   (and (numberp org-agenda-confirm-kill)
-			(> n org-agenda-confirm-kill))))
-    (and conf
-	 (not (y-or-n-p
-	       (format "Delete entry with %d lines in buffer \"%s\"? "
-		       n (buffer-name buffer))))
-	 (error "Abort"))
-    ;; FIXME: if we kill an entire subtree, should we not find all
-    ;; lines coming from the subtree?
-    (save-excursion (org-agenda-change-all-lines "" hdmarker))
-    (with-current-buffer buffer (delete-region dbeg dend))
-    (message "Agenda item and source killed")))
+	    (save-excursion
+	      (goto-char pos)
+	      (org-remove-subtree-entries-from-agenda)
+	      (org-back-to-heading t)
+	      (org-archive-subtree))
+	  (error "Archiving works only in Org-mode files"))))))
+
+(defun org-remove-subtree-entries-from-agenda (&optional buf beg end)
+  "Remove all lines in the agenda that correspond to a given subtree.
+The subtree is the one in buffer BUF, starting at BEG and ending at END.
+If this information is not given, the function uses the tree at point."
+  (let ((buf (or buf (current-buffer))) m p)
+    (save-excursion
+      (unless (and beg end)
+	(org-back-to-heading t)
+	(setq beg (point))
+	(org-end-of-subtree t)
+	(setq end (point)))
+      (set-buffer (get-buffer org-agenda-buffer-name))
+      (save-excursion
+	(goto-char (point-max))
+	(beginning-of-line 1)
+	(while (not (bobp))
+	  (when (and (setq m (get-text-property (point) 'org-marker))
+		     (equal buf (marker-buffer m))
+		     (setq p (marker-position m))
+		     (>= p beg)
+		     (<= p end))
+	    (let (buffer-read-only)
+	      (delete-region (point-at-bol) (1+ (point-at-eol)))))
+	  (beginning-of-line 0))))))
+
+(defun org-agenda-open-link ()
+  "Follow the link in the current line, if any."
+  (interactive)
+  (let ((eol (point-at-eol)))
+    (save-excursion
+      (if (or (re-search-forward org-bracket-link-regexp eol t)
+	      (re-search-forward org-angle-link-re eol t)
+	      (re-search-forward org-plain-link-re eol t))
+	  (call-interactively 'org-open-at-point)
+	(error "No link in current line")))))
 
 (defun org-agenda-switch-to (&optional delete-other-windows)
   "Go to the Org-mode file which contains the item at point."
@@ -8960,6 +15474,24 @@
 (defun org-agenda-error ()
   (error "Command not allowed in this line"))
 
+(defun org-agenda-tree-to-indirect-buffer ()
+  "Show the subtree corresponding to the current entry in an indirect buffer.
+This calls the command `org-tree-to-indirect-buffer' from the original
+Org-mode buffer.
+With numerical prefix arg ARG, go up to this level and then take that tree.
+With a C-u prefix, make a separate frame for this tree (i.e. don't use the
+dedicated frame)."
+  (interactive)
+  (org-agenda-check-no-diary)
+  (let* ((marker (or (get-text-property (point) 'org-marker)
+		     (org-agenda-error)))
+	 (buffer (marker-buffer marker))
+	 (pos (marker-position marker)))
+    (with-current-buffer buffer
+      (save-excursion
+	(goto-char pos)
+	(call-interactively 'org-tree-to-indirect-buffer)))))
+
 (defvar org-last-heading-marker (make-marker)
   "Marker pointing to the headline that last changed its TODO state
 by a remote command from the agenda.")
@@ -8978,23 +15510,24 @@
 	 (hdmarker (get-text-property (point) 'org-hd-marker))
 	 (buffer-read-only nil)
 	 newhead)
-    (with-current-buffer buffer
-      (widen)
-      (goto-char pos)
-      (org-show-context 'agenda)
+    (org-with-remote-undo buffer
+      (with-current-buffer buffer
+	(widen)
+	(goto-char pos)
+	(org-show-context 'agenda)
+	(save-excursion
+	  (and (outline-next-heading)
+	       (org-flag-heading nil)))   ; show the next heading
+	(org-todo arg)
+	(and (bolp) (forward-char 1))
+	(setq newhead (org-get-heading))
+	(save-excursion
+	  (org-back-to-heading)
+	  (move-marker org-last-heading-marker (point))))
+      (beginning-of-line 1)
       (save-excursion
-	(and (outline-next-heading)
-	     (org-flag-heading nil)))   ; show the next heading
-      (org-todo arg)
-      (and (bolp) (forward-char 1))
-      (setq newhead (org-get-heading))
-      (save-excursion
-	(org-back-to-heading)
-	(move-marker org-last-heading-marker (point))))
-    (beginning-of-line 1)
-    (save-excursion
-      (org-agenda-change-all-lines newhead hdmarker 'fixface))
-    (move-to-column col)))
+	(org-agenda-change-all-lines newhead hdmarker 'fixface))
+      (move-to-column col))))
 
 (defun org-agenda-change-all-lines (newhead hdmarker &optional fixface)
   "Change all lines in the agenda buffer which match HDMARKER.
@@ -9041,6 +15574,8 @@
 	(beginning-of-line 0)))
     (org-finalize-agenda)))
 
+;; FIXME: allow negative value for org-agenda-align-tags-to-column
+;; See the code in set-tags for the way to do this.
 (defun org-agenda-align-tags (&optional line)
   "Align all tags in agenda items to `org-agenda-align-tags-to-column'."
   (let ((buffer-read-only))
@@ -9078,18 +15613,19 @@
 	 (hdmarker (get-text-property (point) 'org-hd-marker))
 	 (buffer-read-only nil)
 	 newhead)
-    (with-current-buffer buffer
-      (widen)
-      (goto-char pos)
-      (org-show-context 'agenda)
-      (save-excursion
-	(and (outline-next-heading)
-	     (org-flag-heading nil)))   ; show the next heading
-      (funcall 'org-priority force-direction)
-      (end-of-line 1)
-      (setq newhead (org-get-heading)))
-    (org-agenda-change-all-lines newhead hdmarker)
-    (beginning-of-line 1)))
+    (org-with-remote-undo buffer
+      (with-current-buffer buffer
+	(widen)
+	(goto-char pos)
+	(org-show-context 'agenda)
+	(save-excursion
+	  (and (outline-next-heading)
+	       (org-flag-heading nil)))   ; show the next heading
+	(funcall 'org-priority force-direction)
+	(end-of-line 1)
+	(setq newhead (org-get-heading)))
+      (org-agenda-change-all-lines newhead hdmarker)
+      (beginning-of-line 1))))
 
 (defun org-get-tags-at (&optional pos)
   "Get a list of all headline tags applicable at POS.
@@ -9099,20 +15635,22 @@
   (interactive)
   (let (tags)
     (save-excursion
-      (goto-char (or pos (point)))
-      (save-match-data
-	(org-back-to-heading t)
-	(condition-case nil
-	    (while t
-	      (if (looking-at "[^\r\n]+?:\\([a-zA-Z_@0-9:]+\\):[ \t]*\\([\n\r]\\|\\'\\)")
-		  (setq tags (append (org-split-string
-				      (org-match-string-no-properties 1) ":")
-				     tags)))
+      (save-restriction
+	(widen)
+	(goto-char (or pos (point)))
+	(save-match-data
+	  (org-back-to-heading t)
+	  (condition-case nil
+	      (while t
+		(if (looking-at "[^\r\n]+?:\\([a-zA-Z_@0-9:]+\\):[ \t]*\\([\n\r]\\|\\'\\)")
+		    (setq tags (append (org-split-string
+					(org-match-string-no-properties 1) ":")
+				       tags)))
 	      (or org-use-tag-inheritance (error ""))
 	      (org-up-heading-all 1))
-	  (error nil))))
-    tags))
-
+	    (error nil))))
+      tags)))
+  
 ;; FIXME: should fix the tags property of the agenda line.
 (defun org-agenda-set-tags ()
   "Set tags for the current headline."
@@ -9125,18 +15663,44 @@
 	 (pos (marker-position hdmarker))
 	 (buffer-read-only nil)
 	 newhead)
-    (with-current-buffer buffer
-      (widen)
-      (goto-char pos)
-      (org-show-context 'agenda)
-      (save-excursion
-	(and (outline-next-heading)
-	     (org-flag-heading nil)))   ; show the next heading
-      (call-interactively 'org-set-tags)
-      (end-of-line 1)
-      (setq newhead (org-get-heading)))
-    (org-agenda-change-all-lines newhead hdmarker)
-    (beginning-of-line 1)))
+    (org-with-remote-undo buffer
+      (with-current-buffer buffer
+	(widen)
+	(goto-char pos)
+	(org-show-context 'agenda)
+	(save-excursion
+	  (and (outline-next-heading)
+	       (org-flag-heading nil)))   ; show the next heading
+	(call-interactively 'org-set-tags)
+	(end-of-line 1)
+	(setq newhead (org-get-heading)))
+      (org-agenda-change-all-lines newhead hdmarker)
+      (beginning-of-line 1))))
+
+(defun org-agenda-toggle-archive-tag ()
+  "Toggle the archive tag for the current entry."
+  (interactive)
+  (org-agenda-check-no-diary)
+  (org-agenda-show)   ;;; FIXME This is a stupid hack and should not be needed
+  (let* ((hdmarker (or (get-text-property (point) 'org-hd-marker)
+                       (org-agenda-error)))
+	 (buffer (marker-buffer hdmarker))
+	 (pos (marker-position hdmarker))
+	 (buffer-read-only nil)
+	 newhead)
+    (org-with-remote-undo buffer
+      (with-current-buffer buffer
+	(widen)
+	(goto-char pos)
+	(org-show-context 'agenda)
+	(save-excursion
+	  (and (outline-next-heading)
+	       (org-flag-heading nil)))   ; show the next heading
+	(call-interactively 'org-toggle-archive-tag)
+	(end-of-line 1)
+	(setq newhead (org-get-heading)))
+      (org-agenda-change-all-lines newhead hdmarker)
+      (beginning-of-line 1))))
 
 (defun org-agenda-date-later (arg &optional what)
   "Change the date of this item to one day later."
@@ -9147,19 +15711,46 @@
 		     (org-agenda-error)))
 	 (buffer (marker-buffer marker))
 	 (pos (marker-position marker)))
-    (with-current-buffer buffer
-      (widen)
-      (goto-char pos)
-      (if (not (org-at-timestamp-p))
-	  (error "Cannot find time stamp"))
-      (org-timestamp-change arg (or what 'day))
-      (message "Time stamp changed to %s" org-last-changed-timestamp))))
+    (org-with-remote-undo buffer
+     (with-current-buffer buffer
+       (widen)
+       (goto-char pos)
+       (if (not (org-at-timestamp-p))
+	   (error "Cannot find time stamp"))
+       (org-timestamp-change arg (or what 'day)))
+     (org-agenda-show-new-time marker org-last-changed-timestamp))
+    (message "Time stamp changed to %s" org-last-changed-timestamp)))
 
 (defun org-agenda-date-earlier (arg &optional what)
   "Change the date of this item to one day earlier."
   (interactive "p")
   (org-agenda-date-later (- arg) what))
 
+(defun org-agenda-show-new-time (marker stamp)
+  "Show new date stamp via text properties."
+  ;; We use text properties to make this undoable
+  (let ((buffer-read-only nil))
+    (setq stamp (concat " => " stamp))
+    (save-excursion
+      (goto-char (point-max))
+      (while (not (bobp))
+	(when (equal marker (get-text-property (point) 'org-marker))
+	  (move-to-column (- (window-width) (length stamp)) t)
+          (if (featurep 'xemacs)
+	      ;; Use `duplicable' property to trigger undo recording
+              (let ((ex (make-extent nil nil))
+                    (gl (make-glyph stamp)))
+                (set-glyph-face gl 'secondary-selection)
+                (set-extent-properties
+                 ex (list 'invisible t 'end-glyph gl 'duplicable t))
+                (insert-extent ex (1- (point)) (point-at-eol)))
+            (add-text-properties
+             (1- (point)) (point-at-eol)
+	     (list 'display (org-add-props stamp nil
+			      'face 'secondary-selection))))
+	  (beginning-of-line 1))
+	(beginning-of-line 0)))))
+
 (defun org-agenda-date-prompt (arg)
   "Change the date of this item.  Date is prompted for, with default today.
 The prefix ARG is passed to the `org-time-stamp' command and can therefore
@@ -9171,13 +15762,14 @@
 		     (org-agenda-error)))
 	 (buffer (marker-buffer marker))
 	 (pos (marker-position marker)))
-    (with-current-buffer buffer
-      (widen)
-      (goto-char pos)
-      (if (not (org-at-timestamp-p))
-	  (error "Cannot find time stamp"))
-      (org-time-stamp arg)
-      (message "Time stamp changed to %s" org-last-changed-timestamp))))
+    (org-with-remote-undo buffer
+      (with-current-buffer buffer
+	(widen)
+	(goto-char pos)
+	(if (not (org-at-timestamp-p))
+	    (error "Cannot find time stamp"))
+	(org-time-stamp arg)
+	(message "Time stamp changed to %s" org-last-changed-timestamp)))))
 
 (defun org-agenda-schedule (arg)
   "Schedule the item at point."
@@ -9190,11 +15782,12 @@
 	 (pos (marker-position marker))
 	 (org-insert-labeled-timestamps-at-point nil)
 	 ts)
-    (with-current-buffer buffer
-      (widen)
-      (goto-char pos)
-      (setq ts (org-schedule))
-      (message "Item scheduled for %s" ts))))
+    (org-with-remote-undo buffer
+      (with-current-buffer buffer
+	(widen)
+	(goto-char pos)
+	(setq ts (org-schedule))
+	(message "Item scheduled for %s" ts)))))
 
 (defun org-agenda-deadline (arg)
   "Schedule the item at point."
@@ -9207,20 +15800,18 @@
 	 (pos (marker-position marker))
 	 (org-insert-labeled-timestamps-at-point nil)
 	 ts)
-    (with-current-buffer buffer
-      (widen)
-      (goto-char pos)
-      (setq ts (org-deadline))
-      (message "Deadline for this item set to %s" ts))))
+    (org-with-remote-undo buffer
+      (with-current-buffer buffer
+	(widen)
+	(goto-char pos)
+	(setq ts (org-deadline))
+	(message "Deadline for this item set to %s" ts)))))
 
 (defun org-get-heading ()
   "Return the heading of the current entry, without the stars."
   (save-excursion
-    (and (memq (char-before) '(?\n ?\r)) (skip-chars-forward "^\n\r"))
-    (if (and (re-search-backward "[\r\n]\\*" nil t)
-	     (looking-at "[\r\n]\\*+[ \t]+\\([^\r\n]*\\)"))
-	(match-string 1)
-      "")))
+    (org-back-to-heading t)
+    (if (looking-at "\\*+[ \t]+\\([^\r\n]*\\)")	(match-string 1) "")))
 
 (defun org-agenda-clock-in (&optional arg)
   "Start the clock on the currently selected item."
@@ -9229,10 +15820,27 @@
   (let* ((marker (or (get-text-property (point) 'org-marker)
 		     (org-agenda-error)))
 	 (pos (marker-position marker)))
-    (with-current-buffer (marker-buffer marker)
-      (widen)
-      (goto-char pos)
-      (org-clock-in))))
+    (org-with-remote-undo (marker-buffer marker)
+      (with-current-buffer (marker-buffer marker)
+	(widen)
+	(goto-char pos)
+	(org-clock-in)))))
+
+(defun org-agenda-clock-out (&optional arg)
+  "Stop the currently running clock."
+  (interactive "P")
+  (unless (marker-buffer org-clock-marker)
+    (error "No running clock"))
+  (org-with-remote-undo (marker-buffer org-clock-marker)
+    (org-clock-out)))
+
+(defun org-agenda-clock-cancel (&optional arg)
+  "Cancel the currently running clock."
+  (interactive "P")
+  (unless (marker-buffer org-clock-marker)
+    (error "No running clock"))
+  (org-with-remote-undo (marker-buffer org-clock-marker)
+    (org-clock-cancel)))
 
 (defun org-agenda-diary-entry ()
   "Make a diary entry, like the `i' command from the calendar.
@@ -9252,6 +15860,7 @@
 			    (?b . insert-block-diary-entry)
 			    (?c . insert-cyclic-diary-entry)))))
 	 (oldf (symbol-function 'calendar-cursor-to-date))
+;	 (buf (get-file-buffer (substitute-in-file-name diary-file)))
 	 (point (point))
 	 (mark (or (mark t) (point))))
     (unless cmd
@@ -9272,7 +15881,7 @@
 		  (lambda (&optional error)
 		    (calendar-gregorian-from-absolute
 		     (get-text-property point 'day))))
-	    (call-interactively cmd))
+	      (call-interactively cmd))
 	(fset 'calendar-cursor-to-date oldf)))))
 
 
@@ -9287,6 +15896,7 @@
 	 (point (point))
 	 (date (calendar-gregorian-from-absolute
 		(get-text-property point 'day)))
+         ;; the following 3 vars are needed in the calendar
 	 (displayed-day (extract-calendar-day date))
 	 (displayed-month (extract-calendar-month date))
 	 (displayed-year (extract-calendar-year date)))
@@ -9370,4420 +15980,299 @@
     (if (fboundp 'fit-window-to-buffer)
 	(fit-window-to-buffer (get-buffer-window "*Dates*")))))
 
-;;; Tags
-
-(defun org-scan-tags (action matcher &optional todo-only)
-  "Scan headline tags with inheritance and produce output ACTION.
-ACTION can be `sparse-tree' or `agenda'.  MATCHER is a Lisp form to be
-evaluated, testing if a given set of tags qualifies a headline for
-inclusion.  When TODO-ONLY is non-nil, only lines with a TODO keyword
-are included in the output."
-  (let* ((re (concat "[\n\r]" outline-regexp " *\\(\\<\\("
-		     (mapconcat 'regexp-quote
-				(nreverse (cdr (reverse org-todo-keywords)))
-				"\\|")
-		     "\\>\\)\\)? *\\(.*?\\)\\(:[A-Za-z_@0-9:]+:\\)?[ \t]*$"))
-	 (props (list 'face nil
-		      'done-face 'org-done
-		      'undone-face nil
-		      'mouse-face 'highlight
-		      'org-not-done-regexp org-not-done-regexp
-		      'keymap org-agenda-keymap
-		      'help-echo
-		      (format "mouse-2 or RET jump to org file %s"
-			      (abbreviate-file-name buffer-file-name))))
-	 (case-fold-search nil)
-         lspos
-	 tags tags-list tags-alist (llast 0) rtn level category i txt
-	 todo marker)
-    (save-excursion
-      (goto-char (point-min))
-      (when (eq action 'sparse-tree) (org-overview))
-      (while (re-search-forward re nil t)
-	(catch :skip
-	  (and (eq action 'agenda) (org-agenda-skip))
-	  (setq todo (if (match-end 1) (match-string 2))
-		tags (if (match-end 4) (match-string 4)))
-	  (goto-char (setq lspos (1+ (match-beginning 0))))
-	  (setq level (funcall outline-level)
-		category (org-get-category))
-	  (setq i llast llast level)
-	  ;; remove tag lists from same and sublevels
-	  (while (>= i level)
-	    (when (setq entry (assoc i tags-alist))
-	      (setq tags-alist (delete entry tags-alist)))
-	    (setq i (1- i)))
-	  ;; add the nex tags
-	  (when tags
-	    (setq tags (mapcar 'downcase (org-split-string tags ":"))
-		  tags-alist
-		  (cons (cons level tags) tags-alist)))
-	  ;; compile tags for current headline
-	  (setq tags-list
-		(if org-use-tag-inheritance
-		    (apply 'append (mapcar 'cdr tags-alist))
-		  tags))
-	  (when (and (or (not todo-only) todo)
-		     (eval matcher)
-		     (or (not org-agenda-skip-archived-trees)
-			 (not (member org-archive-tag tags-list))))
-	    ;; list this headline
-	    (if (eq action 'sparse-tree)
-		(progn
-		  (org-show-context 'tags-tree))
-	      (setq txt (org-format-agenda-item
-			 ""
-			 (concat
-			  (if org-tags-match-list-sublevels
-			      (make-string (1- level) ?.) "")
-			  (org-get-heading))
-			 category tags-list))
-	      (goto-char lspos)
-	      (setq marker (org-agenda-new-marker))
-	      (org-add-props txt props
-		'org-marker marker 'org-hd-marker marker 'org-category category)
-	      (push txt rtn))
-	    ;; if we are to skip sublevels, jump to end of subtree
-	    (or org-tags-match-list-sublevels (org-end-of-subtree t))))))
-    (when (and (eq action 'sparse-tree)
-	       (not org-sparse-tree-open-archived-trees))
-      (org-hide-archived-subtrees (point-min) (point-max)))
-    (nreverse rtn)))
-
-(defun org-tags-sparse-tree (&optional arg match)
-  "Create a sparse tree according to tags  string MATCH.
-MATCH can contain positive and negative selection of tags, like
-\"+WORK+URGENT-WITHBOSS\"."
-  (interactive "P")
-  (org-scan-tags 'sparse-tree (cdr (org-make-tags-matcher match))))
-
-(defun org-make-tags-matcher (match)
-  "Create the TAGS//TODO matcher form for the selection string MATCH."
-  (unless match
-    ;; Get a new match request, with completion
-    (setq org-last-tags-completion-table
-	  (or org-tag-alist
-	      org-last-tags-completion-table))
-    (setq match (completing-read
-		 "Match: " 'org-tags-completion-function nil nil nil
-		 'org-tags-history)))  ; FIXME: SHould we have a separate history for this?
-
-  ;; Parse the string and create a lisp form
-  (let ((match0 match) minus tag mm
-	tagsmatch todomatch tagsmatcher todomatcher kwd matcher
-	orterms term orlist)
-    (if (string-match "/+" match)
-	;; match contains also a todo-matching request
-	(setq tagsmatch (substring match 0 (match-beginning 0))
-	      todomatch (substring match (match-end 0)))
-      ;; only matching tags
-      (setq tagsmatch match todomatch nil))
-
-    ;; Make the tags matcher
-    (if (or (not tagsmatch) (not (string-match "\\S-" tagsmatch)))
-	(setq tagsmatcher t)
-      (setq orterms (org-split-string tagsmatch "|") orlist nil)
-      (while (setq term (pop orterms))
-	(while (string-match "^&?\\([-+:]\\)?\\([A-Za-z_@0-9]+\\)" term)
-	  (setq minus (and (match-end 1)
-			   (equal (match-string 1 term) "-"))
-		tag (match-string 2 term)
-		term (substring term (match-end 0))
-		mm (list 'member (downcase tag) 'tags-list)
-		mm (if minus (list 'not mm) mm))
-	  (push mm tagsmatcher))
-	(push (if (> (length tagsmatcher) 1)
-		  (cons 'and tagsmatcher)
-		(car tagsmatcher))
-	      orlist)
-	(setq tagsmatcher nil))
-      (setq tagsmatcher (if (> (length orlist) 1) (cons 'or orlist) (car orlist))))
-
-    ;; Make the todo matcher ;; FIXME: reduce syntax richness?
-    (if (or (not todomatch) (not (string-match "\\S-" todomatch)))
-	(setq todomatcher t)
-      (setq orterms (org-split-string todomatch "|") orlist nil)
-      (while (setq term (pop orterms))
-	(while (string-match "^&?\\([-+:]\\)?\\([A-Za-z_@0-9]+\\)" term)
-	  (setq minus (and (match-end 1)
-			   (equal (match-string 1 term) "-"))
-		kwd (match-string 2 term)
-		term (substring term (match-end 0))
-		mm (list 'equal 'todo kwd)
-		mm (if minus (list 'not mm) mm))
-	  (push mm todomatcher))
-	(push (if (> (length todomatcher) 1)
-		  (cons 'and todomatcher)
-		(car todomatcher))
-	      orlist)
-	(setq todomatcher nil))
-      (setq todomatcher (if (> (length orlist) 1)
-			    (cons 'or orlist) (car orlist))))
-
-    ;; Return the string and lisp forms of the matcher
-    (setq matcher (if todomatcher
-		      (list 'and tagsmatcher todomatcher)
-		    tagsmatcher))
-    (cons match0 matcher)))
-
-;;;###autoload
-(defun org-tags-view (&optional todo-only match)
-  "Show all headlines for all `org-agenda-files' matching a TAGS criterion.
-The prefix arg TODO-ONLY limits the search to TODO entries."
-  (interactive "P")
-  (org-compile-prefix-format 'tags)
-  (org-set-sorting-strategy 'tags)
-  (let* ((org-tags-match-list-sublevels
-	  (if todo-only t org-tags-match-list-sublevels))
-	 (win (selected-window))
-	 (completion-ignore-case t)
-	 rtn rtnall files file pos matcher
-	 buffer)
-    (setq matcher (org-make-tags-matcher match)
-	  match (car matcher) matcher (cdr matcher))
-    (org-prepare-agenda)
-    (setq org-agenda-redo-command
-	  (list 'org-tags-view (list 'quote todo-only)
-		(list 'if 'current-prefix-arg nil match)))
-    (setq files (org-agenda-files)
-	  rtnall nil)
-    (while (setq file (pop files))
-      (catch 'nextfile
-	(org-check-agenda-file file)
-	(setq buffer (if (file-exists-p file)
-			 (org-get-agenda-file-buffer file)
-		       (error "No such file %s" file)))
-	(if (not buffer)
-	    ;; If file does not exist, merror message to agenda
-	    (setq rtn (list
-		       (format "ORG-AGENDA-ERROR: No such org-file %s" file))
-		  rtnall (append rtnall rtn))
-	  (with-current-buffer buffer
-	    (unless (org-mode-p)
-	      (error "Agenda file %s is not in `org-mode'" file))
-	    (setq org-category-table (org-get-category-table))
-	    (save-excursion
-	      (save-restriction
-		(if org-agenda-restrict
-		    (narrow-to-region org-agenda-restrict-begin
-				      org-agenda-restrict-end)
-		  (widen))
-		(setq rtn (org-scan-tags 'agenda matcher todo-only))
-		(setq rtnall (append rtnall rtn))))))))
-    (insert "Headlines with TAGS match: ")
-    (add-text-properties (point-min) (1- (point))
-			 (list 'face 'org-level-3))
-    (setq pos (point))
-    (insert match "\n")
-    (add-text-properties pos (1- (point)) (list 'face 'org-warning))
-    (setq pos (point))
-    (unless org-agenda-multi
-      (insert "Press `C-u r' to search again with new search string\n"))
-    (add-text-properties pos (1- (point)) (list 'face 'org-level-3))
-    (when rtnall
-      (insert (org-finalize-agenda-entries rtnall) "\n"))
-    (goto-char (point-min))
-    (org-fit-agenda-window)
-    (add-text-properties (point-min) (point-max) '(org-agenda-type tags))
-    (org-finalize-agenda)
-    (setq buffer-read-only t)
-    (if (not org-select-agenda-window) (select-window win))))
-
-(defvar org-add-colon-after-tag-completion nil)  ;; dynamically skoped param
-(defvar org-tags-overlay (org-make-overlay 1 1))
-(org-detach-overlay org-tags-overlay)
-
-(defun org-set-tags (&optional arg just-align)
-  "Set the tags for the current headline.
-With prefix ARG, realign all tags in headings in the current buffer."
-  (interactive "P")
-  (let* ((re (concat "^" outline-regexp))
-	 (current (org-get-tags))
-	 table current-tags inherited-tags ; computed below when needed
-	 tags p0 c0 c1 rpl)
-    (if arg
-	(save-excursion
-	  (goto-char (point-min))
-	  (let (buffer-invisibility-spec)  ; Emacs 21 compatibility
-	    (while (re-search-forward re nil t)
-	      (org-set-tags nil t)
-	      (end-of-line 1)))
-	  (message "All tags realigned to column %d" org-tags-column))
-      (if just-align
-	  (setq tags current)
-	;; Get a new set of tags from the user
-	(setq table (or org-tag-alist (org-get-buffer-tags))
-	      org-last-tags-completion-table table
-	      current-tags (org-split-string current ":")
-	      inherited-tags (nreverse
-			      (nthcdr (length current-tags)
-				      (nreverse (org-get-tags-at))))
-	      tags
-	      (if (or (eq t org-use-fast-tag-selection)
-		      (and org-use-fast-tag-selection
-			   (delq nil (mapcar 'cdr table))))
-		  (org-fast-tag-selection current-tags inherited-tags table)
-		(let ((org-add-colon-after-tag-completion t))
-		  (org-trim
-		   (completing-read "Tags: " 'org-tags-completion-function
-				    nil nil current 'org-tags-history)))))
-	(while (string-match "[-+&]+" tags)
-	  ;; No boolean logic, just a list
-	  (setq tags (replace-match ":" t t tags))))
-      (if (string-match "\\`[\t ]*\\'" tags)
-          (setq tags "")
-	(unless (string-match ":$" tags) (setq tags (concat tags ":")))
-	(unless (string-match "^:" tags) (setq tags (concat ":" tags))))
-
-      ;; Insert new tags at the correct column
-      (beginning-of-line 1)
-      (if (re-search-forward
-	   (concat "\\([ \t]*" (regexp-quote current) "\\)[ \t]*$")
-	   (point-at-eol) t)
-	  (progn
-	    (if (equal tags "")
-		(setq rpl "")
-	      (goto-char (match-beginning 0))
-	      (setq c0 (current-column) p0 (point)
-		    c1 (max (1+ c0) (if (> org-tags-column 0)
-					org-tags-column
-				      (- (- org-tags-column) (length tags))))
-		    rpl (concat (make-string (max 0 (- c1 c0)) ?\ ) tags)))
-	    (replace-match rpl)
-	    (and (not (featurep 'xemacs)) c0 (tabify p0 (point)))
-	    tags)
-	(error "Tags alignment failed")))))
-
-(defun org-tags-completion-function (string predicate &optional flag)
-  (let (s1 s2 rtn (ctable org-last-tags-completion-table)
-	   (confirm (lambda (x) (stringp (car x)))))
-    (if (string-match "^\\(.*[-+:&|]\\)\\([^-+:&|]*\\)$" string)
-        (setq s1 (match-string 1 string)
-              s2 (match-string 2 string))
-      (setq s1 "" s2 string))
-    (cond
-     ((eq flag nil)
-      ;; try completion
-      (setq rtn (try-completion s2 ctable confirm))
-      (if (stringp rtn)
-	  (concat s1 s2 (substring rtn (length s2))
-		  (if (and org-add-colon-after-tag-completion
-			   (assoc rtn ctable))
-		      ":" "")))
-      )
-     ((eq flag t)
-      ;; all-completions
-      (all-completions s2 ctable confirm)
-      )
-     ((eq flag 'lambda)
-      ;; exact match?
-      (assoc s2 ctable)))
-    ))
-
-(defun org-fast-tag-insert (kwd tags face &optional end)
-  "Insert KDW, and the TAGS, the latter with face FACE.  Also inser END."
-  (insert (format "%-12s" (concat kwd ":"))
-	  (org-add-props (mapconcat 'identity tags " ") nil 'face face)
-	  (or end "")))
-
-(defun org-fast-tag-show-exit (flag)
-  (save-excursion
-    (goto-line 3)
-    (if (re-search-forward "[ \t]+Next change exits" (point-at-eol) t)
-	(replace-match ""))
-    (when flag
-      (end-of-line 1)
-      (move-to-column (- (window-width) 19) t)
-      (insert (org-add-props " Next change exits" nil 'face 'org-warning)))))
-
-(defun org-set-current-tags-overlay (current prefix)
-  (let ((s (concat ":" (mapconcat 'identity current ":") ":")))
-    (if (featurep 'xemacs)
-	(org-overlay-display org-tags-overlay (concat prefix s)
-			     'secondary-selection)
-      (put-text-property 0 (length s) 'face '(secondary-selection org-tag) s)
-      (org-overlay-display org-tags-overlay (concat prefix s)))))
-
-(defun org-fast-tag-selection (current inherited table)
-  "Fast tag selection with single keys.
-CURRENT is the current list of tags in the headline, INHERITED is the
-list of inherited tags, and TABLE is an alist of tags and corresponding keys,
-possibly with grouping information.
-If the keys are nil, a-z are automatically assigned.
-Returns the new tags string, or nil to not change the current settings."
-  (let* ((maxlen (apply 'max (mapcar
-			      (lambda (x)
-				(if (stringp (car x)) (string-width (car x)) 0))
-			      table)))
-	 (buf (current-buffer))
-	 (buffer-tags nil)
-	 (fwidth (+ maxlen 3 1 3))
-	 (ncol (/ (- (window-width) 4) fwidth))
-	 (i-face 'org-done)
-	 (c-face 'org-tag)
-	 tg cnt e c char c1 c2 ntable tbl rtn
-	 ov-start ov-end ov-prefix
-	 (exit-after-next org-fast-tag-selection-single-key)
-	 groups ingroup)
-    (save-excursion
-      (beginning-of-line 1)
-      (if (looking-at ".*[ \t]\\(:[A-Za-z_@0-9:]+:\\)[ \t]*\\(\r\\|$\\)")
-	  (setq ov-start (match-beginning 1)
-		ov-end (match-end 1)
-		ov-prefix "")
-	(setq ov-start (1- (point-at-eol))
-	      ov-end (1+ ov-start))
-	(skip-chars-forward "^\n\r")
-	(setq ov-prefix
-	      (concat
-	       (buffer-substring (1- (point)) (point))
-	       (if (> (current-column) org-tags-column)
-		   " "
-		 (make-string (- org-tags-column (current-column)) ?\ ))))))
-    (org-move-overlay org-tags-overlay ov-start ov-end)
-    (save-window-excursion
-      ;; FIXME: would it be better to keep the other windows?
-      (delete-other-windows)
-      (split-window-vertically)
-      (switch-to-buffer-other-window (get-buffer-create " *Org tags*"))
-      (erase-buffer)
-      (org-fast-tag-insert "Inherited" inherited i-face "\n")
-      (org-fast-tag-insert "Current" current c-face "\n\n")
-      (org-fast-tag-show-exit exit-after-next)
-      (org-set-current-tags-overlay current ov-prefix)
-      (setq tbl table char ?a cnt 0)
-      (while (setq e (pop tbl))
+
+;;;; Embedded LaTeX
+
+(defvar org-cdlatex-mode-map (make-sparse-keymap)
+  "Keymap for the minor `org-cdlatex-mode'.")
+
+(define-key org-cdlatex-mode-map "_" 'org-cdlatex-underscore-caret)
+(define-key org-cdlatex-mode-map "^" 'org-cdlatex-underscore-caret)
+(define-key org-cdlatex-mode-map "`" 'cdlatex-math-symbol)
+(define-key org-cdlatex-mode-map "'" 'org-cdlatex-math-modify)
+(define-key org-cdlatex-mode-map "\C-c{" 'cdlatex-environment)
+
+(defvar org-cdlatex-texmathp-advice-is-done nil
+  "Flag remembering if we have applied the advice to texmathp already.")
+
+(define-minor-mode org-cdlatex-mode
+  "Toggle the minor `org-cdlatex-mode'.
+This mode supports entering LaTeX environment and math in LaTeX fragments
+in Org-mode.
+\\{org-cdlatex-mode-map}"
+  nil " OCDL" nil
+  (when org-cdlatex-mode (require 'cdlatex))
+  (unless org-cdlatex-texmathp-advice-is-done
+    (setq org-cdlatex-texmathp-advice-is-done t)
+    (defadvice texmathp (around org-math-always-on activate)
+      "Always return t in org-mode buffers.
+This is because we want to insert math symbols without dollars even outside
+the LaTeX math segments.  If Orgmode thinks that point is actually inside
+en embedded LaTeX fragement, let texmathp do its job.
+\\[org-cdlatex-mode-map]"
+      (interactive)
+      (let (p)
 	(cond
-	 ((equal e '(:startgroup))
-	  (push '() groups) (setq ingroup t)
-	  (when (not (= cnt 0))
-	    (setq cnt 0)
-	    (insert "\n"))
-	  (insert "{ "))
-	 ((equal e '(:endgroup))
-	  (setq ingroup nil cnt 0)
-	  (insert "}\n"))
+	 ((not (org-mode-p)) ad-do-it)
+	 ((eq this-command 'cdlatex-math-symbol)
+	  (setq ad-return-value t
+		texmathp-why '("cdlatex-math-symbol in org-mode" . 0)))
 	 (t
-	  (setq tg (car e) c2 nil)
-	  (if (cdr e)
-	      (setq c (cdr e))
-	    ;; automatically assign a character.
-	    (setq c1 (string-to-char
-		      (downcase (substring
-				 tg (if (= (string-to-char tg) ?@) 1 0)))))
-	    (if (or (rassoc c1 ntable) (rassoc c1 table))
-		(while (or (rassoc char ntable) (rassoc char table))
-		  (setq char (1+ char)))
-	      (setq c2 c1))
-	    (setq c (or c2 char)))
-	  (if ingroup (push tg (car groups)))
-	  (setq tg (org-add-props tg nil 'face
-				  (cond
-				   ((member tg current) c-face)
-				   ((member tg inherited) i-face)
-				   (t nil))))
-	  (if (and (= cnt 0) (not ingroup)) (insert "  "))
-	  (insert "[" c "] " tg (make-string
-				 (- fwidth 4 (length tg)) ?\ ))
-	  (push (cons tg c) ntable)
-	  (when (= (setq cnt (1+ cnt)) ncol)
-	    (insert "\n")
-	    (if ingroup (insert "  "))
-	    (setq cnt 0)))))
-      (setq ntable (nreverse ntable))
-      (insert "\n")
-      (goto-char (point-min))
-      (if (fboundp 'fit-window-to-buffer) (fit-window-to-buffer))
-      (setq rtn
-	    (catch 'exit
-	      (while t
-		(message "[a-z..]:Toggle [SPC]:clear [RET]:accept [TAB]:free [C-c]: multi%s"
-			 (if groups "  [!] no groups" ""))
-		(setq c (let ((inhibit-quit t)) (read-char-exclusive)))
-		(cond
-		 ((= c ?\r) (throw 'exit t))
-		 ((= c ?!)
-		  (setq groups nil)
-		  (goto-char (point-min))
-		  (while (re-search-forward "[{}]" nil t) (replace-match " ")))
-		 ((= c ?\C-c)
-		  (org-fast-tag-show-exit
-		   (setq exit-after-next (not exit-after-next))))
-		 ((or (= c ?\C-g)
-		      (and (= c ?q) (not (rassoc c ntable))))
-		  (org-detach-overlay org-tags-overlay)
-		  (setq quit-flag t))
-		 ((= c ?\ )
-		  (setq current nil)
-		  (if exit-after-next (setq exit-after-next 'now)))
-		 ((= c ?\t)
-		  (condition-case nil
-		      (setq tg (completing-read
-				"Tag: "
-				(or buffer-tags
-				    (with-current-buffer buf
-				      (org-get-buffer-tags)))))
-		    (quit (setq tg "")))
-		  (when (string-match "\\S-" tg)
-		    (add-to-list 'buffer-tags (list tg))
-		    (if (member tg current)
-			(setq current (delete tg current))
-		      (push tg current)))
-		  (if exit-after-next (setq exit-after-next 'now)))
-		 ((setq e (rassoc c ntable) tg (car e))
-		  (if (member tg current)
-		      (setq current (delete tg current))
-		    (loop for g in groups do
-			  (if (member tg g)
-			      (mapcar (lambda (x)
-					(setq current (delete x current)))
-				      g)))
-		    (push tg current))
-		  (if exit-after-next (setq exit-after-next 'now))))
-
-		;; Create a sorted list
-		(setq current
-		      (sort current
-			    (lambda (a b)
-			      (assoc b (cdr (memq (assoc a ntable) ntable))))))
-		(if (eq exit-after-next 'now) (throw 'exit t))
-		(goto-char (point-min))
-		(beginning-of-line 2)
-		(delete-region (point) (point-at-eol))
-		(org-fast-tag-insert "Current" current c-face)
-		(org-set-current-tags-overlay current ov-prefix)
-		(while (re-search-forward "\\[.\\] \\([a-zA-Z0-9_@]+\\)" nil t)
-		  (setq tg (match-string 1))
-		  (add-text-properties (match-beginning 1) (match-end 1)
-				       (list 'face
-					     (cond
-					      ((member tg current) c-face)
-					      ((member tg inherited) i-face)
-					      (t nil)))))
-		(goto-char (point-min)))))
-      (org-detach-overlay org-tags-overlay)
-      (if rtn
-	  (mapconcat 'identity current ":")
-	nil))))
-
-(defun org-get-tags ()
-  "Get the TAGS string in the current headline."
-  (unless (org-on-heading-p t)
-    (error "Not on a heading"))
-  (save-excursion
-    (beginning-of-line 1)
-    (if (looking-at ".*[ \t]\\(:[A-Za-z_@0-9:]+:\\)[ \t]*\\(\r\\|$\\)")
-	(org-match-string-no-properties 1)
-      "")))
-
-(defun org-get-buffer-tags ()
-  "Get a table of all tags used in the buffer, for completion."
-  (let (tags)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward "[ \t]:\\([A-Za-z_@0-9:]+\\):[ \t\r\n]" nil t)
-	(mapc (lambda (x) (add-to-list 'tags x))
-	      (org-split-string (org-match-string-no-properties 1) ":"))))
-    (mapcar 'list tags)))
-
-;;; Link Stuff
-
-(defvar org-create-file-search-functions nil
-  "List of functions to construct the right search string for a file link.
-These functions are called in turn with point at the location to
-which the link should point.
-
-A function in the hook should first test if it would like to
-handle this file type, for example by checking the major-mode or
-the file extension.  If it decides not to handle this file, it
-should just return nil to give other functions a chance.  If it
-does handle the file, it must return the search string to be used
-when following the link.  The search string will be part of the
-file link, given after a double colon, and `org-open-at-point'
-will automatically search for it.  If special measures must be
-taken to make the search successful, another function should be
-added to the companion hook `org-execute-file-search-functions',
-which see.
-
-A function in this hook may also use `setq' to set the variable
-`description' to provide a suggestion for the descriptive text to
-be used for this link when it gets inserted into an Org-mode
-buffer with \\[org-insert-link].")
-
-(defvar org-execute-file-search-functions nil
-  "List of functions to execute a file search triggered by a link.
-
-Functions added to this hook must accept a single argument, the
-search string that was part of the file link, the part after the
-double colon.  The function must first check if it would like to
-handle this search, for example by checking the major-mode or the
-file extension.  If it decides not to handle this search, it
-should just return nil to give other functions a chance.  If it
-does handle the search, it must return a non-nil value to keep
-other functions from trying.
-
-Each function can access the current prefix argument through the
-variable `current-prefix-argument'.  Note that a single prefix is
-used to force opening a link in Emacs, so it may be good to only
-use a numeric or double prefix to guide the search function.
-
-In case this is needed, a function in this hook can also restore
-the window configuration before `org-open-at-point' was called using:
-
-    (set-window-configuration org-window-config-before-follow-link)")
-
-(defun org-find-file-at-mouse (ev)
-  "Open file link or URL at mouse."
-  (interactive "e")
-  (mouse-set-point ev)
-  (org-open-at-point 'in-emacs))
-
-(defun org-open-at-mouse (ev)
-  "Open file link or URL at mouse."
-  (interactive "e")
-  (mouse-set-point ev)
-  (org-open-at-point))
-
-(defvar org-window-config-before-follow-link nil
-  "The window configuration before following a link.
-This is saved in case the need arises to restore it.")
-
-;; FIXME: IN-EMACS is used for many purposes, maybe rename this argument???
-(defun org-open-at-point (&optional in-emacs)
-  "Open link at or after point.
-If there is no link at point, this function will search forward up to
-the end of the current subtree.
-Normally, files will be opened by an appropriate application.  If the
-optional argument IN-EMACS is non-nil, Emacs will visit the file."
-  (interactive "P")
-  (setq org-window-config-before-follow-link (current-window-configuration))
-  (org-remove-occur-highlights nil nil t)
-  (if (org-at-timestamp-p t)
-      (org-follow-timestamp-link)
-    (let (type path link line search (pos (point)))
-      (catch 'match
-	(save-excursion
-	  (skip-chars-forward "^]\n\r")
-	  (when (and (re-search-backward "\\[\\[" nil t)
-		     (looking-at org-bracket-link-regexp)
-		     (<= (match-beginning 0) pos)
-		     (>= (match-end 0) pos))
-	    (setq link (org-link-unescape (org-match-string-no-properties 1)))
-	    (while (string-match " *\n *" link)
-	      (setq link (replace-match " " t t link)))
-	    (setq link (org-link-expand-abbrev link))
-	    (if (string-match org-link-re-with-space2 link)
-		(setq type (match-string 1 link)
-		      path (match-string 2 link))
-	      (setq type "thisfile"
-		    path link))
-	    (throw 'match t)))
-
-	(when (get-text-property (point) 'org-linked-text)
-	  (setq type "thisfile"
-		pos (if (get-text-property (1+ (point)) 'org-linked-text)
-			(1+ (point)) (point))
-		path (buffer-substring
-		      (previous-single-property-change pos 'org-linked-text)
-		      (next-single-property-change pos 'org-linked-text)))
-	  (throw 'match t))
-
-	(save-excursion
-	  (skip-chars-backward (concat "^[]" org-non-link-chars " "))
-	  (if (equal (char-before) ?<) (backward-char 1))
-	  (when (or (looking-at org-angle-link-re)
-		    (looking-at org-plain-link-re)
-		    (and (or (re-search-forward org-angle-link-re (point-at-eol) t)
-			     (re-search-forward org-plain-link-re (point-at-eol) t))
-			 (<= (match-beginning 0) pos)
-			 (>= (match-end 0) pos)))
-	    (setq type (match-string 1)
-		  path (match-string 2))
-	    (throw 'match t)))
-	(save-excursion
-	  (skip-chars-backward "^ \t\n\r")
-	  (when (looking-at "\\(:[A-Za-z_@0-9:]+\\):[ \t\r\n]")
-	    (setq type "tags"
-		  path (match-string 1))
-	    (while (string-match ":" path)
-	      (setq path (replace-match "+" t t path)))
-	    (throw 'match t)))
-	(save-excursion
-	  (skip-chars-backward "a-zA-Z_")
-	  (when (and (memq 'camel org-activate-links)
-		     (looking-at org-camel-regexp))
-	    (setq type "camel" path (match-string 0))
-	    (if (equal (char-before) ?*)
-		(setq path (concat "*" path))))
-	  (throw 'match t)))
-      (unless path
-	(error "No link found"))
-      ;; Remove any trailing spaces in path
-      (if (string-match " +\\'" path)
-	  (setq path (replace-match "" t t path)))
-
-      (cond
-
-       ((equal type "mailto")
-	(let ((cmd (car org-link-mailto-program))
-	      (args (cdr org-link-mailto-program)) args1
-	      (address path) (subject "") a)
-	  (if (string-match "\\(.*\\)::\\(.*\\)" path)
-	      (setq address (match-string 1 path)
-		    subject (org-link-escape (match-string 2 path))))
-	  (while args
-	    (cond
-	     ((not (stringp (car args))) (push (pop args) args1))
-	     (t (setq a (pop args))
-		(if (string-match "%a" a)
-		    (setq a (replace-match address t t a)))
-		(if (string-match "%s" a)
-		    (setq a (replace-match subject t t a)))
-		(push a args1))))
-	  (apply cmd (nreverse args1))))
-
-       ((member type '("http" "https" "ftp" "news"))
-	(browse-url (concat type ":" path)))
-
-       ((string= type "tags")
-	(org-tags-view in-emacs path))
-       ((or (string= type "camel")
-	    (string= type "thisfile"))
-	(if in-emacs
-	    (switch-to-buffer-other-window
-	     (org-get-buffer-for-internal-link (current-buffer)))
-	  (org-mark-ring-push))
-	(org-link-search
-	 path
-	 (cond ((equal in-emacs '(4)) 'occur)
-	       ((equal in-emacs '(16)) 'org-occur)
-	       (t nil))))
-
-       ((string= type "file")
-	(if (string-match "::\\([0-9]+\\)\\'" path)
-	    (setq line (string-to-number (match-string 1 path))
-		  path (substring path 0 (match-beginning 0)))
-	  (if (string-match "::\\(.+\\)\\'" path)
-	      (setq search (match-string 1 path)
-		    path (substring path 0 (match-beginning 0)))))
-	(org-open-file path in-emacs line search))
-
-       ((string= type "news")
-	(org-follow-gnus-link path))
-
-       ((string= type "bbdb")
-	(org-follow-bbdb-link path))
-
-       ((string= type "info")
-	(org-follow-info-link path))
-
-       ((string= type "gnus")
-	(let (group article)
-	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-	      (error "Error in Gnus link"))
-	  (setq group (match-string 1 path)
-		article (match-string 3 path))
-	  (org-follow-gnus-link group article)))
-
-       ((string= type "vm")
-	(let (folder article)
-	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-	      (error "Error in VM link"))
-	  (setq folder (match-string 1 path)
-		article (match-string 3 path))
-	  ;; in-emacs is the prefix arg, will be interpreted as read-only
-	  (org-follow-vm-link folder article in-emacs)))
-
-       ((string= type "wl")
-	(let (folder article)
-	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-	      (error "Error in Wanderlust link"))
-	  (setq folder (match-string 1 path)
-		article (match-string 3 path))
-	  (org-follow-wl-link folder article)))
-
-       ((string= type "mhe")
-	(let (folder article)
-	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-	      (error "Error in MHE link"))
-	  (setq folder (match-string 1 path)
-		article (match-string 3 path))
-	  (org-follow-mhe-link folder article)))
-
-       ((string= type "rmail")
-	(let (folder article)
-	  (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-	      (error "Error in RMAIL link"))
-	  (setq folder (match-string 1 path)
-		article (match-string 3 path))
-	  (org-follow-rmail-link folder article)))
-
-       ((string= type "shell")
-	(let ((cmd path))
-	  (while (string-match "@{" cmd) ; FIXME: not needed for [[]] links
-	    (setq cmd (replace-match "<" t t cmd)))
-	  (while (string-match "@}" cmd) ; FIXME: not needed for [[]] links
-	    (setq cmd (replace-match ">" t t cmd)))
-	  (if (or (not org-confirm-shell-link-function)
-		  (funcall org-confirm-shell-link-function
-			   (format "Execute \"%s\" in shell? "
-				   (org-add-props cmd nil
-				     'face 'org-warning))))
-	      (progn
-		(message "Executing %s" cmd)
-		(shell-command cmd))
-	    (error "Abort"))))
-
-       ((string= type "elisp")
-	(let ((cmd path))
-	  (if (or (not org-confirm-elisp-link-function)
-		  (funcall org-confirm-elisp-link-function
-			   (format "Execute \"%s\" as elisp? "
-				   (org-add-props cmd nil
-						  'face 'org-warning))))
-              (message "%s => %s" cmd (eval (read cmd)))
-	    (error "Abort"))))
-
-       (t
-	(browse-url-at-point))))))
-
-(defun org-link-expand-abbrev (link)
-  "Apply replacements as defined in `org-link-abbrev-alist."
-  (if (string-match "^\\([a-zA-Z]+\\)\\(::\\(.*\\)\\)?$" link)
-      (let* ((key (match-string 1 link))
-	     (as (or (assoc key org-link-abbrev-alist-local)
-		     (assoc key org-link-abbrev-alist)))
-	     (tag (and (match-end 2) (match-string 3 link)))
-	     rpl)
-	(if (not as)
-	    link
-	  (setq rpl (cdr as))
-	  (cond
-	   ((symbolp rpl) (funcall rpl tag))
-	   ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
-	   (t (concat rpl tag)))))
-    link))
-
-(defun org-link-search (s &optional type)
-  "Search for a link search option.
-When S is a CamelCaseWord, search for a target, or for a sentence containing
-the words.  If S is surrounded by forward slashes, it is interpreted as a
-regular expression.  In org-mode files, this will create an `org-occur'
-sparse tree.  In ordinary files, `occur' will be used to list matches.
-If the current buffer is in `dired-mode', grep will be used to search
-in all files."
-  (let ((case-fold-search t)
-	(s0 (mapconcat 'identity (org-split-string s "[ \t\r\n]+") " "))
-	(pos (point))
-	(pre "") (post "")
-	words re0 re1 re2 re3 re4 re5 re2a reall camel)
-    (cond
-     ;; First check if there are any special
-     ((run-hook-with-args-until-success 'org-execute-file-search-functions s))
-     ;; Now try the builtin stuff
-     ((save-excursion
-	(goto-char (point-min))
-	(and
-	 (re-search-forward
-	  (concat "<<" (regexp-quote s0) ">>") nil t)
-	 (setq pos (match-beginning 0))))
-      ;; There is an exact target for this
-      (goto-char pos))
-     ((string-match "^/\\(.*\\)/$" s)
-      ;; A regular expression
-      (cond
-       ((org-mode-p)
-	(org-occur (match-string 1 s)))
-       ;;((eq major-mode 'dired-mode)
-       ;; (grep (concat "grep -n -e '" (match-string 1 s) "' *")))
-       (t (org-do-occur (match-string 1 s)))))
-     ((or (setq camel (string-match (concat "^" org-camel-regexp "$") s))
-	  t)
-      ;; A camel or a normal search string
-      (when (equal (string-to-char s) ?*)
-	;; Anchor on headlines, post may include tags.
-	(setq pre "^\\*+[ \t]*\\(?:\\sw+\\)?[ \t]*"
-	      post "[ \t]*\\(?:[ \t]+:[a-zA-Z_@0-9:+]:[ \t]*\\)?$"
-	      s (substring s 1)))
-      (remove-text-properties
-       0 (length s)
-       '(face nil mouse-face nil keymap nil fontified nil) s)
-      ;; Make a series of regular expressions to find a match
-      (setq words
-	    (if camel
-		(org-camel-to-words s)
-	      (org-split-string s "[ \n\r\t]+"))
-	    re0 (concat "\\(<<" (regexp-quote s0) ">>\\)")
-	    re2 (concat "[ \t\r\n]\\(" (mapconcat 'downcase words "[ \t]+") "\\)[ \t\r\n]")
-	    re2a (concat "[ \t\r\n]\\(" (mapconcat 'downcase words "[ \t\r\n]+") "\\)[ \t\r\n]")
-	    re4 (concat "[^a-zA-Z_]\\(" (mapconcat 'downcase words "[^a-zA-Z_\r\n]+") "\\)[^a-zA-Z_]")
-	    re1 (concat pre re2 post)
-	    re3 (concat pre re4 post)
-	    re5 (concat pre ".*" re4)
-	    re2 (concat pre re2)
-	    re2a (concat pre re2a)
-	    re4 (concat pre re4)
-	    reall (concat "\\(" re0 "\\)\\|\\(" re1 "\\)\\|\\(" re2
-			  "\\)\\|\\(" re3 "\\)\\|\\(" re4 "\\)\\|\\("
-			  re5 "\\)"
-			  ))
-      (cond
-       ((eq type 'org-occur) (org-occur reall))
-       ((eq type 'occur) (org-do-occur (downcase reall) 'cleanup))
-       (t (goto-char (point-min))
-	  (if (or (org-search-not-link re0 nil t)
-		  (org-search-not-link re1 nil t)
-		  (org-search-not-link re2 nil t)
-		  (org-search-not-link re2a nil t)
-		  (org-search-not-link re3 nil t)
-		  (org-search-not-link re4 nil t)
-		  (org-search-not-link re5 nil t)
-		  )
-	      (goto-char (match-beginning 1))
-	    (goto-char pos)
-	    (error "No match")))))
-     (t
-      ;; Normal string-search
-      (goto-char (point-min))
-      (if (search-forward s nil t)
-	  (goto-char (match-beginning 0))
-	(error "No match"))))
-    (and (org-mode-p) (org-show-context 'link-search))))
-
-(defun org-search-not-link (&rest args)
-  "Execute `re-search-forward', but only accept matches that are not a link."
+	  (let ((p (org-inside-LaTeX-fragment-p)))
+	    (if (and p (member (car p) (plist-get org-format-latex-options :matchers)))
+		(setq ad-return-value t
+		      texmathp-why '("Org-mode embedded math" . 0))
+	      (if p ad-do-it)))))))))
+
+(defun turn-on-org-cdlatex ()
+  "Unconditionally turn on `org-cdlatex-mode'."
+  (org-cdlatex-mode 1))
+
+(defun org-inside-LaTeX-fragment-p ()
+  "Test if point is inside a LaTeX fragment.
+I.e. after a \\begin, \\(, \\[, $, or $$, without the corresponding closing
+sequence appearing also before point.
+Even though the matchers for math are configurable, this function assumes
+that \\begin, \\(, \\[, and $$ are always used.  Only the single dollar
+delimiters are skipped when they have been removed by customization.
+The return value is nil, or a cons cell with the delimiter and
+and the position of this delimiter.
+
+This function does a reasonably good job, but can locally be fooled by
+for example currency specifications.  For example it will assume being in
+inline math after \"$22.34\".  The LaTeX fragment formatter will only format
+fragments that are properly closed, but during editing, we have to live
+with the uncertainty caused by missing closing delimiters.  This function
+looks only before point, not after."
   (catch 'exit
-    (let (p1)
-      (while (apply 're-search-forward args)
-	(setq p1 (point))
-	(if (not (save-match-data
-		   (and (re-search-backward "\\[\\[" nil t)
-			(looking-at org-bracket-link-regexp)
-			(<= (match-beginning 0) p1)
-			(>= (match-end 0) p1))))
-	    (progn (goto-char (match-end 0))
-		   (throw 'exit (point)))
-	  (goto-char (match-end 0)))))))
-
-(defun org-get-buffer-for-internal-link (buffer)
-  "Return a buffer to be used for displaying the link target of internal links."
-  (cond
-   ((not org-display-internal-link-with-indirect-buffer)
-    buffer)
-   ((string-match "(Clone)$" (buffer-name buffer))
-    (message "Buffer is already a clone, not making another one")
-    ;; we also do not modify visibility in this case
-    buffer)
-   (t ; make a new indirect buffer for displaying the link
-    (let* ((bn (buffer-name buffer))
-	   (ibn (concat bn "(Clone)"))
-	   (ib (or (get-buffer ibn) (make-indirect-buffer buffer ibn 'clone))))
-      (with-current-buffer ib (org-overview))
-      ib))))
-
-(defun org-do-occur (regexp &optional cleanup)
-  "Call the Emacs command `occur'.
-If CLEANUP is non-nil, remove the printout of the regular expression
-in the *Occur* buffer.  This is useful if the regex is long and not useful
-to read."
-  (occur regexp)
-  (when cleanup
-    (let ((cwin (selected-window)) win beg end)
-      (when (setq win (get-buffer-window "*Occur*"))
-	(select-window win))
-      (goto-char (point-min))
-      (when (re-search-forward "match[a-z]+" nil t)
-	(setq beg (match-end 0))
-	(if (re-search-forward "^[ \t]*[0-9]+" nil t)
-	    (setq end (1- (match-beginning 0)))))
-      (and beg end (let ((buffer-read-only)) (delete-region beg end)))
-      (goto-char (point-min))
-      (select-window cwin))))
-
-(defvar org-mark-ring nil
-  "Mark ring for positions before jumps in Org-mode.")
-(defvar org-mark-ring-last-goto nil
-  "Last position in the mark ring used to go back.")
-;; Fill and close the ring
-(setq org-mark-ring nil org-mark-ring-last-goto nil) ;; in case file is reloaded
-(loop for i from 1 to org-mark-ring-length do
-      (push (make-marker) org-mark-ring))
-(setcdr (nthcdr (1- org-mark-ring-length) org-mark-ring)
-	org-mark-ring)
-
-(defun org-mark-ring-push (&optional pos buffer)
-  "Put the current position or POS into the mark ring and rotate it."
-  (interactive)
-  (setq pos (or pos (point)))
-  (setq org-mark-ring (nthcdr (1- org-mark-ring-length) org-mark-ring))
-  (move-marker (car org-mark-ring)
-	       (or pos (point))
-	       (or buffer (current-buffer)))
-  (message
-   (substitute-command-keys
-    "Position saved to mark ring, go back with \\[org-mark-ring-goto].")))
-
-(defun org-mark-ring-goto (&optional n)
-  "Jump to the previous position in the mark ring.
-With prefix arg N, jump back that many stored positions.  When
-called several times in succession, walk through the entire ring.
-Org-mode commands jumping to a different position in the current file,
-or to another Org-mode file, automatically push the old position
-onto the ring."
-  (interactive "p")
-  (let (p m)
-    (if (eq last-command this-command)
-	(setq p (nthcdr n (or org-mark-ring-last-goto org-mark-ring)))
-      (setq p org-mark-ring))
-    (setq org-mark-ring-last-goto p)
-    (setq m (car p))
-    (switch-to-buffer (marker-buffer m))
-    (goto-char m)
-    (if (or (org-invisible-p) (org-invisible-p2)) (org-show-context 'mark-goto))))
-
-(defun org-camel-to-words (s)
-  "Split \"CamelCaseWords\" to (\"Camel\" \"Case\" \"Words\")."
-  (let ((case-fold-search nil)
-	words)
-    (while (string-match "[a-z][A-Z]" s)
-      (push (substring s 0 (1+ (match-beginning 0))) words)
-      (setq s (substring s (1+ (match-beginning 0)))))
-    (nreverse (cons s words))))
-
-(defun org-remove-angle-brackets (s)
-  (if (equal (substring s 0 1) "<") (setq s (substring s 1)))
-  (if (equal (substring s -1) ">") (setq s (substring s 0 -1)))
-  s)
-(defun org-add-angle-brackets (s)
-  (if (equal (substring s 0 1) "<") nil (setq s (concat "<" s)))
-  (if (equal (substring s -1) ">") nil (setq s (concat s ">")))
-  s)
-
-(defun org-follow-timestamp-link ()
-  (cond
-   ((org-at-date-range-p t)
-    (let ((org-agenda-start-on-weekday)
-	  (t1 (match-string 1))
-	  (t2 (match-string 2)))
-      (setq t1 (time-to-days (org-time-string-to-time t1))
-	    t2 (time-to-days (org-time-string-to-time t2)))
-      (org-agenda-list nil t1 (1+ (- t2 t1)))))
-   ((org-at-timestamp-p t)
-    (org-agenda-list nil (time-to-days (org-time-string-to-time
-					(substring (match-string 1) 0 10)))
-		     1))
-   (t (error "This should not happen"))))
-
-
-(defun org-follow-bbdb-link (name)
-  "Follow a BBDB link to NAME."
-  (require 'bbdb)
-  (let ((inhibit-redisplay t)
-	(bbdb-electric-p nil))
-    (catch 'exit
-      ;; Exact match on name
-      (bbdb-name (concat "\\`" name "\\'") nil)
-      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
-      ;; Exact match on name
-      (bbdb-company (concat "\\`" name "\\'") nil)
-      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
-      ;; Partial match on name
-      (bbdb-name name nil)
-      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
-      ;; Partial match on company
-      (bbdb-company name nil)
-      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
-      ;; General match including network address and notes
-      (bbdb name nil)
-      (when (= 0 (buffer-size (get-buffer "*BBDB*")))
-	(delete-window (get-buffer-window "*BBDB*"))
-	(error "No matching BBDB record")))))
-
-
-(defun org-follow-info-link (name)
-  "Follow an info file & node link  to NAME."
-  (if (or (string-match "\\(.*\\)::?\\(.*\\)" name)
-          (string-match "\\(.*\\)" name))
-      (progn
-	(require 'info)
-        (if (match-string 2 name) ; If there isn't a node, choose "Top"
-            (Info-find-node (match-string 1 name) (match-string 2 name))
-          (Info-find-node (match-string 1 name) "Top")))
-    (message (concat "Could not open: " name))))
-
-(defun org-follow-gnus-link (&optional group article)
-  "Follow a Gnus link to GROUP and ARTICLE."
-  (require 'gnus)
-  (funcall (cdr (assq 'gnus org-link-frame-setup)))
-  (if gnus-other-frame-object (select-frame gnus-other-frame-object))
-  (if group (gnus-fetch-group group))
-  (if article
-      (or (gnus-summary-goto-article article nil 'force)
-	  (if (fboundp 'gnus-summary-insert-cached-articles)
-	      (progn
-		(gnus-summary-insert-cached-articles)
-		(gnus-summary-goto-article article nil 'force))
-	    (message "Message could not be found.")))))
-
-(defun org-follow-vm-link (&optional folder article readonly)
-  "Follow a VM link to FOLDER and ARTICLE."
-  (require 'vm)
-  (setq article (org-add-angle-brackets article))
-  (if (string-match "^//\\([a-zA-Z]+@\\)?\\([^:]+\\):\\(.*\\)" folder)
-      ;; ange-ftp or efs or tramp access
-      (let ((user (or (match-string 1 folder) (user-login-name)))
-	    (host (match-string 2 folder))
-	    (file (match-string 3 folder)))
-	(cond
-	 ((featurep 'tramp)
-	  ;; use tramp to access the file
-	  (if (featurep 'xemacs)
-	      (setq folder (format "[%s@%s]%s" user host file))
-	    (setq folder (format "/%s@%s:%s" user host file))))
-	 (t
-	  ;; use ange-ftp or efs
-	  (require (if (featurep 'xemacs) 'efs 'ange-ftp))
-	  (setq folder (format "/%s@%s:%s" user host file))))))
-  (when folder
-    (funcall (cdr (assq 'vm org-link-frame-setup)) folder readonly)
-    (sit-for 0.1)
-    (when article
-      (vm-select-folder-buffer)
-      (widen)
-      (let ((case-fold-search t))
-	(goto-char (point-min))
-	(if (not (re-search-forward
-		  (concat "^" "message-id: *" (regexp-quote article))))
-	    (error "Could not find the specified message in this folder"))
-	(vm-isearch-update)
-	(vm-isearch-narrow)
-	(vm-beginning-of-message)
-	(vm-summarize)))))
-
-(defun org-follow-wl-link (folder article)
-  "Follow a Wanderlust link to FOLDER and ARTICLE."
-  (setq article (org-add-angle-brackets article))
-  (wl-summary-goto-folder-subr folder 'no-sync t nil t)
-  (if article (wl-summary-jump-to-msg-by-message-id article ">"))
-  (wl-summary-redisplay))
-
-(defun org-follow-rmail-link (folder article)
-  "Follow an RMAIL link to FOLDER and ARTICLE."
-  (setq article (org-add-angle-brackets article))
-  (let (message-number)
-    (save-excursion
-      (save-window-excursion
-	(rmail (if (string= folder "RMAIL") rmail-file-name folder))
-	(setq message-number
-	      (save-restriction
-		(widen)
-		(goto-char (point-max))
-		(if (re-search-backward
-		     (concat "^Message-ID:\\s-+" (regexp-quote
-						  (or article "")))
-		     nil t)
-		    (rmail-what-message))))))
-    (if message-number
-	(progn
-	  (rmail (if (string= folder "RMAIL") rmail-file-name folder))
-	  (rmail-show-message message-number)
-	  message-number)
-      (error "Message not found"))))
-
-;; mh-e integration based on planner-mode
-(defun org-mhe-get-message-real-folder ()
-  "Return the name of the current message real folder, so if you use
-sequences, it will now work."
-  (save-excursion
-    (let* ((folder
-            (if (equal major-mode 'mh-folder-mode)
-                mh-current-folder
-              ;; Refer to the show buffer
-              mh-show-folder-buffer))
-           (end-index
-            (if (boundp 'mh-index-folder)
-                (min (length mh-index-folder) (length folder))))
-           )
-      ;; a simple test on mh-index-data does not work, because
-      ;; mh-index-data is always nil in a show buffer.
-      (if (and (boundp 'mh-index-folder)
-               (string= mh-index-folder (substring folder 0 end-index)))
-          (if (equal major-mode 'mh-show-mode)
-              (save-window-excursion
-                (when (buffer-live-p (get-buffer folder))
-                  (progn
-                    (pop-to-buffer folder)
-                    (org-mhe-get-message-folder-from-index)
-                    )
-                  ))
-            (org-mhe-get-message-folder-from-index)
-            )
-        folder
-        )
-      )))
-
-(defun org-mhe-get-message-folder-from-index ()
-  "Returns the name of the message folder in a index folder buffer."
-  (save-excursion
-    (mh-index-previous-folder)
-    (re-search-forward "^\\(+.*\\)$" nil t)
-    (message (match-string 1))))
-
-(defun org-mhe-get-message-folder ()
-  "Return the name of the current message folder.  Be careful if you
-use sequences."
-  (save-excursion
-    (if (equal major-mode 'mh-folder-mode)
-        mh-current-folder
-      ;; Refer to the show buffer
-      mh-show-folder-buffer)))
-
-(defun org-mhe-get-message-num ()
-  "Return the number of the current message.  Be careful if you
-use sequences."
-  (save-excursion
-    (if (equal major-mode 'mh-folder-mode)
-        (mh-get-msg-num nil)
-      ;; Refer to the show buffer
-      (mh-show-buffer-message-number))))
-
-(defun org-mhe-get-header (header)
-  "Return a header of the message in folder mode. This will create a
-show buffer for the corresponding message. If you have a more clever
-idea..."
-  (let* ((folder (org-mhe-get-message-folder))
-         (num (org-mhe-get-message-num))
-         (buffer (get-buffer-create (concat "show-" folder)))
-         (header-field))
-  (with-current-buffer buffer
-    (mh-display-msg num folder)
-    (if (equal major-mode 'mh-folder-mode)
-        (mh-header-display)
-      (mh-show-header-display))
-    (set-buffer buffer)
-    (setq header-field (mh-get-header-field header))
-    (if (equal major-mode 'mh-folder-mode)
-        (mh-show)
-      (mh-show-show))
-    header-field)))
-
-(defun org-follow-mhe-link (folder article)
-  "Follow an MHE link to FOLDER and ARTICLE.
-If ARTICLE is nil FOLDER is shown.  If the configuration variable
-`org-mhe-search-all-folders' is t and `mh-searcher' is pick,
-ARTICLE is searched in all folders.  Indexed searches (swish++,
-namazu, and others supported by MH-E) will always search in all
-folders."
-  (require 'mh-e)
-  (require 'mh-search)
-  (require 'mh-utils)
-  (mh-find-path)
-  (if (not article)
-      (mh-visit-folder (mh-normalize-folder-name folder))
-    (setq article (org-add-angle-brackets article))
-    (mh-search-choose)
-    (if (equal mh-searcher 'pick)
-        (progn
-          (mh-search folder (list "--message-id" article))
-          (when (and org-mhe-search-all-folders
-                     (not (org-mhe-get-message-real-folder)))
-            (kill-this-buffer)
-            (mh-search "+" (list "--message-id" article))))
-      (mh-search "+" article))
-    (if (org-mhe-get-message-real-folder)
-        (mh-show-msg 1)
-      (kill-this-buffer)
-      (error "Message not found"))))
-
-;; BibTeX links
-
-;; Use the custom search meachnism to construct and use search strings for
-;; file links to BibTeX database entries.
-
-(defun org-create-file-search-in-bibtex ()
-  "Create the search string and description for a BibTeX database entry."
-  (when (eq major-mode 'bibtex-mode)
-    ;; yes, we want to construct this search string.
-    ;; Make a good description for this entry, using names, year and the title
-    ;; Put it into the `description' variable which is dynamically scoped.
-    (let ((bibtex-autokey-names 1)
-	  (bibtex-autokey-names-stretch 1)
-	  (bibtex-autokey-name-case-convert-function 'identity)
-	  (bibtex-autokey-name-separator " & ")
-	  (bibtex-autokey-additional-names " et al.")
-	  (bibtex-autokey-year-length 4)
-	  (bibtex-autokey-name-year-separator " ")
-	  (bibtex-autokey-titlewords 3)
-	  (bibtex-autokey-titleword-separator " ")
-	  (bibtex-autokey-titleword-case-convert-function 'identity)
-	  (bibtex-autokey-titleword-length 'infty)
-	  (bibtex-autokey-year-title-separator ": "))
-      (setq description (bibtex-generate-autokey)))
-    ;; Now parse the entry, get the key and return it.
-    (save-excursion
-      (bibtex-beginning-of-entry)
-      (cdr (assoc "=key=" (bibtex-parse-entry))))))
-
-(defun org-execute-file-search-in-bibtex (s)
-  "Find the link search string S as a key for a database entry."
-  (when (eq major-mode 'bibtex-mode)
-    ;; Yes, we want to do the search in this file.
-    ;; We construct a regexp that searches for "@entrytype{" followed by the key
-    (goto-char (point-min))
-    (and (re-search-forward (concat "@[a-zA-Z]+[ \t\n]*{[ \t\n]*"
-				    (regexp-quote s) "[ \t\n]*,") nil t)
-	 (goto-char (match-beginning 0)))
-    (if (and (match-beginning 0) (equal current-prefix-arg '(16)))
-	;; Use double prefix to indicate that any web link should be browsed
-	(let ((b (current-buffer)) (p (point)))
-	  ;; Restore the window configuration because we just use the web link
-	  (set-window-configuration org-window-config-before-follow-link)
-	  (save-excursion (set-buffer b) (goto-char p)
-	    (bibtex-url)))
-      (recenter 0))  ; Move entry start to beginning of window
-  ;; return t to indicate that the search is done.
-    t))
-
-;; Finally add the functions to the right hooks.
-(add-hook 'org-create-file-search-functions 'org-create-file-search-in-bibtex)
-(add-hook 'org-execute-file-search-functions 'org-execute-file-search-in-bibtex)
-
-;; end of Bibtex link setup
-
-(defun org-upgrade-old-links (&optional query-description)
-  "Transfer old <...> style links to new [[...]] style links.
-With arg query-description, ask at each match for a description text to use
-for this link."
-  (interactive (list (y-or-n-p "Would you like to be queried for a description at each link?")))
-  (save-excursion
-    (goto-char (point-min))
-    (let ((re (concat "\\([^[]\\)<\\("
-		      "\\(" (mapconcat 'identity org-link-types "\\|")
-		      "\\):"
-		      "[^" org-non-link-chars "]+\\)>"))
-	  l1 l2 (cnt 0))
-      (while (re-search-forward re nil t)
-	(setq cnt (1+ cnt)
-	      l1 (org-match-string-no-properties 2)
-	      l2 (save-match-data (org-link-escape l1)))
-	(when query-description (setq l1 (read-string "Desc: " l1)))
-	(if (equal l1 l2)
-	    (replace-match (concat (match-string 1) "[[" l1 "]]") t t)
-	  (replace-match (concat (match-string 1) "[[" l2 "][" l1 "]]") t t)))
-      (message "%d matches have beed treated" cnt))))
-
-(defun org-open-file (path &optional in-emacs line search)
-  "Open the file at PATH.
-First, this expands any special file name abbreviations.  Then the
-configuration variable `org-file-apps' is checked if it contains an
-entry for this file type, and if yes, the corresponding command is launched.
-If no application is found, Emacs simply visits the file.
-With optional argument IN-EMACS, Emacs will visit the file.
-Optional LINE specifies a line to go to, optional SEARCH a string to
-search for.  If LINE or SEARCH is given, the file will always be
-opened in Emacs.
-If the file does not exist, an error is thrown."
-  (setq in-emacs (or in-emacs line search))
-  (let* ((file (if (equal path "")
-		   buffer-file-name
-		 (substitute-in-file-name (expand-file-name path))))
-	 (apps (append org-file-apps (org-default-apps)))
-	 (remp (and (assq 'remote apps) (org-file-remote-p file)))
-	 (dirp (if remp nil (file-directory-p file)))
-	 (dfile (downcase file))
-	 (old-buffer (current-buffer))
-	 (old-pos (point))
-	 (old-mode major-mode)
-	 ext cmd)
-    (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\.gz\\)$" dfile)
-	(setq ext (match-string 1 dfile))
-      (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\)$" dfile)
-	  (setq ext (match-string 1 dfile))))
-    (if in-emacs
-	(setq cmd 'emacs)
-      (setq cmd (or (and remp (cdr (assoc 'remote apps)))
-		    (and dirp (cdr (assoc 'directory apps)))
-		    (cdr (assoc ext apps))
-		    (cdr (assoc t apps)))))
-    (when (eq cmd 'mailcap)
-      (require 'mailcap)
-      (mailcap-parse-mailcaps)
-      (let* ((mime-type (mailcap-extension-to-mime (or ext "")))
-	     (command (mailcap-mime-info mime-type)))
-	(if (stringp command)
-	    (setq cmd command)
-	  (setq cmd 'emacs))))
-    (if (and (not (eq cmd 'emacs)) ; Emacs has not problems with non-ex files
-	     (not (file-exists-p file))
-	     (not org-open-non-existing-files))
-	(error "No such file: %s" file))
-    (cond
-     ((and (stringp cmd) (not (string-match "^\\s-*$" cmd)))
-      ;; Remove quotes around the file name - we'll use shell-quote-argument.
-      (if (string-match "['\"]%s['\"]" cmd)
-	  (setq cmd (replace-match "%s" t t cmd)))
-      (setq cmd (format cmd (shell-quote-argument file)))
-      (save-window-excursion
-	(shell-command (concat cmd " &"))))
-     ((or (stringp cmd)
-	  (eq cmd 'emacs))
-;      (unless (equal (file-truename file) (file-truename (or buffer-file-name "")))
-;	(funcall (cdr (assq 'file org-link-frame-setup)) file))
-      (funcall (cdr (assq 'file org-link-frame-setup)) file)
-      (if line (goto-line line)
-	(if search (org-link-search search))))
-     ((consp cmd)
-      (eval cmd))
-     (t (funcall (cdr (assq 'file org-link-frame-setup)) file)))
-    (and (org-mode-p) (eq old-mode 'org-mode)
-	 (or (not (equal old-buffer (current-buffer)))
-	     (not (equal old-pos (point))))
-	 (org-mark-ring-push old-pos old-buffer))))
-
-(defun org-default-apps ()
-  "Return the default applications for this operating system."
-  (cond
-   ((eq system-type 'darwin)
-    org-file-apps-defaults-macosx)
-   ((eq system-type 'windows-nt)
-    org-file-apps-defaults-windowsnt)
-   (t org-file-apps-defaults-gnu)))
-
-(defun org-expand-file-name (path)
-  "Replace special path abbreviations and expand the file name."
-  (expand-file-name path))
-
-(defvar ange-ftp-name-format) ; to silence the XEmacs compiler.
-(defun org-file-remote-p (file)
-  "Test whether FILE specifies a location on a remote system.
-Return non-nil if the location is indeed remote.
-
-For example, the filename \"/user@host:/foo\" specifies a location
-on the system \"/user@host:\"."
-  (cond ((fboundp 'file-remote-p)
-         (file-remote-p file))
-        ((fboundp 'tramp-handle-file-remote-p)
-         (tramp-handle-file-remote-p file))
-        ((and (boundp 'ange-ftp-name-format)
-              (string-match (car ange-ftp-name-format) file))
-         t)
-        (t nil)))
-
-(defvar org-insert-link-history nil
-  "Minibuffer history for links inserted with `org-insert-link'.")
-
-(defvar org-stored-links nil
-  "Contains the links stored with `org-store-link'.")
-
-;;;###autoload
-(defun org-store-link (arg)
-  "\\<org-mode-map>Store an org-link to the current location.
-This link can later be inserted into an org-buffer with
-\\[org-insert-link].
-For some link types, a prefix arg is interpreted:
-For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
-For file links, arg negates `org-context-in-file-links'."
-  (interactive "P")
-  (let (link cpltxt desc description search txt (pos (point)))
-    (cond
-
-     ((eq major-mode 'bbdb-mode)
-      (setq cpltxt (concat
-		    "bbdb:"
-		    (or (bbdb-record-name (bbdb-current-record))
-			(bbdb-record-company (bbdb-current-record))))
-	    link (org-make-link cpltxt)))
-
-     ((eq major-mode 'Info-mode)
-      (setq link (org-make-link "info:"
-				(file-name-nondirectory Info-current-file)
-				":" Info-current-node))
-      (setq cpltxt (concat (file-name-nondirectory Info-current-file)
-			   ":" Info-current-node)))
-
-     ((eq major-mode 'calendar-mode)
-      (let ((cd (calendar-cursor-to-date)))
-	(setq link
-	      (format-time-string
-	       (car org-time-stamp-formats)
-	       (apply 'encode-time
-		      (list 0 0 0 (nth 1 cd) (nth 0 cd) (nth 2 cd)
-			    nil nil nil))))))
-
-     ((or (eq major-mode 'vm-summary-mode)
-	  (eq major-mode 'vm-presentation-mode))
-      (and (eq major-mode 'vm-presentation-mode) (vm-summarize))
-      (vm-follow-summary-cursor)
-      (save-excursion
-       (vm-select-folder-buffer)
-       (let* ((message (car vm-message-pointer))
-	      (folder buffer-file-name)
-	      (subject (vm-su-subject message))
-	      (author (vm-su-full-name message))
-	      (message-id (vm-su-message-id message)))
-	 (setq message-id (org-remove-angle-brackets message-id))
-	 (setq folder (abbreviate-file-name folder))
-	 (if (string-match (concat "^" (regexp-quote vm-folder-directory))
-			   folder)
-	     (setq folder (replace-match "" t t folder)))
-	 (setq cpltxt (concat author " on: " subject))
-	 (setq link (org-make-link "vm:" folder "#" message-id)))))
-
-     ((eq major-mode 'wl-summary-mode)
-      (let* ((msgnum (wl-summary-message-number))
-	     (message-id (elmo-message-field wl-summary-buffer-elmo-folder
-					     msgnum 'message-id))
-	     (wl-message-entity (elmo-msgdb-overview-get-entity
-				 msgnum (wl-summary-buffer-msgdb)))
-	     (author (wl-summary-line-from)) ; FIXME: correct?
-	     (subject "???"))   ; FIXME:
-	(setq message-id (org-remove-angle-brackets message-id))
-	(setq cpltxt (concat author  " on: " subject))
-	(setq link (org-make-link "wl:" wl-summary-buffer-folder-name
-				  "#" message-id))))
-
-     ((or (equal major-mode 'mh-folder-mode)
-	  (equal major-mode 'mh-show-mode))
-      (let ((from-header (org-mhe-get-header "From:"))
-	    (to-header (org-mhe-get-header "To:"))
-	    (subject (org-mhe-get-header "Subject:")))
-	(setq cpltxt (concat from-header " on: " subject))
-	(setq link (org-make-link "mhe:" (org-mhe-get-message-real-folder) "#"
-				  (org-remove-angle-brackets
-				   (org-mhe-get-header "Message-Id:"))))))
-
-     ((eq major-mode 'rmail-mode)
-      (save-excursion
-	(save-restriction
-	  (rmail-narrow-to-non-pruned-header)
-	  (let ((folder buffer-file-name)
-		(message-id (mail-fetch-field "message-id"))
-		(author (mail-fetch-field "from"))
-		(subject (mail-fetch-field "subject")))
-	    (setq message-id (org-remove-angle-brackets message-id))
-	    (setq cpltxt (concat author  " on: " subject))
-	    (setq link (org-make-link "rmail:" folder "#" message-id))))))
-
-     ((eq major-mode 'gnus-group-mode)
-      (let ((group (cond ((fboundp 'gnus-group-group-name) ; depending on Gnus
-			  (gnus-group-group-name))         ; version
-			 ((fboundp 'gnus-group-name)
-			  (gnus-group-name))
-			 (t "???"))))
-	(setq cpltxt (concat
-		      (if (org-xor arg org-usenet-links-prefer-google)
-			  "http://groups.google.com/groups?group="
-			"gnus:")
-		      group)
-	      link (org-make-link cpltxt))))
-
-     ((memq major-mode '(gnus-summary-mode gnus-article-mode))
-      (require 'gnus-sum)
-      (and (eq major-mode 'gnus-article-mode) (gnus-article-show-summary))
-      (gnus-summary-beginning-of-article)
-      (let* ((group (car gnus-article-current))
-	     (article (cdr gnus-article-current))
-	     (header (gnus-summary-article-header article))
-	     (author (mail-header-from header))
-	     (message-id (mail-header-id header))
-	     (date (mail-header-date header))
-	     (subject (gnus-summary-subject-string)))
-	(setq cpltxt (concat author " on: " subject))
-	(if (org-xor arg org-usenet-links-prefer-google)
-	    (setq link
-		  (concat
-		   cpltxt "\n  "
-		   (format "http://groups.google.com/groups?as_umsgid=%s"
-			   (org-fixup-message-id-for-http message-id))))
-	  (setq link (org-make-link "gnus:" group
-				    "#" (number-to-string article))))))
-
-     ((eq major-mode 'w3-mode)
-      (setq cpltxt (url-view-url t)
-	    link (org-make-link cpltxt)))
-     ((eq major-mode 'w3m-mode)
-      (setq cpltxt (or w3m-current-title w3m-current-url)
-	    link (org-make-link w3m-current-url)))
-
-     ((setq search (run-hook-with-args-until-success
-		    'org-create-file-search-functions))
-      (setq link (concat "file:" (abbreviate-file-name buffer-file-name)
-			 "::" search))
-      (setq cpltxt (or description link)))
-
-     ((eq major-mode 'image-mode)
-      (setq cpltxt (concat "file:"
-			   (abbreviate-file-name buffer-file-name))
-	    link (org-make-link cpltxt)))
-
-     ((eq major-mode 'dired-mode)
-      ;; link to the file in the current line
-      (setq cpltxt (concat "file:"
-			   (abbreviate-file-name
-			    (expand-file-name
-			     (dired-get-filename nil t))))
-	    link (org-make-link cpltxt)))
-
-     ((and buffer-file-name (org-mode-p))
-      ;; Just link to current headline
-      (setq cpltxt (concat "file:"
-			   (abbreviate-file-name buffer-file-name)))
-      ;; Add a context search string
-      (when (org-xor org-context-in-file-links arg)
-	;; Check if we are on a target
-	(if (save-excursion
-	      (skip-chars-forward "^>\n\r")
-	      (and (re-search-backward "<<" nil t)
-		   (looking-at "<<\\(.*?\\)>>")
-		   (<= (match-beginning 0) pos)
-		   (>= (match-end 0) pos)))
-	    (setq cpltxt (concat cpltxt "::" (match-string 1)))
-	  (setq txt (cond
-		     ((org-on-heading-p) nil)
-		     ((org-region-active-p)
-		      (buffer-substring (region-beginning) (region-end)))
-		     (t (buffer-substring (point-at-bol) (point-at-eol)))))
-	  (when (or (null txt) (string-match "\\S-" txt))
-	    (setq cpltxt
-		  (concat cpltxt "::"
-			  (if org-file-link-context-use-camel-case
-			      (org-make-org-heading-camel txt)
-			    (org-make-org-heading-search-string txt)))
-		  desc "NONE"))))
-      (if (string-match "::\\'" cpltxt)
-	  (setq cpltxt (substring cpltxt 0 -2)))
-      (setq link (org-make-link cpltxt)))
-
-     (buffer-file-name
-      ;; Just link to this file here.
-      (setq cpltxt (concat "file:"
-			   (abbreviate-file-name buffer-file-name)))
-      ;; Add a context string
-      (when (org-xor org-context-in-file-links arg)
-	(setq txt (if (org-region-active-p)
-		      (buffer-substring (region-beginning) (region-end))
-		    (buffer-substring (point-at-bol) (point-at-eol))))
-	;; Only use search option if there is some text.
-	(when (string-match "\\S-" txt)
-	  (setq cpltxt
-		(concat cpltxt "::"
-			(if org-file-link-context-use-camel-case
-			    (org-make-org-heading-camel txt)
-			  (org-make-org-heading-search-string txt)))
-		desc "NONE")))
-      (setq link (org-make-link cpltxt)))
-
-     ((interactive-p)
-      (error "Cannot link to a buffer which is not visiting a file"))
-
-     (t (setq link nil)))
-
-    (if (consp link) (setq cpltxt (car link) link (cdr link)))
-    (setq link (or link cpltxt)
-	  desc (or desc cpltxt))
-    (if (equal desc "NONE") (setq desc nil))
-
-    (if (and (interactive-p) link)
-	(progn
-	  (setq org-stored-links
-		(cons (list cpltxt link desc) org-stored-links))
-	  (message "Stored: %s" (or cpltxt link)))
-      (org-make-link-string link desc))))
-
-(defun org-make-org-heading-search-string (&optional string heading)
-  "Make search string for STRING or current headline."
-  (interactive)
-  (let ((s (or string (org-get-heading))))
-    (unless (and string (not heading))
-      ;; We are using a headline, clean up garbage in there.
-      (if (string-match org-todo-regexp s)
-	  (setq s (replace-match "" t t s)))
-      (if (string-match ":[a-zA-Z_@0-9:]+:[ \t]*$" s)
-	  (setq s (replace-match "" t t s)))
-      (setq s (org-trim s))
-      (if (string-match (concat "^\\(" org-quote-string "\\|"
-				org-comment-string "\\)") s)
-	  (setq s (replace-match "" t t s)))
-      (while (string-match org-ts-regexp s)
-	(setq s (replace-match "" t t s))))
-    (while (string-match "[^a-zA-Z_0-9 \t]+" s)
-      (setq s (replace-match " " t t s)))
-    (or string (setq s (concat "*" s)))  ; Add * for headlines
-    (mapconcat 'identity (org-split-string s "[ \t]+") " ")))
-
-(defun org-make-org-heading-camel (&optional string heading)
-  "Make a CamelCase string for STRING or the current headline."
-  (interactive)
-  (let ((s (or string (org-get-heading))))
-    (unless (and string (not heading))
-      ;; We are using a headline, clean up garbage in there.
-      (if (string-match org-todo-regexp s)
-	  (setq s (replace-match "" t t s)))
-      (if (string-match ":[a-zA-Z_@0-9:]+:[ \t]*$" s)
-	  (setq s (replace-match "" t t s)))
-      (setq s (org-trim s))
-      (if (string-match (concat "^\\(" org-quote-string "\\|"
-				org-comment-string "\\)") s)
-	  (setq s (replace-match "" t t s)))
-      (while (string-match org-ts-regexp s)
-	(setq s (replace-match "" t t s))))
-    (while (string-match "[^a-zA-Z_ \t]+" s)
-      (setq s (replace-match " " t t s)))
-    (or string (setq s (concat "*" s)))  ; Add * for headlines
-    (mapconcat 'capitalize (org-split-string s "[ \t]+") "")))
-
-(defun org-make-link (&rest strings)
-  "Concatenate STRINGS, format resulting string with `org-link-format'."
-  (format org-link-format (apply 'concat strings)))
-
-(defun org-make-link-string (link &optional description)
-  "Make a link with brackets, consisting of LINK and DESCRIPTION."
-  (if (eq org-link-style 'plain)
-      (if (equal description link)
-	  link
-	(concat description "\n" link))
-    (when (stringp description)
-      ;; Remove brackets from the description, they are fatal.
-      (while (string-match "\\[\\|\\]" description)
-	(setq description (replace-match "" t t description))))
-    (when (equal (org-link-escape link) description)
-      ;; No description needed, it is identical
-      (setq description nil))
-    (when (and (not description)
-	       (not (equal link (org-link-escape link))))
-      (setq description link))
-    (concat "[[" (org-link-escape link) "]"
-	    (if description (concat "[" description "]") "")
-	    "]")))
-
-(defconst org-link-escape-chars '(("[" . "%5B") ("]" . "%5D") (" " . "%20"))
-  "Association list of escapes for some characters problematic in links.")
-
-(defun org-link-escape (text)
-  "Escape charaters in TEXT that are problematic for links."
-  (when text
-    (let ((re (mapconcat (lambda (x) (regexp-quote (car x)))
-			 org-link-escape-chars "\\|")))
-      (while (string-match re text)
-	(setq text
-	      (replace-match
-	       (cdr (assoc (match-string 0 text) org-link-escape-chars))
-	       t t text)))
-      text)))
-
-(defun org-link-unescape (text)
-  "Reverse the action of `org-link-escape'."
-  (when text
-    (let ((re (mapconcat (lambda (x) (regexp-quote (cdr x)))
-			 org-link-escape-chars "\\|")))
-      (while (string-match re text)
-	(setq text
-	      (replace-match
-	       (car (rassoc (match-string 0 text) org-link-escape-chars))
-	       t t text)))
-      text)))
-
-(defun org-xor (a b)
-  "Exclusive or."
-  (if a (not b) b))
-
-(defun org-get-header (header)
-  "Find a header field in the current buffer."
-  (save-excursion
-    (goto-char (point-min))
-    (let ((case-fold-search t) s)
-      (cond
-       ((eq header 'from)
-	(if (re-search-forward "^From:\\s-+\\(.*\\)" nil t)
-	    (setq s (match-string 1)))
-	(while (string-match "\"" s)
-	  (setq s (replace-match "" t t s)))
-	(if (string-match "[<(].*" s)
-	    (setq s (replace-match "" t t s))))
-       ((eq header 'message-id)
-	(if (re-search-forward "^message-id:\\s-+\\(.*\\)" nil t)
-	    (setq s (match-string 1))))
-       ((eq header 'subject)
-	(if (re-search-forward "^subject:\\s-+\\(.*\\)" nil t)
-	    (setq s (match-string 1)))))
-      (if (string-match "\\`[ \t\]+" s) (setq s (replace-match "" t t s)))
-      (if (string-match "[ \t\]+\\'" s) (setq s (replace-match "" t t s)))
-      s)))
-
-
-(defun org-fixup-message-id-for-http (s)
-  "Replace special characters in a message id, so it can be used in an http query."
-  (while (string-match "<" s)
-    (setq s (replace-match "%3C" t t s)))
-  (while (string-match ">" s)
-    (setq s (replace-match "%3E" t t s)))
-  (while (string-match "@" s)
-    (setq s (replace-match "%40" t t s)))
-  s)
-
-(defun org-insert-link (&optional complete-file)
-  "Insert a link.  At the prompt, enter the link.
-
-Completion can be used to select a link previously stored with
-`org-store-link'.  When the empty string is entered (i.e. if you just
-press RET at the prompt), the link defaults to the most recently
-stored link.  As SPC triggers completion in the minibuffer, you need to
-use M-SPC or C-q SPC to force the insertion of a space character.
-
-You will also be prompted for a description, and if one is given, it will
-be displayed in the buffer instead of the link.
-
-If there is already a link at point, this command will allow you to edit link
-and description parts.
-
-With a \\[universal-argument] prefix, prompts for a file to link to.  The file name can be
-selected using completion.  The path to the file will be relative to
-the current directory if the file is in the current directory or a
-subdirectory.  Otherwise, the link will be the absolute path as
-completed in the minibuffer (i.e. normally ~/path/to/file).
-
-With two \\[universal-argument] prefixes, enforce an absolute path even if the file
-is in the current directory or below.
-With three \\[universal-argument] prefixes, negate the meaning of
-`org-keep-stored-link-after-insertion'."
-  (interactive "P")
-  (let (link desc entry remove file (pos (point)))
+    (let ((pos (point))
+	  (dodollar (member "$" (plist-get org-format-latex-options :matchers)))
+	  (lim (progn
+		 (re-search-backward (concat "^\\(" paragraph-start "\\)") nil t)
+		 (point)))
+	  dd-on str (start 0) m re)
+      (goto-char pos)
+      (when dodollar
+	(setq str (concat (buffer-substring lim (point)) "\000 X$.")
+	      re (nth 1 (assoc "$" org-latex-regexps)))
+	(while (string-match re str start)
+	  (cond
+	   ((= (match-end 0) (length str))
+	    (throw 'exit (cons "$" (+ lim (match-beginning 0)))))
+	   ((= (match-end 0) (- (length str) 5))
+	    (throw 'exit nil))
+	   (t (setq start (match-end 0))))))
+      (when (setq m (re-search-backward "\\(\\\\begin{[^}]*}\\|\\\\(\\|\\\\\\[\\)\\|\\(\\\\end{[^}]*}\\|\\\\)\\|\\\\\\]\\)\\|\\(\\$\\$\\)" lim t))
+	(goto-char pos)
+	(and (match-beginning 1) (throw 'exit (cons (match-string 1) m)))
+	(and (match-beginning 2) (throw 'exit nil))
+	;; count $$
+	(while (re-search-backward "\\$\\$" lim t)
+	  (setq dd-on (not dd-on)))
+	(goto-char pos)
+	(if dd-on (cons "$$" m))))))
+
+
+(defun org-try-cdlatex-tab ()
+  "Check if it makes sense to execute `cdlatex-tab', and do it if yes.
+It makes sense to do so if `org-cdlatex-mode' is active and if the cursor is
+  - inside a LaTeX fragment, or
+  - after the first word in a line, where an abbreviation expansion could
+    insert a LaTeX environment."
+  (when org-cdlatex-mode
     (cond
      ((save-excursion
-	(skip-chars-forward "^]\n\r")
-	(and (re-search-backward "\\[\\[" nil t)
-	     (looking-at org-bracket-link-regexp)
-	     (<= (match-beginning 0) pos)
-	     (>= (match-end 0) pos)))
-      ;; We do have a link at point, and we are going to edit it.
-      (setq remove (list (match-beginning 0) (match-end 0)))
-      (setq desc (if (match-end 3) (org-match-string-no-properties 3)))
-      (setq link (read-string "Link: "
-			      (org-link-unescape
-			       (org-match-string-no-properties 1)))))
-     ((equal complete-file '(4))
-      ;; Completing read for file names.
-      (setq file (read-file-name "File: "))
-      (let ((pwd (file-name-as-directory (expand-file-name ".")))
-	    (pwd1 (file-name-as-directory (abbreviate-file-name
-					   (expand-file-name ".")))))
-	(cond
-	 ((equal complete-file '(16))
-	  (setq link (org-make-link
-		      "file:"
-		      (abbreviate-file-name (expand-file-name file)))))
-	 ((string-match (concat "^" (regexp-quote pwd1) "\\(.+\\)") file)
-	  (setq link  (org-make-link "file:" (match-string 1 file))))
-	 ((string-match (concat "^" (regexp-quote pwd) "\\(.+\\)")
-			(expand-file-name file))
-	  (setq link  (org-make-link
-		       "file:" (match-string 1 (expand-file-name file)))))
-	 (t (setq link (org-make-link "file:" file))))))
-     (t
-      ;; Read link, with completion for stored links.
-      (setq link (org-completing-read
-		  "Link: " org-stored-links nil nil nil
-		  org-insert-link-history
-		  (or (car (car org-stored-links)))))
-      (setq entry (assoc link org-stored-links))
-      (if (funcall (if (equal complete-file '(64)) 'not 'identity)
-		   (not org-keep-stored-link-after-insertion))
-	  (setq org-stored-links (delq (assoc link org-stored-links)
-				       org-stored-links)))
-      (setq link (if entry (nth 1 entry) link)
-	    desc (or desc (nth 2 entry)))))
-
-    (if (string-match org-plain-link-re link)
-	;; URL-like link, normalize the use of angular brackets.
-	(setq link (org-make-link (org-remove-angle-brackets link))))
-
-    ;; Check if we are linking to the current file with a search option
-    ;; If yes, simplify the link by using only the search option.
-    (when (and buffer-file-name
-	       (string-match "\\<file:\\(.+?\\)::\\([^>]+\\)" link))
-      (let* ((path (match-string 1 link))
-	     (case-fold-search nil)
-	     (search (match-string 2 link)))
-	(save-match-data
-	  (if (equal (file-truename buffer-file-name) (file-truename path))
-	      ;; We are linking to this same file, with a search option
-	      (setq link search)))))
-
-    ;; Check if we can/should use a relative path.  If yes, simplify the link
-    (when (string-match "\\<file:\\(.*\\)" link)
-      (let* ((path (match-string 1 link))
-	     (case-fold-search nil))
-	(cond
-	 ((eq org-link-file-path-type 'absolute)
-	  (setq path (abbreviate-file-name (expand-file-name path))))
-	 ((eq org-link-file-path-type 'noabbrev)
-	  (setq path (expand-file-name path)))
-	 ((eq org-link-file-path-type 'relative)
-	  (setq path (file-relative-name path)))
-	 (t
-	  (save-match-data
-	    (if (string-match (concat "^" (regexp-quote
-					   (file-name-as-directory
-					    (expand-file-name "."))))
-			      (expand-file-name path))
-		;; We are linking a file with relative path name.
-		(setq path (substring (expand-file-name path)
-				      (match-end 0)))))))
-	(setq link (concat "file:" path))))
-
-    (setq desc (read-string "Description: " desc))
-    (unless (string-match "\\S-" desc) (setq desc nil))
-    (if remove (apply 'delete-region remove))
-    (insert (org-make-link-string link desc))))
-
-(defun org-completing-read (&rest args)
-  (let ((minibuffer-local-completion-map
-	 (copy-keymap minibuffer-local-completion-map)))
-    (define-key minibuffer-local-completion-map " " 'self-insert-command)
-    (apply 'completing-read args)))
-
-;;; Hooks for remember.el
-
-(defvar org-finish-function nil)
-
-;;;###autoload
-(defun org-remember-annotation ()
-  "Return a link to the current location as an annotation for remember.el.
-If you are using Org-mode files as target for data storage with
-remember.el, then the annotations should include a link compatible with the
-conventions in Org-mode.  This function returns such a link."
-  (org-store-link nil))
-
-(defconst org-remember-help
-"Select a destination location for the note.
-UP/DOWN=headline   TAB=cycle visibility  [Q]uit   RET/<left>/<right>=Store
-RET at beg-of-buf -> Append to file as level 2 headline
-RET on headline   -> Store as sublevel entry to current headline
-<left>/<right>    -> before/after current headline, same headings level")
-
-;;;###autoload
-(defun org-remember-apply-template ()
-  "Initialize *remember* buffer with template, invoke `org-mode'.
-This function should be placed into `remember-mode-hook' and in fact requires
-to be run from that hook to fucntion properly."
-  (if org-remember-templates
-
-      (let* ((entry (if (= (length org-remember-templates) 1)
-			(cdar org-remember-templates)
-		      (message "Select template: %s"
-			       (mapconcat
-				(lambda (x) (char-to-string (car x)))
-				org-remember-templates " "))
-		      (cdr (assoc (read-char-exclusive) org-remember-templates))))
-	     (tpl (car entry))
-	     (file (if (consp (cdr entry)) (nth 1 entry)))
-	     (v-t (format-time-string (car org-time-stamp-formats) (org-current-time)))
-	     (v-T (format-time-string (cdr org-time-stamp-formats) (org-current-time)))
-	     (v-u (concat "[" (substring v-t 1 -1) "]"))
-	     (v-U (concat "[" (substring v-T 1 -1) "]"))
-	     (v-a annotation)   ; defined in `remember-mode'
-	     (v-i initial)      ; defined in `remember-mode'
-	     (v-n user-full-name)
-	     )
-	(unless tpl (setq tpl "")	(message "No template") (ding))
-	(insert tpl) (goto-char (point-min))
-	(while (re-search-forward "%\\([tTuTai]\\)" nil t)
-	  (when (and initial (equal (match-string 0) "%i"))
-	    (save-match-data
-	      (let* ((lead (buffer-substring
-			    (point-at-bol) (match-beginning 0))))
-		(setq v-i (mapconcat 'identity
-				     (org-split-string initial "\n")
-				     (concat "\n" lead))))))
-	  (replace-match
-	   (or (eval (intern (concat "v-" (match-string 1)))) "")
-	   t t))
-	(let ((org-startup-folded nil)
-	      (org-startup-with-deadline-check nil))
-	  (org-mode))
-	(if (and file (string-match "\\S-" file) (not (file-directory-p file)))
-	    (org-set-local 'org-default-notes-file file))
-	(goto-char (point-min))
-	(if (re-search-forward "%\\?" nil t) (replace-match "")))
-    (let ((org-startup-folded nil)
-	  (org-startup-with-deadline-check nil))
-      (org-mode)))
-  (org-set-local 'org-finish-function 'remember-buffer))
-
-;;;###autoload
-(defun org-remember-handler ()
-  "Store stuff from remember.el into an org file.
-First prompts for an org file.  If the user just presses return, the value
-of `org-default-notes-file' is used.
-Then the command offers the headings tree of the selected file in order to
-file the text at a specific location.
-You can either immediately press RET to get the note appended to the
-file, or you can use vertical cursor motion and visibility cycling (TAB) to
-find a better place.  Then press RET or <left> or <right> in insert the note.
-
-Key      Cursor position   Note gets inserted
------------------------------------------------------------------------------
-RET      buffer-start      as level 2 heading at end of file
-RET      on headline       as sublevel of the heading at cursor
-RET      no heading        at cursor position, level taken from context.
-			   Or use prefix arg to specify level manually.
-<left>   on headline       as same level, before current heading
-<right>  on headline       as same level, after current heading
-
-So the fastest way to store the note is to press RET RET to append it to
-the default file.  This way your current train of thought is not
-interrupted, in accordance with the principles of remember.el.  But with
-little extra effort, you can push it directly to the correct location.
-
-Before being stored away, the function ensures that the text has a
-headline, i.e. a first line that starts with a \"*\".  If not, a headline
-is constructed from the current date and some additional data.
-
-If the variable `org-adapt-indentation' is non-nil, the entire text is
-also indented so that it starts in the same column as the headline
-\(i.e. after the stars).
-
-See also the variable `org-reverse-note-order'."
-  (catch 'quit
-    (let* ((txt (buffer-substring (point-min) (point-max)))
-	   (fastp current-prefix-arg)
-	   (file (if fastp org-default-notes-file (org-get-org-file)))
-	   (visiting (find-buffer-visiting file))
-	   (org-startup-with-deadline-check nil)
-	   (org-startup-folded nil)
-	   (org-startup-align-all-tables nil)
-	   spos level indent reversed)
-      ;; Modify text so that it becomes a nice subtree which can be inserted
-      ;; into an org tree.
-      (let* ((lines (split-string txt "\n"))
-	     first)
-	;; remove empty lines at the beginning
-	(while (and lines (string-match "^[ \t]*\n" (car lines)))
-	  (setq lines (cdr lines)))
-	(setq first (car lines) lines (cdr lines))
-	(if (string-match "^\\*+" first)
-	    ;; Is already a headline
-	    (setq indent nil)
-	  ;; We need to add a headline:  Use time and first buffer line
-	  (setq lines (cons first lines)
-		first (concat "* " (current-time-string)
-			      " (" (remember-buffer-desc) ")")
-		indent "  "))
-	(if (and org-adapt-indentation indent)
-	    (setq lines (mapcar (lambda (x) (concat indent x)) lines)))
-	(setq txt (concat first "\n"
-			  (mapconcat 'identity lines "\n"))))
-      ;; Find the file
-      (if (not visiting)
-	  (find-file-noselect file))
-      (with-current-buffer (get-file-buffer file)
-	(save-excursion (and (goto-char (point-min))
-			     (not (re-search-forward "^\\* " nil t))
-			     (insert "\n* Notes\n")))
-	(setq reversed (org-notes-order-reversed-p))
-	(save-excursion
-	  (save-restriction
-	    (widen)
-	    ;; Ask the User for a location
-	    (setq spos (if fastp 1 (org-get-location
-				    (current-buffer)
-				    org-remember-help)))
-	    (if (not spos) (throw 'quit nil)) ; return nil to show we did
-					      ; not handle this note
-	    (goto-char spos)
-	    (cond ((bobp)
-		   ;; Put it at the start or end, as level 2
-		   (save-restriction
-		     (widen)
-		     (goto-char (if reversed (point-min) (point-max)))
-		     (if (not (bolp)) (newline))
-		     (org-paste-subtree 2 txt)))
-		  ((and (org-on-heading-p nil) (not current-prefix-arg))
-		   ;; Put it below this entry, at the beg/end of the subtree
-		   (org-back-to-heading)
-		   (setq level (funcall outline-level))
-		   (if reversed
-		       (outline-end-of-heading)
-		     (outline-end-of-subtree))
-		   (if (not (bolp)) (newline))
-		   (beginning-of-line 1)
-		   (org-paste-subtree (org-get-legal-level level 1) txt))
-		  (t
-		   ;; Put it right there, with automatic level determined by
-		   ;; org-paste-subtree or from prefix arg
-		   (org-paste-subtree current-prefix-arg txt)))
-	    (when remember-save-after-remembering
-	      (save-buffer)
-	      (if (not visiting) (kill-buffer (current-buffer)))))))))
-  t)    ;; return t to indicate that we took care of this note.
-
-(defun org-get-org-file ()
-  "Read a filename, with default directory `org-directory'."
-  (let ((default (or org-default-notes-file remember-data-file)))
-    (read-file-name (format "File name [%s]: " default)
-		    (file-name-as-directory org-directory)
-		    default)))
-
-(defun org-notes-order-reversed-p ()
-  "Check if the current file should receive notes in reversed order."
-  (cond
-   ((not org-reverse-note-order) nil)
-   ((eq t org-reverse-note-order) t)
-   ((not (listp org-reverse-note-order)) nil)
-   (t (catch 'exit
-	(let  ((all org-reverse-note-order)
-	       entry)
-	  (while (setq entry (pop all))
-	    (if (string-match (car entry) buffer-file-name)
-		(throw 'exit (cdr entry))))
-	  nil)))))
-
-;;; Tables
-
-;; Watch out:  Here we are talking about two different kind of tables.
-;; Most of the code is for the tables created with the Org-mode table editor.
-;; Sometimes, we talk about tables created and edited with the table.el
-;; Emacs package.  We call the former org-type tables, and the latter
-;; table.el-type tables.
-
-
-(defun org-before-change-function (beg end)
-  "Every change indicates that a table might need an update."
-  (setq org-table-may-need-update t))
-
-(defconst org-table-line-regexp "^[ \t]*|"
-  "Detects an org-type table line.")
-(defconst org-table-dataline-regexp "^[ \t]*|[^-]"
-  "Detects an org-type table line.")
-(defconst org-table-auto-recalculate-regexp "^[ \t]*| *# *\\(|\\|$\\)"
-  "Detects a table line marked for automatic recalculation.")
-(defconst org-table-recalculate-regexp "^[ \t]*| *[#*] *\\(|\\|$\\)"
-  "Detects a table line marked for automatic recalculation.")
-(defconst org-table-calculate-mark-regexp "^[ \t]*| *[!$^_#*] *\\(|\\|$\\)"
-  "Detects a table line marked for automatic recalculation.")
-(defconst org-table-hline-regexp "^[ \t]*|-"
-  "Detects an org-type table hline.")
-(defconst org-table1-hline-regexp "^[ \t]*\\+-[-+]"
-  "Detects a table-type table hline.")
-(defconst org-table-any-line-regexp "^[ \t]*\\(|\\|\\+-[-+]\\)"
-  "Detects an org-type or table-type table.")
-(defconst org-table-border-regexp "^[ \t]*[^| \t]"
-  "Searching from within a table (any type) this finds the first line
-outside the table.")
-(defconst org-table-any-border-regexp "^[ \t]*[^|+ \t]"
-  "Searching from within a table (any type) this finds the first line
-outside the table.")
-
-(defun org-table-create-with-table.el ()
-  "Use the table.el package to insert a new table.
-If there is already a table at point, convert between Org-mode tables
-and table.el tables."
-  (interactive)
-  (require 'table)
-  (cond
-   ((org-at-table.el-p)
-    (if (y-or-n-p "Convert table to Org-mode table? ")
-	(org-table-convert)))
-   ((org-at-table-p)
-    (if (y-or-n-p "Convert table to table.el table? ")
-	(org-table-convert)))
-   (t (call-interactively 'table-insert))))
-
-(defun org-table-create-or-convert-from-region (arg)
-  "Convert region to table, or create an empty table.
-If there is an active region, convert it to a table.  If there is no such
-region, create an empty table."
-  (interactive "P")
-  (if (org-region-active-p)
-      (org-table-convert-region (region-beginning) (region-end) arg)
-    (org-table-create arg)))
-
-(defun org-table-create (&optional size)
-  "Query for a size and insert a table skeleton.
-SIZE is a string Columns x Rows like for example \"3x2\"."
-  (interactive "P")
-  (unless size
-    (setq size (read-string
-		(concat "Table size Columns x Rows [e.g. "
-			org-table-default-size "]: ")
-		"" nil org-table-default-size)))
-
-  (let* ((pos (point))
-	 (indent (make-string (current-column) ?\ ))
-	 (split (org-split-string size " *x *"))
-	 (rows (string-to-number (nth 1 split)))
-	 (columns (string-to-number (car split)))
-	 (line (concat (apply 'concat indent "|" (make-list columns "  |"))
-		       "\n")))
-    (if (string-match "^[ \t]*$" (buffer-substring-no-properties
-				  (point-at-bol) (point)))
-	(beginning-of-line 1)
-      (newline))
-    ;; (mapcar (lambda (x) (insert line)) (make-list rows t))
-    (dotimes (i rows) (insert line))
-    (goto-char pos)
-    (if (> rows 1)
-	;; Insert a hline after the first row.
-	(progn
-	  (end-of-line 1)
-	  (insert "\n|-")
-	  (goto-char pos)))
-    (org-table-align)))
-
-(defun org-table-convert-region (beg0 end0 &optional nspace)
-  "Convert region to a table.
-The region goes from BEG0 to END0, but these borders will be moved
-slightly, to make sure a beginning of line in the first line is included.
-When NSPACE is non-nil, it indicates the minimum number of spaces that
-separate columns (default: just one space)."
-  (interactive "rP")
-  (let* ((beg (min beg0 end0))
-	 (end (max beg0 end0))
-	 (tabsep t)
-	 re)
-    (goto-char beg)
-    (beginning-of-line 1)
-    (setq beg (move-marker (make-marker) (point)))
-    (goto-char end)
-    (if (bolp) (backward-char 1) (end-of-line 1))
-    (setq end (move-marker (make-marker) (point)))
-    ;; Lets see if this is tab-separated material.  If every nonempty line
-    ;; contains a tab, we will assume that it is tab-separated material
-    (if nspace
-	(setq tabsep nil)
-      (goto-char beg)
-      (and (re-search-forward "^[^\n\t]+$" end t) (setq tabsep nil)))
-    (if nspace (setq tabsep nil))
-    (if tabsep
-	(setq re "^\\|\t")
-      (setq re (format "^ *\\| *\t *\\| \\{%d,\\}"
-		       (max 1 (prefix-numeric-value nspace)))))
-    (goto-char beg)
-    (while (re-search-forward re end t)
-      (replace-match "| " t t))
-    (goto-char beg)
-    (insert " ")
-    (org-table-align)))
-
-(defun org-table-import (file arg)
-  "Import FILE as a table.
-The file is assumed to be tab-separated.  Such files can be produced by most
-spreadsheet and database applications.  If no tabs (at least one per line)
-are found, lines will be split on whitespace into fields."
-  (interactive "f\nP")
-  (or (bolp) (newline))
-  (let ((beg (point))
-	(pm (point-max)))
-    (insert-file-contents file)
-    (org-table-convert-region beg (+ (point) (- (point-max) pm)) arg)))
-
-(defun org-table-export ()
-  "Export table as a tab-separated file.
-Such a file can be imported into a spreadsheet program like Excel."
-  (interactive)
-  (let* ((beg (org-table-begin))
-	 (end (org-table-end))
-	 (table (buffer-substring beg end))
-	 (file (read-file-name "Export table to: "))
-	 buf)
-    (unless (or (not (file-exists-p file))
-		(y-or-n-p (format "Overwrite file %s? " file)))
-      (error "Abort"))
-    (with-current-buffer (find-file-noselect file)
-      (setq buf (current-buffer))
-      (erase-buffer)
-      (fundamental-mode)
-      (insert table)
-      (goto-char (point-min))
-      (while (re-search-forward "^[ \t]*|[ \t]*" nil t)
-	(replace-match "" t t)
-	(end-of-line 1))
-      (goto-char (point-min))
-      (while (re-search-forward "[ \t]*|[ \t]*$" nil t)
-	(replace-match "" t t)
-	(goto-char (min (1+ (point)) (point-max))))
-      (goto-char (point-min))
-      (while (re-search-forward "^-[-+]*$" nil t)
-	(replace-match "")
-	(if (looking-at "\n")
-	    (delete-char 1)))
-      (goto-char (point-min))
-      (while (re-search-forward "[ \t]*|[ \t]*" nil t)
-	(replace-match "\t" t t))
-      (save-buffer))
-    (kill-buffer buf)))
-
-(defvar org-table-aligned-begin-marker (make-marker)
-  "Marker at the beginning of the table last aligned.
-Used to check if cursor still is in that table, to minimize realignment.")
-(defvar org-table-aligned-end-marker (make-marker)
-  "Marker at the end of the table last aligned.
-Used to check if cursor still is in that table, to minimize realignment.")
-(defvar org-table-last-alignment nil
-  "List of flags for flushright alignment, from the last re-alignment.
-This is being used to correctly align a single field after TAB or RET.")
-(defvar org-table-last-column-widths nil
-  "List of max width of fields in each column.
-This is being used to correctly align a single field after TAB or RET.")
-
-(defvar org-last-recalc-line nil)
-(defconst org-narrow-column-arrow "=>"
-  "Used as display property in narrowed table columns.")
-
-(defun org-table-align ()
-  "Align the table at point by aligning all vertical bars."
-  (interactive)
-  (let* (
-	 ;; Limits of table
-	 (beg (org-table-begin))
-	 (end (org-table-end))
-	 ;; Current cursor position
-	 (linepos (org-current-line))
-	 (colpos (org-table-current-column))
-	 (winstart (window-start))
-	 (winstartline (org-current-line (min winstart (1- (point-max)))))
-	 lines (new "") lengths l typenums ty fields maxfields i
-	 column
-	 (indent "") cnt frac
-	 rfmt hfmt
-	 (spaces '(1 . 1))
-	 (sp1 (car spaces))
-	 (sp2 (cdr spaces))
-	 (rfmt1 (concat
-		 (make-string sp2 ?\ ) "%%%s%ds" (make-string sp1 ?\ ) "|"))
-	 (hfmt1 (concat
-		 (make-string sp2 ?-) "%s" (make-string sp1 ?-) "+"))
-	 emptystrings links dates narrow fmax f1 len c e)
-    (untabify beg end)
-    (remove-text-properties beg end '(org-cwidth t org-dwidth t display t))
-    ;; Check if we have links or dates
-    (goto-char beg)
-    (setq links (re-search-forward org-bracket-link-regexp end t))
-    (goto-char beg)
-    (setq dates (and org-display-custom-times
-		     (re-search-forward org-ts-regexp-both end t)))
-    ;; Make sure the link properties are right
-    (when links (goto-char beg) (while (org-activate-bracket-links end)))
-    ;; Make sure the date properties are right
-    (when dates (goto-char beg) (while (org-activate-dates end)))
-
-    ;; Check if we are narrowing any columns
-    (goto-char beg)
-    (setq narrow (and org-format-transports-properties-p
-		      (re-search-forward "<[0-9]+>" end t)))
-    ;; Get the rows
-    (setq lines (org-split-string
-		 (buffer-substring beg end) "\n"))
-    ;; Store the indentation of the first line
-    (if (string-match "^ *" (car lines))
-	(setq indent (make-string (- (match-end 0) (match-beginning 0)) ?\ )))
-    ;; Mark the hlines by setting the corresponding element to nil
-    ;; At the same time, we remove trailing space.
-    (setq lines (mapcar (lambda (l)
-			  (if (string-match "^ *|-" l)
-			      nil
-			    (if (string-match "[ \t]+$" l)
-				(substring l 0 (match-beginning 0))
-			      l)))
-			lines))
-    ;; Get the data fields by splitting the lines.
-    (setq fields (mapcar
-		  (lambda (l)
-		      (org-split-string l " *| *"))
-		  (delq nil (copy-sequence lines))))
-    ;; How many fields in the longest line?
-    (condition-case nil
-	(setq maxfields (apply 'max (mapcar 'length fields)))
-      (error
-       (kill-region beg end)
-       (org-table-create org-table-default-size)
-       (error "Empty table - created default table")))
-    ;; A list of empty strings to fill any short rows on output
-    (setq emptystrings (make-list maxfields ""))
-    ;; Check for special formatting.
-    (setq i -1)
-    (while (< (setq i (1+ i)) maxfields)   ;; Loop over all columns
-      (setq column (mapcar (lambda (x) (or (nth i x) "")) fields))
-      ;; Check if there is an explicit width specified
-      (when (and org-table-limit-column-width narrow)
-	(setq c column fmax nil)
-	(while c
-	  (setq e (pop c))
-	  (if (and (stringp e) (string-match "^<\\([0-9]+\\)>$" e))
-	      (setq fmax (string-to-number (match-string 1 e)) c nil)))
-	;; Find fields that are wider than fmax, and shorten them
-	(when fmax
-	  (loop for xx in column do
-		(when (and (stringp xx)
-			   (> (org-string-width xx) fmax))
-		  (org-add-props xx nil
-		    'help-echo
-		    (concat "Clipped table field, use C-c ` to edit. Full value is:\n" (org-no-properties (copy-sequence xx))))
-		  (setq f1 (min fmax (or (string-match org-bracket-link-regexp xx) fmax)))
-		  (unless (> f1 1)
-		    (error "Cannot narrow field starting with wide link \"%s\""
-			   (match-string 0 xx)))
-		  (add-text-properties f1 (length xx) (list 'org-cwidth t) xx)
-		  (add-text-properties (- f1 2) f1
-				       (list 'display org-narrow-column-arrow)
-				       xx)))))
-      ;; Get the maximum width for each column
-      (push (apply 'max 1 (mapcar 'org-string-width column)) lengths)
-      ;; Get the fraction of numbers, to decide about alignment of the column
-      (setq cnt 0 frac 0.0)
-      (loop for x in column do
-	    (if (equal x "")
-		nil
-	      (setq frac ( / (+ (* frac cnt)
-				(if (string-match org-table-number-regexp x) 1 0))
-			     (setq cnt (1+ cnt))))))
-      (push (>= frac org-table-number-fraction) typenums))
-    (setq lengths (nreverse lengths) typenums (nreverse typenums))
-
-    ;; Store the alignment of this table, for later editing of single fields
-    (setq org-table-last-alignment typenums
-	  org-table-last-column-widths lengths)
-
-    ;; With invisible characters, `format' does not get the field width right
-    ;; So we need to make these fields wide by hand.
-    (when links
-      (loop for i from 0 upto (1- maxfields) do
-	    (setq len (nth i lengths))
-	    (loop for j from 0 upto (1- (length fields)) do
-		  (setq c (nthcdr i (car (nthcdr j fields))))
-		  (if (and (stringp (car c))
-			   (string-match org-bracket-link-regexp (car c))
-			   (< (org-string-width (car c)) len))
-		      (setcar c (concat (car c) (make-string (- len (org-string-width (car c))) ?\ )))))))
-
-    ;; Compute the formats needed for output of the table
-    (setq rfmt (concat indent "|") hfmt (concat indent "|"))
-    (while (setq l (pop lengths))
-      (setq ty (if (pop typenums) "" "-")) ; number types flushright
-      (setq rfmt (concat rfmt (format rfmt1 ty l))
-	    hfmt (concat hfmt (format hfmt1 (make-string l ?-)))))
-    (setq rfmt (concat rfmt "\n")
-	  hfmt (concat (substring hfmt 0 -1) "|\n"))
-
-    (setq new (mapconcat
-	       (lambda (l)
-		 (if l (apply 'format rfmt
-			      (append (pop fields) emptystrings))
-		   hfmt))
-	       lines ""))
-    ;; Replace the old one
-    (delete-region beg end)
-    (move-marker end nil)
-    (move-marker org-table-aligned-begin-marker (point))
-    (insert new)
-    (move-marker org-table-aligned-end-marker (point))
-    (when (and orgtbl-mode (not (org-mode-p)))
-      (goto-char org-table-aligned-begin-marker)
-      (while (org-hide-wide-columns org-table-aligned-end-marker)))
-    ;; Try to move to the old location
-    (goto-line winstartline)
-    (setq winstart (point-at-bol))
-    (goto-line linepos)
-    (set-window-start (selected-window) winstart 'noforce)
-    (org-table-goto-column colpos)
-    (setq org-table-may-need-update nil)
-    ))
-
-(defun org-string-width (s)
-  "Compute width of string, ignoring invisible characters.
-This ignores character with invisibility property `org-link', and also
-characters with property `org-cwidth', because these will become invisible
-upon the next fontification round."
-  (let (b l)
-    (when (or (eq t buffer-invisibility-spec)
-	      (assq 'org-link buffer-invisibility-spec))
-      (while (setq b (text-property-any 0 (length s)
-					'invisible 'org-link s))
-	(setq s (concat (substring s 0 b)
-			(substring s (or (next-single-property-change
-					  b 'invisible s) (length s)))))))
-    (while (setq b (text-property-any 0 (length s) 'org-cwidth t s))
-      (setq s (concat (substring s 0 b)
-		      (substring s (or (next-single-property-change
-					b 'org-cwidth s) (length s))))))
-    (setq l (string-width s) b -1)
-    (while (setq b (text-property-any (1+ b) (length s) 'org-dwidth t s))
-      (setq l (- l (get-text-property b 'org-dwidth-n s))))
-    l))
-
-(defun org-table-begin (&optional table-type)
-  "Find the beginning of the table and return its position.
-With argument TABLE-TYPE, go to the beginning of a table.el-type table."
-  (save-excursion
-    (if (not (re-search-backward
-	      (if table-type org-table-any-border-regexp
-		org-table-border-regexp)
-	      nil t))
-	(progn (goto-char (point-min)) (point))
-      (goto-char (match-beginning 0))
-      (beginning-of-line 2)
-      (point))))
-
-(defun org-table-end (&optional table-type)
-  "Find the end of the table and return its position.
-With argument TABLE-TYPE, go to the end of a table.el-type table."
-  (save-excursion
-    (if (not (re-search-forward
-	      (if table-type org-table-any-border-regexp
-		org-table-border-regexp)
-	      nil t))
-	(goto-char (point-max))
-      (goto-char (match-beginning 0)))
-    (point-marker)))
-
-(defun org-table-justify-field-maybe (&optional new)
-  "Justify the current field, text to left, number to right.
-Optional argument NEW may specify text to replace the current field content."
-  (cond
-   ((and (not new) org-table-may-need-update)) ; Realignment will happen anyway
-   ((org-at-table-hline-p))
-   ((and (not new)
-	 (or (not (equal (marker-buffer org-table-aligned-begin-marker)
-			 (current-buffer)))
-	     (< (point) org-table-aligned-begin-marker)
-	     (>= (point) org-table-aligned-end-marker)))
-    ;; This is not the same table, force a full re-align
-    (setq org-table-may-need-update t))
-   (t ;; realign the current field, based on previous full realign
-    (let* ((pos (point)) s
-	   (col (org-table-current-column))
-	   (num (if (> col 0) (nth (1- col) org-table-last-alignment)))
-	   l f n o e)
-      (when (> col 0)
-	(skip-chars-backward "^|\n")
-	(if (looking-at " *\\([^|\n]*?\\) *\\(|\\|$\\)")
-	    (progn
-	      (setq s (match-string 1)
-		    o (match-string 0)
-		    l (max 1 (- (match-end 0) (match-beginning 0) 3))
-		    e (not (= (match-beginning 2) (match-end 2))))
-	      (setq f (format (if num " %%%ds %s" " %%-%ds %s")
-			      l (if e "|" (setq org-table-may-need-update t) ""))
-		    n (format f s))
-	      (if new
-		  (if (<= (length new) l)      ;; FIXME: length -> str-width?
-		      (setq n (format f new))
-		    (setq n (concat new "|") org-table-may-need-update t)))
-	      (or (equal n o)
-		  (let (org-table-may-need-update)
-		    (replace-match n))))
-	  (setq org-table-may-need-update t))
-	(goto-char pos))))))
-
-(defun org-table-next-field ()
-  "Go to the next field in the current table, creating new lines as needed.
-Before doing so, re-align the table if necessary."
-  (interactive)
-  (org-table-maybe-eval-formula)
-  (org-table-maybe-recalculate-line)
-  (if (and org-table-automatic-realign
-	   org-table-may-need-update)
-      (org-table-align))
-  (let ((end (org-table-end)))
-    (if (org-at-table-hline-p)
-	(end-of-line 1))
-    (condition-case nil
-	(progn
-	  (re-search-forward "|" end)
-	  (if (looking-at "[ \t]*$")
-	      (re-search-forward "|" end))
-	  (if (and (looking-at "-")
-		   org-table-tab-jumps-over-hlines
-		   (re-search-forward "^[ \t]*|\\([^-]\\)" end t))
-	      (goto-char (match-beginning 1)))
-	  (if (looking-at "-")
-	      (progn
-		(beginning-of-line 0)
-		(org-table-insert-row 'below))
-	    (if (looking-at " ") (forward-char 1))))
-      (error
-       (org-table-insert-row 'below)))))
-
-(defun org-table-previous-field ()
-  "Go to the previous field in the table.
-Before doing so, re-align the table if necessary."
-  (interactive)
-  (org-table-justify-field-maybe)
-  (org-table-maybe-recalculate-line)
-  (if (and org-table-automatic-realign
-	   org-table-may-need-update)
-      (org-table-align))
-  (if (org-at-table-hline-p)
-      (end-of-line 1))
-  (re-search-backward "|" (org-table-begin))
-  (re-search-backward "|" (org-table-begin))
-  (while (looking-at "|\\(-\\|[ \t]*$\\)")
-    (re-search-backward "|" (org-table-begin)))
-  (if (looking-at "| ?")
-      (goto-char (match-end 0))))
-
-(defun org-table-next-row ()
-  "Go to the next row (same column) in the current table.
-Before doing so, re-align the table if necessary."
-  (interactive)
-  (org-table-maybe-eval-formula)
-  (org-table-maybe-recalculate-line)
-  (if (or (looking-at "[ \t]*$")
-	  (save-excursion (skip-chars-backward " \t") (bolp)))
-      (newline)
-    (if (and org-table-automatic-realign
-	     org-table-may-need-update)
-	(org-table-align))
-    (let ((col (org-table-current-column)))
-      (beginning-of-line 2)
-      (if (or (not (org-at-table-p))
-	      (org-at-table-hline-p))
-	  (progn
-	    (beginning-of-line 0)
-	    (org-table-insert-row 'below)))
-      (org-table-goto-column col)
-      (skip-chars-backward "^|\n\r")
-      (if (looking-at " ") (forward-char 1)))))
-
-(defun org-table-copy-down (n)
-  "Copy a field down in the current column.
-If the field at the cursor is empty, copy into it the content of the nearest
-non-empty field above.  With argument N, use the Nth non-empty field.
-If the current field is not empty, it is copied down to the next row, and
-the cursor is moved with it.  Therefore, repeating this command causes the
-column to be filled row-by-row.
-If the variable `org-table-copy-increment' is non-nil and the field is an
-integer, it will be incremented while copying."
-  (interactive "p")
-  (let* ((colpos (org-table-current-column))
-	 (field (org-table-get-field))
-	 (non-empty (string-match "[^ \t]" field))
-	 (beg (org-table-begin))
-	 txt)
-    (org-table-check-inside-data-field)
-    (if non-empty
-	(progn
-	  (setq txt (org-trim field))
-	  (org-table-next-row)
-	  (org-table-blank-field))
-      (save-excursion
-	(setq txt
-	      (catch 'exit
-		(while (progn (beginning-of-line 1)
-			      (re-search-backward org-table-dataline-regexp
-						  beg t))
-		  (org-table-goto-column colpos t)
-		  (if (and (looking-at
-			    "|[ \t]*\\([^| \t][^|]*?\\)[ \t]*|")
-			   (= (setq n (1- n)) 0))
-		      (throw 'exit (match-string 1))))))))
-    (if txt
-	(progn
-	  (if (and org-table-copy-increment
-		   (string-match "^[0-9]+$" txt))
-	      (setq txt (format "%d" (+ (string-to-number txt) 1))))
-	  (insert txt)
-	  (org-table-maybe-recalculate-line)
-	  (org-table-align))
-      (error "No non-empty field found"))))
-
-(defun org-table-check-inside-data-field ()
-  "Is point inside a table data field?
-I.e. not on a hline or before the first or after the last column?
-This actually throws an error, so it aborts the current command."
-  (if (or (not (org-at-table-p))
-	  (= (org-table-current-column) 0)
-	  (org-at-table-hline-p)
-	  (looking-at "[ \t]*$"))
-      (error "Not in table data field")))
-
-(defvar org-table-clip nil
-  "Clipboard for table regions.")
-
-(defun org-table-blank-field ()
-  "Blank the current table field or active region."
-  (interactive)
-  (org-table-check-inside-data-field)
-  (if (and (interactive-p) (org-region-active-p))
-      (let (org-table-clip)
-	(org-table-cut-region (region-beginning) (region-end)))
-    (skip-chars-backward "^|")
-    (backward-char 1)
-    (if (looking-at "|[^|\n]+")
-	(let* ((pos (match-beginning 0))
-	       (match (match-string 0))
-	       (len (org-string-width match)))
-	  (replace-match (concat "|" (make-string (1- len) ?\ )))
-	  (goto-char (+ 2 pos))
-	  (substring match 1)))))
-
-(defun org-table-get-field (&optional n replace)
-  "Return the value of the field in column N of current row.
-N defaults to current field.
-If REPLACE is a string, replace field with this value.  The return value
-is always the old value."
-  (and n (org-table-goto-column n))
-  (skip-chars-backward "^|\n")
-  (backward-char 1)
-  (if (looking-at "|[^|\r\n]*")
-      (let* ((pos (match-beginning 0))
-	     (val (buffer-substring (1+ pos) (match-end 0))))
-	(if replace
-	    (replace-match (concat "|" replace)))
-	(goto-char (min (point-at-eol) (+ 2 pos)))
-	val)
-    (forward-char 1) ""))
-
-(defun org-table-current-column ()
-  "Find out which column we are in.
-When called interactively, column is also displayed in echo area."
-  (interactive)
-  (if (interactive-p) (org-table-check-inside-data-field))
-  (save-excursion
-    (let ((cnt 0) (pos (point)))
-      (beginning-of-line 1)
-      (while (search-forward "|" pos t)
-	(setq cnt (1+ cnt)))
-      (if (interactive-p) (message "This is table column %d" cnt))
-      cnt)))
-
-(defun org-table-goto-column (n &optional on-delim force)
-  "Move the cursor to the Nth column in the current table line.
-With optional argument ON-DELIM, stop with point before the left delimiter
-of the field.
-If there are less than N fields, just go to after the last delimiter.
-However, when FORCE is non-nil, create new columns if necessary."
-  (interactive "p")
-  (let ((pos (point-at-eol)))
-    (beginning-of-line 1)
-    (when (> n 0)
-      (while (and (> (setq n (1- n)) -1)
-		  (or (search-forward "|" pos t)
-		      (and force
-			   (progn (end-of-line 1)
-				  (skip-chars-backward "^|")
-				  (insert " | "))))))
-;                                  (backward-char 2) t)))))
-      (when (and force (not (looking-at ".*|")))
-	(save-excursion (end-of-line 1) (insert " | ")))
-      (if on-delim
-	  (backward-char 1)
-	(if (looking-at " ") (forward-char 1))))))
-
-(defun org-at-table-p (&optional table-type)
-  "Return t if the cursor is inside an org-type table.
-If TABLE-TYPE is non-nil, also check for table.el-type tables."
-  (if org-enable-table-editor
-      (save-excursion
-	(beginning-of-line 1)
-	(looking-at (if table-type org-table-any-line-regexp
-		      org-table-line-regexp)))
-    nil))
-
-(defun org-at-table.el-p ()
-  "Return t if and only if we are at a table.el table."
-  (and (org-at-table-p 'any)
-       (save-excursion
-	 (goto-char (org-table-begin 'any))
-	 (looking-at org-table1-hline-regexp))))
-
-(defun org-table-recognize-table.el ()
-  "If there is a table.el table nearby, recognize it and move into it."
-  (if org-table-tab-recognizes-table.el
-      (if (org-at-table.el-p)
-	  (progn
-	    (beginning-of-line 1)
-	    (if (looking-at org-table-dataline-regexp)
-		nil
-	      (if (looking-at org-table1-hline-regexp)
-		  (progn
-		    (beginning-of-line 2)
-		    (if (looking-at org-table-any-border-regexp)
-			(beginning-of-line -1)))))
-	    (if (re-search-forward "|" (org-table-end t) t)
-		(progn
-		  (require 'table)
-		  (if (table--at-cell-p (point))
-		      t
-		    (message "recognizing table.el table...")
-		    (table-recognize-table)
-		    (message "recognizing table.el table...done")))
-	      (error "This should not happen..."))
-	    t)
-	nil)
-    nil))
-
-(defun org-at-table-hline-p ()
-  "Return t if the cursor is inside a hline in a table."
-  (if org-enable-table-editor
-      (save-excursion
-	(beginning-of-line 1)
-	(looking-at org-table-hline-regexp))
-    nil))
-
-(defun org-table-insert-column ()
-  "Insert a new column into the table."
-  (interactive)
-  (if (not (org-at-table-p))
-      (error "Not at a table"))
-  (org-table-find-dataline)
-  (let* ((col (max 1 (org-table-current-column)))
-	 (beg (org-table-begin))
-	 (end (org-table-end))
-	 ;; Current cursor position
-	 (linepos (org-current-line))
-	 (colpos col))
-    (goto-char beg)
-    (while (< (point) end)
-      (if (org-at-table-hline-p)
-	  nil
-	(org-table-goto-column col t)
-	(insert "|   "))
-      (beginning-of-line 2))
-    (move-marker end nil)
-    (goto-line linepos)
-    (org-table-goto-column colpos)
-    (org-table-align)
-    (org-table-modify-formulas 'insert col)))
-
-(defun org-table-find-dataline ()
-  "Find a dataline in the current table, which is needed for column commands."
-  (if (and (org-at-table-p)
-	   (not (org-at-table-hline-p)))
-      t
-    (let ((col (current-column))
-	  (end (org-table-end)))
-      (move-to-column col)
-      (while (and (< (point) end)
-		  (or (not (= (current-column) col))
-		      (org-at-table-hline-p)))
-	(beginning-of-line 2)
-	(move-to-column col))
-      (if (and (org-at-table-p)
-	       (not (org-at-table-hline-p)))
-	  t
-	(error
-	 "Please position cursor in a data line for column operations")))))
-
-(defun org-table-delete-column ()
-  "Delete a column from the table."
-  (interactive)
-  (if (not (org-at-table-p))
-      (error "Not at a table"))
-  (org-table-find-dataline)
-  (org-table-check-inside-data-field)
-  (let* ((col (org-table-current-column))
-	 (beg (org-table-begin))
-	 (end (org-table-end))
-	 ;; Current cursor position
-	 (linepos (org-current-line))
-	 (colpos col))
-    (goto-char beg)
-    (while (< (point) end)
-      (if (org-at-table-hline-p)
-	  nil
-	(org-table-goto-column col t)
-	(and (looking-at "|[^|\n]+|")
-	     (replace-match "|")))
-      (beginning-of-line 2))
-    (move-marker end nil)
-    (goto-line linepos)
-    (org-table-goto-column colpos)
-    (org-table-align)
-    (org-table-modify-formulas 'remove col)))
-
-(defun org-table-move-column-right ()
-  "Move column to the right."
-  (interactive)
-  (org-table-move-column nil))
-(defun org-table-move-column-left ()
-  "Move column to the left."
-  (interactive)
-  (org-table-move-column 'left))
-
-(defun org-table-move-column (&optional left)
-  "Move the current column to the right.  With arg LEFT, move to the left."
-  (interactive "P")
-  (if (not (org-at-table-p))
-      (error "Not at a table"))
-  (org-table-find-dataline)
-  (org-table-check-inside-data-field)
-  (let* ((col (org-table-current-column))
-	 (col1 (if left (1- col) col))
-	 (beg (org-table-begin))
-	 (end (org-table-end))
-	 ;; Current cursor position
-	 (linepos (org-current-line))
-	 (colpos (if left (1- col) (1+ col))))
-    (if (and left (= col 1))
-	(error "Cannot move column further left"))
-    (if (and (not left) (looking-at "[^|\n]*|[^|\n]*$"))
-	(error "Cannot move column further right"))
-    (goto-char beg)
-    (while (< (point) end)
-      (if (org-at-table-hline-p)
-	  nil
-	(org-table-goto-column col1 t)
-	(and (looking-at "|\\([^|\n]+\\)|\\([^|\n]+\\)|")
-	     (replace-match "|\\2|\\1|")))
-      (beginning-of-line 2))
-    (move-marker end nil)
-    (goto-line linepos)
-    (org-table-goto-column colpos)
-    (org-table-align)
-    (org-table-modify-formulas 'swap col (if left (1- col) (1+ col)))))
-
-(defun org-table-move-row-down ()
-  "Move table row down."
-  (interactive)
-  (org-table-move-row nil))
-(defun org-table-move-row-up ()
-  "Move table row up."
-  (interactive)
-  (org-table-move-row 'up))
-
-(defun org-table-move-row (&optional up)
-  "Move the current table line down.  With arg UP, move it up."
-  (interactive "P")
-  (let ((col (current-column))
-	(pos (point))
-	(tonew (if up 0 2))
-	txt)
-    (beginning-of-line tonew)
-    (if (not (org-at-table-p))
-	(progn
-	  (goto-char pos)
-	  (error "Cannot move row further")))
-    (goto-char pos)
-    (beginning-of-line 1)
-    (setq pos (point))
-    (setq txt (buffer-substring (point) (1+ (point-at-eol))))
-    (delete-region (point) (1+ (point-at-eol)))
-    (beginning-of-line tonew)
-    (insert txt)
-    (beginning-of-line 0)
-    (move-to-column col)))
-
-(defun org-table-insert-row (&optional arg)
-  "Insert a new row above the current line into the table.
-With prefix ARG, insert below the current line."
-  (interactive "P")
-  (if (not (org-at-table-p))
-      (error "Not at a table"))
-  (let* ((line (buffer-substring (point-at-bol) (point-at-eol)))
-	 (new (org-table-clean-line line)))
-    ;; Fix the first field if necessary
-    (if (string-match "^[ \t]*| *[#$] *|" line)
-	(setq new (replace-match (match-string 0 line) t t new)))
-    (beginning-of-line (if arg 2 1))
-    (let (org-table-may-need-update) (insert-before-markers new "\n"))
-    (beginning-of-line 0)
-    (re-search-forward "| ?" (point-at-eol) t)
-    (and org-table-may-need-update (org-table-align))))
-
-(defun org-table-insert-hline (&optional arg)
-  "Insert a horizontal-line below the current line into the table.
-With prefix ARG, insert above the current line."
-  (interactive "P")
-  (if (not (org-at-table-p))
-      (error "Not at a table"))
-  (let ((line (org-table-clean-line
-	       (buffer-substring (point-at-bol) (point-at-eol))))
-	(col (current-column)))
-    (while (string-match "|\\( +\\)|" line)
-      (setq line (replace-match
-		  (concat "+" (make-string (- (match-end 1) (match-beginning 1))
-					   ?-) "|") t t line)))
-    (and (string-match "\\+" line) (setq line (replace-match "|" t t line)))
-    (beginning-of-line (if arg 1 2))
-    (insert line "\n")
-    (beginning-of-line (if arg 1 -1))
-    (move-to-column col)))
-
-(defun org-table-clean-line (s)
-  "Convert a table line S into a string with only \"|\" and space.
-In particular, this does handle wide and invisible characters."
-  (if (string-match "^[ \t]*|-" s)
-      ;; It's a hline, just map the characters
-      (setq s (mapconcat (lambda (x) (if (member x '(?| ?+)) "|" " ")) s ""))
-    (while (string-match "|\\([ \t]*?[^ \t\r\n|][^\r\n|]*\\)|" s)
-      (setq s (replace-match
-	       (concat "|" (make-string (org-string-width (match-string 1 s))
-					?\ ) "|")
-	       t t s)))
-    s))
-
-(defun org-table-kill-row ()
-  "Delete the current row or horizontal line from the table."
-  (interactive)
-  (if (not (org-at-table-p))
-      (error "Not at a table"))
-  (let ((col (current-column)))
-    (kill-region (point-at-bol) (min (1+ (point-at-eol)) (point-max)))
-    (if (not (org-at-table-p)) (beginning-of-line 0))
-    (move-to-column col)))
-
-(defun org-table-sort-lines (beg end numericp)
-  "Sort table lines in region.
-Point and mark define the first and last line to include.  Both point and
-mark should be in the column that is used for sorting.  For example, to
-sort according to column 3, put the mark in the first line to sort, in
-table column 3.  Put point into the last line to be included in the sorting,
-also in table column 3.  The command will prompt for the sorting method
-\(n for numerical, a for alphanumeric)."
-  (interactive "r\nsSorting method: [n]=numeric [a]=alpha: ")
-  (setq numericp (string-match "[nN]" numericp))
-  (org-table-align) ;; Just to be safe
-  (let* (bcol ecol cmp column lns)
-    (goto-char beg)
-    (org-table-check-inside-data-field)
-    (setq column (org-table-current-column)
-	  beg (move-marker (make-marker) (point-at-bol)))
-    (goto-char end)
-    (org-table-check-inside-data-field)
-    (setq end (move-marker (make-marker) (1+ (point-at-eol))))
-    (untabify beg end)
-    (goto-char beg)
-    (org-table-goto-column column)
-    (skip-chars-backward "^|")
-    (setq bcol (current-column))
-    (org-table-goto-column (1+ column))
-    (skip-chars-backward "^|")
-    (setq ecol (1- (current-column)))
-    (setq cmp (if numericp
-		  (lambda (a b) (< (car a) (car b)))
-		(lambda (a b) (string< (car a) (car b)))))
-    (setq lns (mapcar (lambda(x) (cons (org-trim (substring x bcol ecol)) x))
-		      (org-split-string (buffer-substring beg end) "\n")))
-    (if numericp
-	(setq lns (mapcar (lambda(x)
-			      (cons (string-to-number (car x)) (cdr x)))
-			    lns)))
-    (delete-region beg end)
-    (move-marker beg nil)
-    (move-marker end nil)
-    (insert (mapconcat 'cdr (setq lns (sort lns cmp)) "\n") "\n")
-    (message "%d lines sorted %s based on column %d"
-	     (length lns)
-	     (if numericp "numerically" "alphabetically") column)))
-
-(defun org-table-cut-region (beg end)
-  "Copy region in table to the clipboard and blank all relevant fields."
-  (interactive "r")
-  (org-table-copy-region beg end 'cut))
-
-(defun org-table-copy-region (beg end &optional cut)
-  "Copy rectangular region in table to clipboard.
-A special clipboard is used which can only be accessed
-with `org-table-paste-rectangle'."
-  (interactive "rP")
-  (let* (l01 c01 l02 c02 l1 c1 l2 c2 ic1 ic2
-	 region cols
-	 (rpl (if cut "  " nil)))
-    (goto-char beg)
-    (org-table-check-inside-data-field)
-    (setq l01 (org-current-line)
-	  c01 (org-table-current-column))
-    (goto-char end)
-    (org-table-check-inside-data-field)
-    (setq l02 (org-current-line)
-	  c02 (org-table-current-column))
-    (setq l1 (min l01 l02) l2 (max l01 l02)
-	  c1 (min c01 c02) c2 (max c01 c02))
-    (catch 'exit
-      (while t
-	(catch 'nextline
-	  (if (> l1 l2) (throw 'exit t))
-	  (goto-line l1)
-	  (if (org-at-table-hline-p) (throw 'nextline (setq l1 (1+ l1))))
-	  (setq cols nil ic1 c1 ic2 c2)
-	  (while (< ic1 (1+ ic2))
-	    (push (org-table-get-field ic1 rpl) cols)
-	    (setq ic1 (1+ ic1)))
-	  (push (nreverse cols) region)
-	  (setq l1 (1+ l1)))))
-    (setq org-table-clip (nreverse region))
-    (if cut (org-table-align))
-    org-table-clip))
-
-(defun org-table-paste-rectangle ()
-  "Paste a rectangular region into a table.
-The upper right corner ends up in the current field.  All involved fields
-will be overwritten.  If the rectangle does not fit into the present table,
-the table is enlarged as needed.  The process ignores horizontal separator
-lines."
-  (interactive)
-  (unless (and org-table-clip (listp org-table-clip))
-    (error "First cut/copy a region to paste!"))
-  (org-table-check-inside-data-field)
-  (let* ((clip org-table-clip)
-	 (line (org-current-line))
-	 (col (org-table-current-column))
-	 (org-enable-table-editor t)
-	 (org-table-automatic-realign nil)
-	 c cols field)
-    (while (setq cols (pop clip))
-      (while (org-at-table-hline-p) (beginning-of-line 2))
-      (if (not (org-at-table-p))
-	  (progn (end-of-line 0) (org-table-next-field)))
-      (setq c col)
-      (while (setq field (pop cols))
-	(org-table-goto-column c nil 'force)
-	(org-table-get-field nil field)
-	(setq c (1+ c)))
-      (beginning-of-line 2))
-    (goto-line line)
-    (org-table-goto-column col)
-    (org-table-align)))
-
-(defun org-table-convert ()
-  "Convert from `org-mode' table to table.el and back.
-Obviously, this only works within limits.  When an Org-mode table is
-converted to table.el, all horizontal separator lines get lost, because
-table.el uses these as cell boundaries and has no notion of horizontal lines.
-A table.el table can be converted to an Org-mode table only if it does not
-do row or column spanning.  Multiline cells will become multiple cells.
-Beware, Org-mode does not test if the table can be successfully converted - it
-blindly applies a recipe that works for simple tables."
-  (interactive)
-  (require 'table)
-  (if (org-at-table.el-p)
-      ;; convert to Org-mode table
-      (let ((beg (move-marker (make-marker) (org-table-begin t)))
-	    (end (move-marker (make-marker) (org-table-end t))))
-	(table-unrecognize-region beg end)
-	(goto-char beg)
-	(while (re-search-forward "^\\([ \t]*\\)\\+-.*\n" end t)
-	  (replace-match ""))
-	(goto-char beg))
-    (if (org-at-table-p)
-	;; convert to table.el table
-	(let ((beg (move-marker (make-marker) (org-table-begin)))
-	      (end (move-marker (make-marker) (org-table-end))))
-	  ;; first, get rid of all horizontal lines
-	  (goto-char beg)
-	  (while (re-search-forward "^\\([ \t]*\\)|-.*\n" end t)
-	    (replace-match ""))
-	  ;; insert a hline before first
-	  (goto-char beg)
-	  (org-table-insert-hline 'above)
-	  (beginning-of-line -1)
-	  ;; insert a hline after each line
-	  (while (progn (beginning-of-line 3) (< (point) end))
-	    (org-table-insert-hline))
-	  (goto-char beg)
-	  (setq end (move-marker end (org-table-end)))
-	  ;; replace "+" at beginning and ending of hlines
-	  (while (re-search-forward "^\\([ \t]*\\)|-" end t)
-	    (replace-match "\\1+-"))
-	  (goto-char beg)
-	  (while (re-search-forward "-|[ \t]*$" end t)
-	    (replace-match "-+"))
-	  (goto-char beg)))))
-
-(defun org-table-wrap-region (arg)
-  "Wrap several fields in a column like a paragraph.
-This is useful if you'd like to spread the contents of a field over several
-lines, in order to keep the table compact.
-
-If there is an active region, and both point and mark are in the same column,
-the text in the column is wrapped to minimum width for the given number of
-lines.  Generally, this makes the table more compact.  A prefix ARG may be
-used to change the number of desired lines.  For example, `C-2 \\[org-table-wrap]'
-formats the selected text to two lines.  If the region was longer than two
-lines, the remaining lines remain empty.  A negative prefix argument reduces
-the current number of lines by that amount.  The wrapped text is pasted back
-into the table.  If you formatted it to more lines than it was before, fields
-further down in the table get overwritten - so you might need to make space in
-the table first.
-
-If there is no region, the current field is split at the cursor position and
-the text fragment to the right of the cursor is prepended to the field one
-line down.
-
-If there is no region, but you specify a prefix ARG, the current field gets
-blank, and the content is appended to the field above."
-  (interactive "P")
-  (org-table-check-inside-data-field)
-  (if (org-region-active-p)
-      ;; There is a region:  fill as a paragraph
-      (let ((beg (region-beginning))
-	    nlines)
-	(org-table-cut-region (region-beginning) (region-end))
-	(if (> (length (car org-table-clip)) 1)
-	    (error "Region must be limited to single column"))
-	(setq nlines (if arg
-			 (if (< arg 1)
-			     (+ (length org-table-clip) arg)
-			   arg)
-		       (length org-table-clip)))
-	(setq org-table-clip
-	      (mapcar 'list (org-wrap (mapconcat 'car org-table-clip " ")
-				      nil nlines)))
-	(goto-char beg)
-	(org-table-paste-rectangle))
-    ;; No region, split the current field at point
-    (if arg
-	;; combine with field above
-	(let ((s (org-table-blank-field))
-	      (col (org-table-current-column)))
-	  (beginning-of-line 0)
-	  (while (org-at-table-hline-p) (beginning-of-line 0))
-	  (org-table-goto-column col)
-	  (skip-chars-forward "^|")
-	  (skip-chars-backward " ")
-	  (insert " " (org-trim s))
-	  (org-table-align))
-      ;;  split field
-      (when (looking-at "\\([^|]+\\)+|")
-	(let ((s (match-string 1)))
-	  (replace-match " |")
-	  (goto-char (match-beginning 0))
-	  (org-table-next-row)
-	  (insert (org-trim s) " ")
-	  (org-table-align))))))
-
-(defvar org-field-marker nil)
-
-(defun org-table-edit-field (arg)
-  "Edit table field in a different window.
-This is mainly useful for fields that contain hidden parts.
-When called with a \\[universal-argument] prefix, just make the full field visible so that
-it can be edited in place."
-  (interactive "P")
-  (if arg
-      (let ((b (save-excursion (skip-chars-backward "^|") (point)))
-	    (e (save-excursion (skip-chars-forward "^|\r\n") (point))))
-	(remove-text-properties b e '(org-cwidth t invisible t
-						 display t intangible t))
-	(if (and (boundp 'font-lock-mode) font-lock-mode)
-	    (font-lock-fontify-block)))
-    (let ((pos (move-marker (make-marker) (point)))
-	  (field (org-table-get-field))
-	  (cw (current-window-configuration))
-	  p)
-      (switch-to-buffer-other-window "*Org tmp*")
-      (erase-buffer)
-      (insert "#\n# Edit field and finish with C-c C-c\n#\n")
-      (org-mode)
-      (goto-char (setq p (point-max)))
-      (insert (org-trim field))
-      (remove-text-properties p (point-max)
-			      '(invisible t org-cwidth t display t
-					  intangible t))
-      (goto-char p)
-      (org-set-local 'org-finish-function
-		     'org-table-finish-edit-field)
-      (org-set-local 'org-window-configuration cw)
-      (org-set-local 'org-field-marker pos)
-      (message "Edit and finish with C-c C-c"))))
-
-(defun org-table-finish-edit-field ()
-  "Finish editing a table data field.
-Remove all newline characters, insert the result into the table, realign
-the table and kill the editing buffer."
-  (let ((pos org-field-marker)
-	(cw org-window-configuration)
-	(cb (current-buffer))
-	text)
-    (goto-char (point-min))
-    (while (re-search-forward "^#.*\n?" nil t) (replace-match ""))
-    (while (re-search-forward "\\([ \t]*\n[ \t]*\\)+" nil t)
-      (replace-match " "))
-    (setq text (org-trim (buffer-string)))
-    (set-window-configuration cw)
-    (kill-buffer cb)
-    (select-window (get-buffer-window (marker-buffer pos)))
-    (goto-char pos)
-    (move-marker pos nil)
-    (org-table-check-inside-data-field)
-    (org-table-get-field nil text)
-    (org-table-align)
-    (message "New field value inserted")))
-
-(defun org-trim (s)
-  "Remove whitespace at beginning and end of string."
-  (if (string-match "^[ \t]+" s) (setq s (replace-match "" t t s)))
-  (if (string-match "[ \t]+$" s) (setq s (replace-match "" t t s)))
-  s)
-
-(defun org-wrap (string &optional width lines)
-  "Wrap string to either a number of lines, or a width in characters.
-If WIDTH is non-nil, the string is wrapped to that width, however many lines
-that costs.  If there is a word longer than WIDTH, the text is actually
-wrapped to the length of that word.
-IF WIDTH is nil and LINES is non-nil, the string is forced into at most that
-many lines, whatever width that takes.
-The return value is a list of lines, without newlines at the end."
-  (let* ((words (org-split-string string "[ \t\n]+"))
-	 (maxword (apply 'max (mapcar 'org-string-width words)))
-	 w ll)
-    (cond (width
-	   (org-do-wrap words (max maxword width)))
-	  (lines
-	   (setq w maxword)
-	   (setq ll (org-do-wrap words maxword))
-	   (if (<= (length ll) lines)
-	       ll
-	     (setq ll words)
-	     (while (> (length ll) lines)
-	       (setq w (1+ w))
-	       (setq ll (org-do-wrap words w)))
-	     ll))
-	  (t (error "Cannot wrap this")))))
-
-
-(defun org-do-wrap (words width)
-  "Create lines of maximum width WIDTH (in characters) from word list WORDS."
-  (let (lines line)
-    (while words
-      (setq line (pop words))
-      (while (and words (< (+ (length line) (length (car words))) width))
-	(setq line (concat line " " (pop words))))
-      (setq lines (push line lines)))
-    (nreverse lines)))
-
-(defun org-split-string (string &optional separators)
-  "Splits STRING into substrings at SEPARATORS.
-No empty strings are returned if there are matches at the beginning
-and end of string."
-  (let ((rexp (or separators "[ \f\t\n\r\v]+"))
-	(start 0)
-	notfirst
-	(list nil))
-    (while (and (string-match rexp string
-			      (if (and notfirst
-				       (= start (match-beginning 0))
-				       (< start (length string)))
-				  (1+ start) start))
-		(< (match-beginning 0) (length string)))
-      (setq notfirst t)
-      (or (eq (match-beginning 0) 0)
-	  (and (eq (match-beginning 0) (match-end 0))
-	       (eq (match-beginning 0) start))
-	  (setq list
-		(cons (substring string start (match-beginning 0))
-		      list)))
-      (setq start (match-end 0)))
-    (or (eq start (length string))
-	(setq list
-	      (cons (substring string start)
-		    list)))
-    (nreverse list)))
-
-(defun org-table-map-tables (function)
-  "Apply FUNCTION to the start of all tables in the buffer."
+	(skip-chars-backward "a-zA-Z0-9*")
+	(skip-chars-backward " \t")
+	(bolp))
+      (cdlatex-tab) t)
+     ((org-inside-LaTeX-fragment-p)
+      (cdlatex-tab) t)
+     (t nil))))
+
+(defun org-cdlatex-underscore-caret (&optional arg)
+  "Execute `cdlatex-sub-superscript' in LaTeX fragments.
+Revert to the normal definition outside of these fragments."
+  (interactive "P")
+  (if (org-inside-LaTeX-fragment-p)
+      (call-interactively 'cdlatex-sub-superscript)
+    (let (org-cdlatex-mode)
+      (call-interactively (key-binding (vector last-input-event))))))
+
+(defun org-cdlatex-math-modify (&optional arg)
+  "Execute `cdlatex-math-modify' in LaTeX fragments.
+Revert to the normal definition outside of these fragments."
+  (interactive "P")
+  (if (org-inside-LaTeX-fragment-p)
+      (call-interactively 'cdlatex-math-modify)
+    (let (org-cdlatex-mode)
+      (call-interactively (key-binding (vector last-input-event))))))
+
+(defvar org-latex-fragment-image-overlays nil
+  "List of overlays carrying the images of latex fragments.")
+(make-variable-buffer-local 'org-latex-fragment-image-overlays)
+
+(defun org-remove-latex-fragment-image-overlays ()
+  "Remove all overlays with LaTeX fragment images in current buffer."
+  (mapc 'org-delete-overlay org-latex-fragment-image-overlays)
+  (setq org-latex-fragment-image-overlays nil))
+
+(defun org-preview-latex-fragment (&optional subtree)
+  "Preview the LaTeX fragment at point, or all locally or globally.
+If the cursor is in a LaTeX fragment, create the image and overlay
+it over the source code.  If there is no fragment at point, display
+all fragments in the current text, from one headline to the next.  With
+prefix SUBTREE, display all fragments in the current subtree.  With a
+double prefix `C-u C-u', or when the cursor is before the first headline,
+display all fragments in the buffer.
+The images can be removed again with \\[org-ctrl-c-ctrl-c]."
+  (interactive "P")
+  (org-remove-latex-fragment-image-overlays)
   (save-excursion
     (save-restriction
-      (widen)
-      (goto-char (point-min))
-      (while (re-search-forward org-table-any-line-regexp nil t)
-	(message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size)))
-	(beginning-of-line 1)
-	(if (looking-at org-table-line-regexp)
-	    (save-excursion (funcall function)))
-	(re-search-forward org-table-any-border-regexp nil 1))))
-  (message "Mapping tables: done"))
-
-(defun org-table-sum (&optional beg end nlast)
-  "Sum numbers in region of current table column.
-The result will be displayed in the echo area, and will be available
-as kill to be inserted with \\[yank].
-
-If there is an active region, it is interpreted as a rectangle and all
-numbers in that rectangle will be summed.  If there is no active
-region and point is located in a table column, sum all numbers in that
-column.
-
-If at least one number looks like a time HH:MM or HH:MM:SS, all other
-numbers are assumed to be times as well (in decimal hours) and the
-numbers are added as such.
-
-If NLAST is a number, only the NLAST fields will actually be summed."
-  (interactive)
-  (save-excursion
-    (let (col (timecnt 0) diff h m s org-table-clip)
-      (cond
-       ((and beg end))   ; beg and end given explicitly
-       ((org-region-active-p)
-	(setq beg (region-beginning) end (region-end)))
-       (t
-	(setq col (org-table-current-column))
-	(goto-char (org-table-begin))
-	(unless (re-search-forward "^[ \t]*|[^-]" nil t)
-	  (error "No table data"))
-	(org-table-goto-column col)
-;not needed?        (skip-chars-backward "^|")
-	(setq beg (point))
-	(goto-char (org-table-end))
-	(unless (re-search-backward "^[ \t]*|[^-]" nil t)
-	  (error "No table data"))
-	(org-table-goto-column col)
-;not needed?        (skip-chars-forward "^|")
-	(setq end (point))))
-      (let* ((items (apply 'append (org-table-copy-region beg end)))
-	     (items1 (cond ((not nlast) items)
-			   ((>= nlast (length items)) items)
-			   (t (setq items (reverse items))
-			      (setcdr (nthcdr (1- nlast) items) nil)
-			      (nreverse items))))
-	     (numbers (delq nil (mapcar 'org-table-get-number-for-summing
-					items1)))
-	     (res (apply '+ numbers))
-	     (sres (if (= timecnt 0)
-		       (format "%g" res)
-		     (setq diff (* 3600 res)
-			   h (floor (/ diff 3600)) diff (mod diff 3600)
-			   m (floor (/ diff 60)) diff (mod diff 60)
-			   s diff)
-		     (format "%d:%02d:%02d" h m s))))
-	(kill-new sres)
-	(if (interactive-p)
-	    (message "%s"
-		     (substitute-command-keys
-		      (format "Sum of %d items: %-20s     (\\[yank] will insert result into buffer)"
-			      (length numbers) sres))))
-	sres))))
-
-(defun org-table-get-number-for-summing (s)
-  (let (n)
-    (if (string-match "^ *|? *" s)
-	(setq s (replace-match "" nil nil s)))
-    (if (string-match " *|? *$" s)
-	(setq s (replace-match "" nil nil s)))
-    (setq n (string-to-number s))
-    (cond
-     ((and (string-match "0" s)
-	   (string-match "\\`[-+ \t0.edED]+\\'" s)) 0)
-     ((string-match "\\`[ \t]+\\'" s)         nil)
-     ((string-match "\\`\\([0-9]+\\):\\([0-9]+\\)\\(:\\([0-9]+\\)\\)?\\'" s)
-      (let ((h (string-to-number (or (match-string 1 s) "0")))
-	    (m (string-to-number (or (match-string 2 s) "0")))
-	    (s (string-to-number (or (match-string 4 s) "0"))))
-	(if (boundp 'timecnt) (setq timecnt (1+ timecnt)))
-	(* 1.0 (+ h (/ m 60.0) (/ s 3600.0)))))
-     ((equal n 0)                             nil)
-     (t n))))
-
-(defun org-table-get-vertical-vector (desc &optional tbeg col)
-  "Get a calc vector from a column, accorting to descriptor DESC.
-Optional arguments TBEG and COL can give the beginning of the table and
-the current column, to avoid unnecessary parsing."
-  (save-excursion
-    (or tbeg (setq tbeg (org-table-begin)))
-    (or col (setq col (org-table-current-column)))
-    (let (beg end nn n n1 n2 l (thisline (org-current-line)) hline-list)
-      (cond
-       ((string-match "\\(I+\\)\\(-\\(I+\\)\\)?" desc)
-	(setq n1 (- (match-end 1) (match-beginning 1)))
-	(if (match-beginning 3)
-	    (setq n2 (- (match-end 2) (match-beginning 3))))
-	(setq n (if n2 (max n1 n2) n1))
-	(setq n1 (if n2 (min n1 n2)))
-	(setq nn n)
-	(while (and (> nn 0)
-		    (re-search-backward org-table-hline-regexp tbeg t))
-	  (push (org-current-line) hline-list)
-	  (setq nn (1- nn)))
-	(setq hline-list (nreverse hline-list))
-	(goto-line (nth (1- n) hline-list))
-	(when (re-search-forward org-table-dataline-regexp)
-	  (org-table-goto-column col)
-	  (setq beg (point)))
-	(goto-line (if n1 (nth (1- n1) hline-list) thisline))
-	(when (re-search-backward org-table-dataline-regexp)
-	  (org-table-goto-column col)
-	  (setq end (point)))
-	(setq l (apply 'append (org-table-copy-region beg end)))
-	(concat "[" (mapconcat (lambda (x) (setq x (org-trim x))
-				 (if (equal x "") "0" x))
-			       l ",") "]"))
-       ((string-match "\\([0-9]+\\)-\\([0-9]+\\)" desc)
-	(setq n1 (string-to-number (match-string 1 desc))
-	      n2 (string-to-number (match-string 2 desc)))
-	(beginning-of-line 1)
-	(save-excursion
-	  (when (re-search-backward org-table-dataline-regexp tbeg t n1)
-	    (org-table-goto-column col)
-	    (setq beg (point))))
-	(when (re-search-backward org-table-dataline-regexp tbeg t n2)
-	  (org-table-goto-column col)
-	  (setq end (point)))
-	(setq l (apply 'append (org-table-copy-region beg end)))
-	(concat "[" (mapconcat
-		     (lambda (x) (setq x (org-trim x))
-		       (if (equal x "") "0" x))
-		     l ",") "]"))
-       ((string-match "\\([0-9]+\\)" desc)
-	(beginning-of-line 1)
-	(when (re-search-backward org-table-dataline-regexp tbeg t
-				  (string-to-number (match-string 0 desc)))
-	  (org-table-goto-column col)
-	  (org-trim (org-table-get-field))))))))
-
-(defvar org-table-formula-history nil)
-
-(defvar org-table-column-names nil
-  "Alist with column names, derived from the `!' line.")
-(defvar org-table-column-name-regexp nil
-  "Regular expression matching the current column names.")
-(defvar org-table-local-parameters nil
-  "Alist with parameter names, derived from the `$' line.")
-(defvar org-table-named-field-locations nil
-  "Alist with locations of named fields.")
-
-(defun org-table-get-formula (&optional equation named)
-  "Read a formula from the minibuffer, offer stored formula as default."
-  (let* ((name (car (rassoc (list (org-current-line)
-				  (org-table-current-column))
-			    org-table-named-field-locations)))
-	 (scol (if named
-		   (if name name
-		     (error "Not in a named field"))
-		 (int-to-string (org-table-current-column))))
-	 (dummy (and name (not named)
-		     (not (y-or-n-p "Replace named-field formula with column equation? " ))
-		 (error "Abort")))
-	 (org-table-may-need-update nil)
-	 (stored-list (org-table-get-stored-formulas))
-	 (stored (cdr (assoc scol stored-list)))
-	 (eq (cond
-	      ((and stored equation (string-match "^ *=? *$" equation))
-	       stored)
-	      ((stringp equation)
-	       equation)
-	      (t (read-string
-		  (format "%s formula $%s=" (if named "Field" "Column") scol)
-		  (or stored "") 'org-table-formula-history
-		  ;stored
-		  ))))
-	 mustsave)
-    (when (not (string-match "\\S-" eq))
-      ;; remove formula
-      (setq stored-list (delq (assoc scol stored-list) stored-list))
-      (org-table-store-formulas stored-list)
-      (error "Formula removed"))
-    (if (string-match "^ *=?" eq) (setq eq (replace-match "" t t eq)))
-    (if (string-match " *$" eq) (setq eq (replace-match "" t t eq)))
-    (if (and name (not named))
-	;; We set the column equation, delete the named one.
-	(setq stored-list (delq (assoc name stored-list) stored-list)
-	      mustsave t))
-    (if stored
-	(setcdr (assoc scol stored-list) eq)
-      (setq stored-list (cons (cons scol eq) stored-list)))
-    (if (or mustsave (not (equal stored eq)))
-	(org-table-store-formulas stored-list))
-    eq))
-
-(defun org-table-store-formulas (alist)
-  "Store the list of formulas below the current table."
-  (setq alist (sort alist (lambda (a b) (string< (car a) (car b)))))
-  (save-excursion
-    (goto-char (org-table-end))
-    (if (looking-at "\\([ \t]*\n\\)*#\\+TBLFM:.*\n?")
-	(delete-region (point) (match-end 0)))
-    (insert "#+TBLFM: "
-	    (mapconcat (lambda (x)
-			 (concat "$" (car x) "=" (cdr x)))
-		       alist "::")
-	    "\n")))
-
-(defun org-table-get-stored-formulas ()
-  "Return an alist with the stored formulas directly after current table."
-  (interactive)
-  (let (scol eq eq-alist strings string seen)
-    (save-excursion
-      (goto-char (org-table-end))
-      (when (looking-at "\\([ \t]*\n\\)*#\\+TBLFM: *\\(.*\\)")
-	(setq strings (org-split-string (match-string 2) " *:: *"))
-	(while (setq string (pop strings))
-	  (when (string-match "\\$\\([a-zA-Z0-9]+\\) *= *\\(.*[^ \t]\\)" string)
-	    (setq scol (match-string 1 string)
-		  eq (match-string 2 string)
-		  eq-alist (cons (cons scol eq) eq-alist))
-	    (if (member scol seen)
-		(error "Double definition `$%s=' in TBLFM line, please fix by hand" scol)
-	      (push scol seen))))))
-    (nreverse eq-alist)))
-
-(defun org-table-modify-formulas (action &rest columns)
-  "Modify the formulas stored below the current table.
-ACTION can be `remove', `insert', `swap'.  For `swap', two column numbers are
-expected, for the other actions only a single column number is needed."
-  (let ((list (org-table-get-stored-formulas))
-	(nmax (length (org-split-string
-		       (buffer-substring (point-at-bol) (point-at-eol))
-		       "|")))
-	col col1 col2 scol si sc1 sc2)
-    (cond
-     ((null list))   ; No action needed if there are no stored formulas
-     ((eq action 'remove)
-      (setq col (car columns)
-	    scol (int-to-string col))
-      (org-table-replace-in-formulas list scol "INVALID")
-      (if (assoc scol list) (setq list (delq (assoc scol list) list)))
-      (loop for i from (1+ col) upto nmax by 1 do
-	    (setq si (int-to-string i))
-	    (org-table-replace-in-formulas list si (int-to-string (1- i)))
-	    (if (assoc si list) (setcar (assoc si list)
-					(int-to-string (1- i))))))
-     ((eq action 'insert)
-      (setq col (car columns))
-      (loop for i from nmax downto col by 1 do
-	    (setq si (int-to-string i))
-	    (org-table-replace-in-formulas list si (int-to-string (1+ i)))
-	    (if (assoc si list) (setcar (assoc si list)
-					(int-to-string (1+ i))))))
-     ((eq action 'swap)
-      (setq col1 (car columns) col2 (nth 1 columns)
-	    sc1 (int-to-string col1) sc2 (int-to-string col2))
-      ;; Hopefully, ZqZtZ will never be a name in a table
-      (org-table-replace-in-formulas list sc1 "ZqZtZ")
-      (org-table-replace-in-formulas list sc2 sc1)
-      (org-table-replace-in-formulas list "ZqZtZ" sc2)
-      (if (assoc sc1 list) (setcar (assoc sc1 list) "ZqZtZ"))
-      (if (assoc sc2 list) (setcar (assoc sc2 list) sc1))
-      (if (assoc "ZqZtZ" list)  (setcar (assoc "ZqZtZ" list) sc2)))
-     (t (error "Invalid action in `org-table-modify-formulas'")))
-    (if list (org-table-store-formulas list))))
-
-(defun org-table-replace-in-formulas (list s1 s2)
-  (let (elt re s)
-    (setq s1 (concat "$" (if (integerp s1) (int-to-string s1) s1))
-	  s2 (concat "$" (if (integerp s2) (int-to-string s2) s2))
-	  re (concat (regexp-quote s1) "\\>"))
-    (while (setq elt (pop list))
-      (setq s (cdr elt))
-      (while (string-match re s)
-	(setq s (replace-match s2 t t s)))
-      (setcdr elt s))))
-
-(defun org-table-get-specials ()
-  "Get the column names and local parameters for this table."
-  (save-excursion
-    (let ((beg (org-table-begin)) (end (org-table-end))
-	  names name fields fields1 field cnt c v line col)
-      (setq org-table-column-names nil
-	    org-table-local-parameters nil
-	    org-table-named-field-locations nil)
-      (goto-char beg)
-      (when (re-search-forward "^[ \t]*| *! *\\(|.*\\)" end t)
-	(setq names (org-split-string (match-string 1) " *| *")
-	      cnt 1)
-	(while (setq name (pop names))
-	  (setq cnt (1+ cnt))
-	  (if (string-match "^[a-zA-Z][a-zA-Z0-9]*$" name)
-	      (push (cons name (int-to-string cnt)) org-table-column-names))))
-      (setq org-table-column-names (nreverse org-table-column-names))
-      (setq org-table-column-name-regexp
-	    (concat "\\$\\(" (mapconcat 'car org-table-column-names "\\|") "\\)\\>"))
-      (goto-char beg)
-      (while (re-search-forward "^[ \t]*| *\\$ *\\(|.*\\)" end t)
-	(setq fields (org-split-string (match-string 1) " *| *"))
-	(while (setq field (pop fields))
-	  (if (string-match "^\\([a-zA-Z][a-zA-Z0-9]*\\|%\\) *= *\\(.*\\)" field)
-	      (push (cons (match-string 1 field) (match-string 2 field))
-		    org-table-local-parameters))))
-      (goto-char beg)
-      (while (re-search-forward "^[ \t]*| *\\([_^]\\) *\\(|.*\\)" end t)
-	(setq c (match-string 1)
-	      fields (org-split-string (match-string 2) " *| *"))
-	(save-excursion
-	  (beginning-of-line (if (equal c "_") 2 0))
-	  (setq line (org-current-line) col 1)
-	  (and (looking-at "^[ \t]*|[^|]*\\(|.*\\)")
-	       (setq fields1 (org-split-string (match-string 1) " *| *"))))
-	(while (and fields1 (setq field (pop fields)))
-	  (setq v (pop fields1) col (1+ col))
-	  (when (and (stringp field) (stringp v)
-		     (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field))
-	      (push (cons field v) org-table-local-parameters)
-	      (push (list field line col) org-table-named-field-locations)))))))
-
-(defun org-this-word ()
-  ;; Get the current word
-  (save-excursion
-    (let ((beg (progn (skip-chars-backward "^ \t\n") (point)))
-	  (end (progn (skip-chars-forward "^ \t\n") (point))))
-      (buffer-substring-no-properties beg end))))
-
-(defun org-table-maybe-eval-formula ()
-  "Check if the current field starts with \"=\" or \":=\".
-If yes, store the formula and apply it."
-  ;; We already know we are in a table.  Get field will only return a formula
-  ;; when appropriate.  It might return a separator line, but no problem.
-  (when org-table-formula-evaluate-inline
-    (let* ((field (org-trim (or (org-table-get-field) "")))
-	   named eq)
-      (when (string-match "^:?=\\(.*\\)" field)
-	(setq named (equal (string-to-char field) ?:)
-	      eq (match-string 1 field))
-	(if (fboundp 'calc-eval)
-	    (org-table-eval-formula (if named '(4) nil) eq))))))
-
-(defvar org-recalc-commands nil
-  "List of commands triggering the recalculation of a line.
-Will be filled automatically during use.")
-
-(defvar org-recalc-marks
-  '((" " . "Unmarked: no special line, no automatic recalculation")
-    ("#" . "Automatically recalculate this line upon TAB, RET, and C-c C-c in the line")
-    ("*" . "Recalculate only when entire table is recalculated with `C-u C-c *'")
-    ("!" . "Column name definition line. Reference in formula as $name.")
-    ("$" . "Parameter definition line name=value. Reference in formula as $name.")
-    ("_" . "Names for values in row below this one.")
-    ("^" . "Names for values in row above this one.")))
-
-(defun org-table-rotate-recalc-marks (&optional newchar)
-  "Rotate the recalculation mark in the first column.
-If in any row, the first field is not consistent with a mark,
-insert a new column for the markers.
-When there is an active region, change all the lines in the region,
-after prompting for the marking character.
-After each change, a message will be displayed indicating the meaning
-of the new mark."
-  (interactive)
-  (unless (org-at-table-p) (error "Not at a table"))
-  (let* ((marks (append (mapcar 'car org-recalc-marks) '(" ")))
-	 (beg (org-table-begin))
-	 (end (org-table-end))
-	 (l (org-current-line))
-	 (l1 (if (org-region-active-p) (org-current-line (region-beginning))))
-	 (l2 (if (org-region-active-p) (org-current-line (region-end))))
-	 (have-col
-	  (save-excursion
+      (let (beg end at msg)
+	(cond
+	 ((or (equal subtree '(16))
+	      (not (save-excursion
+		     (re-search-backward (concat "^" outline-regexp) nil t))))
+	  (setq beg (point-min) end (point-max)
+		msg "Creating images for buffer...%s"))
+	 ((equal subtree '(4))
+	  (org-back-to-heading)
+	  (setq beg (point) end (org-end-of-subtree t)
+		msg "Creating images for subtree...%s"))
+	 (t
+	  (if (setq at (org-inside-LaTeX-fragment-p))
+	      (goto-char (max (point-min) (- (cdr at) 2)))
+	    (org-back-to-heading))
+	  (setq beg (point) end (progn (outline-next-heading) (point))
+		msg (if at "Creating image...%s"
+		      "Creating images for entry...%s"))))
+	(message msg "")
+	(narrow-to-region beg end)
+	(org-format-latex
+	 (concat "ltxpng/" (file-name-sans-extension
+			    (file-name-nondirectory
+			     buffer-file-name)))
+	 default-directory 'overlays msg at)
+      (message msg "done.  Use `C-c C-c' to remove images.")))))
+
+(defvar org-latex-regexps
+  '(("begin" "^[ \t]*\\(\\\\begin{\\([a-zA-Z0-9\\*]+\\)[^\000]+?\\\\end{\\2}\\)" 1 t)
+    ;; ("$" "\\([ 	(]\\|^\\)\\(\\(\\([$]\\)\\([^ 	\r\n,.$].*?\\(\n.*?\\)\\{0,5\\}[^ 	\r\n,.$]\\)\\4\\)\\)\\([ 	.,?;:'\")]\\|$\\)" 2 nil)
+    ;; \000 in the following regex is needed for org-inside-LaTeX-fragment-p
+    ("$" "\\([^$]\\)\\(\\(\\$\\([^ 	\r\n,;.$][^$\n\r]*?\\(\n[^$\n\r]*?\\)\\{0,2\\}[^ 	\r\n,.$]\\)\\$\\)\\)\\([ 	.,?;:'\")\000]\\|$\\)" 2 nil)
+    ("\\(" "\\\\([^\000]*?\\\\)" 0 nil)
+    ("\\[" "\\\\\\[[^\000]*?\\\\\\]" 0 t)
+    ("$$" "\\$\\$[^\000]*?\\$\\$" 0 t))
+  "Regular expressions for matching embedded LaTeX.")
+
+(defun org-format-latex (prefix &optional dir overlays msg at)
+  "Replace LaTeX fragments with links to an image, and produce images."
+  (if (and overlays (fboundp 'clear-image-cache)) (clear-image-cache))
+  (let* ((prefixnodir (file-name-nondirectory prefix))
+	 (absprefix (expand-file-name prefix dir))
+	 (todir (file-name-directory absprefix))
+	 (opt org-format-latex-options)
+	 (matchers (plist-get opt :matchers))
+	 (re-list org-latex-regexps)
+	 (cnt 0) txt link beg end re e checkdir
+	 m n block linkfile movefile ov)
+    ;; Check if there are old images files with this prefix, and remove them
+    (when (file-directory-p todir)
+      (mapc 'delete-file
+	    (directory-files
+	     todir 'full
+	     (concat (regexp-quote prefixnodir) "_[0-9]+\\.png$"))))
+    ;; Check the different regular expressions
+    (while (setq e (pop re-list))
+      (setq m (car e) re (nth 1 e) n (nth 2 e)
+	    block (if (nth 3 e) "\n\n" ""))
+      (when (member m matchers)
+	(goto-char (point-min))
+	(while (re-search-forward re nil t)
+	  (when (or (not at) (equal (cdr at) (match-beginning n)))
+	    (setq txt (match-string n)
+		  beg (match-beginning n) end (match-end n)
+		  cnt (1+ cnt)
+		  linkfile (format "%s_%04d.png" prefix cnt)
+		  movefile (format "%s_%04d.png" absprefix cnt)
+		  link (concat block "[[file:" linkfile "]]" block))
+	    (if msg (message msg cnt))
 	    (goto-char beg)
-	    (not (re-search-forward "^[ \t]*|[^-|][^|]*[^#!$*_^| \t][^|]*|" end t))))
-	 (col (org-table-current-column))
-	 (forcenew (car (assoc newchar org-recalc-marks)))
-	 epos new)
-    (when l1
-      (message "Change region to what mark?  Type # * ! $ or SPC: ")
-      (setq newchar (char-to-string (read-char-exclusive))
-	    forcenew (car (assoc newchar org-recalc-marks))))
-    (if (and newchar (not forcenew))
-	(error "Invalid NEWCHAR `%s' in `org-table-rotate-recalc-marks'"
-	       newchar))
-    (if l1 (goto-line l1))
-    (save-excursion
-      (beginning-of-line 1)
-      (unless (looking-at org-table-dataline-regexp)
-	(error "Not at a table data line")))
-    (unless have-col
-      (org-table-goto-column 1)
-      (org-table-insert-column)
-      (org-table-goto-column (1+ col)))
-    (setq epos (point-at-eol))
-    (save-excursion
-      (beginning-of-line 1)
-      (org-table-get-field
-       1 (if (looking-at "^[ \t]*| *\\([#!$*^_ ]\\) *|")
-	     (concat " "
-		     (setq new (or forcenew
-				   (cadr (member (match-string 1) marks))))
-		     " ")
-	   " # ")))
-    (if (and l1 l2)
-	(progn
-	  (goto-line l1)
-	  (while (progn (beginning-of-line 2) (not (= (org-current-line) l2)))
-	    (and (looking-at org-table-dataline-regexp)
-		 (org-table-get-field 1 (concat " " new " "))))
-	  (goto-line l1)))
-    (if (not (= epos (point-at-eol))) (org-table-align))
-    (goto-line l)
-    (and (interactive-p) (message (cdr (assoc new org-recalc-marks))))))
-
-(defun org-table-maybe-recalculate-line ()
-  "Recompute the current line if marked for it, and if we haven't just done it."
-  (interactive)
-  (and org-table-allow-automatic-line-recalculation
-       (not (and (memq last-command org-recalc-commands)
-		 (equal org-last-recalc-line (org-current-line))))
-       (save-excursion (beginning-of-line 1)
-		       (looking-at org-table-auto-recalculate-regexp))
-       (fboundp 'calc-eval)
-       (org-table-recalculate) t))
-
-(defvar org-table-formula-debug nil
-  "Non-nil means, debug table formulas.
-When nil, simply write \"#ERROR\" in corrupted fields.")
-
-(defvar modes)
-(defsubst org-set-calc-mode (var &optional value)
-  (if (stringp var)
-      (setq var (assoc var '(("D" calc-angle-mode deg)
-			     ("R" calc-angle-mode rad)
-			     ("F" calc-prefer-frac t)
-			     ("S" calc-symbolic-mode t)))
-	    value (nth 2 var) var (nth 1 var)))
-  (if (memq var modes)
-      (setcar (cdr (memq var modes)) value)
-    (cons var (cons value modes)))
-  modes)
-
-(defun org-table-eval-formula (&optional arg equation
-					 suppress-align suppress-const
-					 suppress-store)
-  "Replace the table field value at the cursor by the result of a calculation.
-
-This function makes use of Dave Gillespie's Calc package, in my view the
-most exciting program ever written for GNU Emacs.  So you need to have Calc
-installed in order to use this function.
-
-In a table, this command replaces the value in the current field with the
-result of a formula.  It also installs the formula as the \"current\" column
-formula, by storing it in a special line below the table.  When called
-with a `C-u' prefix, the current field must ba a named field, and the
-formula is installed as valid in only this specific field.
-
-When called, the command first prompts for a formula, which is read in
-the minibuffer.  Previously entered formulas are available through the
-history list, and the last used formula is offered as a default.
-These stored formulas are adapted correctly when moving, inserting, or
-deleting columns with the corresponding commands.
-
-The formula can be any algebraic expression understood by the Calc package.
-For details, see the Org-mode manual.
-
-This function can also be called from Lisp programs and offers
-additional arguments: EQUATION can be the formula to apply.  If this
-argument is given, the user will not be prompted.  SUPPRESS-ALIGN is
-used to speed-up recursive calls by by-passing unnecessary aligns.
-SUPPRESS-CONST suppresses the interpretation of constants in the
-formula, assuming that this has been done already outside the function.
-SUPPRESS-STORE means the formula should not be stored, either because
-it is already stored, or because it is a modified equation that should
-not overwrite the stored one."
-  (interactive "P")
-  (require 'calc)
-  (org-table-check-inside-data-field)
-  (org-table-get-specials)
-  (let* (fields
-	 (ndown (if (integerp arg) arg 1))
-	 (org-table-automatic-realign nil)
-	 (case-fold-search nil)
-	 (down (> ndown 1))
-	 (formula (if (and equation suppress-store)
-		      equation
-		    (org-table-get-formula equation (equal arg '(4)))))
-	 (n0 (org-table-current-column))
-	 (modes (copy-sequence org-calc-default-modes))
-	 n form fmt x ev orig c lispp)
-    ;; Parse the format string.  Since we have a lot of modes, this is
-    ;; a lot of work.  However, I think calc still uses most of the time.
-    (if (string-match ";" formula)
-	(let ((tmp (org-split-string formula ";")))
-	  (setq formula (car tmp)
-		fmt (concat (cdr (assoc "%" org-table-local-parameters))
-			    (nth 1 tmp)))
-	  (while (string-match "\\([pnfse]\\)\\(-?[0-9]+\\)" fmt)
-	    (setq c (string-to-char (match-string 1 fmt))
-		  n (string-to-number (match-string 2 fmt)))
-	    (if (= c ?p)
-		(setq modes (org-set-calc-mode 'calc-internal-prec n))
-	      (setq modes (org-set-calc-mode
-			   'calc-float-format
-			   (list (cdr (assoc c '((?n . float) (?f . fix)
-						 (?s . sci) (?e . eng))))
-				 n))))
-	    (setq fmt (replace-match "" t t fmt)))
-	  (while (string-match "[DRFS]" fmt)
-	    (setq modes (org-set-calc-mode (match-string 0 fmt)))
-	    (setq fmt (replace-match "" t t fmt)))
-	  (unless (string-match "\\S-" fmt)
-	    (setq fmt nil))))
-    (if (and (not suppress-const) org-table-formula-use-constants)
-	(setq formula (org-table-formula-substitute-names formula)))
-    (setq orig (or (get-text-property 1 :orig-formula formula) "?"))
-    (while (> ndown 0)
-      (setq fields (org-split-string
-		    (buffer-substring
-		     (point-at-bol) (point-at-eol)) " *| *"))
-      (if org-table-formula-numbers-only
-	  (setq fields (mapcar
-			(lambda (x) (number-to-string (string-to-number x)))
-			fields)))
-      (setq ndown (1- ndown))
-      (setq form (copy-sequence formula)
-	    lispp (equal (substring form 0 2) "'("))
-      ;; Insert the references to fields in same row
-      (while (string-match "\\$\\([0-9]+\\)?" form)
-	(setq n (if (match-beginning 1)
-		    (string-to-number (match-string 1 form))
-		  n0)
-	      x (nth (1- n) fields))
-	(unless x (error "Invalid field specifier \"%s\""
-			 (match-string 0 form)))
-	(if (equal x "") (setq x "0"))
-	(setq form (replace-match
-		    (if lispp x (concat "(" x ")"))
-		    t t form)))
-      ;; Insert ranges in current column
-      (while (string-match "\\&[-I0-9]+" form)
-	(setq form (replace-match
-		    (save-match-data
-		      (org-table-get-vertical-vector (match-string 0 form)
-						     nil n0))
-		    t t form)))
-      (if lispp
-	  (setq ev (eval (eval (read form)))
-		ev (if (numberp ev) (number-to-string ev) ev))
-	(setq ev (calc-eval (cons form modes)
-			    (if org-table-formula-numbers-only 'num))))
-
-      (when org-table-formula-debug
-	(with-output-to-temp-buffer "*Help*"
-	  (princ (format "Substitution history of formula
-Orig:   %s
-$xyz->  %s
-$1->    %s\n" orig formula form))
-	  (if (listp ev)
-	      (princ (format "       %s^\nError:  %s"
-			     (make-string (car ev) ?\-) (nth 1 ev)))
-	    (princ (format "Result: %s\nFormat: %s\nFinal:  %s"
-			   ev (or fmt "NONE")
-			   (if fmt (format fmt (string-to-number ev)) ev)))))
-	(shrink-window-if-larger-than-buffer (get-buffer-window "*Help*"))
-	(unless (and (interactive-p) (not ndown))
-	  (unless (let (inhibit-redisplay)
-		    (y-or-n-p "Debugging Formula. Continue to next? "))
-	    (org-table-align)
-	    (error "Abort"))
-	  (delete-window (get-buffer-window "*Help*"))
-	  (message "")))
-      (if (listp ev) (setq fmt nil ev "#ERROR"))
-      (org-table-justify-field-maybe
-       (if fmt (format fmt (string-to-number ev)) ev))
-      (if (and down (> ndown 0) (looking-at ".*\n[ \t]*|[^-]"))
-	  (call-interactively 'org-return)
-	(setq ndown 0)))
-    (and down (org-table-maybe-recalculate-line))
-    (or suppress-align (and org-table-may-need-update
-			    (org-table-align)))))
-
-(defun org-table-recalculate (&optional all noalign)
-  "Recalculate the current table line by applying all stored formulas.
-With prefix arg ALL, do this for all lines in the table."
-  (interactive "P")
-  (or (memq this-command org-recalc-commands)
-      (setq org-recalc-commands (cons this-command org-recalc-commands)))
-  (unless (org-at-table-p) (error "Not at a table"))
-  (org-table-get-specials)
-  (let* ((eqlist (sort (org-table-get-stored-formulas)
-		       (lambda (a b) (string< (car a) (car b)))))
-	 (inhibit-redisplay t)
-	 (line-re org-table-dataline-regexp)
-	 (thisline (org-current-line))
-	 (thiscol (org-table-current-column))
-	 beg end entry eqlnum eqlname eql (cnt 0) eq a name)
-    ;; Insert constants in all formulas
-    (setq eqlist
-	  (mapcar (lambda (x)
-		    (setcdr x (org-table-formula-substitute-names (cdr x)))
-		    x)
-		  eqlist))
-    ;; Split the equation list
-    (while (setq eq (pop eqlist))
-      (if (<= (string-to-char (car eq)) ?9)
-	  (push eq eqlnum)
-	(push eq eqlname)))
-    (setq eqlnum (nreverse eqlnum) eqlname (nreverse eqlname))
-    (if all
-	(progn
-	  (setq end (move-marker (make-marker) (1+ (org-table-end))))
-	  (goto-char (setq beg (org-table-begin)))
-	  (if (re-search-forward org-table-calculate-mark-regexp end t)
-	      ;; This is a table with marked lines, only compute selected lines
-	      (setq line-re org-table-recalculate-regexp)
-	    ;; Move forward to the first non-header line
-	    (if (and (re-search-forward org-table-dataline-regexp end t)
-		     (re-search-forward org-table-hline-regexp end t)
-		     (re-search-forward org-table-dataline-regexp end t))
-		(setq beg (match-beginning 0))
-	      nil))) ;; just leave beg where it is
-      (setq beg (point-at-bol)
-	    end (move-marker (make-marker) (1+ (point-at-eol)))))
-    (goto-char beg)
-    (and all (message "Re-applying formulas to full table..."))
-    (while (re-search-forward line-re end t)
-      (unless (string-match "^ *[_^!$] *$" (org-table-get-field 1))
-	;; Unprotected line, recalculate
-	(and all (message "Re-applying formulas to full table...(line %d)"
-			  (setq cnt (1+ cnt))))
-	(setq org-last-recalc-line (org-current-line))
-	(setq eql eqlnum)
-	(while (setq entry (pop eql))
-	  (goto-line org-last-recalc-line)
-	  (org-table-goto-column (string-to-number (car entry)) nil 'force)
-	  (org-table-eval-formula nil (cdr entry) 'noalign 'nocst 'nostore))))
-    (goto-line thisline)
-    (org-table-goto-column thiscol)
-    (or noalign (and org-table-may-need-update (org-table-align))
-	(and all (message "Re-applying formulas to %d lines...done" cnt)))
-    ;; Now do the names fields
-    (while (setq eq (pop eqlname))
-      (setq name (car eq)
-	    a (assoc name org-table-named-field-locations))
-      (when a
-	(message "Re-applying formula to named field: %s" name)
-	(goto-line (nth 1 a))
-	(org-table-goto-column (nth 2 a))
-	(org-table-eval-formula nil (cdr eq) 'noalign 'nocst 'nostore)))
-    ;; back to initial position
-    (goto-line thisline)
-    (org-table-goto-column thiscol)
-    (or noalign (and org-table-may-need-update (org-table-align))
-	(and all (message "Re-applying formulas...done")))))
-
-(defun org-table-formula-substitute-names (f)
-  "Replace $const with values in string F."
-  (let ((start 0) a n1 n2 nn1 nn2 s (f1 f))
-    ;; First, check for column names
-    (while (setq start (string-match org-table-column-name-regexp f start))
-      (setq start (1+ start))
-      (setq a (assoc (match-string 1 f) org-table-column-names))
-      (setq f (replace-match (concat "$" (cdr a)) t t f)))
-    ;; Expand ranges to vectors
-    (while (string-match "\\$\\([0-9]+\\)\\.\\.\\.?\\$\\([0-9]+\\)" f)
-      (setq n1 (string-to-number (match-string 1 f))
-	    n2 (string-to-number (match-string 2 f))
-	    nn1 (1+ (min n1 n2)) nn2 (max n1 n2)
-	    s (concat "[($" (number-to-string (1- nn1)) ")"))
-      (loop for i from nn1 upto nn2 do
-	    (setq s (concat s ",($" (int-to-string i) ")")))
-      (setq s (concat s "]"))
-      (if (< n2 n1) (setq s (concat "rev(" s ")")))
-      (setq f (replace-match s t t f)))
-    ;; Parameters and constants
-    (setq start 0)
-    (while (setq start (string-match "\\$\\([a-zA-Z][a-zA-Z0-9]*\\)" f start))
-      (setq start (1+ start))
-      (if (setq a (save-match-data
-		    (org-table-get-constant (match-string 1 f))))
-	  (setq f (replace-match (concat "(" a ")") t t f))))
-    (if org-table-formula-debug
-	(put-text-property 0 (length f) :orig-formula f1 f))
-    f))
-
-(defun org-table-get-constant (const)
-  "Find the value for a parameter or constant in a formula.
-Parameters get priority."
-  (or (cdr (assoc const org-table-local-parameters))
-      (cdr (assoc const org-table-formula-constants))
-      (and (fboundp 'constants-get) (constants-get const))
-      "#UNDEFINED_NAME"))
-
-(defvar org-edit-formulas-map (make-sparse-keymap))
-(define-key org-edit-formulas-map "\C-c\C-c" 'org-finish-edit-formulas)
-(define-key org-edit-formulas-map "\C-c\C-q" 'org-abort-edit-formulas)
-(define-key org-edit-formulas-map "\C-c?" 'org-show-variable)
-
-(defvar org-pos)
-
-(defun org-table-edit-formulas ()
-  "Edit the formulas of the current table in a separate buffer."
-  (interactive)
-  (unless (org-at-table-p)
-    (error "Not at a table"))
-  (org-table-get-specials)
-  (let ((eql (org-table-get-stored-formulas))
-	(pos (move-marker (make-marker) (point)))
-	(wc (current-window-configuration))
-	entry loc s)
-    (switch-to-buffer-other-window "*Edit Formulas*")
-    (erase-buffer)
-    (fundamental-mode)
-    (org-set-local 'org-pos pos)
-    (org-set-local 'org-window-configuration wc)
-    (use-local-map org-edit-formulas-map)
-    (setq s "# Edit formulas and finish with `C-c C-c'.
-# Use `C-u C-c C-c' to also appy them immediately to the entire table.
-# Use `C-c ?' to get information about $name at point.
-# To cancel editing, press `C-c C-q'.\n")
-    (put-text-property 0 (length s) 'face 'font-lock-comment-face s)
-    (insert s)
-    (while (setq entry (pop eql))
-      (when (setq loc (assoc (car entry) org-table-named-field-locations))
-	(setq s (format "# Named formula, referring to column %d in line %d\n"
-			(nth 2 loc) (nth 1 loc)))
-	(put-text-property 0 (length s) 'face 'font-lock-comment-face s)
-	(insert s))
-      (setq s (concat "$" (car entry) "=" (cdr entry) "\n"))
-      (remove-text-properties 0 (length s) '(face nil) s)
-      (insert s))
-    (goto-char (point-min))
-    (message "Edit formulas and finish with `C-c C-c'.")))
-
-(defun org-show-variable ()
-  "Show the location/value of the $ expression at point."
-  (interactive)
-  (let (var (pos org-pos) (win (selected-window)) e)
-    (save-excursion
-      (or (looking-at "\\$") (skip-chars-backward "$a-zA-Z0-9"))
-      (if (looking-at "\\$\\([a-zA-Z0-9]+\\)")
-	  (setq var (match-string 1))
-	(error "No variable at point")))
-    (cond
-     ((setq e (assoc var org-table-named-field-locations))
-      (switch-to-buffer-other-window (marker-buffer pos))
-      (goto-line (nth 1 e))
-      (org-table-goto-column (nth 2 e))
-      (select-window win)
-      (message "Named field, column %d of line %d" (nth 2 e) (nth 1 e)))
-     ((setq e (assoc var org-table-column-names))
-      (switch-to-buffer-other-window (marker-buffer pos))
-      (goto-char pos)
-      (goto-char (org-table-begin))
-      (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|")
-			     (org-table-end) t)
+	    (unless checkdir ; make sure the directory exists
+	      (setq checkdir t)
+	      (or (file-directory-p todir) (make-directory todir)))
+	    (org-create-formula-image
+	     txt movefile opt)
+	    (if overlays
+		(progn
+		  (setq ov (org-make-overlay beg end))
+		  (if (featurep 'xemacs)
+		      (progn
+			(org-overlay-put ov 'invisible t)
+			(org-overlay-put
+			 ov 'end-glyph
+			 (make-glyph (vector 'png :file movefile))))
+		    (org-overlay-put
+		     ov 'display
+		     (list 'image :type 'png :file movefile :ascent 'center)))
+		  (push ov org-latex-fragment-image-overlays)
+		  (goto-char end))
+	      (delete-region beg end)
+	      (insert link))))))))
+
+;; This function borrows from Ganesh Swami's latex2png.el
+(defun org-create-formula-image (string tofile options)
+  (let* ((tmpdir (if (featurep 'xemacs)
+		     (temp-directory)
+		   temporary-file-directory))
+	 (texfilebase (make-temp-name
+		       (expand-file-name "orgtex" tmpdir)))
+
+;(texfilebase (make-temp-file "orgtex"))
+;	 (dummy (delete-file texfilebase))
+	 (texfile (concat texfilebase ".tex"))
+	 (dvifile (concat texfilebase ".dvi"))
+	 (pngfile (concat texfilebase ".png"))
+	 (scale (number-to-string (* 1000 (or (plist-get options :scale) 1.0))))
+	 (fg (or (plist-get options :foreground) "Black"))
+	 (bg (or (plist-get options :background) "Transparent")))
+    (with-temp-file texfile
+      (insert "\\documentclass{article}
+\\usepackage{fullpage}
+\\usepackage{amssymb}
+\\usepackage[usenames]{color}
+\\usepackage{amsmath}
+\\usepackage{latexsym}
+\\usepackage[mathscr]{eucal}
+\\pagestyle{empty}
+\\begin{document}\n" string "\n\\end{document}\n"))
+    (let ((dir default-directory))
+      (condition-case nil
 	  (progn
-	    (goto-char (match-beginning 1))
-	    (message "Named column (column %s)" (cdr e)))
-	(error "Column name not found"))
-      (select-window win))
-     ((string-match "^[0-9]$" var)
-      ;; column number
-      (switch-to-buffer-other-window (marker-buffer pos))
-      (goto-char pos)
-      (goto-char (org-table-begin))
-      (recenter 1)
-      (if (re-search-forward org-table-dataline-regexp
-			     (org-table-end) t)
-	  (progn
-	    (goto-char (match-beginning 0))
-	    (org-table-goto-column (string-to-number var))
-	    (message "Column %s" var))
-	(error "Column name not found"))
-      (select-window win))
-     ((setq e (assoc var org-table-local-parameters))
-      (switch-to-buffer-other-window (marker-buffer pos))
-      (goto-char pos)
-      (goto-char (org-table-begin))
-      (if (re-search-forward (concat "^[ \t]*| *\\$ *.*?| *\\(" var "=\\)") nil t)
-	  (progn
-	    (goto-char (match-beginning 1))
-	    (message "Local parameter."))
-	(error "Parameter not found"))
-      (select-window win))
-     (t
-      (cond
-       ((setq e (assoc var org-table-formula-constants))
-	(message "Constant: $%s=%s in `org-table-formula-constants'." var (cdr e)))
-       ((setq e (and (fboundp 'constants-get) (constants-get var)))
-	(message "Constant: $%s=%s, retrieved from `constants.el'." var e))
-       (t (error "Undefined name $%s" var)))))))
-
-(defun org-finish-edit-formulas (&optional arg)
-  "Parse the buffer for formula definitions and install them.
-With prefix ARG, apply the new formulas to the table."
-  (interactive "P")
-  (let ((pos org-pos) eql)
-    (goto-char (point-min))
-    (while (re-search-forward "^\\$\\([a-zA-Z0-9]+\\) *= *\\(.*?\\) *$" nil t)
-      (push (cons (match-string 1) (match-string 2)) eql))
-    (set-window-configuration org-window-configuration)
-    (select-window (get-buffer-window (marker-buffer pos)))
-    (goto-char pos)
-    (unless (org-at-table-p)
-      (error "Lost table position - cannot install formulae"))
-    (org-table-store-formulas eql)
-    (move-marker pos nil)
-    (kill-buffer "*Edit Formulas*")
-    (if arg
-	(org-table-recalculate 'all)
-      (message "New formulas installed - press C-u C-c C-c to apply."))))
-
-(defun org-abort-edit-formulas ()
-  "Abort editing formulas, without installing the changes."
-  (interactive)
-  (let ((pos org-pos))
-    (set-window-configuration org-window-configuration)
-    (select-window (get-buffer-window (marker-buffer pos)))
-    (goto-char pos)
-    (message "Formula editing aborted without installing changes")))
-
-;;; The orgtbl minor mode
-
-;; Define a minor mode which can be used in other modes in order to
-;; integrate the org-mode table editor.
-
-;; This is really a hack, because the org-mode table editor uses several
-;; keys which normally belong to the major mode, for example the TAB and
-;; RET keys.  Here is how it works: The minor mode defines all the keys
-;; necessary to operate the table editor, but wraps the commands into a
-;; function which tests if the cursor is currently inside a table.  If that
-;; is the case, the table editor command is executed.  However, when any of
-;; those keys is used outside a table, the function uses `key-binding' to
-;; look up if the key has an associated command in another currently active
-;; keymap (minor modes, major mode, global), and executes that command.
-;; There might be problems if any of the keys used by the table editor is
-;; otherwise used as a prefix key.
-
-;; Another challenge is that the key binding for TAB can be tab or \C-i,
-;; likewise the binding for RET can be return or \C-m.  Orgtbl-mode
-;; addresses this by checking explicitly for both bindings.
-
-;; The optimized version (see variable `orgtbl-optimized') takes over
-;; all keys which are bound to `self-insert-command' in the *global map*.
-;; Some modes bind other commands to simple characters, for example
-;; AUCTeX binds the double quote to `Tex-insert-quote'.  With orgtbl-mode
-;; active, this binding is ignored inside tables and replaced with a
-;; modified self-insert.
-
-(defvar orgtbl-mode nil
-  "Variable controlling `orgtbl-mode', a minor mode enabling the `org-mode'
-table editor in arbitrary modes.")
-(make-variable-buffer-local 'orgtbl-mode)
-
-(defvar orgtbl-mode-map (make-keymap)
-  "Keymap for `orgtbl-mode'.")
-
-;;;###autoload
-(defun turn-on-orgtbl ()
-  "Unconditionally turn on `orgtbl-mode'."
-  (orgtbl-mode 1))
-
-;;;###autoload
-(defun orgtbl-mode (&optional arg)
-  "The `org-mode' table editor as a minor mode for use in other modes."
-  (interactive)
-  (if (org-mode-p)
-      ;; Exit without error, in case some hook functions calls this
-      ;; by accident in org-mode.
-      (message "Orgtbl-mode is not useful in org-mode, command ignored")
-    (setq orgtbl-mode
-	  (if arg (> (prefix-numeric-value arg) 0) (not orgtbl-mode)))
-    (if orgtbl-mode
-	(progn
-	  (and (orgtbl-setup) (defun orgtbl-setup () nil))
-	  ;; Make sure we are first in minor-mode-map-alist
-	  (let ((c (assq 'orgtbl-mode minor-mode-map-alist)))
-	    (and c (setq minor-mode-map-alist
-			 (cons c (delq c minor-mode-map-alist)))))
-	  (org-set-local (quote org-table-may-need-update) t)
-	  (org-add-hook 'before-change-functions 'org-before-change-function
-			nil 'local)
-	  (org-set-local 'org-old-auto-fill-inhibit-regexp
-			 auto-fill-inhibit-regexp)
-	  (org-set-local 'auto-fill-inhibit-regexp
-			 (if auto-fill-inhibit-regexp
-			     (concat "\\([ \t]*|\\|" auto-fill-inhibit-regexp)
-			   "[ \t]*|"))
-	  (org-add-to-invisibility-spec '(org-cwidth))
-	  (easy-menu-add orgtbl-mode-menu)
-	  (run-hooks 'orgtbl-mode-hook))
-      (setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp)
-      (org-cleanup-narrow-column-properties)
-      (org-remove-from-invisibility-spec '(org-cwidth))
-      (remove-hook 'before-change-functions 'org-before-change-function t)
-      (easy-menu-remove orgtbl-mode-menu)
-      (force-mode-line-update 'all))))
-
-(defun org-cleanup-narrow-column-properties ()
-  "Remove all properties related to narrow-column invisibility."
-  (let ((s 1))
-    (while (setq s (text-property-any s (point-max)
-				      'display org-narrow-column-arrow))
-      (remove-text-properties s (1+ s) '(display t)))
-    (setq s 1)
-    (while (setq s (text-property-any s (point-max) 'org-cwidth 1))
-      (remove-text-properties s (1+ s) '(org-cwidth t)))
-    (setq s 1)
-    (while (setq s (text-property-any s (point-max) 'invisible 'org-cwidth))
-      (remove-text-properties s (1+ s) '(invisible t)))))
-
-;; Install it as a minor mode.
-(put 'orgtbl-mode :included t)
-(put 'orgtbl-mode :menu-tag "Org Table Mode")
-(add-minor-mode 'orgtbl-mode " OrgTbl" orgtbl-mode-map)
-
-(defun orgtbl-make-binding (fun n &rest keys)
-  "Create a function for binding in the table minor mode.
-FUN is the command to call inside a table.  N is used to create a unique
-command name.  KEYS are keys that should be checked in for a command
-to execute outside of tables."
-  (eval
-   (list 'defun
-	 (intern (concat "orgtbl-hijacker-command-" (int-to-string n)))
-	 '(arg)
-	 (concat "In tables, run `" (symbol-name fun) "'.\n"
-		 "Outside of tables, run the binding of `"
-		 (mapconcat (lambda (x) (format "%s" x)) keys "' or `")
-		 "'.")
-	 '(interactive "p")
-	 (list 'if
-	       '(org-at-table-p)
-	       (list 'call-interactively (list 'quote fun))
-	       (list 'let '(orgtbl-mode)
-		     (list 'call-interactively
-			   (append '(or)
-				   (mapcar (lambda (k)
-					     (list 'key-binding k))
-					   keys)
-				   '('orgtbl-error))))))))
-
-(defun orgtbl-error ()
-  "Error when there is no default binding for a table key."
-  (interactive)
-  (error "This key is has no function outside tables"))
-
-(defun orgtbl-setup ()
-  "Setup orgtbl keymaps."
-  (let ((nfunc 0)
-	(bindings
-	 (list
-	  '([(meta shift left)]  org-table-delete-column)
-	  '([(meta left)]        org-table-move-column-left)
-	  '([(meta right)]       org-table-move-column-right)
-	  '([(meta shift right)] org-table-insert-column)
-	  '([(meta shift up)]    org-table-kill-row)
-	  '([(meta shift down)]  org-table-insert-row)
-	  '([(meta up)]          org-table-move-row-up)
-	  '([(meta down)]        org-table-move-row-down)
-	  '("\C-c\C-w"           org-table-cut-region)
-	  '("\C-c\M-w"           org-table-copy-region)
-	  '("\C-c\C-y"           org-table-paste-rectangle)
-	  '("\C-c-"              org-table-insert-hline)
-;	  '([(shift tab)]        org-table-previous-field)
-	  '("\C-m"               org-table-next-row)
-	  (list (org-key 'S-return) 'org-table-copy-down)
-	  '([(meta return)]      org-table-wrap-region)
-	  '("\C-c\C-q"           org-table-wrap-region)
-	  '("\C-c?"              org-table-current-column)
-	  '("\C-c "              org-table-blank-field)
-	  '("\C-c+"              org-table-sum)
-	  '("\C-c="              org-table-eval-formula)
-	  '("\C-c'"              org-table-edit-formulas)
-	  '("\C-c`"              org-table-edit-field)
-	  '("\C-c*"              org-table-recalculate)
-	  '("\C-c|"              org-table-create-or-convert-from-region)
-	  '("\C-c^"              org-table-sort-lines)
-	  '([(control ?#)]       org-table-rotate-recalc-marks)))
-	elt key fun cmd)
-    (while (setq elt (pop bindings))
-      (setq nfunc (1+ nfunc))
-      (setq key (car elt)
-	    fun (nth 1 elt)
-	    cmd (orgtbl-make-binding fun nfunc key))
-      (define-key orgtbl-mode-map key cmd))
-    ;; Special treatment needed for TAB and RET
-    (define-key orgtbl-mode-map [(return)]
-      (orgtbl-make-binding 'orgtbl-ret 100 [(return)] "\C-m"))
-    (define-key orgtbl-mode-map "\C-m"
-      (orgtbl-make-binding 'orgtbl-ret 101 "\C-m" [(return)]))
-    (define-key orgtbl-mode-map [(tab)]
-      (orgtbl-make-binding 'orgtbl-tab 102 [(tab)] "\C-i"))
-    (define-key orgtbl-mode-map "\C-i"
-      (orgtbl-make-binding 'orgtbl-tab 103 "\C-i" [(tab)])))
-    (define-key orgtbl-mode-map "\C-i"
-      (orgtbl-make-binding 'orgtbl-tab 104 [(shift tab)]))
-    (define-key orgtbl-mode-map "\C-c\C-c"
-      (orgtbl-make-binding 'org-ctrl-c-ctrl-c 105 "\C-c\C-c"))
-    (when orgtbl-optimized
-      ;; If the user wants maximum table support, we need to hijack
-      ;; some standard editing functions
-      (org-remap orgtbl-mode-map
-		 'self-insert-command 'orgtbl-self-insert-command
-		 'delete-char 'org-delete-char
-		 'delete-backward-char 'org-delete-backward-char)
-      (define-key orgtbl-mode-map "|" 'org-force-self-insert))
-    (easy-menu-define orgtbl-mode-menu orgtbl-mode-map "OrgTbl menu"
-      '("OrgTbl"
-	["Align" org-ctrl-c-ctrl-c :active (org-at-table-p) :keys "C-c C-c"]
-	["Next Field" org-cycle :active (org-at-table-p) :keys "TAB"]
-	["Previous Field" org-shifttab :active (org-at-table-p) :keys "S-TAB"]
-	["Next Row" org-return :active (org-at-table-p) :keys "RET"]
-	"--"
-	["Blank Field" org-table-blank-field :active (org-at-table-p) :keys "C-c SPC"]
-	["Edit Field" org-table-edit-field :active (org-at-table-p) :keys "C-c ` "]
-	["Copy Field from Above"
-	 org-table-copy-down :active (org-at-table-p) :keys "S-RET"]
-	"--"
-	("Column"
-	 ["Move Column Left" org-metaleft :active (org-at-table-p) :keys "M-<left>"]
-	 ["Move Column Right" org-metaright :active (org-at-table-p) :keys "M-<right>"]
-	 ["Delete Column" org-shiftmetaleft :active (org-at-table-p) :keys "M-S-<left>"]
-	 ["Insert Column" org-shiftmetaright :active (org-at-table-p) :keys "M-S-<right>"]
-	 "--"
-	 ["Enable Narrowing" (setq org-table-limit-column-width (not org-table-limit-column-width)) :active (org-at-table-p) :selected org-table-limit-column-width :style toggle])
-	("Row"
-	 ["Move Row Up" org-metaup :active (org-at-table-p) :keys "M-<up>"]
-	 ["Move Row Down" org-metadown :active (org-at-table-p) :keys "M-<down>"]
-	 ["Delete Row" org-shiftmetaup :active (org-at-table-p) :keys "M-S-<up>"]
-	 ["Insert Row" org-shiftmetadown :active (org-at-table-p) :keys "M-S-<down>"]
-	 ["Sort lines in region" org-table-sort-lines (org-at-table-p) :keys "C-c ^"]
-	 "--"
-	 ["Insert Hline" org-table-insert-hline :active (org-at-table-p) :keys "C-c -"])
-	("Rectangle"
-	 ["Copy Rectangle" org-copy-special :active (org-at-table-p)]
-	 ["Cut Rectangle" org-cut-special :active (org-at-table-p)]
-	 ["Paste Rectangle" org-paste-special :active (org-at-table-p)]
-	 ["Fill Rectangle" org-table-wrap-region :active (org-at-table-p)])
-	"--"
-	["Set Column Formula" org-table-eval-formula :active (org-at-table-p) :keys "C-c ="]
-	["Set Named Field Formula" (org-table-eval-formula '(4)) :active (org-at-table-p) :keys "C-u C-c ="]
-	["Edit Formulas" org-table-edit-formulas :active (org-at-table-p) :keys "C-c '"]
-	["Recalculate line" org-table-recalculate :active (org-at-table-p) :keys "C-c *"]
-	["Recalculate all" (org-table-recalculate '(4)) :active (org-at-table-p) :keys "C-u C-c *"]
-	["Toggle Recalculate Mark" org-table-rotate-recalc-marks :active (org-at-table-p) :keys "C-c #"]
-	["Sum Column/Rectangle" org-table-sum
-	 :active (or (org-at-table-p) (org-region-active-p)) :keys "C-c +"]
-	["Which Column?" org-table-current-column :active (org-at-table-p) :keys "C-c ?"]
-	["Debug Formulas"
-	 (setq org-table-formula-debug (not org-table-formula-debug))
-	 :style toggle :selected org-table-formula-debug]
-	))
-    t)
-
-(defun orgtbl-tab (arg)
-  "Justification and field motion for `orgtbl-mode'."
-  (interactive "P")
-  (if arg (org-table-edit-field t)
-    (org-table-justify-field-maybe)
-    (org-table-next-field)))
-
-(defun orgtbl-ret ()
-  "Justification and field motion for `orgtbl-mode'."
-  (interactive)
-  (org-table-justify-field-maybe)
-  (org-table-next-row))
-
-(defun orgtbl-self-insert-command (N)
-  "Like `self-insert-command', use overwrite-mode for whitespace in tables.
-If the cursor is in a table looking at whitespace, the whitespace is
-overwritten, and the table is not marked as requiring realignment."
-  (interactive "p")
-  (if (and (org-at-table-p)
-	   (or
-	    (and org-table-auto-blank-field
-		 (member last-command
-			 '(orgtbl-hijacker-command-100
-			   orgtbl-hijacker-command-101
-			   orgtbl-hijacker-command-102
-			   orgtbl-hijacker-command-103
-			   orgtbl-hijacker-command-104
-			   orgtbl-hijacker-command-105))
-		 (org-table-blank-field))
-	    t)
-	   (eq N 1)
-	   (looking-at "[^|\n]*  +|"))
-      (let (org-table-may-need-update)
-	(goto-char (1- (match-end 0)))
-	(delete-backward-char 1)
-	(goto-char (match-beginning 0))
-	(self-insert-command N))
-    (setq org-table-may-need-update t)
-    (let (orgtbl-mode)
-      (call-interactively (key-binding (vector last-input-event))))))
-
-(defun org-force-self-insert (N)
-  "Needed to enforce self-insert under remapping."
-  (interactive "p")
-  (self-insert-command N))
-
-;;; Exporting
+	    (cd tmpdir)
+	    (call-process "latex" nil nil nil texfile))
+	(error nil))
+      (cd dir))
+    (if (not (file-exists-p dvifile))
+	(progn (message "Failed to create dvi file from %s" texfile) nil)
+      (call-process "dvipng" nil nil nil
+		    "-E" "-fg" fg "-bg" bg
+		    "-x" scale "-y" scale "-T" "tight"
+		    "-o" pngfile
+		    dvifile)
+      (if (not (file-exists-p pngfile))
+	  (progn (message "Failed to create png file from %s" texfile) nil)
+	;; Use the requested file name and clean up
+	(copy-file pngfile tofile 'replace)
+	(loop for e in '(".dvi" ".tex" ".aux" ".log" ".png") do
+	      (delete-file (concat texfilebase e)))
+	pngfile))))
+
+;;;; Exporting
+
+;;; Variables, constants, and parameter plists
 
 (defconst org-level-max 20)
 
@@ -13795,9 +16284,13 @@
   "Should default preamble be inserted?  Set by publishing functions.")
 (defvar org-export-html-auto-postamble t
   "Should default postamble be inserted?  Set by publishing functions.")
+(defvar org-current-export-file nil) ; dynamically scoped parameter
+(defvar org-current-export-dir nil) ; dynamically scoped parameter
+
 
 (defconst org-export-plist-vars
   '((:language             . org-export-default-language)
+    (:customtime           . org-display-custom-times)
     (:headline-levels      . org-export-headline-levels)
     (:section-numbers      . org-export-with-section-numbers)
     (:table-of-contents    . org-export-with-toc)
@@ -13871,20 +16364,6 @@
 					 (match-string 1 options)))))))))
       p)))
 
-(defun org-combine-plists (&rest plists)
-  "Create a single property list from all plists in PLISTS.
-The process starts by copying the last list, and then setting properties
-from the other lists.  Settings in the first list are the most significant
-ones and overrule settings in the other lists."
-  (let ((rtn (copy-sequence (pop plists)))
-	p v ls)
-    (while plists
-      (setq ls (pop plists))
-      (while ls
-	(setq p (pop ls) v (pop ls))
-	(setq rtn (plist-put rtn p v))))
-    rtn))
-
 (defun org-export-directory (type plist)
   (let* ((val (plist-get plist :publishing-directory))
 	 (dir (if (listp val)
@@ -13972,8 +16451,6 @@
 	(call-interactively (cdr ass))
       (error "No command associated with key %c" r1))))
 
-;; ASCII
-
 (defconst org-html-entities
   '(("nbsp")
     ("iexcl")
@@ -14272,6 +16749,8 @@
 It is supplemented by a number of commonly used TeX macros with appropriate
 translations.  There is currently no way for users to extend this.")
 
+;;; General functions for all backends
+
 (defun org-cleaned-string-for-export (string &rest parameters)
   "Cleanup a buffer substring so that links can be created safely."
   (interactive)
@@ -14280,12 +16759,16 @@
 	 (re-plain-link (concat "\\([^[<]\\)" org-plain-link-re))
 	 (re-angle-link (concat "\\([^[]\\)" org-angle-link-re))
 	 (re-archive (concat ":" org-archive-tag ":"))
+	 (re-quote (concat "^\\*+[ \t]+" org-quote-string "\\>"))
+	 (htmlp (memq :for-html parameters))
+	 (outline-regexp "\\*+")
 	 rtn)
     (save-excursion
       (set-buffer (get-buffer-create " org-mode-tmp"))
       (erase-buffer)
       (insert string)
       (let ((org-inhibit-startup t)) (org-mode))
+      (untabify (point-min) (point-max))
 
       ;; Get rid of archived trees
       (when (not (eq org-export-with-archived-trees t))
@@ -14298,6 +16781,32 @@
 	     (if org-export-with-archived-trees (1+ (point-at-eol)) (point))
 	     (org-end-of-subtree t)))))
 
+      ;; Protect stuff from HTML processing
+      (goto-char (point-min))
+      (while (re-search-forward "^[ \t]*:.*\\(\n[ \t]*:.*\\)*" nil t)
+	(add-text-properties (match-beginning 0) (match-end 0)
+			     '(org-protected t)))
+      (when htmlp
+	(goto-char (point-min))
+	(while (re-search-forward "^#\\+HTML:[ \t]*\\(.*\\)" nil t)
+	  (replace-match "\\1" t)
+	  (add-text-properties 
+	   (point-at-bol) (min (1+ (point-at-eol)) (point-max))
+	   '(org-protected t))))
+      (goto-char (point-min))
+      (while (re-search-forward
+	      "^#\\+BEGIN_HTML\\>.*\\(\n.*\\)*?\n#\\+END_HTML\\>.*\n?" nil t)
+	(if htmlp
+	    (add-text-properties (match-beginning 1) (1+ (match-end 1))
+				 '(org-protected t))
+	  (delete-region (match-beginning 0) (match-end 0))))
+      (goto-char (point-min))
+      (while (re-search-forward re-quote nil t)
+	(goto-char (match-beginning 0))
+	(end-of-line 1)
+	(add-text-properties (point) (org-end-of-subtree t)
+			     '(org-protected t)))
+
       ;; Find targets in comments and move them out of comments,
       ;; but mark them as targets that should be invisible
       (goto-char (point-min))
@@ -14313,13 +16822,15 @@
       (goto-char (point-min))
       (when re-radio
 	(while (re-search-forward re-radio nil t)
-	  (replace-match "\\1[[\\2]]")))
+	  (org-if-unprotected
+	   (replace-match "\\1[[\\2]]"))))
 
       ;; Find all links that contain a newline and put them into a single line
       (goto-char (point-min))
       (while (re-search-forward "\\(\\(\\[\\|\\]\\)\\[[^]]*?\\)[ \t]*\n[ \t]*\\([^]]*\\]\\(\\[\\|\\]\\)\\)" nil t)
-	(replace-match "\\1 \\3")
-	(goto-char (match-beginning 0)))
+	(org-if-unprotected
+	 (replace-match "\\1 \\3")
+	 (goto-char (match-beginning 0))))
 
       ;; Convert LaTeX fragments to images
       (when (memq :LaTeX-fragments parameters)
@@ -14334,34 +16845,38 @@
       ;; Expand link abbreviations
       (goto-char (point-min))
       (while (re-search-forward re-plain-link nil t)
-	(replace-match
-	 (concat
-	  (match-string 1) "[[" (match-string 2) ":" (match-string 3) "]]")
-	 t t))
+	(org-if-unprotected
+	 (replace-match
+	  (concat
+	   (match-string 1) "[[" (match-string 2) ":" (match-string 3) "]]")
+	  t t)))
       (goto-char (point-min))
       (while (re-search-forward re-angle-link nil t)
-	(replace-match
-	 (concat
-	  (match-string 1) "[[" (match-string 2) ":" (match-string 3) "]]")
-	 t t))
+	(org-if-unprotected
+	 (replace-match
+	  (concat
+	   (match-string 1) "[[" (match-string 2) ":" (match-string 3) "]]")
+	  t t)))
       (goto-char (point-min))
       (while (re-search-forward org-bracket-link-regexp nil t)
-	(replace-match
-	 (concat "[[" (save-match-data
-			(org-link-expand-abbrev (match-string 1)))
-		 "]"
-		 (if (match-end 3)
-		     (match-string 2)
-		   (concat "[" (match-string 1) "]"))
-		 "]")
-	 t t))
+	(org-if-unprotected
+	 (replace-match
+	  (concat "[[" (save-match-data
+			 (org-link-expand-abbrev (match-string 1)))
+		  "]"
+		  (if (match-end 3)
+		      (match-string 2)
+		    (concat "[" (match-string 1) "]"))
+		  "]")
+	  t t)))
 
       ;; Find multiline emphasis and put them into single line
       (when (memq :emph-multiline parameters)
 	(goto-char (point-min))
 	(while (re-search-forward org-emph-re nil t)
-	  (subst-char-in-region (match-beginning 0) (match-end 0) ?\n ?\  t)
-	  (goto-char (1- (match-end 0)))))
+	  (org-if-unprotected
+	   (subst-char-in-region (match-beginning 0) (match-end 0) ?\n ?\  t)
+	   (goto-char (1- (match-end 0))))))
 
       (setq rtn (buffer-string)))
     (kill-buffer " org-mode-tmp")
@@ -14377,48 +16892,56 @@
 	   (a (assoc rtn alist)))
       (or (cdr a) rtn))))
 
-(defun org-convert-to-odd-levels ()
-  "Convert an org-mode file with all levels allowed to one with odd levels.
-This will leave level 1 alone, convert level 2 to level 3, level 3 to
-level 5 etc."
-  (interactive)
-  (when (yes-or-no-p "Are you sure you want to globally change levels to odd? ")
-    (let ((org-odd-levels-only nil) n)
-      (save-excursion
-	(goto-char (point-min))
-	(while (re-search-forward "^\\*\\*+" nil t)
-	  (setq n (1- (length (match-string 0))))
-	  (while (>= (setq n (1- n)) 0)
-	    (org-demote))
-	  (end-of-line 1))))))
-
-
-(defun org-convert-to-oddeven-levels ()
-  "Convert an org-mode file with only odd levels to one with odd and even levels.
-This promotes level 3 to level 2, level 5 to level 3 etc.  If the file contains a
-section with an even level, conversion would destroy the structure of the file.  An error
-is signaled in this case."
-  (interactive)
-  (goto-char (point-min))
-  ;; First check if there are no even levels
-  (when (re-search-forward "^\\(\\*\\*\\)+[^*]" nil t)
-    (org-show-context t)
-    (error "Not all levels are odd in this file.  Conversion not possible."))
-  (when (yes-or-no-p "Are you sure you want to globally change levels to odd-even? ")
-    (let ((org-odd-levels-only nil) n)
-      (save-excursion
-	(goto-char (point-min))
-	(while (re-search-forward "^\\*\\*+" nil t)
-	  (setq n (/ (length (match-string 0)) 2))
-	  (while (>= (setq n (1- n)) 0)
-	    (org-promote))
-	  (end-of-line 1))))))
-
-(defun org-tr-level (n)
-  "Make N odd if required."
-  (if org-odd-levels-only (1+ (/ n 2)) n))
+;; Variable holding the vector with section numbers
+(defvar org-section-numbers (make-vector org-level-max 0))
+
+(defun org-init-section-numbers ()
+  "Initialize the vector for the section numbers."
+  (let* ((level  -1)
+	 (numbers (nreverse (org-split-string "" "\\.")))
+	 (depth (1- (length org-section-numbers)))
+	 (i depth) number-string)
+    (while (>= i 0)
+      (if (> i level)
+	  (aset org-section-numbers i 0)
+	(setq number-string (or (car numbers) "0"))
+	(if (string-match "\\`[A-Z]\\'" number-string)
+	    (aset org-section-numbers i
+		  (- (string-to-char number-string) ?A -1))
+	    (aset org-section-numbers i (string-to-number number-string)))
+	(pop numbers))
+      (setq i (1- i)))))
+
+(defun org-section-number (&optional level)
+  "Return a string with the current section number.
+When LEVEL is non-nil, increase section numbers on that level."
+  (let* ((depth (1- (length org-section-numbers))) idx n (string ""))
+    (when level
+      (when (> level -1)
+	(aset org-section-numbers
+	      level (1+ (aref org-section-numbers level))))
+      (setq idx (1+ level))
+      (while (<= idx depth)
+	(if (not (= idx 1))
+	    (aset org-section-numbers idx 0))
+	(setq idx (1+ idx))))
+    (setq idx 0)
+    (while (<= idx depth)
+      (setq n (aref org-section-numbers idx))
+      (setq string (concat string (if (not (string= string "")) "." "")
+			   (int-to-string n)))
+      (setq idx (1+ idx)))
+    (save-match-data
+      (if (string-match "\\`\\([@0]\\.\\)+" string)
+	  (setq string (replace-match "" t nil string)))
+      (if (string-match "\\(\\.0\\)+\\'" string)
+	  (setq string (replace-match "" t nil string))))
+    string))
+
+;;; ASCII export
 
 (defvar org-last-level nil) ; dynamically scoped variable
+(defvar org-levels-open nil) ; dynamically scoped parameter
 (defvar org-ascii-current-indentation nil) ; For communication
 
 (defun org-export-as-ascii (arg)
@@ -14434,15 +16957,16 @@
 	  (buffer-substring
 	   (if (org-region-active-p) (region-beginning) (point-min))
 	   (if (org-region-active-p) (region-end) (point-max))))
+	 (custom-times org-display-custom-times)
 	 (lines (org-export-find-first-heading-line
 		 (org-skip-comments
 		  (org-split-string
 		   (org-cleaned-string-for-export region)
 		   "[\r\n]"))))
 	 (org-ascii-current-indentation '(0 . 0))
-	 (org-startup-with-deadline-check nil)
 	 (level 0) line txt
 	 (umax nil)
+	 (umax-toc nil)
 	 (case-fold-search nil)
          (filename (concat (file-name-as-directory
 			    (org-export-directory :ascii opt-plist))
@@ -14450,7 +16974,7 @@
 			    (file-name-nondirectory buffer-file-name))
 			   ".txt"))
 	 (buffer (find-file-noselect filename))
-	 (levels-open (make-vector org-level-max nil))
+	 (org-levels-open (make-vector org-level-max nil))
 	 (odd org-odd-levels-only)
 	 (date  (format-time-string "%Y/%m/%d" (current-time)))
 	 (time  (format-time-string "%X" (org-current-time)))
@@ -14461,7 +16985,7 @@
 	 (email       (plist-get opt-plist :email))
 	 (language    (plist-get opt-plist :language))
 	 (quote-re0   (concat "^[ \t]*" org-quote-string "\\>"))
-	 (quote-re    (concat "^\\(\\*+\\)\\([ \t]*" org-quote-string "\\>\\)"))
+;	 (quote-re    (concat "^\\(\\*+\\)\\([ \t]*" org-quote-string "\\>\\)"))
 	 (text        nil)
 	 (todo nil)
 	 (lang-words nil))
@@ -14473,9 +16997,7 @@
 
     (setq lang-words (or (assoc language org-export-language-setup)
 			 (assoc "en" org-export-language-setup)))
-    (if org-export-ascii-show-new-buffer
-	(switch-to-buffer-other-window buffer)
-      (set-buffer buffer))
+    (switch-to-buffer-other-window buffer)
     (erase-buffer)
     (fundamental-mode)
     ;; create local variables for all options, to make sure all called
@@ -14487,6 +17009,9 @@
     (org-set-local 'org-odd-levels-only odd)
     (setq umax (if arg (prefix-numeric-value arg)
 		 org-export-headline-levels))
+    (setq umax-toc (if (integerp org-export-with-toc)
+		       (min org-export-with-toc umax)
+		     umax))
 
     ;; File header
     (if title (org-insert-centered title ?=))
@@ -14520,7 +17045,7 @@
 						      org-done-string)))
 					; TODO, not DONE
 				     (and org-export-mark-todo-in-toc
-					  (= level umax)
+					  (= level umax-toc)
 					  (org-search-todo-below
 					   line lines level))))
 			   (setq txt (org-html-expand-for-ascii txt))
@@ -14534,7 +17059,7 @@
 			   (if org-export-with-section-numbers
 			       (setq txt (concat (org-section-number level)
 						 " " txt)))
-			   (if (<= level umax)
+			   (if (<= level umax-toc)
 			       (progn
 				 (insert
 				  (make-string (* (1- level) 4) ?\ )
@@ -14555,6 +17080,8 @@
 	(setq line (replace-match
 		    (if (match-end 3) "[\\3]" "[\\1]")
 		    t nil line)))
+      (when custom-times
+	(setq line (org-translate-time line)))
       (cond
        ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line)
 	;; a Headline
@@ -14709,7 +17236,7 @@
 		(not (get-char-property s 'invisible))))
     s))
 
-;; HTML
+;;; HTML export
 
 (defun org-get-current-options ()
   "Return a string with current options as keyword options.
@@ -14724,7 +17251,7 @@
 #+CATEGORY:  %s
 #+SEQ_TODO:  %s
 #+TYP_TODO:  %s
-#+STARTUP:   %s %s %s %s %s %s
+#+STARTUP:   %s %s %s %s %s
 #+TAGS:      %s
 #+ARCHIVE:   %s
 #+LINK:      %s
@@ -14750,11 +17277,14 @@
      "Me Jason Marie DONE")
    (cdr (assoc org-startup-folded
 	       '((nil . "showall") (t . "overview") (content . "content"))))
-   (if org-startup-with-deadline-check "dlcheck" "nodlcheck")
    (if org-odd-levels-only "odd" "oddeven")
    (if org-hide-leading-stars "hidestars" "showstars")
    (if org-startup-align-all-tables "align" "noalign")
-   (if org-log-done "logging" "nologging")
+   (cond ((eq t org-log-done) "logdone")
+	 ((not org-log-done) "nologging")
+	 ((listp org-log-done)
+	  (mapconcat (lambda (x) (concat "lognote" (symbol-name x)))
+		     org-log-done " ")))
    (or (mapconcat (lambda (x)
 		    (cond
 		     ((equal '(:startgroup) x) "{")
@@ -14849,6 +17379,7 @@
   (setq-default org-todo-line-regexp org-todo-line-regexp)
   (setq-default org-deadline-line-regexp org-deadline-line-regexp)
   (setq-default org-done-string org-done-string)
+  (setq-default org-maybe-keyword-time-regexp org-maybe-keyword-time-regexp)
   (let* ((opt-plist (org-combine-plists (org-default-export-plist)
 					ext-plist
 					(org-infile-export-plist)))
@@ -14869,13 +17400,14 @@
          (all_lines
           (org-skip-comments (org-split-string
 			      (org-cleaned-string-for-export
-			       region :emph-multiline
+			       region :emph-multiline :for-html
 			       (if (plist-get opt-plist :LaTeX-fragments)
 				   :LaTeX-fragments))
 			      "[\r\n]")))
          (lines (org-export-find-first-heading-line all_lines))
          (level 0) (line "") (origline "") txt todo
          (umax nil)
+         (umax-toc nil)
          (filename (concat (file-name-as-directory
 			    (org-export-directory :html opt-plist))
 			   (file-name-sans-extension
@@ -14883,7 +17415,7 @@
 			   ".html"))
 	 (current-dir (file-name-directory buffer-file-name))
          (buffer (find-file-noselect filename))
-         (levels-open (make-vector org-level-max nil))
+         (org-levels-open (make-vector org-level-max nil))
 	 (date (format-time-string "%Y/%m/%d" (current-time)))
 	 (time  (format-time-string "%X" (org-current-time)))
          (author      (plist-get opt-plist :author))
@@ -14927,7 +17459,7 @@
                          (assoc "en" org-export-language-setup)))
 
     ;; Switch to the output buffer
-    (if (or hidden (not org-export-html-show-new-buffer))
+    (if (or hidden t)
         (set-buffer buffer)
       (switch-to-buffer-other-window buffer))
     (erase-buffer)
@@ -14942,6 +17474,9 @@
 	      org-export-plist-vars)
       (setq umax (if arg (prefix-numeric-value arg)
                    org-export-headline-levels))
+      (setq umax-toc (if (integerp org-export-with-toc)
+			 (min org-export-with-toc umax)
+		       umax))
 
       ;; File header
       (insert (format
@@ -14994,7 +17529,7 @@
 							org-done-string)))
 					; TODO, not DONE
 				       (and org-export-mark-todo-in-toc
-					    (= level umax)
+					    (= level umax-toc)
 					    (org-search-todo-below
 					     line lines level))))
 			     (if (and (memq org-export-with-tags '(not-in-toc nil))
@@ -15005,7 +17540,7 @@
 			     (if org-export-with-section-numbers
 				 (setq txt (concat (org-section-number level)
 						   " " txt)))
-			     (if (<= level umax)
+			     (if (<= level umax-toc)
 				 (progn
 				   (setq head-count (+ head-count 1))
 				   (if (> level org-last-level)
@@ -15075,6 +17610,15 @@
 	      (insert "</pre>\n"))
 	    (throw 'nextline nil))
 
+	  ;; Protected HTML
+	  (when (get-text-property 0 'org-protected line)
+	    (insert line "\n")
+	    (throw 'nextline nil))
+
+	  ;; Horizontal line
+	  (when (string-match "^[ \t]*-\\{5,\\}[ \t]*$" line)
+	    (insert "\n<hr/>\n")
+	    (throw 'nextline nil))
 
 	  ;; make targets to anchors
 	  (while (string-match "<<<?\\([^<>]*\\)>>>?\\((INVISIBLE)\\)?[ \t]*\n?" line)
@@ -15114,6 +17658,12 @@
 		  desc2 (if (match-end 2) (concat type ":" path) path)
 		  descp (and desc1 (not (equal desc1 desc2)))
 		  desc (or desc1 desc2))
+	    ;; Make an image out of the description if that is so wanted
+	    (when (and descp (org-file-image-p desc))
+	      (save-match-data
+		(if (string-match "^file:" desc)
+		    (setq desc (substring desc (match-end 0)))))
+	      (setq desc (concat "<img src=\"" desc "\"/>")))
 	    ;; FIXME: do we need to unescape here somewhere?
 	    (cond
 	     ((equal type "internal")
@@ -15122,7 +17672,15 @@
 		     "<a href=\"#"
 		     (org-solidify-link-text path target-alist)
 		     "\">" desc "</a>")))
-	     ((member type '("http" "https" "ftp" "mailto" "news"))
+	     ((member type '("http" "https")) ; FIXME: need to test this.
+	      ;; standard URL, just check if we need to inline an image
+	      (if (and (or (eq t org-export-html-inline-images)
+			   (and org-export-html-inline-images (not descp)))
+		       (org-file-image-p path))
+		  (setq rpl (concat "<img src=\"" type ":" path "\"/>"))
+		(setq link (concat type ":" path))
+		(setq rpl (concat "<a href=\"" link "\">" desc "</a>"))))
+	     ((member type '("ftp" "mailto" "news"))
 	      ;; standard URL
 	      (setq link (concat type ":" path))
 	      (setq rpl (concat "<a href=\"" link "\">" desc "</a>")))
@@ -15139,8 +17697,7 @@
 			(if (functionp link-validate)
 			    (funcall link-validate filename current-dir)
 			  t))
-		  (setq file-is-image-p
-			(string-match (org-image-file-name-regexp) filename))
+		  (setq file-is-image-p (org-file-image-p filename))
 		  (setq thefile (if abs-p (expand-file-name filename) filename))
 		  (when (and org-export-html-link-org-files-as-html
 			     (string-match "\\.org$" thefile))
@@ -15351,8 +17908,9 @@
 	;; Need to use the code generator in table.el, with the original text.
 	(org-format-table-table-html-using-table-generate-source olines)))))
 
-(defun org-format-org-table-html (lines)
+(defun org-format-org-table-html (lines &optional splice)
   "Format a table into HTML."
+  ;; Get rid of hlines at beginning and end
   (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
   (setq lines (nreverse lines))
   (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
@@ -15360,52 +17918,79 @@
   (when org-export-table-remove-special-lines
     ;; Check if the table has a marking column.  If yes remove the
     ;; column and the special lines
-    (let* ((special
-	    (not
-	     (memq nil
-		   (mapcar
-		    (lambda (x)
-		      (or (string-match "^[ \t]*|-" x)
-			  (string-match "^[ \t]*| *\\([#!$*_^ ]\\) *|" x)))
-		    lines)))))
-      (if special
-	  (setq lines
-		(delq nil
-		      (mapcar
-		       (lambda (x)
-			 (if (string-match "^[ \t]*| *[!_^] *|" x)
-			     nil ; ignore this line
-			   (and (or (string-match "^[ \t]*|-+\\+" x)
-				    (string-match "^[ \t]*|[^|]*|" x))
-				(replace-match "|" t t x))))
-		       lines))))))
+    (setq lines (org-table-clean-before-export lines)))
 
   (let ((head (and org-export-highlight-first-table-line
 		   (delq nil (mapcar
 			      (lambda (x) (string-match "^[ \t]*|-" x))
 			      (cdr lines)))))
-	line fields html)
-    (setq html (concat org-export-html-table-tag "\n"))
+	(nlines 0) fnum i
+	tbopen line fields html)
+    (if splice (setq head nil))
+    (unless splice (push (if head "<thead>" "<tbody>") html))
+    (setq tbopen t)
     (while (setq line (pop lines))
       (catch 'next-line
 	(if (string-match "^[ \t]*|-" line)
 	    (progn
+	      (unless splice 
+		(push (if head "</thead>" "</tbody>") html)
+		(if lines (push "<tbody>" html) (setq tbopen nil)))
 	      (setq head nil)   ;; head ends here, first time around
 	      ;; ignore this line
 	      (throw 'next-line t)))
 	;; Break the line into fields
 	(setq fields (org-split-string line "[ \t]*|[ \t]*"))
-	(setq html (concat
-		    html
-		    "<tr>"
-		    (mapconcat (lambda (x)
-				 (if head
-				     (concat "<th>" x "</th>")
-				   (concat "<td>" x "</td>")))
-			       fields "")
-		    "</tr>\n"))))
-    (setq html (concat html "</table>\n"))
-    html))
+	(unless fnum (setq fnum (make-vector (length fields) 0)))
+	(setq nlines (1+ nlines) i -1)
+	(push (concat "<tr>"
+		      (mapconcat
+		       (lambda (x)
+			 (setq i (1+ i))
+			 (if (and (< i nlines)
+				  (string-match org-table-number-regexp x))
+			     (incf (aref fnum i)))
+			 (if head
+			     (concat "<th>" x "</th>")
+			   (concat "<td>" x "</td>")))
+		       fields "")
+		      "</tr>")
+	      html)))
+    (unless splice (if tbopen (push "</tbody>" html)))
+    (unless splice (push "</table>\n" html))
+    (setq html (nreverse html))
+    (unless splice
+      ;; Put in COL tags with the alignment (unfortuntely often ignored...)
+      (push (mapconcat
+	     (lambda (x)
+	       (format "<COL align=\"%s\">"
+		       (if (> (/ (float x) nlines) org-table-number-fraction)
+			   "right" "left")))
+	     fnum "")
+	    html)
+      (push org-export-html-table-tag html))
+    (concat (mapconcat 'identity html "\n") "\n")))
+
+(defun org-table-clean-before-export (lines)
+  "Check if the table has a marking column.
+If yes remove the column and the special lines."
+  (if (memq nil
+	    (mapcar
+	     (lambda (x) (or (string-match "^[ \t]*|-" x)
+			     (string-match "^[ \t]*| *\\([#!$*_^ /]\\) *|" x)))
+	     lines))
+      (progn
+	(setq org-table-clean-did-remove-column-1 nil)
+	lines)
+    (setq org-table-clean-did-remove-column-1 t)
+    (delq nil
+	  (mapcar
+	   (lambda (x) (if (string-match "^[ \t]*| *[!_^/] *|" x)
+			   nil ; ignore this line
+			 (and (or (string-match "^[ \t]*|-+\\+" x)
+				  (string-match "^[ \t]*|[^|]*|" x))
+			      (replace-match "|" t t x))))
+	   lines))))
 
 (defun org-fake-empty-table-line (line)
   "Replace everything except \"|\" with spaces."
@@ -15494,7 +18079,8 @@
 		       (format "@<span class=\"timestamp-kwd\">%s @</span>"
 			       (match-string 1 s)))
 		   (format " @<span class=\"timestamp\">%s@</span>"
-			   (substring (match-string 3 s) 1 -1)))
+			   (substring
+			    (org-translate-time (match-string 3 s)) 1 -1)))
 		s (substring s (match-end 0)))))
       ;; Line break if line started and ended with time stamp stuff
       (if (not r)
@@ -15635,10 +18221,10 @@
   (org-close-par-maybe)
   (let ((l (1+ (max level umax))))
     (while (<= l org-level-max)
-      (if (aref levels-open (1- l))
+      (if (aref org-levels-open (1- l))
 	  (progn
 	    (org-html-level-close l)
-	    (aset levels-open (1- l) nil)))
+	    (aset org-levels-open (1- l) nil)))
       (setq l (1+ l)))
     (when title
       ;; If title is nil, this means this function is called to close
@@ -15657,11 +18243,11 @@
 		       t t title)))
       (if (> level umax)
 	  (progn
-	    (if (aref levels-open (1- level))
+	    (if (aref org-levels-open (1- level))
 		(progn
 		  (org-close-li)
 		  (insert "<li>" title "<br/>\n"))
-	      (aset levels-open (1- level) t)
+	      (aset org-levels-open (1- level) t)
 	      (org-close-par-maybe)
 	      (insert "<ul>\n<li>" title "<br/>\n")))
 	(if org-export-with-section-numbers
@@ -15678,52 +18264,7 @@
   (org-close-li)
   (insert "</ul>"))
 
-;; Variable holding the vector with section numbers
-(defvar org-section-numbers (make-vector org-level-max 0))
-
-(defun org-init-section-numbers ()
-  "Initialize the vector for the section numbers."
-  (let* ((level  -1)
-	 (numbers (nreverse (org-split-string "" "\\.")))
-	 (depth (1- (length org-section-numbers)))
-	 (i depth) number-string)
-    (while (>= i 0)
-      (if (> i level)
-	  (aset org-section-numbers i 0)
-	(setq number-string (or (car numbers) "0"))
-	(if (string-match "\\`[A-Z]\\'" number-string)
-	    (aset org-section-numbers i
-		  (- (string-to-char number-string) ?A -1))
-	    (aset org-section-numbers i (string-to-number number-string)))
-	(pop numbers))
-      (setq i (1- i)))))
-
-(defun org-section-number (&optional level)
-  "Return a string with the current section number.
-When LEVEL is non-nil, increase section numbers on that level."
-  (let* ((depth (1- (length org-section-numbers))) idx n (string ""))
-    (when level
-      (when (> level -1)
-	(aset org-section-numbers
-	      level (1+ (aref org-section-numbers level))))
-      (setq idx (1+ level))
-      (while (<= idx depth)
-	(if (not (= idx 1))
-	    (aset org-section-numbers idx 0))
-	(setq idx (1+ idx))))
-    (setq idx 0)
-    (while (<= idx depth)
-      (setq n (aref org-section-numbers idx))
-      (setq string (concat string (if (not (string= string "")) "." "")
-			   (int-to-string n)))
-      (setq idx (1+ idx)))
-    (save-match-data
-      (if (string-match "\\`\\([@0]\\.\\)+" string)
-	  (setq string (replace-match "" t nil string)))
-      (if (string-match "\\(\\.0\\)+\\'" string)
-	  (setq string (replace-match "" t nil string))))
-    string))
-
+;;; iCalendar export
 
 ;;;###autoload
 (defun org-export-icalendar-this-file ()
@@ -15733,6 +18274,185 @@
   (interactive)
   (org-export-icalendar nil buffer-file-name))
 
+;;;###autoload
+(defun org-export-icalendar-all-agenda-files ()
+  "Export all files in `org-agenda-files' to iCalendar .ics files.
+Each iCalendar file will be located in the same directory as the Org-mode
+file, but with extension `.ics'."
+  (interactive)
+  (apply 'org-export-icalendar nil (org-agenda-files t)))
+
+;;;###autoload
+(defun org-export-icalendar-combine-agenda-files ()
+  "Export all files in `org-agenda-files' to a single combined iCalendar file.
+The file is stored under the name `org-combined-agenda-icalendar-file'."
+  (interactive)
+  (apply 'org-export-icalendar t (org-agenda-files t)))
+
+(defun org-export-icalendar (combine &rest files)
+  "Create iCalendar files for all elements of FILES.
+If COMBINE is non-nil, combine all calendar entries into a single large
+file and store it under the name `org-combined-agenda-icalendar-file'."
+  (save-excursion
+    (let* ((dir (org-export-directory
+		 :ical (list :publishing-directory
+			     org-export-publishing-directory)))
+	   file ical-file ical-buffer category started org-agenda-new-buffers)
+
+      (when combine
+	(setq ical-file
+	      (if (file-name-absolute-p org-combined-agenda-icalendar-file)
+		  org-combined-agenda-icalendar-file
+		(expand-file-name org-combined-agenda-icalendar-file dir))
+	      ical-buffer (org-get-agenda-file-buffer ical-file))
+	(set-buffer ical-buffer) (erase-buffer))
+      (while (setq file (pop files))
+	(catch 'nextfile
+	  (org-check-agenda-file file)
+	  (set-buffer (org-get-agenda-file-buffer file))
+	  (unless combine
+	    (setq ical-file (concat (file-name-as-directory dir)
+				    (file-name-sans-extension
+				     (file-name-nondirectory buffer-file-name))
+				    ".ics"))
+	    (setq ical-buffer (org-get-agenda-file-buffer ical-file))
+	    (with-current-buffer ical-buffer (erase-buffer)))
+	  (setq category (or org-category
+			     (file-name-sans-extension
+			      (file-name-nondirectory buffer-file-name))))
+	  (if (symbolp category) (setq category (symbol-name category)))
+	  (let ((standard-output ical-buffer))
+	    (if combine
+		(and (not started) (setq started t)
+		     (org-start-icalendar-file org-icalendar-combined-name))
+	      (org-start-icalendar-file category))
+	    (org-print-icalendar-entries combine)
+	    (when (or (and combine (not files)) (not combine))
+	      (org-finish-icalendar-file)
+	      (set-buffer ical-buffer)
+	      (save-buffer)
+	      (run-hooks 'org-after-save-iCalendar-file-hook)))))
+      (org-release-buffers org-agenda-new-buffers))))
+
+(defvar org-after-save-iCalendar-file-hook nil
+  "Hook run after an iCalendar file has been saved.
+The iCalendar buffer is still current when this hook is run.
+A good way to use this is to tell a desktop calenndar application to re-read
+the iCalendar file.")
+
+(defun org-print-icalendar-entries (&optional combine)
+  "Print iCalendar entries for the current Org-mode file to `standard-output'.
+When COMBINE is non nil, add the category to each line."
+  (let ((re2 (concat "--?-?\\(" org-ts-regexp "\\)"))
+	(org-category-table (org-get-category-table))
+	(dts (org-ical-ts-to-string
+	      (format-time-string (cdr org-time-stamp-formats) (current-time))
+	      "DTSTART"))
+	hd ts ts2 state status (inc t) pos
+	scheduledp deadlinep tmp pri category)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward org-ts-regexp nil t)
+	(setq pos (match-beginning 0)
+	      ts (match-string 0)
+	      inc t
+	      hd (org-get-heading)
+	      category (org-get-category))
+	(if (looking-at re2)
+	    (progn
+	      (goto-char (match-end 0))
+	      (setq ts2 (match-string 1) inc nil))
+	  (setq ts2 ts
+		tmp (buffer-substring (max (point-min)
+					     (- pos org-ds-keyword-length))
+				      pos)
+		deadlinep (string-match org-deadline-regexp tmp)
+		scheduledp (string-match org-scheduled-regexp tmp)
+		;; donep (org-entry-is-done-p)
+                ))
+	(if (or (string-match org-tr-regexp hd)
+		(string-match org-ts-regexp hd))
+	    (setq hd (replace-match "" t t hd)))
+	(if (string-match org-bracket-link-regexp hd)
+	    (setq hd (replace-match (if (match-end 3) (match-string 3 hd)
+				      (match-string 1 hd))
+				    t t hd)))
+	(if deadlinep (setq hd (concat "DL: " hd)))
+	(if scheduledp (setq hd (concat "S: " hd)))
+	(princ (format "BEGIN:VEVENT
+%s
+%s
+SUMMARY:%s
+CATEGORIES:%s
+END:VEVENT\n"
+		       (org-ical-ts-to-string ts "DTSTART")
+		       (org-ical-ts-to-string ts2 "DTEND" inc)
+		       hd category)))
+      (when org-icalendar-include-todo
+	(goto-char (point-min))
+	(while (re-search-forward org-todo-line-regexp nil t)
+	  (setq state (match-string 2))
+	  (setq status (if (equal state org-done-string)
+			   "COMPLETED" "NEEDS-ACTION"))
+	  (when (and state
+		     (or (not (equal state org-done-string))
+			 (eq org-icalendar-include-todo 'all)))
+	    (setq hd (match-string 3))
+	    (if (string-match org-priority-regexp hd)
+		(setq pri (string-to-char (match-string 2 hd))
+		      hd (concat (substring hd 0 (match-beginning 1))
+				 (substring hd (match-end 1))))
+	      (setq pri org-default-priority))
+	    (setq pri (floor (1+ (* 8. (/ (float (- org-lowest-priority pri))
+					  (- org-lowest-priority ?A))))))
+
+	    (princ (format "BEGIN:VTODO
+%s
+SUMMARY:%s
+CATEGORIES:%s
+SEQUENCE:1
+PRIORITY:%d
+STATUS:%s
+END:VTODO\n"
+			   dts hd category pri status))))))))
+
+(defun org-start-icalendar-file (name)
+  "Start an iCalendar file by inserting the header."
+  (let ((user user-full-name)
+	(name (or name "unknown"))
+	(timezone (cadr (current-time-zone))))
+    (princ
+     (format "BEGIN:VCALENDAR
+VERSION:2.0
+X-WR-CALNAME:%s
+PRODID:-//%s//Emacs with Org-mode//EN
+X-WR-TIMEZONE:%s
+CALSCALE:GREGORIAN\n" name user timezone))))
+
+(defun org-finish-icalendar-file ()
+  "Finish an iCalendar file by inserting the END statement."
+  (princ "END:VCALENDAR\n"))
+
+(defun org-ical-ts-to-string (s keyword &optional inc)
+  "Take a time string S and convert it to iCalendar format.
+KEYWORD is added in front, to make a complete line like DTSTART....
+When INC is non-nil, increase the hour by two (if time string contains
+a time), or the day by one (if it does not contain a time)."
+  (let ((t1 (org-parse-time-string s 'nodefault))
+	t2 fmt have-time time)
+    (if (and (car t1) (nth 1 t1) (nth 2 t1))
+	(setq t2 t1 have-time t)
+      (setq t2 (org-parse-time-string s)))
+    (let ((s (car t2))   (mi (nth 1 t2)) (h (nth 2 t2))
+	  (d (nth 3 t2)) (m  (nth 4 t2)) (y (nth 5 t2)))
+      (when inc
+	(if have-time (setq h (+ 2 h)) (setq d (1+ d))))
+      (setq time (encode-time s mi h d m y)))
+    (setq fmt (if have-time ":%Y%m%dT%H%M%S" ";VALUE=DATE:%Y%m%d"))
+    (concat keyword (format-time-string fmt time))))
+
+;;; XOXO export
+
 (defun org-export-as-xoxo-insert-into (buffer &rest output)
   (with-current-buffer buffer
     (apply 'insert output)))
@@ -15816,459 +18536,8 @@
       (goto-char (point-min))
       )))
 
-;;;###autoload
-(defun org-export-icalendar-all-agenda-files ()
-  "Export all files in `org-agenda-files' to iCalendar .ics files.
-Each iCalendar file will be located in the same directory as the Org-mode
-file, but with extension `.ics'."
-  (interactive)
-  (apply 'org-export-icalendar nil (org-agenda-files t)))
-
-;;;###autoload
-(defun org-export-icalendar-combine-agenda-files ()
-  "Export all files in `org-agenda-files' to a single combined iCalendar file.
-The file is stored under the name `org-combined-agenda-icalendar-file'."
-  (interactive)
-  (apply 'org-export-icalendar t (org-agenda-files t)))
-
-(defun org-export-icalendar (combine &rest files)
-  "Create iCalendar files for all elements of FILES.
-If COMBINE is non-nil, combine all calendar entries into a single large
-file and store it under the name `org-combined-agenda-icalendar-file'."
-  (save-excursion
-    (let* ((dir (org-export-directory
-		 :ical (list :publishing-directory
-			     org-export-publishing-directory)))
-	   file ical-file ical-buffer category started org-agenda-new-buffers)
-
-      (when combine
-	(setq ical-file
-	      (if (file-name-absolute-p org-combined-agenda-icalendar-file)
-		  org-combined-agenda-icalendar-file
-		(expand-file-name org-combined-agenda-icalendar-file dir))
-	      ical-buffer (org-get-agenda-file-buffer ical-file))
-	(set-buffer ical-buffer) (erase-buffer))
-      (while (setq file (pop files))
-	(catch 'nextfile
-	  (org-check-agenda-file file)
-	  (set-buffer (org-get-agenda-file-buffer file))
-	  (unless combine
-	    (setq ical-file (concat (file-name-as-directory dir)
-				    (file-name-sans-extension
-				     (file-name-nondirectory buffer-file-name))
-				    ".ics"))
-	    (setq ical-buffer (org-get-agenda-file-buffer ical-file))
-	    (with-current-buffer ical-buffer (erase-buffer)))
-	  (setq category (or org-category
-			     (file-name-sans-extension
-			      (file-name-nondirectory buffer-file-name))))
-	  (if (symbolp category) (setq category (symbol-name category)))
-	  (let ((standard-output ical-buffer))
-	    (if combine
-		(and (not started) (setq started t)
-		     (org-start-icalendar-file org-icalendar-combined-name))
-	      (org-start-icalendar-file category))
-	    (org-print-icalendar-entries combine category)
-	    (when (or (and combine (not files)) (not combine))
-	      (org-finish-icalendar-file)
-	      (set-buffer ical-buffer)
-	      (save-buffer)
-	      (run-hooks 'org-after-save-iCalendar-file-hook)))))
-      (org-release-buffers org-agenda-new-buffers))))
-
-(defvar org-after-save-iCalendar-file-hook nil
-  "Hook run after an iCalendar file has been saved.
-The iCalendar buffer is still current when this hook is run.
-A good way to use this is to tell a desktop calenndar application to re-read
-the iCalendar file.")
-
-(defun org-print-icalendar-entries (&optional combine category)
-  "Print iCalendar entries for the current Org-mode file to `standard-output'.
-When COMBINE is non nil, add the category to each line."
-  (let ((re2 (concat "--?-?\\(" org-ts-regexp "\\)"))
-	(dts (org-ical-ts-to-string
-	      (format-time-string (cdr org-time-stamp-formats) (current-time))
-	      "DTSTART"))
-	hd ts ts2 state (inc t) pos scheduledp deadlinep tmp pri)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward org-ts-regexp nil t)
-	(setq pos (match-beginning 0)
-	      ts (match-string 0)
-	      inc t
-	      hd (org-get-heading))
-	(if (looking-at re2)
-	    (progn
-	      (goto-char (match-end 0))
-	      (setq ts2 (match-string 1) inc nil))
-	  (setq ts2 ts
-		tmp (buffer-substring (max (point-min)
-					     (- pos org-ds-keyword-length))
-				      pos)
-		deadlinep (string-match org-deadline-regexp tmp)
-		scheduledp (string-match org-scheduled-regexp tmp)
-		;; donep (org-entry-is-done-p)
-                ))
-	(if (or (string-match org-tr-regexp hd)
-		(string-match org-ts-regexp hd))
-	    (setq hd (replace-match "" t t hd)))
-	(if combine
-	    (setq hd (concat hd " (category " category ")")))
-	(if deadlinep (setq hd (concat "DL: " hd " This is a deadline")))
-	(if scheduledp (setq hd (concat "S: " hd " Scheduled for this date")))
-	(princ (format "BEGIN:VEVENT
-%s
-%s
-SUMMARY:%s
-END:VEVENT\n"
-		       (org-ical-ts-to-string ts "DTSTART")
-		       (org-ical-ts-to-string ts2 "DTEND" inc)
-		       hd)))
-      (when org-icalendar-include-todo
-	(goto-char (point-min))
-	(while (re-search-forward org-todo-line-regexp nil t)
-	  (setq state (match-string 1))
-	  (unless (equal state org-done-string)
-	    (setq hd (match-string 3))
-	    (if (string-match org-priority-regexp hd)
-		(setq pri (string-to-char (match-string 2 hd))
-		      hd (concat (substring hd 0 (match-beginning 1))
-				 (substring hd (- (match-end 1)))))
-	      (setq pri org-default-priority))
-	    (setq pri (floor (1+ (* 8. (/ (float (- org-lowest-priority pri))
-					  (- org-lowest-priority ?A))))))
-
-	    (princ (format "BEGIN:VTODO
-%s
-SUMMARY:%s
-SEQUENCE:1
-PRIORITY:%d
-END:VTODO\n"
-			   dts hd pri))))))))
-
-(defun org-start-icalendar-file (name)
-  "Start an iCalendar file by inserting the header."
-  (let ((user user-full-name)
-	(name (or name "unknown"))
-	(timezone (cadr (current-time-zone))))
-    (princ
-     (format "BEGIN:VCALENDAR
-VERSION:2.0
-X-WR-CALNAME:%s
-PRODID:-//%s//Emacs with Org-mode//EN
-X-WR-TIMEZONE:%s
-CALSCALE:GREGORIAN\n" name user timezone))))
-
-(defun org-finish-icalendar-file ()
-  "Finish an iCalendar file by inserting the END statement."
-  (princ "END:VCALENDAR\n"))
-
-(defun org-ical-ts-to-string (s keyword &optional inc)
-  "Take a time string S and convert it to iCalendar format.
-KEYWORD is added in front, to make a complete line like DTSTART....
-When INC is non-nil, increase the hour by two (if time string contains
-a time), or the day by one (if it does not contain a time)."
-  (let ((t1 (org-parse-time-string s 'nodefault))
-	t2 fmt have-time time)
-    (if (and (car t1) (nth 1 t1) (nth 2 t1))
-	(setq t2 t1 have-time t)
-      (setq t2 (org-parse-time-string s)))
-    (let ((s (car t2))   (mi (nth 1 t2)) (h (nth 2 t2))
-	  (d (nth 3 t2)) (m  (nth 4 t2)) (y (nth 5 t2)))
-      (when inc
-	(if have-time (setq h (+ 2 h)) (setq d (1+ d))))
-      (setq time (encode-time s mi h d m y)))
-    (setq fmt (if have-time ":%Y%m%dT%H%M%S" ";VALUE=DATE:%Y%m%d"))
-    (concat keyword (format-time-string fmt time))))
-
-;;; LaTeX stuff
-
-(defvar org-cdlatex-mode-map (make-sparse-keymap)
-  "Keymap for the minor `org-cdlatex-mode'.")
-
-(define-key org-cdlatex-mode-map "_" 'org-cdlatex-underscore-caret)
-(define-key org-cdlatex-mode-map "^" 'org-cdlatex-underscore-caret)
-(define-key org-cdlatex-mode-map "`" 'cdlatex-math-symbol)
-(define-key org-cdlatex-mode-map "'" 'org-cdlatex-math-modify)
-(define-key org-cdlatex-mode-map "\C-c{" 'cdlatex-environment)
-
-(defvar org-cdlatex-texmathp-advice-is-done nil
-  "Flag remembering if we have applied the advice to texmathp already.")
-
-(define-minor-mode org-cdlatex-mode
-  "Toggle the minor `org-cdlatex-mode'.
-This mode supports entering LaTeX environment and math in LaTeX fragments
-in Org-mode.
-\\{org-cdlatex-mode-map}"
-  nil " OCDL" nil
-  (when org-cdlatex-mode (require 'cdlatex))
-  (unless org-cdlatex-texmathp-advice-is-done
-    (setq org-cdlatex-texmathp-advice-is-done t)
-    (defadvice texmathp (around org-math-always-on activate)
-      "Always return t in org-mode buffers.
-This is because we want to insert math symbols without dollars even outside
-the LaTeX math segments.  If Orgmode thinks that point is actually inside
-en embedded LaTeX fragement, let texmathp do its job.
-\\[org-cdlatex-mode-map]"
-      (interactive)
-      (let (p)
-	(cond
-	 ((not (org-mode-p)) ad-do-it)
-	 ((eq this-command 'cdlatex-math-symbol)
-	  (setq ad-return-value t
-		texmathp-why '("cdlatex-math-symbol in org-mode" . 0)))
-	 (t
-	  (let ((p (org-inside-LaTeX-fragment-p)))
-	    (if (and p (member (car p) (plist-get org-format-latex-options :matchers)))
-		(setq ad-return-value t
-		      texmathp-why '("Org-mode embedded math" . 0))
-	      (if p ad-do-it)))))))))
-
-(defun turn-on-org-cdlatex ()
-  "Unconditionally turn on `org-cdlatex-mode'."
-  (org-cdlatex-mode 1))
-
-(defun org-inside-LaTeX-fragment-p ()
-  "Test if point is inside a LaTeX fragment.
-I.e. after a \\begin, \\(, \\[, $, or $$, without the corresponding closing
-sequence appearing also before point.
-Even though the matchers for math are configurable, this function assumes
-that \\begin, \\(, \\[, and $$ are always used.  Only the single dollar
-delimiters are skipped when they have been removed by customization.
-The return value is nil, or a cons cell with the delimiter and
-and the position of this delimiter.
-
-This function does a reasonably good job, but can locally be fooled by
-for example currency specifications.  For example it will assume being in
-inline math after \"$22.34\".  The LaTeX fragment formatter will only format
-fragments that are properly closed, but during editing, we have to live
-with the uncertainty caused by missing closing delimiters.  This function
-looks only before point, not after."
-  (catch 'exit
-    (let ((pos (point))
-	  (dodollar (member "$" (plist-get org-format-latex-options :matchers)))
-	  (lim (progn
-		 (re-search-backward (concat "^\\(" paragraph-start "\\)") nil t)
-		 (point)))
-	  dd-on str (start 0) m re)
-      (goto-char pos)
-      (when dodollar
-	(setq str (concat (buffer-substring lim (point)) "\000 X$.")
-	      re (nth 1 (assoc "$" org-latex-regexps)))
-	(while (string-match re str start)
-	  (cond
-	   ((= (match-end 0) (length str))
-	    (throw 'exit (cons "$" (+ lim (match-beginning 0)))))
-	   ((= (match-end 0) (- (length str) 5))
-	    (throw 'exit nil))
-	   (t (setq start (match-end 0))))))
-      (when (setq m (re-search-backward "\\(\\\\begin{[^}]*}\\|\\\\(\\|\\\\\\[\\)\\|\\(\\\\end{[^}]*}\\|\\\\)\\|\\\\\\]\\)\\|\\(\\$\\$\\)" lim t))
-	(goto-char pos)
-	(and (match-beginning 1) (throw 'exit (cons (match-string 1) m)))
-	(and (match-beginning 2) (throw 'exit nil))
-	;; count $$
-	(while (re-search-backward "\\$\\$" lim t)
-	  (setq dd-on (not dd-on)))
-	(goto-char pos)
-	(if dd-on (cons "$$" m))))))
-
-
-(defun org-try-cdlatex-tab ()
-  "Check if it makes sense to execute `cdlatex-tab', and do it if yes.
-It makes sense to do so if `org-cdlatex-mode' is active and if the cursor is
-  - inside a LaTeX fragment, or
-  - after the first word in a line, where an abbreviation expansion could
-    insert a LaTeX environment."
-  (when org-cdlatex-mode
-    (cond
-     ((save-excursion
-	(skip-chars-backward "a-zA-Z0-9*")
-	(skip-chars-backward " \t")
-	(bolp))
-      (cdlatex-tab) t)
-     ((org-inside-LaTeX-fragment-p)
-      (cdlatex-tab) t)
-     (t nil))))
-
-(defun org-cdlatex-underscore-caret (&optional arg)
-  "Execute `cdlatex-sub-superscript' in LaTeX fragments.
-Revert to the normal definition outside of these fragments."
-  (interactive "P")
-  (if (org-inside-LaTeX-fragment-p)
-      (call-interactively 'cdlatex-sub-superscript)
-    (let (org-cdlatex-mode)
-      (call-interactively (key-binding (vector last-input-event))))))
-
-(defun org-cdlatex-math-modify (&optional arg)
-  "Execute `cdlatex-math-modify' in LaTeX fragments.
-Revert to the normal definition outside of these fragments."
-  (interactive "P")
-  (if (org-inside-LaTeX-fragment-p)
-      (call-interactively 'cdlatex-math-modify)
-    (let (org-cdlatex-mode)
-      (call-interactively (key-binding (vector last-input-event))))))
-
-(defvar org-latex-fragment-image-overlays nil
-  "List of overlays carrying the images of latex fragments.")
-(make-variable-buffer-local 'org-latex-fragment-image-overlays)
-
-(defun org-remove-latex-fragment-image-overlays ()
-  "Remove all overlays with LaTeX fragment images in current buffer."
-  (mapc 'org-delete-overlay org-latex-fragment-image-overlays)
-  (setq org-latex-fragment-image-overlays nil))
-
-(defun org-preview-latex-fragment (&optional subtree)
-  "Preview the LaTeX fragment at point, or all locally or globally.
-If the cursor is in a LaTeX fragment, create the image and overlay
-it over the source code.  If there is no fragment at point, display
-all fragments in the current text, from one headline to the next.  With
-prefix SUBTREE, display all fragments in the current subtree.  With a
-double prefix `C-u C-u', or when the cursor is before the first headline,
-display all fragments in the buffer.
-The images can be removed again with \\[org-ctrl-c-ctrl-c]."
-  (interactive "P")
-  (org-remove-latex-fragment-image-overlays)
-  (save-excursion
-    (save-restriction
-      (let (beg end at msg)
-	(cond
-	 ((or (equal subtree '(16))
-	      (not (save-excursion
-		     (re-search-backward (concat "^" outline-regexp) nil t))))
-	  (setq beg (point-min) end (point-max)
-		msg "Creating images for buffer...%s"))
-	 ((equal subtree '(4))
-	  (org-back-to-heading)
-	  (setq beg (point) end (org-end-of-subtree t)
-		msg "Creating images for subtree...%s"))
-	 (t
-	  (if (setq at (org-inside-LaTeX-fragment-p))
-	      (goto-char (max (point-min) (- (cdr at) 2)))
-	    (org-back-to-heading))
-	  (setq beg (point) end (progn (outline-next-heading) (point))
-		msg (if at "Creating image...%s"
-		      "Creating images for entry...%s"))))
-	(message msg "")
-	(narrow-to-region beg end)
-	(org-format-latex
-	 (concat "ltxpng/" (file-name-sans-extension
-			    (file-name-nondirectory
-			     buffer-file-name)))
-	 default-directory 'overlays msg at)
-      (message msg "done.  Use `C-c C-c' to remove images.")))))
-
-(defvar org-latex-regexps
-  '(("begin" "^[ \t]*\\(\\\\begin{\\([a-zA-Z0-9\\*]+\\)[^\000]+?\\\\end{\\2}\\)" 1 t)
-    ;; ("$" "\\([ 	(]\\|^\\)\\(\\(\\([$]\\)\\([^ 	\r\n,.$].*?\\(\n.*?\\)\\{0,5\\}[^ 	\r\n,.$]\\)\\4\\)\\)\\([ 	.,?;:'\")]\\|$\\)" 2 nil)
-    ;; \000 in the following regex is needed for org-inside-LaTeX-fragment-p
-    ("$" "\\([^$]\\)\\(\\(\\$\\([^ 	\r\n,;.$][^$\n\r]*?\\(\n[^$\n\r]*?\\)\\{0,2\\}[^ 	\r\n,.$]\\)\\$\\)\\)\\([ 	.,?;:'\")\000]\\|$\\)" 2 nil)
-    ("\\(" "\\\\([^\000]*?\\\\)" 0 nil)
-    ("\\[" "\\\\\\[[^\000]*?\\\\\\]" 0 t)
-    ("$$" "\\$\\$[^\000]*?\\$\\$" 0 t))
-  "Regular expressions for matching embedded LaTeX.")
-
-(defun org-format-latex (prefix &optional dir overlays msg at)
-  "Replace LaTeX fragments with links to an image, and produce images."
-  (if (and overlays (fboundp 'clear-image-cache)) (clear-image-cache))
-  (let* ((prefixnodir (file-name-nondirectory prefix))
-	 (absprefix (expand-file-name prefix dir))
-	 (todir (file-name-directory absprefix))
-	 (opt org-format-latex-options)
-	 (matchers (plist-get opt :matchers))
-	 (re-list org-latex-regexps)
-	 (cnt 0) txt link beg end re e oldfiles
-	 m n block linkfile movefile ov)
-    ;; Make sure the directory exists
-    (or (file-directory-p todir) (make-directory todir))
-    ;; Check if there are old images files with this prefix, and remove them
-    (setq oldfiles (directory-files
-		    todir 'full
-		    (concat (regexp-quote prefixnodir) "_[0-9]+\\.png$")))
-    (while oldfiles (delete-file (pop oldfiles)))
-    ;; Check the different regular expressions
-    (while (setq e (pop re-list))
-      (setq m (car e) re (nth 1 e) n (nth 2 e)
-	    block (if (nth 3 e) "\n\n" ""))
-      (when (member m matchers)
-	(goto-char (point-min))
-	(while (re-search-forward re nil t)
-	  (when (or (not at) (equal (cdr at) (match-beginning n)))
-	    (setq txt (match-string n)
-		  beg (match-beginning n) end (match-end n)
-		  cnt (1+ cnt)
-		  linkfile (format "%s_%04d.png" prefix cnt)
-		  movefile (format "%s_%04d.png" absprefix cnt)
-		  link (concat block "[[file:" linkfile "]]" block))
-	    (if msg (message msg cnt))
-	    (goto-char beg)
-	    (org-create-formula-image
-	     txt movefile opt)
-	    (if overlays
-		(progn
-		  (setq ov (org-make-overlay beg end))
-		  (if (featurep 'xemacs)
-		      (progn
-			(org-overlay-put ov 'invisible t)
-			(org-overlay-put
-			 ov 'end-glyph
-			 (make-glyph (vector 'png :file movefile))))
-		    (org-overlay-put
-		     ov 'display
-		     (list 'image :type 'png :file movefile :ascent 'center)))
-		  (push ov org-latex-fragment-image-overlays)
-		  (goto-char end))
-	      (delete-region beg end)
-	      (insert link))))))))
-
-;; This function borrows from Ganesh Swami's latex2png.el
-(defun org-create-formula-image (string tofile options)
-  (let* ((tmpdir (if (featurep 'xemacs)
-		     (temp-directory)
-		   temporary-file-directory))
-	 (texfilebase (make-temp-name
-		       (expand-file-name "orgtex" tmpdir)))
-
-;(texfilebase (make-temp-file "orgtex"))
-;	 (dummy (delete-file texfilebase))
-	 (texfile (concat texfilebase ".tex"))
-	 (dvifile (concat texfilebase ".dvi"))
-	 (pngfile (concat texfilebase ".png"))
-	 (scale (number-to-string (* 1000 (or (plist-get options :scale) 1.0))))
-	 (fg (or (plist-get options :foreground) "Black"))
-	 (bg (or (plist-get options :background) "Transparent")))
-    (with-temp-file texfile
-      (insert "\\documentclass{article}
-\\usepackage{fullpage}
-\\usepackage{amssymb}
-\\usepackage[usenames]{color}
-\\usepackage{amsmath}
-\\usepackage{latexsym}
-\\usepackage[mathscr]{eucal}
-\\pagestyle{empty}
-\\begin{document}\n" string "\n\\end{document}\n"))
-    (let ((dir default-directory))
-      (condition-case nil
-	  (progn
-	    (cd tmpdir)
-	    (call-process "latex" nil nil nil texfile))
-	(error nil))
-      (cd dir))
-    (if (not (file-exists-p dvifile))
-	(progn (message "Failed to create dvi file from %s" texfile) nil)
-      (call-process "dvipng" nil nil nil
-		    "-E" "-fg" fg "-bg" bg
-		    "-x" scale "-y" scale "-T" "tight"
-		    "-o" pngfile
-		    dvifile)
-      (if (not (file-exists-p pngfile))
-	  (progn (message "Failed to create png file from %s" texfile) nil)
-	;; Use the requested file name and clean up
-	(copy-file pngfile tofile 'replace)
-	(loop for e in '(".dvi" ".tex" ".aux" ".log" ".png") do
-	      (delete-file (concat texfilebase e)))
-	pngfile))))
-
-;;; Key bindings
+
+;;;; Key bindings
 
 ;; - Bindings in Org-mode map are currently
 ;;   0123456789abcdefghijklmnopqrstuvwxyz!?@#$%^&-+*/=()_{}[]:;"|,.<>~`'\t  the alphabet
@@ -16286,6 +18555,7 @@
 (define-key org-mode-map [(control tab)] 'org-force-cycle-archived)
 (define-key org-mode-map [(meta tab)] 'org-complete)
 (define-key org-mode-map "\M-\t" 'org-complete)
+(define-key org-mode-map "\M-\C-i"      'org-complete)
 ;; The following line is necessary under Suse GNU/Linux
 (unless (featurep 'xemacs)
   (define-key org-mode-map [S-iso-lefttab]  'org-shifttab))
@@ -16311,12 +18581,12 @@
 (define-key org-mode-map (org-key 'S-left)     'org-shiftleft)
 (define-key org-mode-map (org-key 'S-right)    'org-shiftright)
 
-;; Extra keys for tty access.  We only set them when really needed
-;; because otherwise the menus don't show the simple keys
+;;; Extra keys for tty access.
+;;  We only set them when really needed because otherwise the
+;;  menus don't show the simple keys
 
 (when (or (featurep 'xemacs)   ;; because XEmacs supports multi-device stuff
 	  (not window-system))
-  (define-key org-mode-map "\M-\C-i"      'org-complete)
   (define-key org-mode-map "\C-c\C-xc"    'org-table-copy-down)
   (define-key org-mode-map "\C-c\C-xM"    'org-insert-todo-heading)
   (define-key org-mode-map "\C-c\C-xm"    'org-meta-return)
@@ -16337,14 +18607,16 @@
   (define-key org-mode-map [?\C-c ?\C-x (down)]  'org-shiftdown)
   (define-key org-mode-map [?\C-c ?\C-x (left)]  'org-shiftleft)
   (define-key org-mode-map [?\C-c ?\C-x (right)] 'org-shiftright))
-  
+
   ;; All the other keys
 
 (define-key org-mode-map "\C-c\C-a" 'show-all)  ; in case allout messed up.
 (define-key org-mode-map "\C-c\C-r" 'org-reveal)
 (define-key org-mode-map "\C-xns" 'org-narrow-to-subtree)
 (define-key org-mode-map "\C-c$"    'org-archive-subtree)
+(define-key org-mode-map "\C-c\C-x\C-s" 'org-advertized-archive-subtree)
 (define-key org-mode-map "\C-c\C-x\C-a" 'org-toggle-archive-tag)
+(define-key org-mode-map "\C-c\C-xb" 'org-tree-to-indirect-buffer)
 (define-key org-mode-map "\C-c\C-j" 'org-goto)
 (define-key org-mode-map "\C-c\C-t" 'org-todo)
 (define-key org-mode-map "\C-c\C-s" 'org-schedule)
@@ -16356,6 +18628,8 @@
 (define-key org-mode-map "\C-c\\"   'org-tags-sparse-tree) ; Minor-mode res.
 (define-key org-mode-map "\C-c\C-m" 'org-insert-heading)
 (define-key org-mode-map "\M-\C-m"  'org-insert-heading)
+(define-key org-mode-map "\C-c\C-x\C-n" 'org-next-link)
+(define-key org-mode-map "\C-c\C-x\C-p" 'org-previous-link)
 (define-key org-mode-map "\C-c\C-l" 'org-insert-link)
 (define-key org-mode-map "\C-c\C-o" 'org-open-at-point)
 (define-key org-mode-map "\C-c%"    'org-mark-ring-push)
@@ -16368,31 +18642,34 @@
 (define-key org-mode-map "\C-c>"    'org-goto-calendar)
 (define-key org-mode-map "\C-c<"    'org-date-from-calendar)
 (define-key org-mode-map [(control ?,)]     'org-cycle-agenda-files)
+(define-key org-mode-map [(control ?\')]     'org-cycle-agenda-files)
 (define-key org-mode-map "\C-c["    'org-agenda-file-to-front)
 (define-key org-mode-map "\C-c]"    'org-remove-file)
-(define-key org-mode-map "\C-c-"          'org-table-insert-hline)
-(define-key org-mode-map "\C-c^"          'org-table-sort-lines)
-(define-key org-mode-map "\C-c\C-c"       'org-ctrl-c-ctrl-c)
-(define-key org-mode-map "\C-c#"          'org-update-checkbox-count)
-(define-key org-mode-map "\C-m"           'org-return)
-(define-key org-mode-map "\C-c?"          'org-table-current-column)
-(define-key org-mode-map "\C-c "          'org-table-blank-field)
-(define-key org-mode-map "\C-c+"          'org-table-sum)
-(define-key org-mode-map "\C-c="          'org-table-eval-formula)
-(define-key org-mode-map "\C-c'"          'org-table-edit-formulas)
-(define-key org-mode-map "\C-c`"          'org-table-edit-field)
-(define-key org-mode-map "\C-c|"          'org-table-create-or-convert-from-region)
-(define-key org-mode-map "\C-c*"          'org-table-recalculate)
-(define-key org-mode-map [(control ?#)]   'org-table-rotate-recalc-marks)
-(define-key org-mode-map "\C-c~"          'org-table-create-with-table.el)
-(define-key org-mode-map "\C-c\C-q"       'org-table-wrap-region)
-(define-key org-mode-map "\C-c\C-e"       'org-export)
-(define-key org-mode-map "\C-c:"          'org-toggle-fixed-width-section)
-
-(define-key org-mode-map "\C-c\C-x\C-k"   'org-cut-special)
-(define-key org-mode-map "\C-c\C-x\C-w"   'org-cut-special)
-(define-key org-mode-map "\C-c\C-x\M-w"   'org-copy-special)
-(define-key org-mode-map "\C-c\C-x\C-y"   'org-paste-special)
+(define-key org-mode-map "\C-c-"    'org-table-insert-hline)
+(define-key org-mode-map "\C-c^"    'org-sort)
+(define-key org-mode-map "\C-c\C-c" 'org-ctrl-c-ctrl-c)
+(define-key org-mode-map "\C-c#"    'org-update-checkbox-count)
+(define-key org-mode-map "\C-m"     'org-return)
+(define-key org-mode-map "\C-c?"    'org-table-field-info)
+(define-key org-mode-map "\C-c "    'org-table-blank-field)
+(define-key org-mode-map "\C-c+"    'org-table-sum)
+(define-key org-mode-map "\C-c="    'org-table-eval-formula)
+(define-key org-mode-map "\C-c'"    'org-table-edit-formulas)
+(define-key org-mode-map "\C-c`"    'org-table-edit-field)
+(define-key org-mode-map "\C-c|"    'org-table-create-or-convert-from-region)
+(define-key org-mode-map "\C-c*"    'org-table-recalculate)
+(define-key org-mode-map [(control ?#)] 'org-table-rotate-recalc-marks)
+(define-key org-mode-map "\C-c~"    'org-table-create-with-table.el)
+(define-key org-mode-map "\C-c\C-q" 'org-table-wrap-region)
+(define-key org-mode-map "\C-c}"    'org-table-toggle-coordinate-overlays)
+(define-key org-mode-map "\C-c{"    'org-table-toggle-formula-debugger)
+(define-key org-mode-map "\C-c\C-e" 'org-export)
+(define-key org-mode-map "\C-c:"    'org-toggle-fixed-width-section)
+
+(define-key org-mode-map "\C-c\C-x\C-k" 'org-cut-special)
+(define-key org-mode-map "\C-c\C-x\C-w" 'org-cut-special)
+(define-key org-mode-map "\C-c\C-x\M-w" 'org-copy-special)
+(define-key org-mode-map "\C-c\C-x\C-y" 'org-paste-special)
 
 (define-key org-mode-map "\C-c\C-x\C-t" 'org-toggle-time-stamp-overlays)
 (define-key org-mode-map "\C-c\C-x\C-i" 'org-clock-in)
@@ -16524,6 +18801,9 @@
   (interactive "P")
   (cond
    ((org-at-table-p) (call-interactively 'org-table-previous-field))
+   (arg (message  "Content view to level: ")
+	(org-content (prefix-numeric-value arg))
+	(setq org-cycle-global-status 'overview))
    (t (call-interactively 'org-global-cycle))))
 
 (defun org-shiftmetaleft ()
@@ -16803,9 +19083,7 @@
      ["Move Column Left" org-metaleft (org-at-table-p)]
      ["Move Column Right" org-metaright (org-at-table-p)]
      ["Delete Column" org-shiftmetaleft (org-at-table-p)]
-     ["Insert Column" org-shiftmetaright (org-at-table-p)]
-    "--"
-    ["Enable Narrowing" (setq org-table-limit-column-width (not org-table-limit-column-width)) :active (org-at-table-p) :selected org-table-limit-column-width :style toggle])
+     ["Insert Column" org-shiftmetaright (org-at-table-p)])
     ("Row"
      ["Move Row Up" org-metaup (org-at-table-p)]
      ["Move Row Down" org-metadown (org-at-table-p)]
@@ -16822,19 +19100,24 @@
     "--"
     ("Calculate"
      ["Set Column Formula" org-table-eval-formula (org-at-table-p)]
-     ["Set Named Field Formula" (org-table-eval-formula '(4)) :active (org-at-table-p) :keys "C-u C-c ="]
+     ["Set Field Formula" (org-table-eval-formula '(4)) :active (org-at-table-p) :keys "C-u C-c ="]
      ["Edit Formulas" org-table-edit-formulas (org-at-table-p)]
      "--"
      ["Recalculate line" org-table-recalculate (org-at-table-p)]
      ["Recalculate all" (lambda () (interactive) (org-table-recalculate '(4))) :active (org-at-table-p) :keys "C-u C-c *"]
+     ["Iterate all" (lambda () (interactive) (org-table-recalculate '(16))) :active (org-at-table-p) :keys "C-u C-u C-c *"]
+     "--"
      ["Toggle Recalculate Mark" org-table-rotate-recalc-marks (org-at-table-p)]
      "--"
      ["Sum Column/Rectangle" org-table-sum
       (or (org-at-table-p) (org-region-active-p))]
      ["Which Column?" org-table-current-column (org-at-table-p)])
     ["Debug Formulas"
-     (setq org-table-formula-debug (not org-table-formula-debug))
+     org-table-toggle-formula-debugger
      :style toggle :selected org-table-formula-debug]
+    ["Show Col/Row Numbers"
+     org-table-toggle-coordinate-overlays
+     :style toggle :selected org-table-overlay-coordinates]
     "--"
     ["Create" org-table-create (and (not (org-at-table-p))
 				    org-enable-table-editor)]
@@ -16851,7 +19134,9 @@
      ["Cycle Global Visibility" org-shifttab (not (org-at-table-p))]
      ["Sparse Tree" org-occur t]
      ["Reveal Context" org-reveal t]
-     ["Show All" show-all t])
+     ["Show All" show-all t]
+     "--"
+     ["Subtree to indirect buffer" org-tree-to-indirect-buffer t])
     "--"
     ["New Heading" org-insert-heading t]
     ("Navigate Headings"
@@ -16875,12 +19160,14 @@
      ["Demote Heading"  org-metaright (not (org-at-table-p))]
      ["Demote Subtree"  org-shiftmetaright (not (org-at-table-p))]
      "--"
+     ["Sort Region/Children" org-sort  (not (org-at-table-p))]
+     "--"
      ["Convert to odd levels" org-convert-to-odd-levels t]
      ["Convert to odd/even levels" org-convert-to-oddeven-levels t])
     ("Archive"
      ["Toggle ARCHIVE tag" org-toggle-archive-tag t]
-     ["Check and Tag Children" (org-toggle-archive-tag (4))
-      :active t :keys "C-u C-c C-x C-a"]
+;     ["Check and Tag Children" (org-toggle-archive-tag (4))
+;      :active t :keys "C-u C-c C-x C-a"]
      ["Sparse trees open ARCHIVE trees"
       (setq org-sparse-tree-open-archived-trees
 	    (not org-sparse-tree-open-archived-trees))
@@ -16892,9 +19179,10 @@
       (setq org-agenda-skip-archived-trees (not org-agenda-skip-archived-trees))
       :style toggle :selected (not org-agenda-skip-archived-trees)]
      "--"
-     ["Move Subtree to Archive" org-archive-subtree t]
-     ["Check and Move Children" (org-archive-subtree '(4))
-      :active t :keys "C-u C-c $"])
+     ["Move Subtree to Archive" org-advertized-archive-subtree t]
+ ;    ["Check and Move Children" (org-archive-subtree '(4))
+ ;     :active t :keys "C-u C-c C-x C-s"]
+     )
     "--"
     ("TODO Lists"
      ["TODO/DONE/-" org-todo t]
@@ -16961,17 +19249,16 @@
      ["Insert Link" org-insert-link t]
      ["Follow Link" org-open-at-point t]
      "--"
+     ["Next link" org-next-link t]
+     ["Previous link" org-previous-link t]
+     "--"
      ["Descriptive Links"
       (progn (org-add-to-invisibility-spec '(org-link)) (org-restart-font-lock))
       :style radio :selected (member '(org-link) buffer-invisibility-spec)]
      ["Literal Links"
       (progn
 	(org-remove-from-invisibility-spec '(org-link)) (org-restart-font-lock))
-      :style radio :selected (not (member '(org-link) buffer-invisibility-spec))]
-     "--"
-     ["Upgrade all <link> to [[link][desc]]" org-upgrade-old-links
-      (save-excursion (goto-char (point-min))
-		      (re-search-forward "<[a-z]+:" nil t))])
+      :style radio :selected (not (member '(org-link) buffer-invisibility-spec))])
     "--"
     ["Export/Publish..." org-export t]
     ("LaTeX"
@@ -16997,6 +19284,15 @@
     ["Refresh setup" org-mode-restart t]
     ))
 
+(defun org-toggle-log-option (type)
+  (if (not (listp org-log-done)) (setq org-log-done nil))
+  (if (memq type org-log-done)
+      (setq org-log-done (delq type org-log-done))
+    (add-to-list 'org-log-done type)))
+
+(defun org-check-log-option (type)
+  (and (listp org-log-done) (memq type org-log-done)))
+
 (defun org-info (&optional node)
   "Read documentation for Org-mode in the info system.
 With optional NODE, go directly to that node."
@@ -17022,7 +19318,7 @@
 	   "--")
 	  (mapcar 'org-file-menu-entry (org-agenda-files t))))))))
 
-;;; Documentation
+;;;; Documentation
 
 (defun org-customize ()
   "Call the customize function with org as argument."
@@ -17047,7 +19343,10 @@
 	(message "\"Org\"-menu now contains full customization menu"))
     (error "Cannot expand menu (outdated version of cus-edit.el)")))
 
-;;; Miscellaneous stuff
+;;;; Miscellaneous stuff
+
+
+;;; Generally useful functions
 
 (defun org-context ()
   "Return a list of contexts of the current cursor position.
@@ -17067,7 +19366,7 @@
 :table            in an org-mode table
 :table-special    on a special filed in a table
 :table-table      in a table.el table
-:link             on a hyperline
+:link             on a hyperlink
 :keyword          on a keyword: SCHEDULED, DEADLINE, CLOSE,COMMENT, QUOTE.
 :target           on a <<target>>
 :radio-target     on a <<<radio-target>>>
@@ -17147,6 +19446,23 @@
     (setq clist (nreverse (delq nil clist)))
     clist))
 
+(defun org-in-regexp (re &optional nlines visually)
+  "Check if point is inside a match of regexp.
+Normally only the current line is checked, but you can include NLINES extra
+lines both before and after point into the search.
+If VISUALLY is set, require that the cursor is not after the match but
+really on, so that the block visually is on the match."
+  (catch 'exit
+    (let ((pos (point))
+          (eol (point-at-eol (+ 1 (or nlines 0))))
+	  (inc (if visually 1 0)))
+      (save-excursion
+	(beginning-of-line (- 1 (or nlines 0)))
+	(while (re-search-forward re eol t)
+	  (if (and (<= (match-beginning 0) pos) 
+		   (>= (+ inc (match-end 0)) pos))
+	      (throw 'exit (cons (match-beginning 0) (match-end 0)))))))))
+
 (defun org-point-in-group (point group &optional context)
   "Check if POINT is in match-group GROUP.
 If CONTEXT is non-nil, return a list with CONTEXT and the boundaries of the
@@ -17159,6 +19475,20 @@
 	   (list context (match-beginning group) (match-end group))
 	 t)))
 
+(defun org-combine-plists (&rest plists)
+  "Create a single property list from all plists in PLISTS.
+The process starts by copying the first list, and then setting properties
+from the other lists.  Settings in the last list are the most significant
+ones and overrule settings in the other lists."
+  (let ((rtn (copy-sequence (pop plists)))
+	p v ls)
+    (while plists
+      (setq ls (pop plists))
+      (while ls
+	(setq p (pop ls) v (pop ls))
+	(setq rtn (plist-put rtn p v))))
+    rtn))
+
 (defun org-move-line-down (arg)
   "Move the current line down.  With prefix argument, move it past ARG lines."
   (interactive "p")
@@ -17185,8 +19515,54 @@
     (goto-char pos)
     (move-to-column col)))
 
-;; Paragraph filling stuff.
+(defun org-replace-escapes (string table)
+  "Replace %-escapes in STRING with values in TABLE.
+TABLE is an association list with keys line \"%a\" and string values.
+The sequences in STRING may contain normal field width and padding information,
+for example \"%-5s\".  Replacements happen in the sequence given by TABLE,
+so values can contain further %-escapes if they are define later in TABLE."
+  (let ((case-fold-search nil)
+	e re rpl)	  
+    (while (setq e (pop table))
+      (setq re (concat "%-?[0-9.]*" (substring (car e) 1)))
+      (while (string-match re string)
+	(setq rpl (format (concat (substring (match-string 0 string) 0 -1) "s")
+			  (cdr e)))
+	(setq string (replace-match rpl t t string))))
+    string))
+
+
+(defun org-sublist (list start end)
+  "Return a section of LIST, from START to END.
+Counting starts at 1."
+  (let (rtn (c start))
+    (setq list (nthcdr (1- start) list))
+    (while (and list (<= c end))
+      (push (pop list) rtn)
+      (setq c (1+ c)))
+    (nreverse rtn)))
+
+(defun org-at-regexp-p (regexp)
+  "Is point inside a match of REGEXP in the current line?"
+  (catch 'exit
+    (save-excursion
+      (let ((pos (point)) (end (point-at-eol)))
+	(beginning-of-line 1)
+	(while (re-search-forward regexp end t)
+	  (if (and (<= (match-beginning 0) pos)
+		   (>= (match-end 0) pos))
+	      (throw 'exit t)))
+	nil))))
+
+(defun org-find-base-buffer-visiting (file)
+  "Like `find-buffer-visiting' but alway return the base buffer and
+not an indirect buffer"
+  (let ((buf (find-buffer-visiting file)))
+    (or (buffer-base-buffer buf) buf)))
+
+;;; Paragraph filling stuff.
 ;; We want this to be just right, so use the full arsenal.
+;; FIXME: configure filladapt for XEmacs
 
 (defun org-set-autofill-regexps ()
   (interactive)
@@ -17202,7 +19578,7 @@
   ;; But only if the user has not turned off tables or fixed-width regions
   (org-set-local
    'auto-fill-inhibit-regexp
-   (concat "\\*\\|#"
+   (concat "\\*\\|#\\+"
 	   "\\|[ \t]*" org-keyword-time-regexp
 	   (if (or org-enable-table-editor org-enable-fixed-width-editor)
 	       (concat
@@ -17236,52 +19612,12 @@
   "Return a fill prefix for org-mode files.
 In particular, this makes sure hanging paragraphs for hand-formatted lists
 work correctly."
-  (if (looking-at " *\\([-*+] \\|[0-9]+[.)] \\)?")
-      (make-string (- (match-end 0) (match-beginning 0)) ?\ )))
-
-;; Functions needed for Emacs/XEmacs region compatibility
-
-(defun org-add-hook (hook function &optional append local)
-  "Add-hook, compatible with both Emacsen."
-  (if (and local (featurep 'xemacs))
-      (add-local-hook hook function append)
-    (add-hook hook function append local)))
-
-(defun org-region-active-p ()
-  "Is `transient-mark-mode' on and the region active?
-Works on both Emacs and XEmacs."
-  (if org-ignore-region
-      nil
-    (if (featurep 'xemacs)
-	(and zmacs-regions (region-active-p))
-      (and transient-mark-mode mark-active))))
-
-(defun org-add-to-invisibility-spec (arg)
-  "Add elements to `buffer-invisibility-spec'.
-See documentation for `buffer-invisibility-spec' for the kind of elements
-that can be added."
-  (cond
-   ((fboundp 'add-to-invisibility-spec)
-    (add-to-invisibility-spec arg))
-   ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t))
-	(setq buffer-invisibility-spec (list arg)))
-   (t
-    (setq buffer-invisibility-spec
-	  (cons arg buffer-invisibility-spec)))))
-
-(defun org-remove-from-invisibility-spec (arg)
-  "Remove elements from `buffer-invisibility-spec'."
-  (if (fboundp 'remove-from-invisibility-spec)
-      (remove-from-invisibility-spec arg)
-    (if (consp buffer-invisibility-spec)
-	(setq buffer-invisibility-spec
-	      (delete arg buffer-invisibility-spec)))))
-
-(defun org-in-invisibility-spec-p (arg)
-  "Is ARG a member of `buffer-invisibility-spec'?"
-  (if (consp buffer-invisibility-spec)
-      (member arg buffer-invisibility-spec)
-    nil))
+  (cond ((looking-at "#[ \t]+")
+	 (match-string 0))
+	((looking-at " *\\([-*+] \\|[0-9]+[.)] \\)?")
+	 (make-string (- (match-end 0) (match-beginning 0)) ?\ ))
+	(t nil)))
+
 
 (defun org-image-file-name-regexp ()
   "Return regexp matching the file names of images."
@@ -17297,7 +19633,12 @@
 			  t)
 	      "\\'"))))
 
-;; Functions extending outline functionality
+(defun org-file-image-p (file)
+  "Return non-nil if FILE is an image."
+  (save-match-data
+    (string-match (org-image-file-name-regexp) file)))
+
+;;;; Functions extending outline functionality
 
 ;; C-a should go to the beginning of a *visible* line, also in the
 ;; new outline.el.  I guess this should be patched into Emacs?
@@ -17337,14 +19678,8 @@
 (defalias 'org-on-heading-p 'outline-on-heading-p)
 
 (defun org-on-target-p ()
-  (let ((pos (point)))
-    (save-excursion
-      (skip-chars-forward "<")
-      (and (re-search-backward "<<" nil t)
-	   (or (looking-at org-radio-target-regexp)
-	       (looking-at org-target-regexp))
-	   (<= (match-beginning 0) pos)
-	   (>= (1+ (match-end 0)) pos)))))
+  (or (org-in-regexp org-radio-target-regexp)
+      (org-in-regexp org-target-regexp)))
 
 (defun org-up-heading-all (arg)
   "Move to the heading line of which the present line is a subheading.
@@ -17374,6 +19709,14 @@
       (goto-char pos)
       nil)))
 
+(defun org-show-siblings ()
+  "Show all siblings of the current headline."
+  (save-excursion
+    (while (org-goto-sibling) (org-flag-heading nil)))
+  (save-excursion
+    (while (org-goto-sibling 'previous)
+      (org-flag-heading nil))))
+
 (defun org-show-hidden-entry ()
   "Show an entry where even the heading is hidden."
   (save-excursion
@@ -17446,6 +19789,30 @@
    "\\):[ \t]*"
    "\\(.+\\)"))
 
+;; Make isearch reveal the necessary context
+(defun org-isearch-end ()
+  "Reveal context after isearch exits."
+  (when isearch-success ; only if search was successful
+    (if (featurep 'xemacs)
+	;; Under XEmacs, the hook is run in the correct place,
+	;; we directly show the context.
+	(org-show-context 'isearch)
+      ;; In Emacs the hook runs *before* restoring the overlays.
+      ;; So we have to use a one-time post-command-hook to do this.
+      ;; (Emacs 22 has a special variable, see function `org-mode')
+      (unless (and (boundp 'isearch-mode-end-hook-quit)
+		   isearch-mode-end-hook-quit)
+	;; Only when the isearch was not quitted.
+	(org-add-hook 'post-command-hook 'org-isearch-post-command
+		      'append 'local)))))
+
+(defun org-isearch-post-command ()
+  "Remove self from hook, and show context."
+  (remove-hook 'post-command-hook 'org-isearch-post-command 'local)
+  (org-show-context 'isearch))
+
+;;;; Repair problems with some other packages
+
 ;; Make `bookmark-jump' show the jump location if it was hidden.
 (eval-after-load "bookmark"
   '(if (boundp 'bookmark-after-jump-hook)
@@ -17468,9 +19835,10 @@
 (eval-after-load "session"
   '(add-to-list 'session-globals-exclude 'org-mark-ring))
 
-;;; Experimental code
-
-;;; Finish up
+;;;; Experimental code
+
+
+;;;; Finish up
 
 (provide 'org)
 
@@ -17478,3 +19846,4 @@
 
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 ;;; org.el ends here
+
--- a/lisp/tutorial.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/tutorial.el	Sun Apr 22 11:42:03 2007 +0000
@@ -154,7 +154,10 @@
                           (format "%s" db)
                           " RET instead."))
               (insert "\n\nWith your current key bindings"
-                      " you can use the key "
+                      " you can use "
+                      (if (string-equal "the menus" where)
+                          ""
+                        "the key ")
                       where
                       " to get the function `"
                       (format "%s" db)
--- a/lisp/version.el	Sat Feb 24 20:29:24 2007 +0000
+++ b/lisp/version.el	Sun Apr 22 11:42:03 2007 +0000
@@ -32,13 +32,13 @@
 
 (defconst emacs-major-version
   (progn (string-match "^[0-9]+" emacs-version)
-	 (string-to-int (match-string 0 emacs-version)))
+	 (string-to-number (match-string 0 emacs-version)))
   "Major version number of this version of Emacs.
 This variable first existed in version 19.23.")
 
 (defconst emacs-minor-version
   (progn (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version)
-	 (string-to-int (match-string 1 emacs-version)))
+	 (string-to-number (match-string 1 emacs-version)))
   "Minor version number of this version of Emacs.
 This variable first existed in version 19.23.")
 
@@ -93,5 +93,5 @@
 ;;version-control: never
 ;;End:
 
-;;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
+;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
 ;;; version.el ends here
--- a/lispref/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/lispref/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,8 @@
+2007-02-25  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* loading.texi (How Programs Do Loading): Fix anchor position at
+	load-read-function definition doc. (tiny change)
+	
 2007-02-21  Kim F. Storm  <storm@cua.dk>
 
 	* strings.texi (Text Comparison): Mention that assoc-string
--- a/lispref/elisp.texi	Sat Feb 24 20:29:24 2007 +0000
+++ b/lispref/elisp.texi	Sun Apr 22 11:42:03 2007 +0000
@@ -7,7 +7,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  2.9
-@set EMACSVER 22.0.94
+@set EMACSVER 22.0.95
 
 @dircategory Emacs
 @direntry
--- a/lispref/loading.texi	Sat Feb 24 20:29:24 2007 +0000
+++ b/lispref/loading.texi	Sun Apr 22 11:42:03 2007 +0000
@@ -155,10 +155,9 @@
 @end defvar
 
 @defvar load-read-function
-This
 @anchor{Definition of load-read-function}
 @c do not allow page break at anchor; work around Texinfo deficiency.
-variable specifies an alternate expression-reading function for
+This variable specifies an alternate expression-reading function for
 @code{load} and @code{eval-region} to use instead of @code{read}.
 The function should accept one argument, just as @code{read} does.
 
--- a/lwlib/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,8 @@
+2007-02-28  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (distclean): Delete Makefile.
+	(maintainer-clean): Delete TAGS.
+
 2007-01-01  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xlwmenu.c (xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
--- a/lwlib/Makefile.in	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/Makefile.in	Sun Apr 22 11:42:03 2007 +0000
@@ -1,6 +1,27 @@
-# This was taken from the output of Imake
+# Copyright (C) 1992, 1993 Lucid, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+#   2007 Free Software Foundation, Inc.
+# 
+# This file is part of the Lucid Widget Library.
+# 
+# The Lucid Widget Library 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 1, or (at your option)
+# any later version.
+# 
+# The Lucid Widget Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# 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., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+
+# This was taken from the output of Imake using Lucid's Imakefile.
 # and set up to be configured by ../configure.
-# Some parts Copyright (c) 1992, 1993 Lucid, Inc.
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -61,7 +82,9 @@
 
 clean: mostlyclean
 distclean: clean
+	$(RM) Makefile
 maintainer-clean: distclean
+	$(RM) TAGS
 
 TAGS:
 	../lib-src/etags $(srcdir)/*.[ch]
--- a/lwlib/README	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/README	Sun Apr 22 11:42:03 2007 +0000
@@ -1,5 +1,9 @@
-This subdirectory contains the lwlib library which provides a uniform
-interface to a few different X toolkits.  The library was written by
-Lucid, and is not part of GNU Emacs.  This version has changes in the
-makefile to fit in with Emacs's configure script, and some source
-files have been renamed to fit in 14 characters.
+This subdirectory contains the Lucid Widget Library (lwlib), which
+provides a uniform interface to a few different X toolkits.  The
+library was written by Lucid, Inc and released under the terms of the
+GPL version 1 (or later).  It is not considered part of GNU Emacs.
+
+This version of the library differs from the original as described in
+the ChangeLog file.  For example, the file "lwlib-int.h" was renamed
+from "lwlib-internal.h" in order to fit in 14 characters, and the
+makefile adjusted to fit in with Emacs's configure script.
--- a/lwlib/lwlib-Xaw.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/lwlib-Xaw.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,5 +1,7 @@
 /* The lwlib interface to Athena widgets.
-   Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
+Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
--- a/lwlib/lwlib-Xm.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/lwlib-Xm.c	Sun Apr 22 11:42:03 2007 +0000
@@ -7,7 +7,7 @@
 
 The Lucid Widget Library 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 1, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
--- a/lwlib/lwlib-Xm.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/lwlib-Xm.h	Sun Apr 22 11:42:03 2007 +0000
@@ -1,13 +1,11 @@
 /* The lwlib interface to Motif widgets.
-   Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
-   Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
 
 The Lucid Widget Library 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 1, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
--- a/lwlib/lwlib-int.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/lwlib-int.h	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,26 @@
+/*
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library 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 1, or (at your option)
+any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+
 #ifndef LWLIB_INTERNAL_H
 #define LWLIB_INTERNAL_H
 
--- a/lwlib/lwlib-utils.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/lwlib-utils.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,5 +1,7 @@
 /* Defines some widget utility functions.
-   Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
--- a/lwlib/lwlib.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/lwlib.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,5 +1,7 @@
 /* A general interface to the widgets of different toolkits.
-   Copyright (C) 1992, 1993 Lucid, Inc.
+Copyright (C) 1992, 1993 Lucid, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
--- a/lwlib/lwlib.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/lwlib.h	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,26 @@
+/*
+Copyright (C) 1992, 1993 Lucid, Inc.
+Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  Free Software Foundation, Inc.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library 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 1, or (at your option)
+any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+
 #ifndef LWLIB_H
 #define LWLIB_H
 
--- a/lwlib/xlwmenu.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/xlwmenu.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,6 +1,7 @@
 /* Implements a lightweight menubar widget.
-   Copyright (C) 1992 Lucid, Inc.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
--- a/lwlib/xlwmenu.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/xlwmenu.h	Sun Apr 22 11:42:03 2007 +0000
@@ -1,12 +1,13 @@
 /* Interface of a lightweight menubar widget.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
 The Lucid Widget Library 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 1, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
--- a/lwlib/xlwmenuP.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/lwlib/xlwmenuP.h	Sun Apr 22 11:42:03 2007 +0000
@@ -1,12 +1,13 @@
 /* Internals of a lightweight menubar widget.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
 The Lucid Widget Library 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 1, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings	Sat Feb 24 20:29:24 2007 +0000
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings	Sun Apr 22 11:42:03 2007 +0000
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Emacs";
-CFBundleShortVersionString = "22.0.94";
-CFBundleGetInfoString = "22.0.94, Copyright (C) 2007 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.0.95";
+CFBundleGetInfoString = "22.0.95, Copyright (C) 2007 Free Software Foundation, Inc.";
--- a/mac/src/Emacs.r	Sat Feb 24 20:29:24 2007 +0000
+++ b/mac/src/Emacs.r	Sun Apr 22 11:42:03 2007 +0000
@@ -221,10 +221,10 @@
 	0x22,		/* Major revision in BCD */
 	0x0,		/* Minor revision in BCD */
 	alpha,	/* development, alpha, beta, or final (release) */
-	94,		/* Non-final release # */
+	95,		/* Non-final release # */
 	0,		/* Region code */
-	"22.0.94",	/* Short version number */
-	"22.0.94, Copyright \0xa9 2007 "
+	"22.0.95",	/* Short version number */
+	"22.0.95, Copyright \0xa9 2007 "
 	"Free Software Foundation, Inc." /* Long version number */
 };
 
--- a/make-dist	Sat Feb 24 20:29:24 2007 +0000
+++ b/make-dist	Sun Apr 22 11:42:03 2007 +0000
@@ -558,7 +558,7 @@
 echo "Making links to \`oldXMenu'"
 (cd oldXMenu
  ln *.c *.h *.in ../${tempdir}/oldXMenu
- ln README Imakefile ChangeLog ../${tempdir}/oldXMenu
+ ln README ChangeLog ../${tempdir}/oldXMenu
  ln compile.com descrip.mms ../${tempdir}/oldXMenu)
 
 echo "Making links to \`lwlib'"
@@ -603,7 +603,7 @@
 
 echo "Making links to \`etc/images'"
 (cd etc/images
- for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
+ for img in README [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
    if [ -f $img ]; then
      ln $img ../../${tempdir}/etc/images
    fi
--- a/man/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/man/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,45 @@
+2007-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus.texi (NNTP): Mention nntp-never-echoes-commands and
+	nntp-open-connection-functions-never-echo-commands.
+
+2007-02-28  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	* rmail.texi (Movemail): Add internal ref.
+	Don't indent the intro for the PROTO table.
+	Format PROTO table items with @code.
+
+2007-02-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* pgg.texi (Caching passphrase): Document gpg-agent usage, gpg-agent
+	problems on the console, and security risk in not using gpg-agent.
+
+2007-02-26  Nick Roberts  <nickrob@snap.net.nz>
+
+	* building.texi: Remove references to bashdb.
+
+2007-02-25  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi (The spreadsheet): Renamed from "Table calculations".
+	Completely reorganized and rewritten.
+	(CamelCase links): Section removed.
+	(Repeating items): New section.
+	(Tracking TODO state changes): New section.
+	(Agenda views): Chapter reorganized and rewritten.
+	(HTML export): Section rewritten.
+	(Tables in arbitrary syntax): New section.
+	(Summary): Better feature summary.
+	(Activation): Document problem with cut-and-paste of Lisp code
+	from PDF files.
+	(Visibility cycling): Document indirect buffer use.
+	(Structure editing): Document sorting.
+	(Remember): Section rewritten.
+	(Time stamps): Better description of time stamp types.
+	(Tag searches): Document regular expression search for tags.
+	(Stuck projects): New section.
+	(In-buffer settings): New keywords.
+	(History and Acknowledgments): Updated description.
+
 2007-02-24  Alan Mackenzie  <acm@muc.de>
 
 	* cc-mode.texi (Movement Commands): Insert two missing command names.
--- a/man/building.texi	Sat Feb 24 20:29:24 2007 +0000
+++ b/man/building.texi	Sun Apr 22 11:42:03 2007 +0000
@@ -446,7 +446,6 @@
 @cindex SDB
 @cindex XDB
 @cindex Perldb
-@cindex bashdb
 @cindex JDB
 @cindex PDB
 
@@ -455,7 +454,7 @@
 various symbolic debuggers from within Emacs.  We recommend the
 debugger GDB, which is free software, but GUD can also run DBX, SDB or
 XDB.  GUD can also serve as an interface to Perl's debugging mode, the
-Python debugger PDB, the Bash debugger, and to JDB, the Java Debugger.
+Python debugger PDB, and to JDB, the Java Debugger.
 @xref{Debugging,, The Lisp Debugger, elisp, the Emacs Lisp Reference
 Manual}, for information on debugging Emacs Lisp programs.
 
@@ -508,10 +507,6 @@
 requires a valid tags table to work}.  If this happens, generate a valid
 tags table in the working directory and try again.
 
-@item M-x bashdb @key{RET} @var{file} @key{RET}
-@findex bashdb
-Run the bash debugger to debug @var{file}, a shell script.
-
 @item M-x perldb @key{RET} @var{file} @key{RET}
 @findex perldb
 Run the Perl interpreter in debug mode to debug @var{file}, a Perl program.
@@ -746,13 +741,11 @@
 @vindex perldb-mode-hook
 @vindex pdb-mode-hook
 @vindex jdb-mode-hook
-@vindex bashdb-mode-hook
   On startup, GUD runs one of the following hooks: @code{gdb-mode-hook},
 if you are using GDB; @code{dbx-mode-hook}, if you are using DBX;
 @code{sdb-mode-hook}, if you are using SDB; @code{xdb-mode-hook}, if you
 are using XDB; @code{perldb-mode-hook}, for Perl debugging mode;
-@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB;
-@code{bashdb-mode-hook}, for the Bash debugger.  You can
+@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB.  You can
 use these hooks to define custom key bindings for the debugger
 interaction buffer.  @xref{Hooks}.
 
--- a/man/emacs.texi	Sat Feb 24 20:29:24 2007 +0000
+++ b/man/emacs.texi	Sun Apr 22 11:42:03 2007 +0000
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  22.0.94
+@set EMACSVER  22.0.95
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
--- a/man/gnus.texi	Sat Feb 24 20:29:24 2007 +0000
+++ b/man/gnus.texi	Sun Apr 22 11:42:03 2007 +0000
@@ -12942,6 +12942,24 @@
 two categories: direct connection functions (four pre-made), and
 indirect ones (two pre-made).
 
+@item nntp-never-echoes-commands
+@vindex nntp-never-echoes-commands
+Non-@code{nil} means the nntp server never echoes commands.  It is
+reported that some nntps server doesn't echo commands.  So, you may want
+to set this to non-@code{nil} in the method for such a server setting
+@code{nntp-open-connection-function} to @code{nntp-open-ssl-stream} for
+example.  The default value is @code{nil}.  Note that the
+@code{nntp-open-connection-functions-never-echo-commands} variable
+overrides the @code{nil} value of this variable.
+
+@item nntp-open-connection-functions-never-echo-commands
+@vindex nntp-open-connection-functions-never-echo-commands
+List of functions that never echo commands.  Add or set a function which
+you set to @code{nntp-open-connection-function} to this list if it does
+not echo commands.  Note that a non-@code{nil} value of the
+@code{nntp-never-echoes-commands} variable overrides this variable.  The
+default value is @code{(nntp-open-network-stream)}.
+
 @item nntp-prepare-post-hook
 @vindex nntp-prepare-post-hook
 A hook run just before posting an article.  If there is no
--- a/man/org.texi	Sat Feb 24 20:29:24 2007 +0000
+++ b/man/org.texi	Sun Apr 22 11:42:03 2007 +0000
@@ -3,12 +3,12 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.56
-@set DATE November 2006
+@set VERSION 4.67
+@set DATE February 2007
 
 @dircategory Emacs
 @direntry
-* Org Mode: (org).      outline-based notes management and organizer
+* Org Mode: (org).      Outline-based notes management and organizer
 @end direntry
 
 @c Version and Contact Info
@@ -35,7 +35,7 @@
 @copying
 This manual is for Org-mode (version @value{VERSION}).
 
-Copyright @copyright{} 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+Copyright @copyright{} 2004, 2005, 2006, 2007 Free Software Foundation
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -122,19 +122,19 @@
 
 * Built-in table editor::       Simple tables
 * Narrow columns::              Stop wasting space in tables   
-* Table calculations::          Compute a field from other fields
 * orgtbl-mode::                 The table editor as minor mode
-* table.el::                    Complex tables
-
-Calculations in tables
-
-* Formula syntax::              How to write a formula
-* Lisp formulas::               An alternative way to write formulas
-* Column formulas::             Formulas valid for all fields in a column
+* The spreadsheet::             The table editor has spreadsheet capabilities.
+
+The spreadsheet
+
+* References::                  How to refer to another field or range
+* Formula syntax for Calc::     Using Calc to compute stuff
+* Formula syntax for Lisp::     Writing formulas in Emacs Lisp
+* Field formulas::              Formulas valid for a single field
+* Column formulas::             Formulas valid for an entire column
+* Editing and debugging formulas::  Fixing formulas
+* Updating the table::          Recomputing all dependent fields
 * Advanced features::           Field names, parameters and automatic recalc
-* Named-field formulas::        Formulas valid in single fields
-* Editing/debugging formulas::  Changing a stored formula
-* Appetizer::                   Taste the power of calc
 
 Hyperlinks
 
@@ -150,7 +150,12 @@
 Internal links
 
 * Radio targets::               Make targets trigger links in plain text.
-* CamelCase links::             Activating CamelCase words as links
+
+Remember
+
+* Setting up remember::         Some code for .emacs to get things going
+* Remember templates::          Define the outline of different note types
+* Storing notes::               Directly get the note to where it belongs
 
 TODO items
 
@@ -171,6 +176,7 @@
 * Time stamps::                 Assigning a time to a tree entry
 * Creating timestamps::         Commands which insert timestamps
 * Custom time format::          If you cannot work with the ISO format
+* Repeating items::             Deadlines that come back again and again
 * Progress logging::            Documenting when what work was done.
 
 Creating timestamps
@@ -180,6 +186,7 @@
 Progress Logging
 
 * Closing items::               When was this entry marked DONE?
+* Tracking TODO state changes::  When did the status change?
 * Clocking work time::          When exactly did you work on this item?
 
 Tags
@@ -192,17 +199,18 @@
 
 * Agenda files::                Files being searched for agenda information
 * Agenda dispatcher::           Keyboard access to agenda views
+* Built-in agenda views::       What is available out of the box?
+* Presentation and sorting::    How agenda items are prepared for display
+* Agenda commands::             Remote editing of org trees
+* Custom agenda views::         Defining special searches and views
+
+The built-in agenda views
+
 * Weekly/Daily agenda::         The calendar page with current tasks
 * Global TODO list::            All unfinished action items
 * Matching headline tags::      Structured information with fine-tuned search
 * Timeline::                    Time-sorted view for single file
-* Presentation and sorting::    How agenda items are prepared for display
-* Agenda commands::             Remote editing of org trees
-* Custom agenda views::         Defining special searches and views
-
-The weekly/daily agenda
-
-* Calendar/Diary integration::  Integrating Anniversaries and more
+* Stuck projects::              Find projects you need to review
 
 Presentation and sorting
 
@@ -233,6 +241,14 @@
 * iCalendar export::            Exporting in iCalendar format
 * Text interpretation::         How the exporter looks at the file
 
+HTML export
+
+* Export commands::             How to invode HTML export
+* Quoting HTML tags::           Using direct HTML in Org-mode
+* Links::                       How hyperlinks get transferred to HTML
+* Images::                      To inline or not to inline?
+* CSS support::                 Style specifications
+
 Text interpretation by the exporter
 
 * Comment lines::               Some lines will not be exported
@@ -279,7 +295,15 @@
 Extensions, Hooks and Hacking
 
 * Extensions::                  Existing 3rd-part extensions
+* Tables in arbitrary syntax::  Orgtbl for LaTeX and other programs
 * Dynamic blocks::              Automatically filled blocks
+* Special agenda views::        Customized views
+
+Tables in arbitrary syntax
+
+* Radio tables::                Sending and receiving
+* A LaTeX example::             Step by step, almost a tutorial
+* Translator functions::        Copy and modify
 
 @end detailmenu
 @end menu
@@ -318,7 +342,7 @@
 linked webpages.
 
 An important design aspect that distinguishes Org-mode from for example
-Planner/Muse is that it encougages to store every piece of information
+Planner/Muse is that it encourages to store every piece of information
 only once.  In Planner, you have project pages, day pages and possibly
 other files, duplicating some information such as tasks.  In Org-mode,
 you only have notes files.  In your notes you mark entries as tasks,
@@ -330,21 +354,23 @@
 feel like a straightforward, easy to use outliner.  Complexity is not
 imposed, but a large amount of functionality is available when you need
 it.  Org-mode can be used on different levels and in different ways, for
-example:
+example as:
 
 @example
-@r{@bullet{} as an outline extension with visibility cycling and structure editing}
-@r{@bullet{} as an ASCII system and table editor for taking structured notes}
-@r{@bullet{} as an ASCII table editor with spreadsheet-like capabilities}
-@r{@bullet{} as a TODO list editor}
-@r{@bullet{} as a full agenda and planner with deadlines and work scheduling}
-@r{@bullet{} as an environment to implement David Allen's GTD system}
-@r{@bullet{} as a simple hypertext system, with HTML export}
-@r{@bullet{} as a publishing tool to create a set of interlinked webpages}
+@r{@bullet{} outline extension with visibility cycling and structure editing}
+@r{@bullet{} ASCII system and table editor for taking structured notes}
+@r{@bullet{} ASCII table editor with spreadsheet-like capabilities}
+@r{@bullet{} TODO list editor}
+@r{@bullet{} full agenda and planner with deadlines and work scheduling}
+@r{@bullet{} environment to implement David Allen's GTD system}
+@r{@bullet{} simple hypertext system, with HTML export}
+@r{@bullet{} publishing tool to create a set of interlinked webpages}
 @end example
 
-Org-mode's automatic, context sensitive table editor can be integrated
-into any major mode by activating the minor Orgtbl-mode.
+Org-mode's automatic, context sensitive table editor with spreadsheet
+capabilities can be integrated into any major mode by activating the
+minor Orgtbl-mode.  Using a translation step, it can be used to maintain
+tables in arbitray file types, for example in LaTeX.
 
 @cindex FAQ
 There is a website for Org-mode which provides links to the newest
@@ -354,14 +380,15 @@
 
 @page
 
+
 @node Installation, Activation, Summary, Introduction
 @section Installation
 @cindex installation
 @cindex XEmacs
 
-@b{Important:} If Org-mode is part of the Emacs distribution or an
+@b{Important:} @i{If Org-mode is part of the Emacs distribution or an
 XEmacs package, please skip this section and go directly to
-@ref{Activation}.
+@ref{Activation}.}
 
 If you have downloaded Org-mode from the Web, you must take the
 following steps to install it: Go into the Org-mode distribution
@@ -413,6 +440,13 @@
 @cindex global keybindings
 @cindex keybindings, global
 
+@iftex
+@b{Important:} @i{If you use copy-and-paste to copy lisp code from the
+PDF documentation to your .emacs file, the single quote character comes
+out incorrectly and the code will not work.  You need to fix the single
+quotes by hand, or copy from Info documentation.}
+@end iftex
+
 Add the following lines to your @file{.emacs} file.  The last two lines
 define @emph{global} keys for the commands @command{org-store-link} and
 @command{org-agenda} - please choose suitable keys yourself.
@@ -609,6 +643,8 @@
 '--------------------------------------'
 @end example
 
+When @kbd{S-@key{TAB}} is called with a numerical prefix N, the CONTENTS
+view up to headlines of level N will be shown.
 Note that inside tables, @kbd{S-@key{TAB}} jumps to the previous field.
 
 @cindex show all, command
@@ -620,7 +656,18 @@
 Reveal context around point, showing the current entry, the following
 heading and the hierarchy above.  Useful for working near a location
 exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda
-command (@pxref{Agenda commands}).
+command (@pxref{Agenda commands}).  With prefix arg show, on each
+level, all sibling headings.
+@kindex C-c C-x b
+@item C-c C-x b
+Show the current subtree in an indirect buffer@footnote{The indirect
+buffer (@pxref{Indirect Buffers,Indirect Buffers,Indirect
+Buffers,emacs,GNU Emacs Manual}) will contain the entire buffer, but
+will be narrowed to the current tree.  Editing the indirect buffer will
+also change the original buffer, but without affecting visibility in
+that buffer.}.  With numerical prefix ARG, go up to this level and then
+take that tree.  If ARG is negative, go up that many levels.  With
+@kbd{C-u} prefix, do not remove the previously used indirect buffer.
 @end table
 
 When Emacs first visits an Org-mode file, the global state is set to
@@ -730,6 +777,15 @@
 make sure the tree fits in nicely at the yank position.  The yank
 level can also be specified with a prefix arg, or by yanking after a
 headline marker like @samp{****}.
+@kindex C-c ^
+@item C-c ^
+Sort same-level entries.  When there is an active region, all entries in
+the region will be sorted.  Otherwise the children of the current
+headline are sorted.  The command prompts for the sorting method, which
+can be alphabetically, numerically, by time (using the first time stamp
+in each entry), and each of these in reverse order.  With a @kbd{C-u}
+prefix, sorting will be case-sensitive.  With two @kbd{C-u C-u}
+prefixes, duplicate entries will also be removed.
 @end table
 
 @cindex region, active
@@ -814,12 +870,12 @@
 file, the archive file.
 
 @table @kbd
-@kindex C-c $
-@item C-c $
+@kindex C-c C-x C-s
+@item C-c C-x C-s
 Archive the subtree starting at the cursor position to the location
 given by @code{org-archive-location}.
-@kindex C-u C-c $
-@item C-u C-c $
+@kindex C-u C-c C-x C-s
+@item C-u C-c C-x C-s
 Check if any direct children of the current headline could be moved to
 the archive.  To do this, each subtree is checked for open TODO entries.
 If none are found, the command offers to move it to the archive
@@ -832,7 +888,17 @@
 current file, with the name derived by appending @file{_archive} to the
 current file name.  For information and examples on how to change this,
 see the documentation string of the variable
-@code{org-archive-location}.
+@code{org-archive-location}.  There is also an in-buffer option for
+setting this variable, for example
+
+@example
+#+ARCHIVE: %s_done::
+@end example
+
+@noindent
+You may have several such lines in the buffer, they will then be valid
+for the entries following the line (the first will also apply to any
+text before it).
 
 @node Sparse trees, Plain lists, Archiving, Document structure
 @section Sparse trees
@@ -846,9 +912,10 @@
 sparse tree means that the entire document is folded as much as
 possible, but the selected information is made visible along with the
 headline structure above it@footnote{See also the variables
-@code{org-show-hierarchy-above} and
-@code{org-show-following-heading}.}.  Just try it out and you will see
-immediately how it works.
+@code{org-show-hierarchy-above}, @code{org-show-following-heading}, and
+@code{org-show-siblings} for detailed control on how much context is
+shown around each match.}.  Just try it out and you will see immediately
+how it works.
 
 Org-mode contains several commands creating such trees.  The most
 basic one is @command{org-occur}:
@@ -862,7 +929,7 @@
 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 bufer is changes an editing command, or by pressing @kbd{C-c
+when the buffer 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
@@ -1010,14 +1077,13 @@
 @menu
 * Built-in table editor::       Simple tables
 * Narrow columns::              Stop wasting space in tables   
-* Table calculations::          Compute a field from other fields
 * orgtbl-mode::                 The table editor as minor mode
-* table.el::                    Complex tables
+* The spreadsheet::             The table editor has spreadsheet capabilities.
 @end menu
 
 @node Built-in table editor, Narrow columns, Tables, Tables
 @section The built-in table editor
-@cindex table editor, builtin
+@cindex table editor, built-in
 
 Org-mode makes it easy to format tables in plain ASCII.  Any line with
 @samp{|} as the first non-white character is considered part of a
@@ -1126,10 +1192,15 @@
 
 @kindex C-c ^
 @item C-c ^
-Sort the table lines in the region.  Point and mark must be in the first
-and last line to be included, and must be in the column that should be
-used for sorting.  The command prompts for numerical versus
-alphanumerical sorting.
+Sort the table lines in the region.  The position of point indicates the
+column to be used for sorting, and the range of lines is the range
+between the nearest horizontal separator lines, or the entire table.  If
+point is before the first column, you will be prompted for the sorting
+column.  If there is an active region, the mark specifies the first line
+and the sorting column, while point should be in the last line to be
+included into the sorting.  The command prompts for the sorting type
+(alphabetically, numerically, or by time).  When called with a prefix
+argument, alphabetic sorting will be case-sensitive.
 
 @tsubheading{Regions}
 @kindex C-c C-x M-w
@@ -1163,40 +1234,6 @@
 @tsubheading{Calculations}
 @cindex formula, in tables
 @cindex calculations, in tables
-@kindex C-c =
-@item C-c =
-Install a new formula for the current column and replace current field
-with the result of the formula.
-
-@kindex C-u C-c =
-@item C-u C-c =
-Install a new formula for the current field, which must be a named
-field.  Evaluate the formula and replace the field content with the
-result.
-
-@kindex C-c '
-@item C-c '
-Edit all formulas associated with the current table in a separate
-buffer.
-
-@kindex C-c *
-@item C-c *
-Recalculate the current row by applying the stored formulas from left
-to right.  When called with a @kbd{C-u} prefix, recalculate the
-entire table, starting with the first non-header line (i.e. below the
-first horizontal separator line).  For details, see @ref{Table calculations}.
-
-@kindex C-#
-@item C-#
-Rotate the calculation mark in first column through the states
-@samp{}, @samp{#}, @samp{*}, @samp{!}, @samp{$}.  For the meaning of
-these marks see @ref{Advanced features}.  When there is an active
-region, change all marks in the region.
-
-@kindex C-c ?
-@item C-c ?
-Which table column is the cursor in?  Displays number >0 in echo
-area.
 
 @cindex region, active
 @cindex active region
@@ -1254,7 +1291,7 @@
 @noindent Then the only table command that still works is
 @kbd{C-c C-c} to do a manual re-align.
 
-@node Narrow columns, Table calculations, Built-in table editor, Tables
+@node Narrow columns, orgtbl-mode, Built-in table editor, Tables
 @section Narrow columns
 @cindex narrow columns in tables
 
@@ -1268,6 +1305,7 @@
 value.
 
 @example
+@group
 |---+------------------------------|               |---+--------|
 |   |                              |               |   | <6>    |
 | 1 | one                          |               | 1 | one    |
@@ -1275,6 +1313,7 @@
 | 3 | This is a long chunk of text |     ----/     | 3 | This=> |
 | 4 | four                         |               | 4 | four   |
 |---+------------------------------|               |---+--------|
+@end group
 @end example
 
 @noindent
@@ -1298,64 +1337,132 @@
 #+STARTUP: noalign
 @end example
 
-@node Table calculations, orgtbl-mode, Narrow columns, Tables
-@section Calculations in tables
+@node orgtbl-mode, The spreadsheet, Narrow columns, Tables
+@section The Orgtbl minor mode
+@cindex orgtbl-mode
+@cindex minor mode for tables
+
+If you like the intuitive way the Org-mode table editor works, you
+might also want to use it in other modes like text-mode or mail-mode.
+The minor mode Orgtbl-mode makes this possible.  You can always toggle
+the mode with @kbd{M-x orgtbl-mode}.  To turn it on by default, for
+example in mail mode, use
+
+@lisp
+(add-hook 'mail-mode-hook 'turn-on-orgtbl)
+@end lisp
+
+Furthermore, with some special setup, it is possible to maintain tables
+in arbitrary syntax with Orgtbl-mode.  For example, it is possible to
+construct LaTeX tables with the underlying ease and power of
+Orgtbl-mode, including spreadsheet capabulities.  For details, see
+@ref{Tables in arbitrary syntax}.
+
+@node The spreadsheet,  , orgtbl-mode, Tables
+@section The spreadsheet
 @cindex calculations, in tables
 @cindex spreadsheet capabilities
 @cindex @file{calc} package
 
 The table editor makes use of the Emacs @file{calc} package to implement
 spreadsheet-like capabilities.  It can also evaluate Emacs Lisp forms to
-derive fields from other fields.  Org-mode has two levels of complexity
-for table calculations.  On the basic level, tables do only horizontal
-computations, so a field can be computed from other fields @emph{in the
-same row}, and Org-mode assumes that there is only one formula for each
-column.  This is very efficient to work with and enough for many tasks.
-On the complex level, columns and individual fields can be named for
-easier referencing in formulas, individual named fields can have their
-own formula associated with them, and recalculation can be automated.
-
+derive fields from other fields.
 @menu
-* Formula syntax::              How to write a formula
-* Lisp formulas::               An alternative way to write formulas
-* Column formulas::             Formulas valid for all fields in a column
+* References::                  How to refer to another field or range
+* Formula syntax for Calc::     Using Calc to compute stuff
+* Formula syntax for Lisp::     Writing formulas in Emacs Lisp
+* Field formulas::              Formulas valid for a single field
+* Column formulas::             Formulas valid for an entire column
+* Editing and debugging formulas::  Fixing formulas
+* Updating the table::          Recomputing all dependent fields
 * Advanced features::           Field names, parameters and automatic recalc
-* Named-field formulas::        Formulas valid in single fields
-* Editing/debugging formulas::  Changing a stored formula
-* Appetizer::                   Taste the power of calc
 @end menu
 
-@node Formula syntax, Lisp formulas, Table calculations, Table calculations
-@subsection Formula syntax
-@cindex formula syntax
-@cindex syntax, of formulas
-
-A formula can be any algebraic expression understood by the Emacs
-@file{calc} package.  Note that @file{calc} has the slightly
-non-standard convention that @samp{/} has lower precedence than
-@samp{*}, so that @samp{a/b*c} is interpreted as @samp{a/(b*c)}.  Before
-evaluation by @code{calc-eval} (@pxref{Calling Calc from Your
-Programs,calc-eval,Calling calc from Your Lisp Programs,calc,GNU Emacs
-Calc Manual}), variable substitution takes place:
+@node References, Formula syntax for Calc, The spreadsheet, The spreadsheet
+@subsection References
+@cindex references
+
+To compute fields in the table from other fields, formulas must
+reference other fields or ranges.  In Org-mode, fields can be referenced
+by name, by absolute coordinates, and by relative coordinates.  To find
+out what the coordinates of a field are, press @kbd{C-c ?} in that
+field.
+
+@subsubheading Field references
+@cindex field references
+@cindex references, to fields
+
+Formulas can reference the value of another field with the operator
+@example
+@@row$column
+@end example
+
+Column references can be absolute like @samp{1}, @samp{2},...@samp{N},
+or relative to the current column like @samp{+1} or @samp{-2}.
+
+The row specification only counts data lines and ignores horizontal
+separator lines (hlines).  You can use absolute row numbers
+@samp{1}...@samp{N}, and row numbers relative to the current row like
+@samp{+3} or @samp{-1}.  Or specify the row relative to one of the
+hlines: @samp{I} refers to the first hline, @samp{II} to the second etc.
+@samp{-I} refers to the first such line above the current line,
+@samp{+I} to the first such line below the current line.  You can also
+write @samp{III+2} which is the second data line after the third hline
+in the table.  Relative row numbers like @samp{-3} will not cross hlines
+if the current line is too close to the hline.  Instead, the value
+directly at the hline is used.
+
+@samp{0} refers to the current row and column.  Also, if you omit
+either the column or the row part of the reference, the current
+row/column is implied. 
+
+Org-mode's references with @emph{positive} numbers correspond to fixed
+references in other spreadsheet programs.  For example, @code{@@3$28}
+corresponds to @code{$AB$3}.  Org-mode's references with @emph{negative}
+numbers behave similar to non-fixed references in other spreadsheet
+programs, because when the same formula is used in several fields,
+different fields are referenced each time.
+
+Here are a few examples:
 
 @example
-  $        @r{refers to the current field}
-  $3       @r{refers to the field in column 3 of the current row}
-  $3..$7   @r{a vector of the fields in columns 3-7 of current row}
-  $P1..$P3 @r{vector of column range, using column names}
-  &2       @r{second data field above the current, in same column}
-  &5-2     @r{vector from fifth to second field above current}
-  &III-II  @r{vector of fields between 2nd and 3rd hline above}
-  &III     @r{vector of fields between third hline above and current field}
-  $name    @r{a named field, parameter or constant}
+@@2$3      @r{2nd row, 3rd column}
+$5        @r{column 5 in the current row}
+@@2        @r{current column, row 2}
+@@-1$-3    @r{the field one row up, three columns to the left}
+@@-I$2     @r{field just under hline above current row, column 2}
 @end example
 
-@cindex vectors, in table calculations
-The range vectors can be directly fed into the calc vector functions
-like @samp{vmean} and @samp{vsum}.
-
+@subsubheading Range references
+@cindex range references
+@cindex references, to ranges
+
+You may reference a rectangular range of fields by specifying two field
+references connected by two dots @samp{..}.  If both fields are in the
+current row, you may simply use @samp{$2..$7}, but if at least one field
+is in a different row, you need to use the general @code{@@row$column}
+format at least for the first field (i.e the reference must start with
+@samp{@@} in order to be interpreted correctly).  Examples:
+
+@example
+$1..$3        @r{First three fields in the current row.}
+$P..$Q        @r{Range, using column names (see under Advanced)}
+@@2$1..@@4$3    @r{6 fields between these two fields.}
+@@-1$-2..@@-1   @r{3 numbers from the column to the left, 2 up to current row}
+@end example
+
+@noindent Range references return a vector of values that can be fed
+into Calc vector functions.  Empty fields in ranges are normally
+suppressed, so that the vector contains only the non-empty fields (but
+see the @samp{E} mode switch below).  If there are no non-empty fields,
+@samp{[0]} is returned to avoid syntax errors in formulas.
+
+@subsubheading Named references
+@cindex named references
+@cindex references, named
 @cindex name, of column or field
 @cindex constants, in calculations
+
 @samp{$name} is interpreted as the name of a column, parameter or
 constant.  Constants are defined globally through the variable
 @code{org-table-formula-constants}.  If you have the
@@ -1365,21 +1472,46 @@
 parameters can be specified in special table lines.  These are
 described below, see @ref{Advanced features}.
 
+@node Formula syntax for Calc, Formula syntax for Lisp, References, The spreadsheet
+@subsection Formula syntax for Calc
+@cindex formula syntax, Calc
+@cindex syntax, of formulas
+
+A formula can be any algebraic expression understood by the Emacs
+@file{Calc} package.  Note that @file{calc} has the slightly
+non-standard convention that @samp{/} has lower precedence than
+@samp{*}, so that @samp{a/b*c} is interpreted as @samp{a/(b*c)}.  Before
+evaluation by @code{calc-eval} (@pxref{Calling Calc from
+Your Programs,calc-eval,Calling calc from Your Lisp Programs,calc,GNU
+Emacs Calc Manual}),
+variable substitution takes place according to the rules described above.
+@cindex vectors, in table calculations
+The range vectors can be directly fed into the calc vector functions
+like @samp{vmean} and @samp{vsum}.
+
 @cindex format specifier
 @cindex mode, for @file{calc}
 A formula can contain an optional mode string after a semicolon.  This
-string consists of flags to influence calc's modes@footnote{By
-default, Org-mode uses the standard calc modes (precision 12, angular
-units degrees, fraction and symbolic modes off).  The display format,
-however, has been changed to @code{(float 5)} to keep tables compact.
-The default settings can be configured using the variable
-@code{org-calc-default-modes}.} during execution, e.g.  @samp{p20} to
-switch the internal precision to 20 digits, @samp{n3}, @samp{s3},
-@samp{e2} or @samp{f4} to switch to normal, scientific, engineering,
-or fixed display format, respectively, and @samp{D}, @samp{R}, @samp{F},
-and @samp{S} to turn on degrees, radians, fraction and symbolic modes,
-respectively.  In addition, you may provide a @code{printf} format
-specifier to reformat the final result.  A few examples:
+string consists of flags to influence Calc and other modes during
+execution.  By default, Org-mode uses the standard calc modes (precision
+12, angular units degrees, fraction and symbolic modes off.  The display
+format, however, has been changed to @code{(float 5)} to keep tables
+compact.  The default settings can be configured using the variable
+@code{org-calc-default-modes}.
+
+@example
+p20           @r{switch the internal precision to 20 digits}
+n3 s3 e2 f4   @r{normal, scientific, engineering, or fixed display format}
+D R           @r{angle modes: degrees, radians}
+F S           @r{fraction and symbolic modes}
+N             @r{interpret all fields as numbers, use 0 for non-numbers}
+T             @r{force text interpretation}
+E             @r{keep empty fields in ranges}
+@end example
+
+@noindent
+In addition, you may provide a @code{printf} format specifier to
+reformat the final result.  A few examples:
 
 @example
 $1+$2                @r{Sum of first and second field}
@@ -1391,74 +1523,243 @@
 tan($1);Dp3s1        @r{Compute in degrees, precision 3, display SCI 1}
 sin($1);Dp3%.1e      @r{Same, but use printf specifier for display}
 vmean($2..$7)        @r{Compute column range mean, using vector function}
-vsum(&III)           @r{Sum numbers from 3rd hline above, up to here}
+vmean($2..$7);EN     @r{Same, but treat empty fields as 0}
 taylor($3,x=7,2)     @r{taylor series of $3, at x=7, second degree}
 @end example
 
-@node Lisp formulas, Column formulas, Formula syntax, Table calculations
+@node Formula syntax for Lisp, Field formulas, Formula syntax for Calc, The spreadsheet
 @subsection Emacs Lisp forms as formulas
 @cindex Lisp forms, as table formulas
 
-It is also possible to write a formula in Emacs lisp; this can be useful
+It is also possible to write a formula in Emacs Lisp; this can be useful
 for string manipulation and control structures.  If a formula starts
 with a single quote followed by an opening parenthesis, then it is
 evaluated as a lisp form.  The evaluation should return either a string
-or a number.  Just as with @file{calc} formulas, you can provide a
-format specifier after a semicolon.  A few examples:
+or a number.  Just as with @file{calc} formulas, you can specify modes
+and a printf format after a semicolon.  A reference will be replaced
+with a string (in double quotes) containing the field.  If you provide
+the @samp{N} mode switch, all referenced elements will be numbers.
+Ranges are inserted as space-separated fields, so you can embed them in
+list or vector syntax.  A few examples, note how the @samp{N} mode is
+used when we do computations in lisp.
 
 @example
-@r{swap the first two characters of the content of column 1}
-'(concat (substring "$1" 1 2) (substring "$1" 0 1) (substring "$1" 2))
-@r{Add columns 1 and 2, equivalent to the calc's @code{$1+$2}}
-'(+ $1 $2)
+@r{Swap the first two characters of the content of column 1}
+  '(concat (substring $1 1 2) (substring $1 0 1) (substring $1 2))
+@r{Add columns 1 and 2, equivalent to the Calc's @code{$1+$2}}
+  '(+ $1 $2);N
+@r{Compute the sum of columns 1-4, like Calc's @code{vsum($1..$4)}}
+  '(apply '+ '($1..$4));N
 @end example
 
-@node Column formulas, Advanced features, Lisp formulas, Table calculations
+@node Field formulas, Column formulas, Formula syntax for Lisp, The spreadsheet
+@subsection Field formulas
+@cindex field formula
+@cindex formula, for individual table field
+
+To assign a formula to a particular field, type it directly into the
+field, preceded by @samp{:=}, for example @samp{:=$1+$2}.  When you
+press @key{TAB} or @key{RET} or @kbd{C-c C-c} with the cursor still in
+the field, the formula will be stored as the formula for this field,
+evaluated, and the current field replaced with the result.
+
+Formulas are stored in a special line starting with @samp{#+TBLFM:}
+directly below the table.  If you typed the equation in the 4th field of
+the 3rd data line in the table, the formula will look like
+@samp{@@3$2=$1+$2}.  When inserting/deleting/swapping column and rows
+with the appropriate commands, @i{absolute references} (but not relative
+ones) in stored formulas are modified in order to
+still reference the same field.  Of cause this is not true if you edit
+the table structure with normal editing commands - then you must go and
+fix equations yourself.
+
+Instead of typing an equation into the field, you may also use the
+following command
+
+@table @kbd
+@kindex C-u C-c =
+@item C-u C-c =
+Install a new formula for the current field.  The command prompts for a
+formula, with default taken from the @samp{#+TBLFM:} line, applies
+it to the current field and stores it.
+@end table
+
+@node Column formulas, Editing and debugging formulas, Field formulas, The spreadsheet
 @subsection Column formulas
 @cindex column formula
 @cindex formula, for table column
 
-To apply a formula to a field, type it directly into the field,
-preceded by an equal sign, like @samp{=$1+$2}.  When you press
+Often in a table, the same formula should be used for all fields in a
+particular column.  Instead of having to copy the formula to all fields
+in that column, org-mode allows to assign a single formula to an entire
+column.
+
+To assign a formula to a column, type it directly into any field in the
+column, preceded by an equal sign, like @samp{=$1+$2}.  When you press
 @key{TAB} or @key{RET} or @kbd{C-c C-c} with the cursor still in the
-field, the formula will be stored as the formula for the current
-column, evaluated and the current field replaced with the result.  If
-the field contains only @samp{=}, the previously stored formula for
-this column is used.
-
-For each column, Org-mode will remember the most recently used
-formula.  The information is stored in a special line starting with
-@samp{#+TBLFM} directly below the table.  When adding/deleting/moving
-columns with the appropriate commands, the stored equations will be
-modified accordingly.  When a column used in a calculation is removed,
-references to this column become invalid and will cause an error upon
-applying the equation.
+field, the formula will be stored as the formula for the current column,
+evaluated and the current field replaced with the result.  If the field
+contains only @samp{=}, the previously stored formula for this column is
+used.  For each column, Org-mode will only remember the most recently
+used formula.  In the @samp{TBLFM:} line, column formulas will look like
+@samp{$4=$1+$2}.
 
 Instead of typing an equation into the field, you may also use the
-command @kbd{C-c =}.  It prompts for a formula (with default taken
-from the @samp{#+TBLFM:} line) and applies it to the current field.  A
-numerical prefix (e.g. @kbd{C-5 C-c =}) will apply it to that many
-consecutive fields in the current column.
-
+following command:
+
+@table @kbd
+@kindex C-c =
+@item C-c =
+Install a new formula for the current column and replace current field
+with the result of the formula.  The command prompts for a formula, with
+default taken from the @samp{#+TBLFM} line, applies it to the current
+field and stores it.  With a numerical prefix (e.g. @kbd{C-5 C-c =})
+will apply it to that many consecutive fields in the current column.
+@end table
+
+
+@node Editing and debugging formulas, Updating the table, Column formulas, The spreadsheet
+@subsection Editing and Debugging formulas
+@cindex formula editing
+@cindex editing, of table formulas
+
+You can edit individual formulas in the minibuffer or directly in the
+field.  Org-mode can also prepare a special buffer with all active
+formulas of a table.
+
+@table @kbd
+@kindex C-c =
+@kindex C-u C-c =
+@item C-c =
+@itemx C-u C-c =
+Edit the formula associated with the current column/field in the
+minibuffer.  See @ref{Column formulas} and @ref{Field formulas}.
+@kindex C-u C-u C-c =
+@item C-u C-u C-c =
+Re-insert the active formula (either a
+field formula, or a column formula) into the current field, so that you
+can edit it directly in the field.  The advantage over editing in the
+minibuffer is that you can use the command @kbd{C-c ?}.
+@kindex C-c ?
+@item C-c ?
+While editing a formula in a table field, highlight the field(s)
+referenced by the reference at the cursor position in the formula.
+@kindex C-c '
+@item C-c '
+Edit all formulas for the current table in a special buffer, where the
+formulas will be displayed one per line. 
+While inside the special buffer, Org-mode will automatically highlight
+any field or range reference at the cursor position.  You may edit,
+remove and add formulas, and use the following commands:
+@table @kbd
+@kindex C-c C-c
+@item C-c C-c
+Exit the buffer and store the modified formulas.  With @kbd{C-u} prefix,
+also apply the new formulas to the entire table.
+@kindex C-c C-q
+@item C-c C-q
+Exit the buffer without installing changes.
+@kindex @key{TAB}
+@item @key{TAB}
+Pretty-print or indent lisp formula at point.  When in a line containing
+a lisp formula, format the formula according to Emacs Lisp rules.
+Another @key{TAB} collapses the formula back again.  In the open
+formula, @key{TAB} re-indents just like in Emacs-lisp-mode.
+@kindex M-@key{TAB}
+@item M-@key{TAB}
+Complete Lisp symbols, just like in Emacs-lisp-mode.
+@kindex S-@key{up}
+@kindex S-@key{down}
+@item S-@key{up}/@key{down}
+Move the reference line in the Org-mode buffer up and down.  This is
+important for highlighting the references of column formulas for
+different rows.
+@kindex M-@key{up}
+@kindex M-@key{down}
+@item M-@key{up}/@key{down}
+Scroll the window displaying the table.
+@end table
+@kindex C-c @}
+@item C-c @}
+Toggle the display of row and column numbers for a table, using
+overlays.  These are uptated each time the table is aligned, you can
+force it with @kbd{C-c C-c}.
+@kindex C-c @{
+@item C-c @{
+Toggle the formula debugger on and off.  See below.
+@end table
+
+Making a table field blank does not remove the formula associated with
+the field, because that is stored in a different line (the @samp{TBLFM}
+line) - during the next recalculation the field will be filled again.
+To remove a formula from a field, you have to give an empty reply when
+prompted for the formula, or to edit the @samp{#+TBLFM} line.
+
+@kindex C-c C-c
+You may edit the @samp{#+TBLFM} directly and re-apply the changed
+equations with @kbd{C-c C-c} in that line, or with the normal
+recalculation commands in the table.
+
+@subsubheading Debugging formulas
+@cindex formula debugging
+@cindex debugging, of table formulas
+When the evaluation of a formula leads to an error, the field content
+becomes the string @samp{#ERROR}.  If you would like see what is going
+on during variable substitution and calculation in order to find a bug,
+turn on formula debugging in the @code{Tbl} menu and repeat the
+calculation, for example by pressing @kbd{C-c = @key{RET}} in a field.
+Detailed information will be displayed.
+
+@node Updating the table, Advanced features, Editing and debugging formulas, The spreadsheet
+@subsection Updating the Table
 @cindex recomputing table fields
-To recompute all the fields in a line, use the command @kbd{C-c *}.
-It re-applies all stored equations to the current row, from left to
-right.  With a @kbd{C-u} prefix, this will be done to every line in
-the table, so use this command it you want to make sure the entire
-table is up-to-date. @kbd{C-u C-c C-c} is another way to update the
-entire table.  Global updating does not touch the line(s) above the
-first horizontal separator line, assuming that this is the table
-header.
-
-@node Advanced features, Named-field formulas, Column formulas, Table calculations
+@cindex updating, table
+
+Recalculation of a table is normally not automatic, but needs to be
+triggered by a command.  See @ref{Advanced features} for a way to make
+recalculation at least semi-automatically.
+
+In order to recalculate a line of a table or the entire table, use the
+following commands:
+
+@table @kbd
+@kindex C-c *
+@item C-c *
+Recalculate the current row by first applying the stored column formulas
+from left to right, and all field formulas in the current row.
+
+@kindex C-u C-c *
+@item C-u C-c *
+@kindex C-u C-c C-c
+@itemx C-u C-c C-c
+Recompute the entire table, line by line.  Any lines before the first
+hline are left alone, assuming that these are part of the table header.
+
+@kindex C-u C-u C-c *
+@item C-u C-u C-c *
+Iterate the table by recomputing it until no further changes occur.
+This may be necessary if some computed fields use the value of other
+fields that are computed @i{later} in the calculation sequence.
+@end table
+
+
+@node Advanced features,  , Updating the table, The spreadsheet
 @subsection Advanced features
 
-If you want the recalculation of fields to happen automatically,
-or if you want to be able to assign a formula to an individual field
-(instead of an entire column) you need to reserve the first column of
-the table for special marking characters.  Here is an example of a
-table that collects exam results of students and makes use of these
-features:
+If you want the recalculation of fields to happen automatically, or if
+you want to be able to assign @i{names} to fields and columns, you need
+to reserve the first column of the table for special marking characters.
+@table @kbd
+@kindex C-#
+@item C-#
+Rotate the calculation mark in first column through the states @samp{},
+@samp{#}, @samp{*}, @samp{!}, @samp{$}.  The meaning of these characters
+is discussed below.  When there is an active region, change all marks in
+the region.
+@end table
+
+Here is an example of a table that collects exam results of students and
+makes use of these features:
 
 @example
 @group
@@ -1477,14 +1778,15 @@
 | ^ |         |        |        |        |    at |      |
 | $ | max=50  |        |        |        |       |      |
 |---+---------+--------+--------+--------+-------+------|
-#+TBLFM: $6=vsum($P1..$P3)::$7=10*$Tot/$max;%.1f::$at=vmean(&II);%.1f
+#+TBLFM: $6=vsum($P1..$P3)::$7=10*$Tot/$max;%.1f::$at=vmean(@@-II..@@-I);%.1f
 @end group
 @end example
 
 @noindent @b{Important}: Please note that for these special tables,
-recalculating the table with @kbd{C-u C-c *} will only affect rows
-that are marked @samp{#} or @samp{*}, and named fields.  The column
-formulas are not applied in rows with empty first field.
+recalculating the table with @kbd{C-u C-c *} will only affect rows that
+are marked @samp{#} or @samp{*}, and fields that have a formula assigned
+to the field itself.  The column formulas are not applied in rows with
+empty first field.
 
 @cindex marking characters, tables
 The marking characters have the following meaning:
@@ -1495,8 +1797,8 @@
 @item ^
 This row defines names for the fields @emph{above} the row.  With such
 a definition, any formula in the table may use @samp{$m1} to refer to
-the value @samp{10}.  Also, named fields can have their own formula
-associated with them.
+the value @samp{10}.  Also, if you assign a formula to a names field, it
+will be stored as @samp{$name=...}.
 @item _
 Similar to @samp{^}, but defines names for the fields in the row
 @emph{below}.
@@ -1505,8 +1807,7 @@
 example, if a field in a @samp{$} row contains @samp{max=50}, then
 formulas in this table can refer to the value 50 using @samp{$max}.
 Parameters work exactly like constants, only that they can be defined on
-a per-table basis.  Changing a parameter and then recalculating the
-table can be useful.
+a per-table basis.
 @item #
 Fields in this row are automatically recalculated when pressing
 @key{TAB} or @key{RET} or @kbd{S-@key{TAB}} in this row.  Also, this row
@@ -1520,69 +1821,15 @@
 Unmarked lines are exempt from recalculation with @kbd{C-u C-c *}.
 All lines that should be recalculated should be marked with @samp{#}
 or @samp{*}.
+@item /
+Do not export this line.  Useful for lines that contain the narrowing
+@samp{<N>} markers.
 @end table
 
-@node Named-field formulas, Editing/debugging formulas, Advanced features, Table calculations
-@subsection Named-field formulas
-@cindex named field formula
-@cindex formula, for named table field
-
-A named field can have its own formula associated with it.  In the
-example above, this is used for the @samp{at} field that contains
-the average result of the students.  To enter a formula for a named
-field, just type it into the buffer, preceded by @samp{:=}.  Or use
-@kbd{C-u C-c =}.  This equation will be stored below the table like
-@samp{$name=...}.  Any recalculation in the table (even if only
-requested for the current line) will also update all named field
-formulas.
-
-@node Editing/debugging formulas, Appetizer, Named-field formulas, Table calculations
-@subsection Editing and debugging formulas
-@cindex formula editing
-@cindex editing, of table formulas
-
-To edit a column or field formula, use the commands @kbd{C-c
-=} and @kbd{C-u C-c =}, respectively.  The currently active expression
-is then presented as default in the minibuffer, where it may be edited.
-
-Note that making a table field blank does not remove the formula
-associated with the field - during the next recalculation the field
-will be filled again.  To remove a formula from a field, you have to
-give an empty reply when prompted for the formula, or to edit the
-@samp{#+TBLFM} line.
-
-@kindex C-c C-c
-You may edit the @samp{#+TBLFM} directly and re-apply
-the changed equations with @kbd{C-c C-c} in that line, or with the
-normal recalculation commands in the table.
-
-@kindex C-c '
-@kindex C-c C-c
-@kindex C-c C-q
-@kindex C-c ?
-In particular for large tables with many formulas, it is convenient to
-use the command @kbd{C-c '} to edit the formulas of the current table
-in a separate buffer.  That buffer will show the formulas one per
-line, and you are free to edit, add and remove formulas.  Press
-@kbd{C-c ?} on a @samp{$...}  expression to get information about its
-interpretation.  Exiting the buffer with @kbd{C-c C-c} only stores the
-modified formulas below the table.  Exiting with @kbd{C-u C-c C-c}
-also applies them to the entire table.  @kbd{C-c C-q} exits without
-installing the changes.
-
-When the evaluation of a formula leads to an error, the field content
-becomes the string @samp{#ERROR}.  If you would like see what is going
-on during variable substitution and calculation in order to find a
-bug, turn on formula debugging in the menu and repeat the calculation,
-for example by pressing @kbd{C-c = @key{RET}} in a field.
-Detailed information will be displayed.
-
-@node Appetizer,  , Editing/debugging formulas, Table calculations
-@subsection Appetizer
-
-Finally, just to whet your appetite on what can be done with the fantastic
-@file{calc} package, here is a table that computes the Taylor series
-for a couple of functions (homework: try that with Excel :-)
+Finally, just to whet your appetite on what can be done with the
+fantastic @file{calc} package, here is a table that computes the Taylor
+series of degree @code{n} at location @code{x} for a couple of functions
+(homework: try that with Excel :-)
 
 @example
 @group
@@ -1600,51 +1847,6 @@
 @end group
 @end example
 
-@node orgtbl-mode, table.el, Table calculations, Tables
-@section The Orgtbl minor mode
-@cindex orgtbl-mode
-@cindex minor mode for tables
-
-If you like the intuitive way the Org-mode table editor works, you
-might also want to use it in other modes like text-mode or mail-mode.
-The minor mode Orgtbl-mode makes this possible.  You can always toggle
-the mode with @kbd{M-x orgtbl-mode}.  To turn it on by default, for
-example in mail mode, use
-
-@lisp
-(add-hook 'mail-mode-hook 'turn-on-orgtbl)
-@end lisp
-
-@node table.el,  , orgtbl-mode, Tables
-@section The @file{table.el} package
-@kindex C-c C-c
-@cindex table editor, @file{table.el}
-@cindex @file{table.el}
-
-Complex ASCII tables with automatic line wrapping, column- and
-row-spanning, and alignment can be created using the Emacs table
-package by Takaaki Ota (@uref{http://sourceforge.net/projects/table},
-and also part of Emacs 22).
-When @key{TAB} or @kbd{C-c C-c} is pressed in such a table, Org-mode
-will call @command{table-recognize-table} and move the cursor into the
-table.  Inside a table, the keymap of Org-mode is inactive.  In order
-to execute Org-mode-related commands, leave the table.
-
-@table @kbd
-@kindex C-c C-c
-@item C-c C-c
-Recognize @file{table.el} table.  Works when the cursor is in a
-table.el table.
-
-@kindex C-c ~
-@item C-c ~
-Insert a table.el table.  If there is already a table at point, this
-command converts it between the table.el format and the Org-mode
-format.  See the documentation string of the command
-@code{org-convert-table} for the restrictions under which this is
-possible.
-@end table
-
 @node Hyperlinks, TODO items, Tables, Top
 @chapter Hyperlinks
 @cindex hyperlinks
@@ -1697,7 +1899,6 @@
 @section Internal links
 @cindex internal links
 @cindex links, internal
-@cindex CamelCase links
 @cindex targets, for links
 
 If the link does not look like a URL, it is considered to be internal in
@@ -1706,7 +1907,7 @@
 The link can be followed with @kbd{C-c C-o} when the cursor is on the
 link, or with a mouse click (@pxref{Handling links}).  The preferred
 match for such a link is a dedicated target: the same string in double
-angular brackets.  Targets may be located anywhere; often it is
+angular brackets.  Targets may be located anywhere; sometimes it is
 convenient to put them into a comment line. For example
 
 @example
@@ -1744,10 +1945,9 @@
 
 @menu
 * Radio targets::               Make targets trigger links in plain text.
-* CamelCase links::             Activating CamelCase words as links
 @end menu
 
-@node Radio targets, CamelCase links, Internal links, Internal links
+@node Radio targets,  , Internal links, Internal links
 @subsection Radio targets
 @cindex radio targets
 @cindex targets, radio
@@ -1763,19 +1963,6 @@
 loaded into Emacs.  To update the target list during editing, press
 @kbd{C-c C-c} with the cursor on or at a target.
 
-@node CamelCase links,  , Radio targets, Internal links
-@subsection CamelCase words as links
-@cindex completion, of CamelCase links
-@cindex CamelCase links, completion of
-
-Org-mode also supports CamelCase words as links.  This feature is not
-turned on by default because of the inconsistencies this system suffers
-from.  It is also possible that this feature will disappear entirely in
-a future version of Org-mode.  To activate CamelCase words as links, you
-need to customize the option @code{org-activate-links}.  A CamelCase
-word then leads to a text search such that @samp{CamelCaseLink} is
-equivalent to @samp{[[camel case link]]}.
-
 @node External links, Handling links, Internal links, Hyperlinks
 @section External links
 @cindex links, external
@@ -1830,12 +2017,19 @@
 [[http://www.gnu.org/software/emacs/][GNU Emacs]]
 @end example
 
+@noindent
+If the description is a file name or URL that points to an image, HTML
+export (@pxref{HTML export}) will inline the image as a clickable
+button.  If there is no description at all and the link points to an
+image,
+that image will be inlined into the exported HTML file.
+
 @cindex angular brackets, around links
 @cindex plain text external links
 Org-mode also finds external links in the normal text and activates them
 as links.  If spaces must be part of the link (for example in
-@samp{bbdb:Richard Stallman}), or you need to remove ambiguities about the end of
-the link, enclose them in angular brackets.
+@samp{bbdb:Richard Stallman}), or if you need to remove ambiguities
+about the end of the link, enclose them in angular brackets.
 
 @node Handling links, Link abbreviations, External links, Hyperlinks
 @section Handling links
@@ -1871,20 +2065,25 @@
 @item C-c C-l
 Insert a link.  This prompts for a link to be inserted into the buffer.
 You can just type a link, using text for an internal link, or one of the
-link type prefixes mentioned in the examples above.  Through completion,
-all links stored during the current session can be
-accessed@footnote{After insertion of a stored link, the link will be
+link type prefixes mentioned in the examples above.  All links stored
+during the current session are part of the history for this prompt, so
+you can access them with @key{up} and @key{down}, or with
+completion@footnote{After insertion of a stored link, the link will be
 removed from the list of stored links.  To keep it in the list later
 use, use a triple @kbd{C-u} prefix to @kbd{C-c C-l}, or configure the
-option @code{org-keep-stored-link-after-insertion}.}.  The link
-will be inserted into the buffer, along with a descriptive text.  Note
-that you don't have to use this command to insert a link.  Links in
-Org-mode are plain text, and you can type or paste them straight into
-the buffer.  By using this command, the links are automatically enclosed
-in double brackets, and you will be asked for the optional descriptive
-text.  If the link is a @samp{file:} link and the linked file is located
-in the same directory as the current file or a subdirectory of it, the
-path of the file will be inserted relative to the current directory.
+option @code{org-keep-stored-link-after-insertion}.}.  The link will be
+inserted into the buffer, along with a descriptive text.  If some text
+was selected when this command is called, the selected text becomes the
+default description.@* Note that you don't have to use this command to
+insert a link.  Links in Org-mode are plain text, and you can type or
+paste them straight into the buffer.  By using this command, the links
+are automatically enclosed in double brackets, and you will be asked for
+the optional descriptive text.
+
+@c  If the link is a @samp{file:} link and
+@c the linked file is located in the same directory as the current file or
+@c a subdirectory of it, the path of the file will be inserted relative to
+@c the current directory.
 
 @kindex C-u C-c C-l
 @cindex file name completion
@@ -1945,10 +2144,26 @@
 commands following internal links, and by @kbd{C-c %}.  Using this
 command several times in direct succession moves through a ring of
 previously recorded positions.
+
+@kindex C-c C-x C-n
+@kindex C-c C-x C-p
+@cindex links, finding next/previous
+@item C-c C-x C-n
+@itemx C-c C-x C-p
+Move forward/backward to the next link in the buffer.  At the limit of
+the buffer, the search fails once, and then wraps around.  The key
+bindings for this are really too long, you might want to bind this also
+to @kbd{C-n} and @kbd{C-p}
+@lisp
+(add-hook 'org-load-hook
+  (lambda ()
+    (define-key 'org-mode-map "\C-n" 'org-next-link)
+    (define-key 'org-mode-map "\C-p" 'org-previous-link)))
+@end lisp
 @end table
 
 @node Link abbreviations, Search options, Handling links, Hyperlinks
-@section Link abbreviatons
+@section Link abbreviations
 @cindex link abbreviations
 @cindex abbreviation, links
 
@@ -1957,7 +2172,7 @@
 abbreviated link looks like this
 
 @example
-[[linkword::tag][description]]
+[[linkword:tag][description]]
 @end example
 
 @noindent
@@ -1981,9 +2196,9 @@
 be called with the tag as the only argument to create the link.
 
 With the above setting, you could link to a specific bug with
-@code{[[bugzilla::129]]}, search the web for OrgMode with
-@code{[[google::OrgMode]]} and find out what the Org-mode author is
-doing besides Emacs hacking with @code{[[ads::Dominik,C]]}.
+@code{[[bugzilla:129]]}, search the web for @samp{OrgMode} with
+@code{[[google:OrgMode]]} and find out what the Org-mode author is
+doing besides Emacs hacking with @code{[[ads:Dominik,C]]}.
 
 If you need special abbreviations just for a single Org-mode buffer, you
 can define them in the file with
@@ -2042,7 +2257,7 @@
 @end table
 
 As a degenerate case, a file link with an empty file name can be used
-to search the current file.  For example, @code{<file:::find me>} does
+to search the current file.  For example, @code{[[file:::find me]]} does
 a search for @samp{find me} in the current file, just as
 @samp{[[find me]]} would.
 
@@ -2075,15 +2290,27 @@
 @cindex @file{remember.el}
 
 Another way to create org entries with links to other files is through
-the @emph{Remember} package by John Wiegley.  @emph{Remember} lets you
-store quick notes with little interruption of your work flow.  See
+the @i{remember} package by John Wiegley.  @i{Remember} lets you store
+quick notes with little interruption of your work flow.  See
 @uref{http://www.emacswiki.org/cgi-bin/wiki/RememberMode} for more
-information.  The notes produced by @emph{Remember} can be stored in
-different ways, and Org-mode files are a good target.  Org-mode allows
-you to file away notes either to a default file, or directly to the correct
-location in your Org-mode outline tree.  The following customization
-will tell @emph{Remember} to use org files as target, and to create
-annotations compatible with Org-mode links.
+information.  The notes produced by @i{Remember} can be stored in
+different ways, and Org-mode files are a good target.  Org-mode
+significantly expands the possibilities of @i{remember}: You may define
+templates for different note types, and to associate target files and
+headlines with specific templates.  It also allows you to select the
+location where a note should be stored interactively, on the fly.
+
+@menu
+* Setting up remember::         Some code for .emacs to get things going
+* Remember templates::          Define the outline of different note types
+* Storing notes::               Directly get the note to where it belongs
+@end menu
+
+@node Setting up remember, Remember templates, Remember, Remember
+@subsection Setting up remember
+
+The following customization will tell @i{remember} to use org files as
+target, and to create annotations compatible with Org-mode links.
 
 @example
 (setq org-directory "~/path/to/my/orgfiles/")
@@ -2093,28 +2320,38 @@
 (add-hook 'remember-mode-hook 'org-remember-apply-template)
 @end example
 
+@node Remember templates, Storing notes, Setting up remember, Remember
+@subsection Remember templates
 @cindex templates, for remember
+
 In combination with Org-mode, you can use templates to generate
-different types of remember notes.  For example, if you would like to
-use one template to create general TODO entries, and another one for
-journal entries, you could use:
+different types of @i{remember} notes.  For example, if you would like
+to use one template to create general TODO entries, another one for
+journal entries, and a third one for collecting random ideas, you could
+use:
 
 @example
 (setq org-remember-templates
-      '((?t "* TODO %?\n  %i\n  %a" "~/org/TODO.org")
-        (?j "* %U %?\n\n  %i\n  %a" "~/org/JOURNAL.org")))
+ '((?t "* TODO %?\n  %i\n  %a" "~/org/TODO.org")
+   (?j "* %U %?\n\n  %i\n  %a" "~/org/JOURNAL.org")
+   (?i "* %^@{Title@}\n  %i\n  %a" "~/org/JOURNAL.org" "New Ideas")))
 @end example
 
 @noindent In these entries, the character specifies how to select the
-template, the first string specifies the template, and the (optional)
-second string specifies a default file (overruling
-@code{org-default-notes-file}) as a target for this note.
-
-When you call @kbd{M-x remember} to remember something, org will prompt
-for a key to select the template and then prepare the buffer like
+template.  The first string specifies the template.  Two more (optional)
+strings give the file in which, and the headline under which the new
+note should be stored.  The file defaults to
+@code{org-default-notes-file}, the heading to
+@code{org-remember-default-headline}.  Both defaults help to get to the
+storing location quickly, but you can change the location interactively
+while storing the note.
+
+When you call @kbd{M-x remember} (or @kbd{M-x org-remember}) to remember
+something, org will prompt for a key to select the template (if you have
+more than one template) and then prepare the buffer like
 @example
 * TODO
-  <file:link to where you called remember>
+  [[file:link to where you called remember]]
 @end example
 
 @noindent or
@@ -2122,20 +2359,69 @@
 @example
 * [2006-03-21 Tue 15:37]
 
-  <file:link to where you called remember>
+  [[file:link to where you called remember]]
+@end example
+
+@noindent
+During expansion of the template, special @kbd{%}-escapes allow dynamic
+insertion of content:
+@example
+%^@{prompt@}  @r{prompt the user for a string and replace this sequence with it.}
+%t          @r{time stamp, date only}
+%T          @r{time stamp with date and time}
+%u, %U      @r{like the above, but inactive time stamps}
+%^t         @r{like @code{%t}, but prompt for date.  Similarly @code{%^T}, @code{%^u}, @code{%^U}}
+            @r{You may define a prompt like @code{%^@{Birthday@}t}}
+%n          @r{user name (taken from @code{user-full-name})}
+%a          @r{annotation, normally the link created with @code{org-store-link}}
+%i          @r{initial content, the region when remember is called with C-u.}
+            @r{The entire text will be indented like @code{%i} itself.}
+%:keyword   @r{specific information for certain link types, see below}
 @end example
 
-@noindent See the variable @code{org-remember-templates} for more details.
-
-When you are finished composing a note with remember, you have to press
+@noindent
+For specific link types, the following keywords will be defined:
+
+@example
+Link type          |  Available keywords
+-------------------+----------------------------------------------
+bbdb               |  %:name %:company
+vm, wl, mh, rmail  |  %:type %:subject %:message-id
+                   |  %:from %:fromname %:fromaddress
+                   |  %:to   %:toname   %:toaddress
+                   |  %:fromto @r{(either "to NAME" or "from NAME")@footnote{This will always be the other, not the user.  See the variable @code{org-from-is-user-regexp}.}}       
+gnus               |  %:group, @r{for messages also all email fields}
+w3, w3m            |  %:url
+info               |  %:file %:node
+calendar           |  %:date"
+@end example
+
+@noindent
+If you would like to have the cursor in a specific position after the
+template has been expanded:
+
+@example
+%?          @r{After completing the template, position cursor here.}
+@end example
+
+@noindent
+If you change you mind about which template to use, call
+@code{org-remember} in the remember buffer.  You may then select a new
+template that will be filled with the previoous context information.
+
+@node Storing notes,  , Remember templates, Remember
+@subsection Storing notes
+
+When you are finished preparing a note with @i{remember}, you have to press
 @kbd{C-c C-c} to file the note away.  The handler first prompts for a
-target file - if you press @key{RET}, the value of
-@code{org-default-notes-file} is used.  Then the command offers the
-headings tree of the selected file.  You can either immediately press
-@key{RET} to get the note appended to the file.  Or you can use vertical
-cursor motion (@key{up} and @key{down}) and visibility cycling
-(@key{TAB}) to find a better place.  Pressing @key{RET} or @key{left} or
-@key{right} leads to the following result.
+target file - if you press @key{RET}, the value specified for the
+template is used.  Then the command offers the headings tree of the
+selected file, with the cursor position at the default headline (if you
+had specified one in the template).  You can either immediately press
+@key{RET} to get the note placed there.  Or you can use vertical cursor
+motion (@key{up} and @key{down}) and visibility cycling (@key{TAB}) to
+find a better place.  Pressing @key{RET} or @key{left} or @key{right}
+then leads to the following result.
 
 @multitable @columnfractions 0.2 0.1 0.7
 @item @b{Cursor position} @tab @b{Key} @tab @b{Note gets inserted}
@@ -2148,11 +2434,10 @@
            Or use prefix arg to specify level manually.
 @end multitable
 
-So a fast way to store the note is to press @kbd{C-c C-c @key{RET}
-@key{RET}} to append it to the default file.  Even shorter would be
-@kbd{C-u C-c C-c}, which does the same without even showing the tree.
-But with little extra effort, you can push it directly to the correct
-location.
+So a fast way to store the note to its default location is to press
+@kbd{C-c C-c @key{RET} @key{RET}}.  Even shorter would be @kbd{C-u C-c
+C-c}, which does the same without even asking for a file or showing the
+tree.
 
 Before inserting the text into a tree, the function ensures that the
 text has a headline, i.e. a first line that starts with a @samp{*}.
@@ -2277,7 +2562,9 @@
 use a prefix argument to quickly select a specific state.  For example
 @kbd{C-3 C-c C-t} will change the state immediately to VERIFY.
 If you define many keywords, you can use in-buffer completion (see
-@ref{Completion}) to insert these words into the buffer.
+@ref{Completion}) to insert these words into the buffer.  Changing a todo
+state can be logged with a timestamp, see @ref{Tracking TODO state
+changes} for more information.
 
 @node TODO types, Per file keywords, Workflow states, TODO extensions
 @subsection TODO keywords as types
@@ -2333,7 +2620,7 @@
 #+TYP_TODO: Fred Sara Lucy Mike DONE
 @end example
 
-@cindex Completion, of option keywords
+@cindex completion, of option keywords
 @kindex M-@key{TAB}
 @noindent To make sure you are using the correct keyword, type
 @samp{#+} into the buffer and then use @kbd{M-@key{TAB}} completion.
@@ -2493,6 +2780,7 @@
 * Time stamps::                 Assigning a time to a tree entry
 * Creating timestamps::         Commands which insert timestamps
 * Custom time format::          If you cannot work with the ISO format
+* Repeating items::             Deadlines that come back again and again
 * Progress logging::            Documenting when what work was done.
 @end menu
 
@@ -2554,10 +2842,12 @@
 If a time stamp is preceded by the word @samp{SCHEDULED:}, it means you
 are planning to start working on that task on the given date. So this is
 not about recording an event, but about planning your work.  The
-headline will be listed under the given date.  In addition, a reminder
-that the scheduled date has passed will be present in the compilation
-for @emph{today}, until the entry is marked DONE.  I.e., the task will
-automatically be forwarded until completed.
+headline will be listed under the given date@footnote{It will still be
+listed on that date after it has been marked DONE.  If you don't like
+this, set the variable @code{org-agenda-skip-scheduled-if-done}.}.  In
+addition, a reminder that the scheduled date has passed will be present
+in the compilation for @emph{today}, until the entry is marked DONE.
+I.e., the task will automatically be forwarded until completed.
 
 @example
 *** TODO Call Trillian for a date on New Years Eve.
@@ -2575,7 +2865,7 @@
 
 @example
 *** TODO write article about the Earth for the Guide
-    The editor in charge is <bbdb:Ford Prefect>
+    The editor in charge is [[bbdb:Ford Prefect]]
     DEADLINE: <2004-02-29 Sun>
 @end example
 @item Time stamp with CLOSED keyword
@@ -2707,6 +2997,7 @@
   22 sept 0:34  --> currentyear-09-22 0:34
   12            --> currentyear-currentmonth-12
   Fri           --> nearest Friday (today or later)
+  +4            --> 4 days from now (if +N is the only thing given)
 @end example
 
 The function understands English month and weekday abbreviations.  If
@@ -2716,8 +3007,11 @@
 @cindex calendar, for selecting date
 Parallel to the minibuffer prompt, a calendar is popped up@footnote{If
 you don't need/want the calendar, configure the variable
-@code{org-popup-calendar-for-date-prompt}.}.  You can control the
-calendar fully from the minibuffer:
+@code{org-popup-calendar-for-date-prompt}.}.  When you exit the date
+prompt, either by clicking on a date in the calendar, or by pressing
+@key{RET}, the date selected in the calendar will be combined with the
+information entered at the prompt.  You can control the calendar fully
+from the minibuffer:
 
 @table @kbd
 @kindex <
@@ -2752,7 +3046,7 @@
 Choose date in calendar (only if nothing was typed into minibuffer).
 @end table
 
-@node Custom time format, Progress logging, Creating timestamps, Timestamps
+@node Custom time format, Repeating items, Creating timestamps, Timestamps
 @section Custom time format
 @cindex custom date/time format
 @cindex time format, custom
@@ -2795,26 +3089,70 @@
 format is shorter, things do work as expected.
 @end itemize
 
-@node Progress logging,  , Custom time format, Timestamps
+@node Repeating items, Progress logging, Custom time format, Timestamps
+@section Repeating items
+@cindex TODO items, repeating
+@cindex deadlines, repeating
+@cindex scheduling, repeating
+
+Org-mode integrates with the Emacs calendar and diary to display cyclic
+appointments, anniversaries and other special entries in the agenda
+(@pxref{Weekly/Daily agenda}).  However, it can be useful to have
+certain deadlines and scheduling items to auto-repeat.  The advantage of
+a deadline or scheduled item is that the they produce warnings ahead of
+time and automatically forward themselves in the agenda until they are
+done.  The abstract difference is therefore between cyclic
+@i{appointments} and cyclic @i{action items}.  For appointments you
+should use the diary, for actions you can uses an org-mode deadline or
+scheduling time stamp together with a REPEAT cookie.  For example:
+
+@example
+* TODO Replace batteries in smoke detector REPEAT(+18m)
+  SCHEDULED: <2007-01-01 Mon>
+
+* TODO Get dentist appointment REPEAT(+6m)
+  SCHEDULED: <2006-12-19 Tue>
+
+* TODO Tax report to IRS REPEAT(+1y)
+  DEADLINE: <2007-04-01 Sun>
+@end example
+
+Each time you try to mark one of these entries DONE using @kbd{C-c C-t},
+they will automatically switch back to the state TODO, and the
+deadline/scheduling will be shifted accordingly.  The time units
+recognized by org-mode are year (y), month (m), week (w), and day (d).
+Org-mode will also prompt you for a note and record the fact that you
+have closed this item in a note under the headline.
+
+One unusual property of these repeating items is that only one instance
+of each exist at any given time.  So if you look back or ahead in the
+agenda, you will not find past and future instances, only the current
+one will show up.  Use a cyclic diary entry if you need all past and
+future instances to be visible in the agenda.
+
+@node Progress logging,  , Repeating items, Timestamps
 @section Progress Logging
 @cindex progress logging
 @cindex logging, of progress
 
 Org-mode can automatically record a time stamp when you mark a TODO item
-as DONE.  You can also measure precisely the time you spent on specific
-items in a project by starting and stopping a clock when you start and
-stop working on an aspect of a project.
+as DONE, or even each time when you change the state of a TODO item.
+You can also measure precisely the time you spent on specific items in a
+project by starting and stopping a clock when you start and stop working
+on an aspect of a project.
 
 @menu
 * Closing items::               When was this entry marked DONE?
+* Tracking TODO state changes::  When did the status change?
 * Clocking work time::          When exactly did you work on this item?
 @end menu
 
-@node Closing items, Clocking work time, Progress logging, Progress logging
+@node Closing items, Tracking TODO state changes, Progress logging, Progress logging
 @subsection Closing items
 
 If you want to keep track of @emph{when} a certain TODO item was
-finished, turn on logging with
+finished, turn on logging with@footnote{The corresponding in-buffer
+setting is: @code{#+STARTUP: logdone}}
 
 @lisp
 (setq org-log-done t)
@@ -2823,16 +3161,44 @@
 @noindent
 Then each time you turn a TODO entry into DONE using either @kbd{C-c
 C-t} in the Org-mode buffer or @kbd{t} in the agenda buffer, a line
-@samp{CLOSED: [timestamp]} will be inserted just after the headline.
-If you turn the entry back into a TODO item again through further
-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
+@samp{CLOSED: [timestamp]} will be inserted just after the headline.  If
+you turn the entry back into a TODO item through further 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.  If you want to record a note
+along with the timestamp, use@footnote{The corresponding in-buffer
+setting is: @code{#+STARTUP: lognotedone}}
+
+@lisp
+(setq org-log-done '(done))
+@end lisp
+
+@node Tracking TODO state changes, Clocking work time, Closing items, Progress logging
+@subsection Tracking TODO state changes
+
+When TODO keywords are used as workflow states (@pxref{Workflow
+states}), you might want to keep track of when a state change occurred,
+and you may even want to attach notes to that state change.  With the
+setting
+
+@lisp
+(setq org-log-done '(state))
+@end lisp
+
+@noindent
+each state change will prompt you for a note that will be attached to
+the current headline.  Very likely you do not want this verbose tracking
+all the time, so it is probably better to configure this behavior with
+in-buffer options.  For example, if you are tracking purchases, put
+these into a separate file that starts with:
+
+@example
+#+SEQ_TODO: TODO ORDERED INVOICE PAYED RECEIVED SENT
+#+STARTUP: lognotestate
+@end example
+
+@node Clocking work time,  , Tracking TODO state changes, Progress logging
 @subsection Clocking work time
 
 Org-mode allows you to clock the time you spent on specific tasks in a
@@ -2852,7 +3218,9 @@
 location where the clock was last started.  It also directly computes
 the resulting time in inserts it after the time range as @samp{=>
 HH:MM}.  See the variable @code{org-log-done} for the possibility to
-record an additional note together with the clock-out time stamp.
+record an additional note together with the clock-out time
+stamp@footnote{The corresponding in-buffer setting is: @code{#+STARTUP:
+lognoteclock-out}}.
 @kindex C-c C-y
 @item C-c C-y
 Recompute the time interval after changing one of the time stamps.  This
@@ -3073,6 +3441,8 @@
 exception) assign several tags from such a group.
 @item C-c
 Toggle auto-exit after the next change (see below).
+If you are using expert mode, the first @kbd{C-c} will display the
+selection window.
 @end table
 
 @noindent
@@ -3090,7 +3460,11 @@
 @code{org-fast-tag-selection-single-key}.  Then you no longer have to
 press @key{RET} to exit fast tag selection - it will immediately exit
 after the first change.  If you then occasionally need more keys, press
-@kbd{C-c} to turn off auto-exit for the current tag selection process.
+@kbd{C-c} to turn off auto-exit for the current tag selection process
+(in effect: start selection with @kbd{C-c C-c C-c} instead of @kbd{C-c
+C-c}).  If you set the variable to the value @code{expert}, the special
+window is not even shown for single-key tag selection, it comes up only
+when you press an extra @kbd{C-c}.
 
 @node Tag searches,  , Setting tags, Tags
 @section Tag searches
@@ -3103,7 +3477,8 @@
 @table @kbd
 @kindex C-c \
 @item C-c \
-Create a sparse tree with all headlines matching a tags search.
+Create a sparse tree with all headlines matching a tags search.  With a
+@kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
 @kindex C-c a m
 @item C-c a m
 Create a global list of tag matches from all agenda files.
@@ -3125,13 +3500,13 @@
 
 @table @samp
 @item +WORK-BOSS
-Select all headlines that are tagged @samp{:WORK:}, but discard those also tagged
+Select headlines tagged @samp{:WORK:}, but discard those also tagged
 @samp{:BOSS:}.
 @item WORK|LAPTOP
 Selects lines tagged @samp{:WORK:} or @samp{:LAPTOP:}.
 @item WORK|LAPTOP&NIGHT
-Like the previous example, but require  the @samp{:LAPTOP:} lines to be
-tagged also @samp{NIGHT}.
+Like before, but require the @samp{:LAPTOP:} lines to be tagged also
+@samp{NIGHT}.
 @end table
 
 @cindex TODO keyword matching, with tags search
@@ -3141,13 +3516,16 @@
 to the tag matches, but should be applied with consideration: For
 example, a positive selection on several TODO keywords can not
 meaningfully be combined with boolean AND.  However, @emph{negative
-selection} combined with AND can be meaningful.  Examples:
+selection} combined with AND can be meaningful.  To make sure that only
+lines are checked that actually have any TODO keyword, use @kbd{C-c a
+M}, or equivalently start the todo part after the slash with @samp{!}.
+Examples:
 
 @table @samp
 @item WORK/WAITING
 Select @samp{:WORK:}-tagged TODO lines with the specific TODO
 keyword @samp{WAITING}.
-@item WORK/-WAITING-NEXT
+@item WORK/!-WAITING-NEXT
 Select @samp{:WORK:}-tagged TODO lines that are neither @samp{WAITING}
 nor @samp{NEXT}
 @item WORK/+WAITING|+NEXT
@@ -3155,6 +3533,18 @@
 @samp{NEXT}.
 @end table
 
+@cindex regular expressions, with tags search
+Any element of the tag/todo match can be a regular expression - in this
+case it must be enclosed in curly braces.  For example,
+@samp{WORK+@{^BOSS.*@}} matches headlines that contain the tag
+@samp{WORK} and any tag @i{starting} with @samp{BOSS}.
+
+@cindex level, require for tags match
+You can also require a headline to be of a certain level, by writing
+instead of any TAG an expression like @samp{LEVEL=3}.  For example, a
+search @samp{+LEVEL=3+BOSS/-DONE} lists all level three headlines that
+have the tag BOSS and are @emph{not} marked with the todo keyword DONE.
+
 @node Agenda views, Embedded LaTeX, Tags, Top
 @chapter Agenda Views
 @cindex agenda views
@@ -3166,23 +3556,26 @@
 sorted and displayed in an organized way.
 
 Org-mode can select items based on various criteria, and display them
-in a separate buffer.  Five different view types are provided:
+in a separate buffer.  Six different view types are provided:
 
 @itemize @bullet
 @item
 an @emph{agenda} that is like a calendar and shows information
-for specific dates
+for specific dates,
 @item
 a @emph{TODO list} that covers all unfinished
 action items,
 @item
-a @emph{tags view} that shows information based on
-the tags associated with headlines in the outline tree,
+a @emph{tags view}, showings headlines based on
+the tags associated with them,
 @item
 a @emph{timeline view} that shows all events in a single Org-mode file,
-in time-sorted view
+in time-sorted view,
 @item
-@emph{custom views} that are special tag and keyword searches and
+a @emph{stuck projects view} showing projects that currently don't move
+along, and
+@item
+@emph{custom views} that are special tag/keyword searches and
 combinations of different views.
 @end itemize
 
@@ -3200,10 +3593,7 @@
 @menu
 * Agenda files::                Files being searched for agenda information
 * Agenda dispatcher::           Keyboard access to agenda views
-* Weekly/Daily agenda::         The calendar page with current tasks
-* Global TODO list::            All unfinished action items
-* Matching headline tags::      Structured information with fine-tuned search
-* Timeline::                    Time-sorted view for single file
+* Built-in agenda views::       What is available out of the box?
 * Presentation and sorting::    How agenda items are prepared for display
 * Agenda commands::             Remote editing of org trees
 * Custom agenda views::         Defining special searches and views
@@ -3236,7 +3626,9 @@
 @item C-c ]
 Remove current file from the list of agenda files.
 @kindex C-,
+@kindex C-'
 @item C-,
+@itemx C-'
 Cycle through agenda file list, visiting one file after the other.
 @end table
 
@@ -3244,7 +3636,7 @@
 The Org menu contains the current list of files and can be used
 to visit any of them.
 
-@node Agenda dispatcher, Weekly/Daily agenda, Agenda files, Agenda views
+@node Agenda dispatcher, Built-in agenda views, Agenda files, Agenda views
 @section The agenda dispatcher
 @cindex agenda dispatcher
 @cindex dispatching agenda commands
@@ -3257,13 +3649,15 @@
 @table @kbd
 @item a
 Create the calendar-like agenda (@pxref{Weekly/Daily agenda}).
-@item t / T
+@item t @r{/} T
 Create a list of all TODO items (@pxref{Global TODO list}).
-@item m / M
+@item m @r{/} M
 Create a list of headlines matching a TAGS expression (@pxref{Matching
 headline tags}).
 @item L
 Create the timeline view for the current buffer (@pxref{Timeline}).
+@item # @r{/} !
+Create a list of stuck projects (@pxref{Stuck projects}).
 @item 1
 Restrict an agenda command to the current buffer.  After pressing
 @kbd{1}, you still need to press the character selecting the command.
@@ -3280,8 +3674,21 @@
 blocks together, for example the weekly agenda, the global TODO list and
 a number of special tags matches.  @xref{Custom agenda views}.
 
-@node Weekly/Daily agenda, Global TODO list, Agenda dispatcher, Agenda views
-@section The weekly/daily agenda
+@node Built-in agenda views, Presentation and sorting, Agenda dispatcher, Agenda views
+@section The built-in agenda views
+
+In this section we describe the built-in views.
+
+@menu
+* Weekly/Daily agenda::         The calendar page with current tasks
+* Global TODO list::            All unfinished action items
+* Matching headline tags::      Structured information with fine-tuned search
+* Timeline::                    Time-sorted view for single file
+* Stuck projects::              Find projects you need to review
+@end menu
+
+@node Weekly/Daily agenda, Global TODO list, Built-in agenda views, Built-in agenda views
+@subsection The weekly/daily agenda
 @cindex agenda
 @cindex weekly agenda
 @cindex daily agenda
@@ -3305,13 +3712,7 @@
 The commands available in the Agenda buffer are listed in @ref{Agenda
 commands}.
 
-@menu
-* Calendar/Diary integration::  Integrating Anniversaries and more
-@end menu
-
-
-@node Calendar/Diary integration,  , Weekly/Daily agenda, Weekly/Daily agenda
-@subsection Calendar/Diary integration
+@subsubheading Calendar/Diary integration
 @cindex calendar integration
 @cindex diary integration
 
@@ -3342,8 +3743,8 @@
 between calendar and agenda.
 
 
-@node Global TODO list, Matching headline tags, Weekly/Daily agenda, Agenda views
-@section The global TODO list
+@node Global TODO list, Matching headline tags, Weekly/Daily agenda, Built-in agenda views
+@subsection The global TODO list
 @cindex global TODO list
 @cindex TODO list, global
 
@@ -3394,8 +3795,8 @@
 @code{org-agenda-todo-list-sublevels} to get this behavior.
 @end itemize
 
-@node Matching headline tags, Timeline, Global TODO list, Agenda views
-@section Matching headline tags
+@node Matching headline tags, Timeline, Global TODO list, Built-in agenda views
+@subsection Matching headline tags
 @cindex matching, of tags
 @cindex tags view
 
@@ -3422,8 +3823,8 @@
 The commands available in the tags list are described in @ref{Agenda
 commands}.
 
-@node Timeline, Presentation and sorting, Matching headline tags, Agenda views
-@section Timeline for a single file
+@node Timeline, Stuck projects, Matching headline tags, Built-in agenda views
+@subsection Timeline for a single file
 @cindex timeline, single file
 @cindex time-sorted view
 
@@ -3444,7 +3845,49 @@
 @ref{Agenda commands}.
 
 
-@node Presentation and sorting, Agenda commands, Timeline, Agenda views
+@node Stuck projects,  , Timeline, Built-in agenda views
+@subsection Stuck projects
+
+If you are following a system like David Allen's GTD to organize your
+work, one of the ``duties'' you have is a regular review to make sure
+that all projects move along.  A @emph{stuck} project is a project that
+has no defined next actions, so it will never show up in the TODO lists
+Org-mode produces.  During the review, you need to identify such
+projects and define next actions for them.
+
+@table @kbd
+@kindex C-c a #
+@item C-c a #
+List projects that are stuck.
+@kindex C-c a !
+@item C-c a !
+Customize the variable @code{org-stuck-projects} to define what a stuck
+project is and how to find it.
+@end table
+
+You almost certainly will have to configure this view before it will
+work for you.  The built-in default assumes that all your projects are
+level-2 headlines, and that a project is not stuck if it has at least
+one entry marked with a todo keyword TODO or NEXT or NEXTACTION.
+
+Lets assume that you, in your own way of using Org-mode, identify
+projects with a tag PROJECT, and that you use a todo keyword MAYBE to
+indicate a project that should not be considered yet.  Lets further
+assume that the todo keyword DONE marks finished projects, and that NEXT
+and TODO indicate next actions.  Finally, the tag @@SHOP indicates
+shopping and is a next action even without the NEXT tag.  In this case
+you would start by identifying eligible projects with a tags/todo match
+@samp{+PROJECT/-MAYBE-DONE}, and then check for TODO, NEXT and @@SHOP in
+the subtree to identify projects that are not stuck.  The correct
+customization for this is
+
+@lisp
+(setq org-stuck-projects
+      ("+PROJECT/-MAYBE-DONE" ("NEXT" "TODO") ("@@SHOP")))
+@end lisp
+
+
+@node Presentation and sorting, Agenda commands, Built-in agenda views, Agenda views
 @section Presentation and sorting
 @cindex presentation, of agenda items
 
@@ -3492,7 +3935,7 @@
 
 In the headline of the entry itself, a time(range) may also appear as
 plain text (like @samp{12:45} or a @samp{8:30-1pm}.  If the agenda
-integrates the Emacs diary (@pxref{Calendar/Diary integration}), time
+integrates the Emacs diary (@pxref{Weekly/Daily agenda}), time
 specifications in diary entries are recognized as well.
 
 For agenda display, Org-mode extracts the time and displays it in a
@@ -3613,6 +4056,13 @@
 agenda buffers can be set with the variable
 @code{org-agenda-start-with-follow-mode}.
 
+@kindex b
+@item b
+Display the entire subtree of the current item in an indirect buffer.
+With numerical prefix ARG, go up to this level and then take that tree.
+If ARG is negative, go up that many levels.  With @kbd{C-u} prefix, do
+not remove the previously used indirect buffer.
+
 @kindex l
 @item l
 Toggle Logbook mode.  In Logbook mode, entries that where marked DONE while
@@ -3635,7 +4085,7 @@
 
 @kindex D
 @item D
-Toggle the inclusion of diary entries.  See @ref{Calendar/Diary integration}.
+Toggle the inclusion of diary entries.  See @ref{Weekly/Daily agenda}.
 
 @kindex g
 @item g
@@ -3674,6 +4124,13 @@
 @item 0-9
 Digit argument.
 
+@cindex undoing remote-editing events
+@cindex remote editing, undo
+@kindex C-_
+@item C-_
+Undo a change due to a remote editing command.  The change is undone
+both in the agenda buffer and in the remote buffer.
+
 @kindex t
 @item t
 Change the TODO state of the item, both in the agenda and in the
@@ -3686,6 +4143,10 @@
 is longer than one line, the kill needs to be confirmed by the user.  See
 variable @code{org-agenda-confirm-kill}.
 
+@kindex $
+@item $
+Archive the subtree corresponding to the current headline.
+
 @kindex T
 @item T
 Show all tags associated with the current item.  Because of
@@ -3706,7 +4167,7 @@
 is removed from the entry.
 
 @kindex P
-@item p
+@item P
 Display weighted priority of current item.
 
 @kindex +
@@ -4310,6 +4771,17 @@
 HTML formatting, in ways similar to John Grubers @emph{markdown}
 language, but with additional support for tables.
 
+@menu
+* Export commands::             How to invode HTML export
+* Quoting HTML tags::           Using direct HTML in Org-mode
+* Links::                       How hyperlinks get transferred to HTML
+* Images::                      To inline or not to inline?
+* CSS support::                 Style specifications
+@end menu
+
+@node Export commands, Quoting HTML tags, HTML export, HTML export
+@subsection HTML export commands
+
 @cindex region, active
 @cindex active region
 @cindex transient-mark-mode
@@ -4340,10 +4812,31 @@
 @noindent
 creates two levels of headings and does the rest as items.
 
-If you want to include HTML tags which should be interpreted as such,
-mark them with @samp{@@} as in @samp{@@<b>bold text@@</b>}.
+@node Quoting HTML tags, Links, Export commands, HTML export
+@subsection Quoting HTML tags
+
 Plain @samp{<} and @samp{>} are always transformed to @samp{&lt;} and
-@samp{&gt;} in HTML export.
+@samp{&gt;} in HTML export.  If you want to include simple HTML tags
+which should be interpreted as such, mark them with @samp{@@} as in
+@samp{@@<b>bold text@@</b>}.  Note that this really works only for
+simple tags.  For more extensive HTML that should be copied verbatim to
+the exported file use either
+
+@example
+#+HTML: Literal HTML code for export
+@end example
+
+@noindent or
+
+@example
+#+BEGIN_HTML
+All lines between these markers are exported literally
+#+END_HTML
+@end example
+
+
+@node Links, Images, Quoting HTML tags, HTML export
+@subsection Links
 
 @cindex links, in HTML export
 @cindex internal links, in HTML export
@@ -4358,6 +4851,33 @@
 linking files while publishing them to a publishing directory see
 @ref{Publishing links}.
 
+@node Images, CSS support, Links, HTML export
+@subsection Images
+
+@cindex images, inline in HTML
+@cindex inlining images in HTML
+HTML export can inline images given as links in the Org-mode file, and
+it can make an image the clickable part of a link.  By
+default@footnote{but see the variable
+@code{org-export-html-inline-images}}, images are inlined if a link does
+not have a description.  So @samp{[[file:myimg.jpg]]} will be inlined,
+while @samp{[[file:myimg.jpg][the image]]} will just produce a link
+@samp{the image} that points to the image.  If the description part
+itself is a @code{file:} link or a @code{http:} URL pointing to an
+image, this image will be inlined and activated so that clicking on the
+image will activate the link.  For example, to include a thumbnail that
+will link to a high resolution version of the image, you could use:
+
+@example
+[[file:highres.jpg][file:thumb.jpg]]
+@end example
+
+@noindent
+and you could use @code{http} addresses just as well.
+
+@node CSS support,  , Images, HTML export
+@subsection CSS support
+
 You can also give style information for the exported file.  The HTML
 exporter assigns the following CSS classes to appropriate parts of the
 document - your style specifications may change these:
@@ -4373,10 +4893,12 @@
 The default style specification can be configured through the option
 @code{org-export-html-style}.  If you want to use a file-local style,
 you may use file variables, best wrapped into a COMMENT section at the
-end of the outline tree.  For example:
+end of the outline tree.  For example@footnote{Under Emacs 21, the
+continuation lines for a variable value should have no @samp{#} at the
+start of the line.}:
 
 @example
-* COMMENT HTML style specifications
+* COMMENT html style specifications
 
 # Local Variables:
 # org-export-html-style: "   <style type=\"text/css\">
@@ -4420,7 +4942,8 @@
 appointments.  In this case it can be useful to have deadlines and
 other time-stamped items in Org-mode files show up in the calendar
 application.  Org-mode can export calendar information in the standard
-iCalendar format.
+iCalendar format.  If you also want to have TODO entries included in the
+export, configure the variable @code{org-icalendar-include-todo}.
 
 @table @kbd
 @kindex C-c C-e i
@@ -4440,25 +4963,8 @@
 @end table
 
 How this calendar is best read and updated, depends on the application
-you are using.  For example, when using iCal under Apple MacOS X, you
-could create a new calendar @samp{OrgMode} (the default name for the
-calendar created by @kbd{C-c C-e c}, see the variables
-@code{org-icalendar-combined-name} and
-@code{org-combined-agenda-icalendar-file}).  Then set Org-mode to
-overwrite the corresponding file
-@file{~/Library/Calendars/OrgMode.ics}.  You may even use AppleScript
-to make iCal re-read the calendar files each time a new version of
-@file{OrgMode.ics} is produced.  Here is the setup needed for this:
-
-@cindex applescript, for calendar update
-@lisp
-(setq org-combined-agenda-icalendar-file
-    "~/Library/Calendars/OrgMode.ics")
-(add-hook 'org-after-save-iCalendar-file-hook
- (lambda ()
-  (shell-command
-   "osascript -e 'tell application \"iCal\" to reload calendars'")))
-@end lisp
+you are using.  The FAQ covers this issue.
+
 
 @node Text interpretation,  , iCalendar export, Exporting
 @section Text interpretation by the exporter
@@ -4514,6 +5020,11 @@
 You can make words @b{*bold*}, @i{/italic/}, _underlined_,
 @code{=code=}, and @samp{+strikethrough+}.
 
+@cindex horizontal rules, in exported files
+@item
+A line consisting of only dashes, and at least 5 of them, will be
+exported as a horizontal line (@samp{<hr/>} in HTML).
+
 @cindex LaTeX fragments, export
 @cindex TeX macros, export
 @item
@@ -4596,7 +5107,7 @@
 @example
 H:      @r{set the number of headline levels for export}
 num:    @r{turn on/off section-numbers}
-toc:    @r{turn on/off table of contents}
+toc:    @r{turn on/off table of contents, or set level limit (integer)}
 \n:     @r{turn on/off linebreak-preservation}
 @@:      @r{turn on/off quoted HTML tags}
 ::      @r{turn on/off fixed-width sections}
@@ -4966,14 +5477,14 @@
 @cindex completion, of TODO keywords
 @cindex completion, of dictionary words
 @cindex completion, of option keywords
-@cindex completion, of CamelCase links
 @cindex completion, of tags
+@cindex completion, of link abbreviations
 @cindex @TeX{} symbol completion
 @cindex TODO keywords completion
 @cindex dictionary word completion
 @cindex option keyword completion
-@cindex CamelCase link completion
 @cindex tag completion
+@cindex link abbreviations, completion of
 
 Org-mode supports in-buffer completion.  This type of completion does
 not make use of the minibuffer.  You simply type a few letters into
@@ -5017,8 +5528,8 @@
 @cindex options, for customization
 @cindex variables, for customization
 
-There are more than 100 variables that can be used to customize
-Org-mode.  For the sake of compactness of the manual, we are not
+There are more than 180 variables that can be used to customize
+Org-mode.  For the sake of compactness of the manual, I am not
 describing the variables here.  A structured overview of customization
 variables is available with @kbd{M-x org-customize}.  Or select
 @code{Browse Org Group} from the @code{Org->Customization} menu.  Many
@@ -5047,6 +5558,9 @@
 initial visibility of the outline tree.  The corresponding variable for
 global default settings is @code{org-startup-folded}, with a default
 value @code{t}, which means @code{overview}.
+@cindex @code{overview}, STARTUP keyword
+@cindex @code{content}, STARTUP keyword
+@cindex @code{showall}, STARTUP keyword
 @example
 overview   @r{top-level headlines only}
 content    @r{all headlines}
@@ -5056,20 +5570,34 @@
 is useful in files containing narrowed table columns.  The corresponding
 variable is @code{org-startup-align-all-tables}, with a default value
 @code{nil}. 
+@cindex @code{align}, STARTUP keyword
+@cindex @code{noalign}, STARTUP keyword
 @example
 align      @r{align all tables}
 noalign    @r{don't align tables on startup}
 @end example
-Logging when a TODO item is marked DONE (variable @code{org-log-done})
-can be configured using these options.
+Logging TODO state changes and clock intervals (variable
+@code{org-log-done}) can be configured using these options.
+@cindex @code{logdone}, STARTUP keyword
+@cindex @code{nologging}, STARTUP keyword
+@cindex @code{lognotedone}, STARTUP keyword
+@cindex @code{lognoteclock-out}, STARTUP keyword
+@cindex @code{lognotestate}, STARTUP keyword
 @example
-logging    @r{record a timestamp when an item is marked DONE}
-nologging  @r{don't record when items are marked DONE}
+logging          @r{record a timestamp when an item is marked DONE}
+nologging        @r{don't record when items are marked DONE}
+lognotedone      @r{record timestamp and a note when DONE}
+lognotestate     @r{record timestamp, note when TODO state changes}
+lognoteclock-out @r{record timestamp and a note when clocking out}
 @end example
 Here are the options for hiding leading stars in outline headings.  The
 corresponding variables are @code{org-hide-leading-stars} and
 @code{org-odd-levels-only}, both with a default setting @code{nil}
 (meaning @code{showstars} and @code{oddeven}).
+@cindex @code{hidestars}, STARTUP keyword
+@cindex @code{showstars}, STARTUP keyword
+@cindex @code{odd}, STARTUP keyword
+@cindex @code{even}, STARTUP keyword
 @example
 hidestars  @r{make all but one of the stars starting a headline invisible.}
 showstars  @r{show all stars starting a headline}
@@ -5079,6 +5607,7 @@
 To turn on custom format overlays over time stamps (variables
 @code{org-put-time-stamp-overlays} and
 @code{org-time-stamp-overlay-formats}), use
+@cindex @code{customtime}, STARTUP keyword
 @example
 customtime @r{overlay custom time format}
 @end example
@@ -5097,7 +5626,12 @@
 @item #+CATEGORY:
 This line sets the category for the agenda file.  The category applies
 for all subsequent lines until the next @samp{#+CATEGORY} line, or the
-end of the file.
+end of the file.  The first such line also applies to any entries before it.
+@item #+ARCHIVE: %s_done::
+This line sets the archive location for the agenda file.  It applies for
+all subsequent lines until the next @samp{#+CATEGORY} line, or the end
+of the file.  The first such line also applies to any entries before it.
+The corresponding variable is @code{org-archive-location}.
 @item #+TBLFM:
 This line contains the formulas for the table directly above the line.
 @item #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+TEXT:, #+OPTIONS:
@@ -5305,7 +5839,7 @@
 @cindex @file{calc.el}
 @item @file{calc.el} by Dave Gillespie
 Org-mode uses the calc package for implementing spreadsheet
-functionality in its tables (@pxref{Table calculations}).  Org-modes
+functionality in its tables (@pxref{The spreadsheet}).  Org-mode
 checks for the availability of calc by looking for the function
 @code{calc-eval} which should be autoloaded in your setup if calc has
 been installed properly.  As of Emacs 22, calc is part of the Emacs
@@ -5314,7 +5848,7 @@
 , Embedded Mode, calc, GNU Emacs Calc Manual}.
 @cindex @file{constants.el}
 @item @file{constants.el} by Carsten Dominik
-In a table formula (@pxref{Table calculations}), it is possible to use
+In a table formula (@pxref{The spreadsheet}), it is possible to use
 names for natural constants or units.  Instead of defining your own
 constants in the variable @code{org-table-formula-constants}, install
 the @file{constants} package which defines a large number of constants
@@ -5334,8 +5868,34 @@
 @file{Remember.el} is not part of Emacs, find it on the web.
 @cindex @file{table.el}
 @item @file{table.el} by Takaaki Ota
-Org mode cooperates with table.el, see @ref{table.el}.  @file{table.el}
-is part of Emacs 22.
+@kindex C-c C-c
+@cindex table editor, @file{table.el}
+@cindex @file{table.el}
+
+Complex ASCII tables with automatic line wrapping, column- and
+row-spanning, and alignment can be created using the Emacs table
+package by Takaaki Ota (@uref{http://sourceforge.net/projects/table},
+and also part of Emacs 22).
+When @key{TAB} or @kbd{C-c C-c} is pressed in such a table, Org-mode
+will call @command{table-recognize-table} and move the cursor into the
+table.  Inside a table, the keymap of Org-mode is inactive.  In order
+to execute Org-mode-related commands, leave the table.
+
+@table @kbd
+@kindex C-c C-c
+@item C-c C-c
+Recognize @file{table.el} table.  Works when the cursor is in a
+table.el table.
+
+@kindex C-c ~
+@item C-c ~
+Insert a table.el table.  If there is already a table at point, this
+command converts it between the table.el format and the Org-mode
+format.  See the documentation string of the command
+@code{org-convert-table} for the restrictions under which this is
+possible.
+@end table
+@file{table.el} is part of Emacs 22.
 @end table
 
 @node Conflicts,  , Cooperation, Interaction
@@ -5405,14 +5965,11 @@
 (for example because the application does not exist or refuses to open
 the file), it does so silently.  No error message is displayed.
 @item
-The remote-editing commands in the agenda buffer cannot be undone with
-@code{undo} called from within the agenda buffer.  But you can go to
-the corresponding buffer (using @key{TAB} or @key{RET} and execute
-@code{undo} there.
-@item
 Recalculating a table line applies the formulas from left to right.
 If a formula uses @emph{calculated} fields further down the row,
-multiple recalculation may be needed to get all fields consistent.
+multiple recalculation may be needed to get all fields consistent.  You
+may use the command @code{org-table-iterate} (@kbd{C-u C-c *}) to
+recalculate until convergence.
 @item
 A single letter cannot be made bold, for example @samp{*a*}.
 @item
@@ -5424,16 +5981,19 @@
 @appendix Extensions, Hooks and Hacking
 
 This appendix lists extensions for Org-mode written by other authors.
-It also covers some aspects where users can easily extend the
-functionality of Org-mode.
+It also covers some aspects where users can extend the functionality of
+Org-mode.
 
 @menu
 * Extensions::                  Existing 3rd-part extensions
+* Tables in arbitrary syntax::  Orgtbl for LaTeX and other programs
 * Dynamic blocks::              Automatically filled blocks
+* Special agenda views::        Customized views
 @end menu
 
-@node Extensions, Dynamic blocks, Extensions and Hacking, Extensions and Hacking
+@node Extensions, Tables in arbitrary syntax, Extensions and Hacking, Extensions and Hacking
 @section Third-party extensions for Org-mode
+@cindex extension, third-party
 
 The following extensions for Org-mode have been written by other people:
 
@@ -5441,7 +6001,7 @@
 @cindex @file{org-publish.el}
 @item @file{org-publish.el} by David O'Toole
 This package provides facilities for publishing related sets of Org-mode
-files together with linked files like images as a webpages.  It is
+files together with linked files like images as webpages.  It is
 highly configurable and can be used for other publishing purposes as
 well.  As of Org-mode version 4.30, @file{org-publish.el} is part of the
 Org-mode distribution.  It is not yet part of Emacs, however, a delay
@@ -5463,19 +6023,293 @@
 @item @file{org-blog.el} by David O'Toole
 A blogging plug-in for @file{org-publish.el}.@*
 @url{http://dto.freeshell.org/notebook/OrgMode.html}.
-@cindex @file{org-blogging.el}
-@item @file{org-blogging.el} by  Bastien Guerry
+@cindex @file{blorg.el}
+@item @file{blorg.el} by Bastien Guerry
 Publish Org-mode files as
-blogs. @url{http://www.cognition.ens.fr/~guerry/org-blogging.html}.
+blogs. @url{http://www.cognition.ens.fr/~guerry/blorg.html}.
+@cindex @file{org2rem.el}
+@item @file{org2rem.el} by Bastien Guerry
+Translates Org-mode files into something readable by
+Remind. @url{http://www.cognition.ens.fr/~guerry/u/org2rem.el}.
+@end table
+
+@page
+
+@node Tables in arbitrary syntax, Dynamic blocks, Extensions, Extensions and Hacking
+@section Tables in arbitrary syntax
+@cindex tables, in other modes
+@cindex orgtbl-mode
+
+Since Orgtbl-mode can be used as a minor mode in arbitrary buffers, a
+frequent feature request has been to make it work with native tables in
+specific languages, for example LaTeX.  However, this is extremely hard
+to do in a general way, would lead to a customization nightmare, and
+would take away much of the simplicity of the Orgtbl-mode table editor.
+
+This appendix describes a different approach.  We keep the Orgtbl-mode
+table in its native format (the @i{source table}), and use a custom
+function to @i{translate} the table to the correct syntax, and to
+@i{install} it in the right location (the @i{target table}).  This puts
+the burden of writing conversion functions on the user, but it allows
+for a very flexible system.
+
+@menu
+* Radio tables::                Sending and receiving
+* A LaTeX example::             Step by step, almost a tutorial
+* Translator functions::        Copy and modify
+@end menu
+
+@node Radio tables, A LaTeX example, Tables in arbitrary syntax, Tables in arbitrary syntax
+@subsection Radio tables
+@cindex radio tables
+
+To define the location of the target table, you first need to create two
+lines that are comments in the current mode, but contain magic words for
+Orgtbl-mode to find.  Orgtbl-mode will insert the translated table
+between these lines, replacing whatever was there before.  For example:
+
+@example
+/* BEGIN RECEIVE ORGTBL table_name */
+/* END RECEIVE ORGTBL table_name */
+@end example
+
+@noindent
+Just above the source table, we put a special line that tells
+Orgtbl-mode how to translate this table and where to install it.  For
+example:
+@example
+#+ORGTBL: SEND table_name translation_function arguments....
+@end example
+
+@noindent
+@code{table_name} is the reference name for the table that is also used
+in the receiver lines. @code{translation_function} is the Lisp function
+that does the translation.  Furthermore, the line can contain a list of
+arguments (alternating key and value) at the end.  The arguments will be
+passed as a property list to the translation function for
+interpretation.  A few standard parameters are already recognized and
+acted upon before the translation function is called:
+
+@table @code
+@item :skip N
+Skip the first N lines of the table. Hlines do count!
+@item :skipcols (n1 n2 ...)
+List of columns that should be skipped.  If the table has a column with
+calculation marks, that column is automatically discarded as well.
+Please note that the translator function sees the table @emph{after} the
+removal of these columns, the function never knows that there have been
+additional columns.
 @end table
 
-@node Dynamic blocks,  , Extensions, Extensions and Hacking
+@noindent
+The one problem remaining is how to keep the source table in the buffer
+without disturbing the normal workings of the file, for example during
+compilation of a C file or processing of a LaTeX file.  There are a
+number of different solutions:
+
+@itemize @bullet
+@item
+The table could be placed in a block comment if that is supported by the
+language.  For example, in C-mode you could wrap the table between
+@samp{/*} and @samp{*/} lines.
+@item 
+Sometimes it is possible to put the table after some kind of @i{END}
+statement, for example @samp{\bye} in TeX and @samp{\end@{document@}}
+in LaTeX.
+@item
+You can just comment the table line by line whenever you want to process
+the file, and uncomment it whenever you need to edit the table.  This
+only sounds tedious - the command @kbd{M-x orgtbl-toggle-comment} does
+make this comment-toggling very easy, in particular if you bind it to a
+key.
+@end itemize
+
+@node A LaTeX example, Translator functions, Radio tables, Tables in arbitrary syntax
+@subsection A LaTeX example
+@cindex LaTeX, and orgtbl-mode
+
+The best way to wrap the source table in LaTeX is to use the
+@code{comment} environment provided by @file{comment.sty}.  It has to be
+activated by placing @code{\usepackage@{comment@}} into the document
+header.  Orgtbl-mode can insert a radio table skeleton@footnote{By
+default this works only for LaTeX, HTML, and TeXInfo.  Configure the
+variable @code{orgtbl-radio-tables} to install templates for other
+modes.}  with the command @kbd{M-x orgtbl-insert-radio-table}.  You will
+be prompted for a table name, lets say we use @samp{salesfigures}.  You
+will then get the following template:
+
+@example
+% BEGIN RECEIVE ORGTBL salesfigures
+% END RECEIVE ORGTBL salesfigures
+\begin@{comment@}
+#+ORGTBL: SEND salesfigures orgtbl-to-latex
+| | |
+\end@{comment@}
+@end example
+
+@noindent
+The @code{#+ORGTBL: SEND} line tells orgtbl-mode to use the function
+@code{orgtbl-to-latex} to convert the table into LaTeX and to put it
+into the receiver location with name @code{salesfigures}.  You may now
+fill in the table, feel free to use the spreadsheet features@footnote{If
+the @samp{#+TBLFM} line contains an odd number of dollar characters,
+this may cause problems with font-lock in latex-mode.  As shown in the
+example you can fix this by adding an extra line inside the
+@code{comment} environment that is used to balance the dollar
+expressions.  If you are using AUCTeX with the font-latex library, a
+much better solution is to add the @code{comment} environment to the
+variable @code{LaTeX-verbatim-environments}.}:
+
+@example
+% BEGIN RECEIVE ORGTBL salesfigures
+% END RECEIVE ORGTBL salesfigures
+\begin@{comment@}
+#+ORGTBL: SEND salesfigures orgtbl-to-latex
+| Month | Days | Nr sold | per day |
+|-------+------+---------+---------|
+| Jan   |   23 |      55 |     2.4 |
+| Feb   |   21 |      16 |     0.8 |
+| March |   22 |     278 |    12.6 |
+#+TBLFM: $4=$3/$2;%.1f
+% $ (optional extra dollar to keep font-lock happy, see footnote)
+\end@{comment@}
+@end example
+
+@noindent
+When you are done, press @kbd{C-c C-c} in the table to get the converted
+table inserted between the two marker lines.
+
+Now lets assume you want to make the table header by hand, because you
+want to control how columns are aligned etc.  In this case we make sure
+that the table translator does skip the first 2 lines of the source
+table, and tell the command to work as a @i{splice}, i.e. to not produce
+header and footer commands of the target table:
+
+@example
+\begin@{tabular@}@{lrrr@}
+Month & \multicolumn@{1@}@{c@}@{Days@} & Nr.\ sold & per day\\
+% BEGIN RECEIVE ORGTBL salesfigures
+% END RECEIVE ORGTBL salesfigures
+\end@{tabular@}
+%
+\begin@{comment@}
+#+ORGTBL: SEND salesfigures orgtbl-to-latex :splice t :skip 2
+| Month | Days | Nr sold | per day |
+|-------+------+---------+---------|
+| Jan   |   23 |      55 |     2.4 |
+| Feb   |   21 |      16 |     0.8 |
+| March |   22 |     278 |    12.6 |
+#+TBLFM: $4=$3/$2;%.1f
+\end@{comment@}
+@end example
+
+The LaTeX translator function @code{orgtbl-to-latex} is already part of
+Orgtbl-mode.  It uses a @code{tabular} environment to typeset the table
+and marks horizontal lines with @code{\hline}.  Furthermore, it
+interprets the following parameters:
+
+@table @code
+@item :splice nil/t
+When set to t, return only table body lines, don't wrap them into a
+tabular environment.  Default is nil.
+
+@item :fmt fmt
+A format to be used to wrap each field, should contain @code{%s} for the
+original field value.  For example, to wrap each field value in dollars,
+you could use @code{:fmt "$%s$"}.  This may also be a property list with
+column numbers and formats. for example @code{:fmt (2 "$%s$" 4 "%s\\%%")}.
+
+@item :efmt efmt
+Use this format to print numbers with exponentials.  The format should
+have @code{%s} twice for inserting mantissa and exponent, for example
+@code{"%s\\times10^@{%s@}"}.  The default is @code{"%s\\,(%s)"}.  This
+may also be a property list with column numbers and formats, for example
+@code{:efmt (2 "$%s\\times10^@{%s@}$" 4 "$%s\\cdot10^@{%s@}$")}.  After
+@code{efmt} has been applied to a value, @code{fmt} will also be
+applied.
+@end table
+
+@node Translator functions,  , A LaTeX example, Tables in arbitrary syntax
+@subsection Translator functions
+@cindex HTML, and orgtbl-mode
+@cindex translator function
+
+Orgtbl-mode has several translator functions built-in:
+@code{orgtbl-to-latex}, @code{orgtbl-to-html}, and
+@code{orgtbl-to-texinfo}.  Except for @code{orgtbl-to-html}@footnote{The
+HTML translator uses the same code that produces tables during HTML
+export.}, these all use a generic translator, @code{orgtbl-to-generic}.
+For example, @code{orgtbl-to-latex} itself is a very short function that
+computes the column definitions for the @code{tabular} environment,
+defines a few field and line separators and then hands over to the
+generic translator.  Here is the entire code:
+
+@lisp
+@group
+(defun orgtbl-to-latex (table params)
+  "Convert the orgtbl-mode TABLE to LaTeX."
+  (let* ((alignment (mapconcat (lambda (x) (if x "r" "l"))
+                               org-table-last-alignment ""))
+         (params2
+          (list
+           :tstart (concat "\\begin@{tabular@}@{" alignment "@}")
+           :tend "\\end@{tabular@}"
+           :lstart "" :lend " \\\\" :sep " & "
+           :efmt "%s\\,(%s)" :hline "\\hline")))
+    (orgtbl-to-generic table (org-combine-plists params2 params))))
+@end group
+@end lisp
+
+As you can see, the properties passed into the function (variable
+@var{PARAMS}) are combined with the ones newly defined in the function
+(variable @var{PARAMS2}).  The ones passed into the function (i.e. the
+ones set by the @samp{ORGTBL SEND} line) take precedence.  So if you
+would like to use the LaTeX translator, but wanted the line endings to
+be @samp{\\[2mm]} instead of the default @samp{\\}, you could just
+overrule the default with
+
+@example
+#+ORGTBL: SEND test orgtbl-to-latex :lend " \\\\[2mm]"
+@end example
+
+For a new language, you can either write your own converter function in
+analogy with the LaTeX translator, or you can use the generic function
+directly.  For example, if you have a language where a table is started
+with @samp{!BTBL!}, ended with @samp{!ETBL!}, and where table lines are
+started with @samp{!BL!}, ended with @samp{!EL!} and where the field
+separator is a TAB, you could call the generic translator like this (on
+a single line!):
+
+@example
+#+ORGTBL: SEND test orgtbl-to-generic :tstart "!BTBL!" :tend "!ETBL!"
+                              :lstart "!BL! " :lend " !EL!" :sep "\t"
+@end example
+
+@noindent
+Please check the documentation string of the function
+@code{orgtbl-to-generic} for a full list of parameters understood by
+that function and remember that you can pass each of them into
+@code{orgtbl-to-latex}, @code{orgtbl-to-texinfo}, and any other function
+using the generic function.
+
+Of course you can also write a completely new function doing complicated
+things the generic translator cannot do.  A translator function takes
+two arguments.  The first argument is the table, a list of lines, each
+line either the symbol @code{hline} or a list of fields.  The second
+argument is the property list containing all parameters specified in the
+@samp{#+ORGTBL: SEND} line.  The function must return a single string
+containing the formatted table.  If you write a generally useful
+translator, please post it on @code{emacs-orgmode@@gnu.org} so that
+others can benefit from your work.
+
+@node Dynamic blocks, Special agenda views, Tables in arbitrary syntax, Extensions and Hacking
 @section Dynamic blocks
+@cindex dynamic blocks
 
 Org-mode documents can contain @emph{dynamic blocks}.  These are
-specially marked regions that are updated by some user-written
-function.  A good example for such a block is the clock table inserted
-by the command @kbd{C-c C-x C-r} (@pxref{Clocking work time}).
+specially marked regions that are updated by some user-written function.
+A good example for such a block is the clock table inserted by the
+command @kbd{C-c C-x C-r} (@pxref{Clocking work time}).
 
 Dynamic block are enclosed by a BEGIN-END structure that assigns a name
 to the block and can also specify parameters for the function producing
@@ -5528,6 +6362,60 @@
 example @code{before-save-hook}.  @code{org-update-all-dblocks} is
 written in a way that is does nothing in buffers that are not in Org-mode.
 
+@node Special agenda views,  , Dynamic blocks, Extensions and Hacking
+@section Special Agenda Views
+@cindex agenda views, user-defined
+
+Org-mode provides a special hook that can be used to narrow down the
+selection made by any of the agenda views.  You may specify a function
+that is used at each match to verify if the match should indeed be part
+of the agenda view, and if not, how much should be skipped.
+
+Let's say you want to produce a list of projects that contain a WAITING
+tag anywhere in the project tree.  Let's further assume that you have
+marked all tree headings that define a project with the todo keyword
+PROJECT.  In this case you would run a todo search for the keyword
+PROJECT, but skip the match unless there is a WAITING tag anywhere in
+the subtree belonging to the project line.
+
+To achieve this, you must write a function that searches the subtree for
+the tag.  If the tag is found, the function must return @code{nil} to
+indicate that this match should not be skipped.  If there is no such
+tag, return the location of the end of the subtree, to indicate that
+search should continue from there.
+
+@lisp
+(defun my-skip-unless-waiting ()
+  "Skip trees that are not waiting"
+  (let ((subtree-end (save-excursion (org-end-of-subtree t))))
+    (if (re-search-forward ":WAITING:" subtree-end t)
+        nil          ; tag found, do not skip
+      subtree-end))) ; tag not found, continue after end of subtree
+@end lisp
+
+Furthermore you must write a command that uses @code{let} to temporarily
+put this function into the variable @code{org-agenda-skip-function},
+sets the header string for the agenda buffer, and calls the todo-list
+generator while asking for the specific TODO keyword PROJECT.  The
+function must also accept one argument MATCH, but it can choose to
+ignore it@footnote{MATCH must be present in case you want to define a
+custom command for producing this special list.  Custom commands always
+supply the MATCH argument, but it can be empty if you do not specify it
+while defining the command(@pxref{Custom agenda
+views}).} (as we do in the example below).  Here is the example:
+
+@lisp
+(defun my-org-waiting-projects (&optional match)
+  "Produce a list of projects that contain a WAITING tag.
+MATCH is being ignored."
+  (interactive)
+  (let ((org-agenda-skip-function 'my-skip-unless-waiting)
+        (org-agenda-overriding-header "Projects waiting for something: "))
+    ;; make the list
+    (org-todo-list "PROJECT")))
+@end lisp
+
+
 @node History and Acknowledgments, Index, Extensions and Hacking, Top
 @appendix History and Acknowledgments
 @cindex acknowledgments
@@ -5535,25 +6423,29 @@
 @cindex thanks
 
 Org-mode was borne in 2003, out of frustration over the user interface
-of the Emacs outline-mode.  All I wanted was to make working with an
-outline tree possible without having to remember more than 10 commands
-just for hiding and unhiding parts of the outline tree, and to allow to
-restructure a tree easily.  Visibility cycling and structure editing
-were originally implemented in the package @file{outline-magic.el}, but
-quickly moved to the more general @file{org.el}.  TODO entries, basic
-time stamps, and table support were added next, and highlight the two
-main goals that Org-mode still has today: To create a new,
-outline-based, plain text mode with innovative and intuitive editing
-features, and to incorporate project planning functionality directly
-into a notes file.
+of the Emacs outline-mode.  I was trying to organize my notes and
+projects, and using Emacs seemed to be the natural way to go.  However,
+having to remember eleven different commands with two or three keys per
+command, only to hide and unhide parts of the outline tree, that seemed
+entirely unacceptable to me.  Also, when using outlines to take notes, I
+constantly want to restructure the tree, organizing it parallel to my
+thoughts and plans.  @emph{Visibility cycling} and @emph{structure
+editing} were originally implemented in the package
+@file{outline-magic.el}, but quickly moved to the more general
+@file{org.el}.  As this environment became comfortable for project
+planning, the next step was adding @emph{TODO entries}, basic @emph{time
+stamps}, and @emph{table support}.  These areas highlight the two main
+goals that Org-mode still has today: To create a new, outline-based,
+plain text mode with innovative and intuitive editing features, and to
+incorporate project planning functionality directly into a notes file.
 
 Since the first release, hundreds of emails to me or on
 @code{emacs-orgmode@@gnu.org} have provided a constant stream of bug
-reports, feedback, new ideas, and sometimes even patches and add-on
-code.  Many thanks to everyone who has helped to improve this package.
-I am trying to keep here a list of the people who had significant
-influence in shaping one or more aspects of Org-mode.  The list may not
-be complete, if I have forgotten someone, please accept my apologies and
+reports, feedback, new ideas, and sometimes patches and add-on code.
+Many thanks to everyone who has helped to improve this package.  I am
+trying to keep here a list of the people who had significant influence
+in shaping one or more aspects of Org-mode.  The list may not be
+complete, if I have forgotten someone, please accept my apologies and
 let me know.
 
 @itemize @bullet
@@ -5578,19 +6470,27 @@
 @item
 @i{Eddward DeVilla} proposed and tested checkbox statistics.
 @item
-@i{Kees Dullemond} inspired the use of narrowed tabled columns.
+@i{Kees Dullemond} used to edit projects lists directly in HTML and so
+inspired some of the early development, including HTML export.  He also
+asked for a way to narrow wide table columns.
 @item
 @i{Christian Egli} converted the documentation into TeXInfo format,
 patched CSS formatting into the HTML exporter, and inspired the agenda.
 @item
 @i{Nic Ferrier} contributed mailcap and XOXO support.
 @item
+@i{John Foerch} figured out how to make incremental search show context
+around a match in a hidden outline tree.
+@item
 @i{Niels Giessen} had the idea to automatically archive DONE trees.
 @item
-@i{Bastien Guerry} provided extensive feedback.
+@i{Bastien Guerry} provided extensive feedback and some patches, and
+translated David O'Toole's tutorial into French.
 @item
 @i{Kai Grossjohann} pointed out key-binding conflicts with other packages.
 @item
+@i{Shidai Liu} (``Leo'') provided extensive feedback and some patches.
+@item
 @i{Leon Liu} asked for embedded LaTeX and tested it.
 @item
 @i{Stefan Monnier} provided a patch to keep the Emacs-Lisp compiler
@@ -5601,6 +6501,9 @@
 @i{Tim O'Callaghan} suggested in-file links, search options for general
 file links, and TAGS.
 @item
+@i{Takeshi Okano} translated the manual and David O'Toole's tutorial
+into Japanese.
+@item
 @i{Oliver Oppitz} suggested multi-state TODO items.
 @item
 @i{Scott Otterson} sparked the introduction of descriptive text for
--- a/man/pgg.texi	Sat Feb 24 20:29:24 2007 +0000
+++ b/man/pgg.texi	Sun Apr 22 11:42:03 2007 +0000
@@ -229,8 +229,61 @@
 @node Caching passphrase
 @section Caching passphrase
 
-PGG provides a simple passphrase caching mechanism.  If you want to
-arrange the interaction, set the variable @code{pgg-read-passphrase}.
+When using GnuPG (gpg) as the PGP scheme, we recommend using a program
+called @code{gpg-agent} for entering and caching
+passphrases@footnote{Actually, @code{gpg-agent} does not cache
+passphrases but private keys.  On the other hand, from a user's point
+of view, this technical difference isn't visible.}.
+
+@defvar pgg-gpg-use-agent
+If non-@code{nil}, attempt to use @code{gpg-agent} whenever possible.
+The default is @code{t}.  If @code{gpg-agent} is not running, or GnuPG
+is not the current PGP scheme, PGG's own passphrase-caching mechanism
+is used (see below).
+@end defvar
+
+To use @code{gpg-agent} with PGG, you must first ensure that
+@code{gpg-agent} is running.  For example, if you are running in the X
+Window System, you can do this by putting the following line in your
+@file{.xsession} file:
+
+@smallexample
+eval "$(gpg-agent --daemon)"
+@end smallexample
+
+For more details on invoking @code{gpg-agent}, @xref{Invoking
+GPG-AGENT,,,gnupg,Using the GNU Privacy Guard}.
+
+Whenever you perform a PGG operation that requires a GnuPG passphrase,
+GnuPG will contact @code{gpg-agent}, which prompts you for the
+passphrase.  Furthermore, @code{gpg-agent} ``caches'' the result, so
+that subsequent uses will not require you to enter the passphrase
+again.  (This cache usually expires after a certain time has passed;
+you can change this using the @code{--default-cache-ttl} option when
+invoking @code{gpg-agent}.)
+
+If you are running in a X Window System environment, @code{gpg-agent}
+prompts for a passphrase by opening a graphical window.  However, if
+you are running Emacs on a text terminal, @code{gpg-agent} has trouble
+receiving input from the terminal, since it is being sent to Emacs.
+One workaround for this problem is to run @code{gpg-agent} on a
+different terminal from Emacs, with the @code{--keep-tty} option; this
+tells @code{gpg-agent} use its own terminal to prompt for passphrases.
+
+When @code{gpg-agent} is not being used, PGG prompts for a passphrase
+through Emacs.  It also has its own passphrase caching mechanism,
+which is controlled by the variable @code{pgg-read-passphrase} (see
+below).
+
+There is a security risk in handling passphrases through PGG rather
+than @code{gpg-agent}.  When you enter your passphrase into an Emacs
+prompt, it is temporarily stored as a cleartext string in the memory
+of the Emacs executable.  If the executable memory is swapped to disk,
+the root user can, in theory, extract the passphrase from the
+swapfile.  Furthermore, the swapfile containing the cleartext
+passphrase might remain on the disk after the system is discarded or
+stolen.  @code{gpg-agent} avoids this problem by using certain tricks,
+such as memory locking, which have not been implemented in Emacs.
 
 @defvar pgg-cache-passphrase
 If non-@code{nil}, store passphrases.  The default value of this
@@ -243,14 +296,6 @@
 Elapsed time for expiration in seconds.
 @end defvar
 
-@defvar pgg-gpg-use-agent
-When using GnuPG (gpg) as PGP scheme you can use @code{gpg-agent} for
-caching@footnote{Actually @code{gpg-agent} does not cache passphrases
-but private keys.  On the other hand, from a users point of view this
-technical difference isn't visible.}.  It defaults to @code{t}.
-Setting this to @code{nil} is not recommended.
-@end defvar
-
 @node Default user identity
 @section Default user identity
 
--- a/man/rmail.texi	Sat Feb 24 20:29:24 2007 +0000
+++ b/man/rmail.texi	Sun Apr 22 11:42:03 2007 +0000
@@ -1240,7 +1240,7 @@
 @item proto
 Specifies the @dfn{mailbox protocol}, or @dfn{format} to
 use.  The exact semantics of the rest of @acronym{URL} elements depends
-on the actual value of @var{proto}.
+on the actual value of @var{proto} (see below).
 
 @item user
 User name to access the remote mailbox.
@@ -1253,9 +1253,10 @@
 local mailbox.
 @end table
 
+@noindent
 @var{Proto} can be one of:
 
-@table @asis
+@table @code
 @item mbox
 Usual UNIX mailbox format.  In this case, neither @var{user} nor
 @var{pass} are used, and @var{host-or-file-name} denotes the file name of
--- a/nt/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/nt/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,8 @@
+2007-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+	* INSTALL: Add URL of another site with detailed build
+	instructions.
+
 2007-02-16  Glenn Morris  <rgm@gnu.org>
 
 	* icons/gnu2a32.ico, icons/gnu2a32t.ico, icons/gnu2b48.ico:
--- a/nt/INSTALL	Sat Feb 24 20:29:24 2007 +0000
+++ b/nt/INSTALL	Sun Apr 22 11:42:03 2007 +0000
@@ -26,7 +26,8 @@
        command.com /c configure.bat
 
   3. Run the Make utility suitable for your environment.  If you build
-     with the Microsoft's Visual C compiler:
+     with the Microsoft's Visual C compiler (but see notes about using
+     VC++ 8.0 and later below):
 
        nmake
 
@@ -99,15 +100,17 @@
 
 * Supported development environments
 
-  To compile Emacs, you will need either Microsoft Visual C++ 2.0 or
-  later and nmake, or a Windows port of GCC 2.95 or later with MinGW
-  and W32 API support and a port of GNU Make.  You can use the Cygwin
-  ports of GCC, but Emacs requires the MinGW headers and libraries to
-  build (latest versions of the Cygwin toolkit, at least since v1.3.3,
-  include the MinGW headers and libraries as an integral part).
+  To compile Emacs, you will need either Microsoft Visual C++ 2.0, or
+  later up to 7.0, and nmake, or a Windows port of GCC 2.95 or later
+  with MinGW and W32 API support and a port of GNU Make.  You can use
+  the Cygwin ports of GCC, but Emacs requires the MinGW headers and
+  libraries to build (latest versions of the Cygwin toolkit, at least
+  since v1.3.3, include the MinGW headers and libraries as an integral
+  part).
 
-  Note that building Emacs with Visual Studio 2005 is not supported at
-  this time.
+  Note that building Emacs with Visual Studio 2005 (VC++ 8.0) is not
+  supported at this time, due to changes introduced by Microsoft into
+  the libraries shipped with the compiler.
 
   The rest of this file assumes you have a working development
   environment.  If you just installed  such an environment, try
@@ -191,9 +194,14 @@
 
     http://www.emacswiki.org/cgi-bin/wiki/WThirtyTwoInstallationKit
 
-  and at this URL:
+  and on these URLs:
 
     http://ourcomments.org/Emacs/w32-build-emacs.html
+    http://derekslager.com/blog/posts/2007/01/emacs-hack-3-compile-emacs-from-cvs-on-windows.ashx
+
+  The second URL above includes instructions for building with MSVC,
+  as well as with MinGW, while the first URL covers only MinGW, but
+  has more details about it.
 
 * Configuring
 
--- a/nt/emacs.rc	Sat Feb 24 20:29:24 2007 +0000
+++ b/nt/emacs.rc	Sun Apr 22 11:42:03 2007 +0000
@@ -6,8 +6,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,0,94,0
- PRODUCTVERSION 22,0,94,0
+ FILEVERSION 22,0,95,0
+ PRODUCTVERSION 22,0,95,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@
 	BEGIN
 	    VALUE "CompanyName", "Free Software Foundation\0"
 	    VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
-	    VALUE "FileVersion", "22, 0, 94, 0\0"
+	    VALUE "FileVersion", "22, 0, 95, 0\0"
 	    VALUE "InternalName", "Emacs\0"
 	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
-	    VALUE "ProductVersion", "22, 0, 94, 0\0"
+	    VALUE "ProductVersion", "22, 0, 95, 0\0"
 	    VALUE "OLESelfRegister", "\0"
 	 END
      END
--- a/oldXMenu/Activate.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Activate.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,10 +1,28 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
 /*
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+
+This program 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)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
+
+/*
  * XMenu:	MIT Project Athena, X Window system menu package
  *
  *	XMenuActivate -	Maps a given menu to the display and activates
--- a/oldXMenu/AddPane.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/AddPane.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,6 @@
-#include "copyright.h"
+/* Copyright    Massachusetts Institute of Technology    1985	*/
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
+#include "copyright.h"
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/AddSel.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/AddSel.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,14 @@
+2007-02-27  Glenn Morris  <rgm@gnu.org>
+
+	* Imakefile: Remove unused file with no explicit legal info.
+	* Makefile.in (distclean): Remove Makefile.
+
+2007-02-25  Glenn Morris  <rgm@gnu.org>
+
+	* XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c:
+	* XMakeAssoc.c: Remove license text in favour of including
+	copyright.h, as was done in original X11 source.
+
 2004-12-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* Activate.c (XMenuActivate): Return XM_NO_SELECT if Escape or C-g
--- a/oldXMenu/ChgPane.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/ChgPane.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/ChgSel.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/ChgSel.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/Create.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Create.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,10 +1,28 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
 /*
+Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
+
+This program 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)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
+
+/*
  * XMenu:	MIT Project Athena, X Window system menu package
  *
  * 	XMenuCreate -	Creates an X window system menu object.
--- a/oldXMenu/DelPane.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/DelPane.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/DelSel.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/DelSel.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/Destroy.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Destroy.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/Error.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Error.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/EvHand.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/EvHand.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/FindPane.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/FindPane.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/Imakefile	Sat Feb 24 20:29:24 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-        HEADERS = XMenu.h
-       LINTLIBS = ../lib/X/llib-lX.ln
-   INSTALLFLAGS = $(INSTINCFLAGS)
-         RANLIB = ranlib -t
-
-SRCS =  Activate.c \
-	AddPane.c \
-	AddSel.c \
-	ChgPane.c \
-	ChgSel.c \
-	Create.c \
-	DelPane.c \
-	DelSel.c \
-	Destroy.c \
-	Error.c \
-	EvHand.c \
-	FindPane.c \
-	FindSel.c \
-	InsPane.c \
-	InsSel.c \
-	Internal.c \
-	Locate.c \
-	Post.c \
-	Recomp.c \
-	SetAEQ.c \
-	SetFrz.c \
-	SetPane.c \
-	SetSel.c \
-	XCrAssoc.c \
-	XDelAssoc.c \
-	XDestAssoc.c \
-	XLookAssoc.c \
-	XMakeAssoc.c
-
-OBJS =  Activate.o \
-	AddPane.o \
-	AddSel.o \
-	ChgPane.o \
-	ChgSel.o \
-	Create.o \
-	DelPane.o \
-	DelSel.o \
-	Destroy.o \
-	Error.o \
-	EvHand.o \
-	FindPane.o \
-	FindSel.o \
-	InsPane.o \
-	InsSel.o \
-	Internal.o \
-	Locate.o \
-	Post.o \
-	Recomp.o \
-	SetAEQ.o \
-	SetFrz.o \
-	SetPane.o \
-	SetSel.o \
-	XCrAssoc.o \
-	XDelAssoc.o \
-	XDestAssoc.o \
-	XLookAssoc.o \
-	XMakeAssoc.o
-
-#if DebugOldLibXMenu && ProfileOldLibXMenu
-DebuggedAndProfiledLibraryObjectRule()
-#else
-# if DebugOldLibXMenu
-DebuggedLibraryObjectRule()
-# else
-#  if ProfileOldLibXMenu
-ProfiledLibraryObjectRule()
-#  else
-NormalLibraryObjectRule()
-#  endif
-# endif
-#endif
-
-NormalLibraryTarget(XMenu11,$(OBJS))
-LintLibraryTarget(XMenu11,$(SRCS))
-InstallLibrary(XMenu11,$(USRLIBDIR))
-#if InstallLintLibs
-InstallLintLibrary(XMenu11,$(LINTLIBDIR))
-#endif
-InstallMultiple($(HEADERS),$(INCDIR))
-
-#if ProfileOldLibXMenu
-ProfiledLibraryTarget(XMenu11,$(OBJS))
-InstallLibrary(XMenu11_p,$(USRLIBDIR))
-#endif
-
-#if DebugOldLibXMenu
-DebuggedLibraryTarget(XMenu11,$(OBJS))
-#endif
-
-DependTarget()
-
-NormalLintTarget($(SRCS))
-
-/* arch-tag: bc7d2799-8343-4700-a415-847e7fa12540
-   (do not change this comment) */
--- a/oldXMenu/InsPane.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/InsPane.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/InsSel.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/InsSel.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/Internal.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Internal.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,26 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
+/*
+Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
+
+This program 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)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/Locate.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Locate.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/Makefile.in	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Makefile.in	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,50 @@
+## Makefile for oldXMenu 
+
+## Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
+
+## Permission to use, copy, modify, and distribute this
+## software and its documentation for any purpose and without
+## fee is hereby granted, provided that the above copyright
+## notice appear in all copies and that both that copyright
+## notice and this permission notice appear in supporting
+## documentation, and that the name of M.I.T. not be used in
+## advertising or publicity pertaining to distribution of the
+## software without specific, written prior permission.
+## M.I.T. makes no representations about the suitability of
+## this software for any purpose.  It is provided "as is"
+## without express or implied warranty.
+
+
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+##   Free Software Foundation, Inc.
+
+## This program 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)
+## any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+
+### Commentary:
+
+## To the best of our knowledge, this code was originally based on the
+## X11 oldXMenu Makefile, which was automatically generated from the
+## X11 oldXMenu Imakefile. There was no explicit copyright information
+## in the Imakefile, therefore we have added the same MIT license as
+## used by the rest of the oldXMenu code.
+
+
+### Code:
+
 srcdir=@srcdir@
 VPATH=@srcdir@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
@@ -103,6 +150,7 @@
 	rm -f libXMenu11.a ${OBJS} ${EXTRA}
 clean: mostlyclean
 distclean: clean
+	rm -f Makefile
 maintainer-clean: distclean
 
 tags::
--- a/oldXMenu/Post.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Post.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/README	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/README	Sun Apr 22 11:42:03 2007 +0000
@@ -1,6 +1,22 @@
-This directory contains the source code for the X11R2 XMenu library.
+Most of the files in this directory are originally from the X11R2
+XMenu library, distributed by MIT under the terms in the file copyright.h.
 
 As of Release 2 of the X Window System, Version 11 from MIT, the XMenu
-library no longer supported.  It is not used in any software supplied
-by MIT and its use is not encouraged.
+library is no longer supported.  It is not used in any software
+supplied by MIT and its use is not encouraged.
+
+In X11R1, oldXMenu/ was found in the lib/ directory of the X11 source;
+but in X11R2 it was moved to contrib/.
+
+The following files are from the X11 oldXMenu/ directory:
 
+ Activate.c AddPane.c AddSel.c ChgPane.c ChgSel.c Create.c DelPane.c
+ DelSel.c Destroy.c Error.c EvHand.c FindPane.c FindSel.c InsPane.c
+ InsSel.c Internal.c Locate.c Post.c Recomp.c SetAEQ.c SetFrz.c
+ SetPane.c SetSel.c XMenu.h XMenuInt.h (renamed from "XMenuInternal.h")
+
+The following files are from the X11 oldX/ directory:
+
+ X10.h XCrAssoc.c XDelAssoc.c XDestAssoc.c XLookAssoc.c XMakeAssoc.c
+
+This code is used by Emacs in the absence of an X-toolkit.
--- a/oldXMenu/Recomp.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/Recomp.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/SetAEQ.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/SetAEQ.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/SetFrz.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/SetFrz.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/SetPane.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/SetPane.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/SetSel.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/SetSel.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/X10.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/X10.h	Sun Apr 22 11:42:03 2007 +0000
@@ -15,8 +15,6 @@
  *
  */
 
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  *	X10.h - Header definition and support file for the C subroutine
--- a/oldXMenu/XCrAssoc.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/XCrAssoc.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,18 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
+#include "copyright.h"
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
 
 #include <config.h>
 #include <X11/Xlib.h>
--- a/oldXMenu/XDelAssoc.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/XDelAssoc.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <X11/Xlib.h>
 #include "X10.h"
--- a/oldXMenu/XDestAssoc.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/XDestAssoc.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <X11/Xlib.h>
 #include "X10.h"
--- a/oldXMenu/XLookAssoc.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/XLookAssoc.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
--- a/oldXMenu/XMakeAssoc.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/XMakeAssoc.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <config.h>
 #include <X11/Xlib.h>
--- a/oldXMenu/XMenu.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/XMenu.h	Sun Apr 22 11:42:03 2007 +0000
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/XMenuInt.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/XMenuInt.h	Sun Apr 22 11:42:03 2007 +0000
@@ -1,6 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
+
+#include "copyright.h"
+
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
--- a/oldXMenu/descrip.mms	Sat Feb 24 20:29:24 2007 +0000
+++ b/oldXMenu/descrip.mms	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,28 @@
+### descrip.mms - port of oldXMenu Makefile to VMS
+
+## Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006,
+##   2007  Free Software Foundation, Inc.
+
+## Author: Richard Levitte
+
+## This program 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)
+## any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; see the file COPYING.  If not, write to
+## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+
+### Code:
+
 !# Uncomment following line if linking temacs complains about missing insque.
 EXTRA=insque.obj
 
--- a/src/.gdbinit	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/.gdbinit	Sun Apr 22 11:42:03 2007 +0000
@@ -977,7 +977,7 @@
 end
 
 define xprintstr
-  set $data = $arg0->data
+  set $data = (char *) $arg0->data
   output ($arg0->size > 1000) ? 0 : ($data[0])@($arg0->size_byte < 0 ? $arg0->size & ~gdb_array_mark_flag : $arg0->size_byte)
 end
 
--- a/src/ChangeLog	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/ChangeLog	Sun Apr 22 11:42:03 2007 +0000
@@ -1,3 +1,27 @@
+2007-03-02  Stuart D. Herring <herring@lanl.gov>
+
+	* keymap.c (Fkey_binding): Don't consider two-element lists as
+	events.
+
+2007-03-01  Kenichi Handa  <handa@m17n.org>
+
+	* process.c (send_process_object): Check the process status and
+	signal an error if something is wrong.
+
+2007-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* insdel.c (Fcombine_after_change_execute): Return nil if
+	combine_after_change_buffer has been invalidated.
+
+2007-02-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* m/xtensa.h: New file.
+
+2007-02-24  Nick Roberts  <nickrob@snap.net.nz>
+
+	* .gdbinit (xprintstr): Ensure GDB (> 6.6) prints symbol name
+	as strings and not character arrays.
+
 2007-02-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macterm.c [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_drag)
--- a/src/insdel.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/insdel.c	Sun Apr 22 11:42:03 2007 +0000
@@ -2351,6 +2351,17 @@
   if (NILP (combine_after_change_list))
     return Qnil;
 
+  /* It is rare for combine_after_change_buffer to be invalid, but
+     possible.  It can happen when combine-after-change-calls is
+     non-nil, and insertion calls a file handler (e.g. through
+     lock_file) which scribbles into a temp file -- cyd  */
+  if (!BUFFERP (combine_after_change_buffer)
+      || NILP (XBUFFER (combine_after_change_buffer)->name))
+    {
+      combine_after_change_list = Qnil;
+      return Qnil;
+    }
+
   record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
 
   Fset_buffer (combine_after_change_buffer);
--- a/src/keymap.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/keymap.c	Sun Apr 22 11:42:03 2007 +0000
@@ -1605,10 +1605,10 @@
 
       /* We are not interested in locations without event data */
 
-      if (EVENT_HAS_PARAMETERS (event))
+      if (EVENT_HAS_PARAMETERS (event) && CONSP (XCDR (event)))
 	{
 	  Lisp_Object kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
-	  if (CONSP (XCDR (event)) && EQ (kind, Qmouse_click))
+	  if (EQ (kind, Qmouse_click))
 	    position = EVENT_START (event);
 	}
     }
--- a/src/m/alpha.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/m/alpha.h	Sun Apr 22 11:42:03 2007 +0000
@@ -6,7 +6,7 @@
 
 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
--- a/src/m/macppc.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/m/macppc.h	Sun Apr 22 11:42:03 2007 +0000
@@ -6,7 +6,7 @@
 
 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
--- a/src/m/mips4.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/m/mips4.h	Sun Apr 22 11:42:03 2007 +0000
@@ -7,7 +7,7 @@
 
 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
--- a/src/m/news-risc.h	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/m/news-risc.h	Sun Apr 22 11:42:03 2007 +0000
@@ -7,7 +7,7 @@
 
 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/m/xtensa.h	Sun Apr 22 11:42:03 2007 +0000
@@ -0,0 +1,15 @@
+/* Machine description file for Tensilica Xtensa.
+
+Add a license notice if this grows to > 10 lines of code.  */
+
+#define NO_ARG_ARRAY
+#define NO_UNION_TYPE
+
+#ifdef __LITTLE_ENDIAN
+#undef WORDS_BIG_ENDIAN
+#else
+#define WORDS_BIG_ENDIAN
+#endif
+
+/* arch-tag: fe5872de-d565-4d81-8fe0-ea19865b3e6a
+   (do not change this comment) */
--- a/src/process.c	Sat Feb 24 20:29:24 2007 +0000
+++ b/src/process.c	Sun Apr 22 11:42:03 2007 +0000
@@ -5699,8 +5699,16 @@
       : ! NILP (XBUFFER (object)->enable_multibyte_characters))
     {
       struct Lisp_Process *p = XPROCESS (proc);
-      struct coding_system *coding = proc_encode_coding_system[XINT (p->outfd)];
-
+      struct coding_system *coding;
+
+      if (p->raw_status_new)
+	update_status (p);
+      if (! EQ (p->status, Qrun))
+	error ("Process %s not running", SDATA (p->name));
+      if (XINT (p->outfd) < 0)
+	error ("Output file descriptor of %s is closed", SDATA (p->name));
+
+      coding = proc_encode_coding_system[XINT (p->outfd)];
       if (! EQ (coding->symbol, p->encode_coding_system))
 	/* The coding system for encoding was changed to raw-text
 	   because we sent a unibyte text previously.  Now we are