20 files changed, 1566 insertions, 2377 deletions

diff --git a/etc/COOKIES b/etc/COOKIES
index fa8894795f0..1d8c0955d42 100644
--- a/etc/COOKIES
+++ b/etc/COOKIES
@@ -26,7 +26,7 @@ Cream together:		2 cups butter
 Add:                    4 eggs
                         2 tsp. vanilla
 
-Mis together in
+Mix together in
 separate bowl:          4 cups flour
                         5 cups oatmeal (put small
  amounts of oatmeal in blender until it turns to
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 301aa3e1417..1f2b33fe8a8 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,70 @@
+2007-04-15  Glenn Morris  <rgm@gnu.org>
+
+        * FTP: Make it a duplicate of ../FTP.
+
+2007-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * SERVICE: Replace with a pointer to the web version.
+
+        * emacs.1: Update some of the more obsolete information.
+
+2007-04-13  Glenn Morris  <rgm@gnu.org>
+
+        * MACHINES: emacserver is removed.
+
+        * MORE.STUFF: Update some links, remove some dead ones.
+
+2007-04-04  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
+
+        * emacs.py (format_exception): New function.
+        (eexecfile): Use it instead of traceback.print_exception.
+        Don't use execfile to avoid a bug in w32.
+
+2007-04-04  Glenn Morris  <rgm@gnu.org>
+
+        * MACHINES: Mention preprocessor to use with /opt/SUNWspro/bin/cc
+        on Solaris.
+
+        * PROBLEMS (Configuration): Add entries on compiler/preprocessor
+        mismatch, and on preprocessor inserting whitespace.
+
+2007-04-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * TODO: Add entry for switching MS-Windows keyboard input to
+        Unicode.  Add specific pointer to msdos.c functions that support
+        menus on text terminals.
+
+2007-04-01  Michael Olson  <mwolson@gnu.org>
+
+        * ERC-NEWS: Update for the ERC 5.2 release.  Most of these entries
+        were for previously-committed changes.
+
+2007-03-31  Michael Albinus  <michael.albinus@gmx.de>
+
+        * PROBLEMS: Remove Tramp problem; it has been fixed.
+
+2007-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * PROBLEMS (MS-Windows problems): How to bind non-ASCII keys with
+        modifiers.
+
+2007-03-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile (DESTDIR, LIBDIR, BINDIR, MANDIR, MANEXT):
+        Delete unused variables.
+        (dired-refcards, misc-refcards, survival-card, viper-cards):
+        New targets.
+        (all): Also build dired-refcards and misc-refcards.
+        (clean, distclean, maintainer-clean): Depend on mostlyclean.
+        (SOURCES): Remove non-existent files.
+        (mostlyclean, clean, distclean, maintainer-clean, unlock, relock):
+        Mark as phony.
+        (.ps files): Specify default papersize in the dvips command.
+
+        * fr-refcard.tex (\letterpaper): Switch to A4.
+        (\section): Reduce \vskips to fit on A4 paper.
+        (\shortcopyrightnotice): Display at end of first column.
+
 2007-03-21  Glenn Morris  <rgm@gnu.org>
 
         * fr-refcard.tex (\metax): Tweak \hsize to avoid overfull columns.
@@ -322,7 +389,7 @@
         (section{TODO Items and Checkboxes}): Checkbox keys moved to this
         section, added documentation for the key `C-c #'.
 
-2006-11-05  Slawomir Nowaczyk  <slawek@cs.lth.se>  (tiny change)
+2006-11-05  Slawomir Nowaczyk  <slawek@cs.lth.se>
 
         * emacs.py (eargs): Provide eldoc message for builtin types.
           Make sure eargs always outputs sentinel, to avoid Emacs freeze.
@@ -417,7 +484,7 @@
         (eimport): Use __main__ rather than `emacs' namespace.
         (modpath): New fun.
 
-2006-08-20  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
+2006-08-20  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
 
         * emacs.py (eexecfile): Use the __main__ rather than `emacs' namespace.
 
@@ -680,8 +747,8 @@
         * pl-refcard.tex (section{Info}): Ditto.  Translation suggested by
         Slawomir Nowaczyk <slawomir.nowaczyk.847@student.lu.se>.
 
-        * cs-refcard.tex (section{Info}): Use `s' instead of `M-s'.  Entry
-        for `i' is not translated yet.
+        * cs-refcard.tex (section{Info}): Use `s' instead of `M-s'.
+        Entry for `i' is not translated yet.
 
         * pt-br-refcard.tex (section{Info}): Ditto.
 
@@ -1410,7 +1477,7 @@
 
         * NEWS: Lots of clarifications and cleanups.
 
-2005-05-05  Slawomir Nowaczyk  <slawek@cs.lth.se>  (tiny change)
+2005-05-05  Slawomir Nowaczyk  <slawek@cs.lth.se>
 
         * TUTORIAL.pl: Updated header.
 
diff --git a/etc/DEBUG b/etc/DEBUG
index ad59d48b3ca..ea4e14866ca 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -306,10 +306,15 @@ debugger, type "gdb temacs", then start it with `r -batch -l loadup'.
 
 ** If you encounter X protocol errors
 
-Try evaluating (x-synchronize t).  That puts Emacs into synchronous
-mode, where each Xlib call checks for errors before it returns.  This
-mode is much slower, but when you get an error, you will see exactly
-which call really caused the error.
+The X server normally reports protocol errors asynchronously,
+so you find out about them long after the primitive which caused
+the error has returned.
+
+To get clear information about the cause of an error, try evaluating
+(x-synchronize t).  That puts Emacs into synchronous mode, where each
+Xlib call checks for errors before it returns.  This mode is much
+slower, but when you get an error, you will see exactly which call
+really caused the error.
 
 You can start Emacs in a synchronous mode by invoking it with the -xrm
 option, like this:
@@ -562,7 +567,7 @@ are involved in the crash.
 
 Once you discover the corrupted Lisp object or data structure, grep
 the sources for its uses and try to figure out what could cause the
-corruption.  If looking at the sources doesn;t help, you could try
+corruption.  If looking at the sources doesn't help, you could try
 setting a watchpoint on the corrupted data, and see what code modifies
 it in some invalid way.  (Obviously, this technique is only useful for
 data that is modified only very rarely.)
@@ -726,7 +731,7 @@ prints the backtrace for a crash.  It is usually best to look at the
 disassembly to determine exactly what code is being run--the
 disassembly will probably show several source lines followed by a
 block of assembler for those lines.  The actual point where Emacs
-crashes will be one of those source lines, but not neccesarily the one
+crashes will be one of those source lines, but not necessarily the one
 that the debugger reports.
 
 Another problematic area with the MS debugger is with variables that
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index dd5c113c195..e7b0dcb81bf 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -3,8 +3,7 @@ ERC NEWS                                                       -*- outline -*-
 Copyright (C) 2006, 2007  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-
-* Changes in ERC 5.2 (stable pre-release for Emacs 22)
+* Changes in ERC 5.2
 
 ** M-x erc RET now starts ERC.
 `erc-select' has been changed to `erc'.  `erc-select' still remains as
@@ -12,37 +11,173 @@ an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
 `erc-ssl' with `erc-select-ssl' as its alias.  The function that was
 known as `erc' is now `erc-open'.
 
+** Open query buffers by default when private messages are received.
+The default value of `erc-auto-query' has been changed to 'bury.
+
 ** New command: /RECONNECT
 This command tries to reconnect to the current IRC server exactly
 once.  It does not work in server buffers (throws an error before the
 command is run), but works in query and channel buffers.
 
+** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
+
+** Fix buggy interaction with multi-tty Emacs.
+
+** After running /QUIT, make sure that the IRC process is killed within
+4 seconds.  Freenode, in particular, needs this at times.
+
+** If the IRC process has not responded to our PINGs within a certain
+time, kill it and restart the connection.  See
+`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
+`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
+`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
+
+** Avoid getting into an infinite connection loop.
+Previously, this could happen if your nick was banned, you were using
+Tor, incorrect information was entered, or the connection was bad.
+
+** Make ban messages less confusing.
+
+** Restore the point correctly when reconnecting to an IRC server.
+
+** Make /IGNORE and /UNIGNORE prompt to determine whether their
+argument is a user or a regexp.  This results in less-confusing
+behavior when trying to ignore someone who has a bracket in their
+nick.
+
+** Make the default port "6667" rather than "ircd", because some
+operating systems don't know what port "ircd" maps to.
+
+** Fix several bugs in erc-iswitchb (C-c C-b).
+
+** Clean up internal documentation.
+Special thanks go to Juanma Barranquero for the thorough vetting of
+ERC's internal documentation.
+
+** Display a more informative message when a module is not found.
+
+** Fix a bug where paths were being colored like IRC commands.
+
+** In the customize interface for `erc-modules', add the name of the module.
+This makes it easier to find modules by name.
+
+** erc-server-send-ping-interval: Change to use a default of 30 seconds.
+
+** Some files which are included with the release of ERC 5.2 will not
+appear in the version of ERC that is bundled with Emacs 22.  These
+extras files may be found at:
+
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
+
+** Renamed files
+
+Several files were renamed so as to make them distinct to users of the
+MS-DOS operating system.
+
+ o erc-autojoin.el -> erc-join.el
+ o erc-complete.el -> erc-hecomplete.el
+ o erc-nickserv.el -> erc-services.el
+ o ChangeLog.NNNN -> ChangeLog.NN
+
+** Header line changes
+
+*** Remove "[IRC]" from the header line.
+
+*** Add the %l format character to `erc-header-line-format',
+
+*** Document how to remove the header line.
+Namely: (setq erc-header-line-format nil).
+
 ** New options
 
 *** erc-server-reconnect-attempts: Determines the number of
 reconnection attempts that ERC will make per server.
 
-*** erc-server-reconnect-timeout: New option that determines the
-amount of time, in seconds, that ERC will wait between successive
-reconnect attempts.
+*** erc-server-reconnect-timeout: Determines the amount of time,
+in seconds, that ERC will wait between successive reconnect attempts.
+
+*** erc-server-send-ping-timeout: Determines when to consider a connection
+stalled and restart it.  The default is after 120 seconds.
+
+*** erc-system-name: Determines the system name to use when logging in.
+The default is to figure this out by calling `system-name'.
 
 ** New face: `erc-my-nick-face'
 This helps make it easier to distinguish messages sent by yourself
 from messages sent by other users when the value of the variable
 `erc-show-my-nick' is non-nil.
 
+** Namespace changes
+
+*** New macro: `erc-with-server-buffer'
+Switches to the current ERC server buffer and runs some code.  If no
+server buffer is available, return nil.  This is a useful way to
+access variables in the server buffer.
+
+*** New function: `erc-open-server-buffer-p'
+Returns non-nil if the given buffer is an ERC server buffer that has
+an open IRC process.
+
+*** New function: `erc-format-lag-time'
+Returns the estimated lag time to server, `erc-server-lag'.
+
+*** Renamed items
+
+ o `erc-server-setup-periodical-server-ping' is now
+   `erc-server-setup-periodical-ping'
+
+ o `erc-away-p' is now `erc-away-time'
+
+** Changes to the ERC manual
+
+*** New section: Sample Session.
+Describes a sample ERC session for connecting to the #emacs channel on
+Freenode.  Also mention the #erc channel.
+
+*** New section: Special Features.
+Describes some of the special features of ERC.
+
+*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
+interface.
+
+*** Development: Mention ErcDevelopment page on emacswiki.org.
+
+*** Tips and Tricks: Remove empty section for now.
+
+*** Options: Mention how to see available ERC options.
+
+*** Sample Configuration: Add an example of how to configure ERC.
+
 ** New modules
 
+*** Autoaway (erc-autoaway.el)
+
+**** Make this much more reliable.
+
+**** Avoid duplicate messages when coming back from being away.
+
+**** Fix bug where autoaway was enabled just by loading the file.
+
+*** BBDB (erc-bbdb.el)
+
+**** Display information on how to cancel merging of info or how to
+create a new John Doe record.
+
+**** Make it so that information from /whois continues to come in, even
+while prompting for a record to merge.
+
+**** Make hitting C-g correctly abort merging the record.
+
 *** Capab identify (erc-capab.el)
 Mark users who haven't identified to NickServ on servers supporting
 CAPAB IDENTIFY-MSG.
 
 ** Changes and additions to modules
 
-*** Channel lists (erc-list.el)
+*** Button (erc-button.el)
 
-**** This has been removed from Emacs 22, since a major contributor
-to it has not yet assigned changes.
+**** Make <backtab> go to the previous button.
 
 *** Channel tracking (erc-track.el)
 
@@ -50,6 +185,103 @@ to it has not yet assigned changes.
 This helps people using a mouse know that they are buttons and can be
 clicked on.
 
+**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
+This is accomplished by moving these bindings to their own global
+minor mode.  Now the default is to check whether the user has bound
+something to C-c C-SPC or C-c C-@.  If they have, prompt them about
+whether to really override that binding.  This also has the effect of
+preventing ERC from clobbering rcirc's keybinding, unless this is
+desired.  See `erc-track-enable-keybindings' for more details.
+
+**** New option: erc-track-enable-keybindings.
+Determine whether or not to enable the C-c C-SPC and C-c C-@
+keybindings.  The default is to ask whether to do this if a binding to
+these keys already exists.  It can also be set to t or nil to always
+bind or never bind, respectively.
+
+**** Remove `track-when-inactive' module.
+See `erc-track-when-inactive' for further details.
+
+**** New option: erc-track-when-inactive.
+This option replaces the track-when-inactive module.  Set it to
+non-nil to track activity even in visible buffers when inactive.  The
+default is nil.
+
+**** Remove the `track-modified-channels' alias for the `track' module.
+
+*** DCC support (erc-dcc.el)
+
+**** Add Usage section to Commentary.
+
+**** Fix a bug in the server message output.
+
+*** Filling (erc-fill.el)
+
+**** Fix bug involving messages that start with one or more blank lines.
+
+*** Identd (erc-identd.el)
+
+**** New option `erc-identd-port'
+Specifies the port to use if none is given as an argument to
+`erc-identd-start'.  This is placed in the new customization group
+`erc-identd'.
+
+**** New function: `erc-identd-quickstart'
+Ignores any arguments and calls `erc-identd-start'.
+
+*** Channel lists (erc-list.el)
+
+**** Enable by default, except in the version of ERC bundled with Emacs 22.
+
+*** Logging (erc-log.el)
+
+**** Make sure filenames are safe to use before writing to them.
+
+**** Save all log buffers when exiting Emacs.
+
+**** erc-generate-log-file-name-function: Add option for
+`erc-generate-log-file-name-network', which is a new function that
+uses the network name rather than the server name when possible.
+
+*** Menu (erc-menu.el)
+
+**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
+and other clients.
+
+**** Make this into a proper module and load it by default.
+
+**** Add "Current channel" submenu.
+
+*** Networks (erc-networks.el)
+
+**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
+
+**** Escape periods in Konfido.Net and Kewl.Org.
+
+*** Internet services / Nickserv (erc-nickserv.el)
+
+**** Add new 'both method for the `erc-nickserv-identify-mode' option
+and make it the default.  This tries to do the right thing both when a
+known nickserv message exists for an IRC network, and when it does
+not.
+
+**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
+
+**** Support authentication on BitlBee.
+
+**** Make source code easier to understand by using accessor functions.
+
+*** Sound support (erc-sound.el)
+
+**** Make this work with both Emacs 21 and Emacs 22.
+
+*** Timestamps (erc-stamp.el)
+
+**** Exclude the newline from the erc-timestamp field.
+
+**** New function: `erc-toggle-timestamps'.
+Toggles display of timestamps.
+
 * Changes in ERC 5.1.4
 
 ** Make find-function and find-variable work in Emacs 22 for
@@ -156,6 +388,10 @@ to make the BBDB buffer electric.  This defaults to not electric.
 
 **** Don't create an extra buffer for the identd process.
 
+*** Channel lists (erc-list.el)
+
+**** Enable by default, except in the version of ERC bundled with Emacs 22.
+
 *** Logging (erc-log.el)
 
 **** By default, don't insert old logs when opening an ERC buffer.
diff --git a/etc/FTP b/etc/FTP
index 45048af4160..0337d464c30 100644
--- a/etc/FTP
+++ b/etc/FTP
@@ -1,2 +1,6 @@
-Please refer to <http://www.gnu.org/software/emacs/> for information
-about obtaining Emacs.
+For information about how to obtain GNU Emacs and other GNU software
+by FTP, please see <http://www.gnu.org/order/ftp.html>.
+
+Information about Emacs is also available at
+<http://www.gnu.org/software/emacs/>.
+
diff --git a/etc/MACHINES b/etc/MACHINES
index 3323c0b98b5..83723fccbbc 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -126,7 +126,7 @@ Apple PowerPC Macintosh running GNU/Linux
   Emacs distribution, and remove the "#if 0" and "#endif" directives
   which surround the following block near the end of the file:
 
-    #if 0  /* This breaks things on PPC GNU/Linux ecept for Yellowdog,
+    #if 0  /* This breaks things on PPC GNU/Linux except for Yellowdog,
               even with identical GCC, as, ld.  Let's take it out until we
               know what's really going on here.  */
     /* GCC 2.95 and newer on GNU/Linux PPC changed the load address to
@@ -156,9 +156,8 @@ Apollo running X Windows (m68k-apollo-bsd)
   installations may have to edit src/Makefile manually after it is created.
   There are too many versions of both cc and X to automate this easily.
 
-  In `lib-src/Makefile', emacsclient and emacsserver compile and work fine
-  under CC 6.9.  They now probably work under other versions of the compiler,
-  as well.
+  In `lib-src/Makefile', emacsclient compiles and works fine under CC 6.9.
+  It now probably works under other versions of the compiler, as well.
 
   The Apollo Domain CC compiler will issue quite a few warning messages,
   mostly complaining about incompatible pointers.  In general, these are
@@ -1149,7 +1148,9 @@ Sun 3, Sun 4 (sparc), Sun 386 (m68k-sun-sunos, sparc-sun-sunos, i386-sun-sunos,
   On Solaris, do not use /usr/ucb/cc.  Use /opt/SUNWspro/bin/cc.  Make
   sure that /usr/ccs/bin and /opt/SUNWspro/bin are in your PATH before
   /usr/ucb.  (Most free software packages have the same requirement on
-  Solaris.)
+  Solaris.)  With this compiler, use `/opt/SUNWspro/bin/cc -E' as the
+  preprocessor.  If this inserts extra whitespace into its output (see
+  the PROBLEMS file) then add the option `-Xs'.
 
   If you have trouble using open-network-stream, get the distribution
   of `bind' (the BSD name-server), build libresolv.a, and link Emacs
@@ -1393,7 +1394,7 @@ System V rel 3 (usg5.3)
   cannot be made to work.  Whether or not the GNU relocating malloc is
   used, the symptom is that the first call Emacs makes to sbrk(0) returns
   (char *)-1.  Sorry, you're stuck with character-only mode.  Try
-  installing Xfree86 to fix this.
+  installing XFree86 to fix this.
 
 System V rel 4.0.3 and 4.0.4 (usg5.4)
 
@@ -1497,11 +1498,10 @@ Xenix (xenix)
   to make the Emacs meta key work.
 
 Local variables:
-mode: indented-text
+mode: text
 fill-prefix: "  "
 End:
 
-
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 1072cd29775..b55b2822d39 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -47,9 +47,6 @@ You might find bug-fixes or enhancements in these places.
 
  * Battery and Info Look: <URL:http://www-cdf.fnal.gov/~sthrlnd/emacs/>
 
- * BibTeX:
-   <URL:http://www.ida.ing.tu-bs.de/people/dirk/bibtex/index.html>
-
  * BS: <URL:http://www.geekware.de/software/emacs/index.html>
 
  * Calculator: <URL:http://www.barzilay.org/misc/calculator.el>
@@ -85,26 +82,24 @@ You might find bug-fixes or enhancements in these places.
 
  * MH-E: <URL:http://mh-e.sourceforge.net/>
 
- * PC Selection: <URL:ftp://ftp.thp.uni-duisburg.de/pub/source/elisp/>
-
  * PS mode: <URL:http://odur.let.rug.nl/%7Ekleiweg/postscript/>
 
- * PS-print: <URL:http://www.cpqd.com.br/~vinicius/emacs/>
+ * PS-print: <URL:http://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage>
 
  * QuickURL: <URL:http://www.davep.org/emacs/>
 
- * RefTeX: <URL:http://staff.science.uva.nl/~dominik/Tools/reftex/>
+ * RefTeX: <URL:http://www.gnu.org/software/auctex/reftex.html>
 
  * Speedbar, Checkdoc etc: <URL:http://cedet.sourceforge.net/>
 
- * SQL: <URL:http://www.geocities.com/TimesSquare/6120/emacs.html>
+ * SQL: <URL:http://www.emacswiki.org/cgi-bin/wiki/sql.el>
 
  * Tramp: Remote file access via rsh/ssh
    <URL:http://savannah.gnu.org/projects/tramp/>
 
  * Webjump: <URL:http://www.neilvandyke.org/webjump>
 
- * Whitespace: <URL:http://www.dsmit.com/lisp/>
+ * Whitespace: <URL:http://www.dsmit.com/lisp/whitespace.el>
 
 * Auxiliary files
 
@@ -147,7 +142,7 @@ Several are for Debian GNU/Linux in particular.
    mirrors of the `CTAN' TeX archives.
 
  * Dismal: spreadsheet:
-   <URL:http://www.gnu.org/software/dismal/dismal.html>
+   <URL:http://ritter.ist.psu.edu/dismal/dismal.html>
 
  * ECB: Emacs Code Browser: <URL:http://ecb.sourceforge.net/>
 
@@ -177,8 +172,7 @@ Several are for Debian GNU/Linux in particular.
    <URL:http://emacspeak.sourceforge.net/>
 
  * Emacs-w3m : <URL:http://emacs-w3m.namazu.org/>
-   A simple Emacs interface to w3m, which is a text-mode
-   WWW browser
+   A simple Emacs interface to w3m, which is a text-mode WWW browser
 
  * Emacs Wiki Mode: <URL:http://www.mwolson.org/projects/EmacsWiki.html>
    A wiki-like publishing tool and personal information manager
@@ -198,7 +192,7 @@ Several are for Debian GNU/Linux in particular.
    HTML-specific editing.  Can work with PSGML.
 
  * Hyperbole:
-   <URL:http://ftp.gnu.org/pub/gnu/hyperbole/>
+   <URL:http://directory.fsf.org/hyperbole.html>
    Hyperbole is an open, efficient, programmable information
    management and hypertext system.
 
@@ -229,11 +223,11 @@ Several are for Debian GNU/Linux in particular.
    nXML mode is an addon for GNU Emacs, which makes GNU Emacs into a
    powerful XML editor.
 
- * Planner Mode: <URL:http://www.plannerlove.com/>
+ * Planner Mode: <URL:http://wjsullivan.net/PlannerMode>
    Planner is an organizer and day planner for Emacs.
 
  * Preview LaTeX: embed preview LaTeX images in source buffer.
-   <URL:http://preview-latex.sourceforge.net/>
+   <URL:http://www.gnu.org/software/auctex/preview-latex>
 
  * PSGML: <URL:http://www.lysator.liu.se/projects/about_psgml.html>
    DTD-aware serious SGML/XML editing.
@@ -260,7 +254,7 @@ Several are for Debian GNU/Linux in particular.
 
  * Tiny Tools: <URL:http://tiny-tools.sourceforge.net/>
 
- * VM (View Mail): <URL:http://www.wonderworks.com/vm/> Alternative
+ * VM (View Mail): <URL:http://www.nongnu.org/viewmail/> Alternative
    mail reader.  There is a VM newsgroup: <URL:news:gnu.emacs.vm.info>
 
  * W3: <URL:http://savannah.gnu.org/projects/w3/>
@@ -276,8 +270,7 @@ Several are for Debian GNU/Linux in particular.
    shell-script daemon and some LaTeX macros.
 
  * X-Symbol: <URL:http://x-symbol.sourceforge.net/>
-   Quasi-WYSIWYG editing of TeX & al.  (It will be improved to take
-   better advantage of Emacs 21 features.)
+   Quasi-WYSIWYG editing of TeX & al.
 
 Local Variables:
 mode: text
diff --git a/etc/Makefile b/etc/Makefile
index a238bea1928..0226c2838d9 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,43 +1,110 @@
-DESTDIR=
-LIBDIR=/usr/local/lib
-BINDIR=/usr/local/bin
-MANDIR=/usr/man/man1
-MANEXT=1
+### Makefile for Emacs etc/ directory
 
-all:
+## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+##   2007 Free Software Foundation, Inc.
 
-refcards:       refcard.ps cs-refcard.ps de-refcard.ps fr-refcard.ps \
-                pl-refcard.ps pt-br-refcard.ps ru-refcard.ps sk-refcard.ps
+## This file is part of GNU Emacs.
+
+## GNU Emacs is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## GNU Emacs 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.
+
+
+## Top-level targets.
+
+## PS files included with Emacs.
+all: refcards dired-refcards misc-refcards
+
+
+refcards: refcard.ps cs-refcard.ps de-refcard.ps fr-refcard.ps \
+          pl-refcard.ps pt-br-refcard.ps ru-refcard.ps sk-refcard.ps
+
+dired-refcards: dired-ref.ps cs-dired-ref.ps fr-drdref.ps sk-dired-ref.ps
+
+## No PS files: vipcard.tex viperCard.tex survival.tex sk-survival.tex
+misc-refcards: calccard.ps gnus-booklet.ps gnus-refcard.ps orgcard.ps
+
+## Following PS files are not included with Emacs.
+survival-cards: survival.ps cs-survival.ps sk-survival.ps
+
+viper-cards: vipcard.ps viperCard.ps
 
-refcard.dvi de-refcard.dvi fr-refcard.dvi pt-br-refcard.dvi sk-refcard.dvi:     %.dvi:  %.tex
-        tex $<
 
-cs-refcard.dvi: %.dvi:  %.tex
+## dvi files.
+
+## FIXME the sk-*.tex files say to use csplain, but were not
+## traditionally in this rule. Fix the doc or the rule.
+cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi: %.dvi: %.tex
         csplain $<
 
-pl-refcard.dvi: %.dvi:  %.tex
+pl-refcard.dvi: %.dvi: %.tex
         if ! kpsewhich -format=fmt mex > /dev/null; then \
           echo "No mex format found."; false; \
         fi
         tex $<
 
-ru-refcard.dvi: %.dvi:  %.tex
+ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
         latex $<
 
-refcard.ps de-refcard.ps fr-refcard.ps pt-br-refcard.ps:        %.ps:   %.dvi
-        dvips -t landscape $<
+gnus-booklet.dvi: gnus-refcard.tex
+        latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
+        mv gnus-refcard.dvi $@
+
+## Everything not explicitly listed above.
+%.dvi: %.tex
+        tex $<
+
+
+## PostScript files.
+
+## Note that some of the tex files (refcard, de-refcard, fr-refcard,
+## pt-br-refcard) have settings for letter or a4 paper. Following are
+## the default paper sizes (letter for English, A4 for translations).
+## FIXME orgcard.ps does not fit on letter (see orgcard.tex).
+
+## A4, landscape.
+de-refcard.ps fr-refcard.ps pt-br-refcard.ps orgcard.ps: %.ps: %.dvi
+        dvips -t a4 -t landscape $<
 
-cs-refcard.ps pl-refcard.ps ru-refcard.ps sk-refcard.ps:        %.ps:   %.dvi
-        dvips $<
+## A4, portrait.
+cs-dired-ref.ps cs-refcard.ps cs-survival.ps fr-drdref.ps \
+pl-refcard.ps ru-refcard.ps \
+sk-dired-ref.ps sk-refcard.ps sk-survival.ps: %.ps: %.dvi
+        dvips -t a4 $<
+
+## letter, landscape.
+calccard.ps refcard.ps: %.ps: %.dvi
+        dvips -t letter -t landscape $<
+
+## letter, portrait.
+dired-ref.ps gnus-booklet.ps gnus-refcard.ps survival.ps vipcard.ps \
+viperCard.ps: %.ps: %.dvi
+        dvips -t letter $<
+
+
+.PHONY: mostlyclean clean distclean maintainer-clean unlock relock
 
 mostlyclean:
-        -rm -f core *.dvi *.log
+        -rm -f *.dvi *.log
+
+## Note does not delete generated ps files.
+clean distclean maintainer-clean: mostlyclean
+        -rm -f DOC*
 
-clean distclean maintainer-clean:
-        -rm -f DOC* core *.dvi *.log
 
-SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* etags.* ledit.l ms-* \
-        spook-lines tasks.texi termcap.* *.tex
+SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* ms-* \
+        spook-lines termcap.* *.tex
 
 unlock:
         chmod u+w $(SOURCES)
@@ -54,4 +121,6 @@ TIC=tic
 e/eterm-color: e/eterm-color.ti
         TERMINFO=`pwd`; export TERMINFO; $(TIC) e/eterm-color.ti
 
-# arch-tag: 4261f003-cf77-4478-a10a-5284e9d8f797
+
+## arch-tag: 4261f003-cf77-4478-a10a-5284e9d8f797
+### Makefile ends here
diff --git a/etc/NEWS b/etc/NEWS
index 8b22fd38b84..9e18d887834 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1,4 +1,4 @@
-GNU Emacs NEWS -- history of user-visible changes.  2006-06-04
+GNU Emacs NEWS -- history of user-visible changes.
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
           Free Software Foundation, Inc.
@@ -35,7 +35,7 @@ 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:
+Some specific packages that are known to cause problems are:
 
 ** Semantic (used by CEDET, ECB, JDEE): upgrade to latest version.
 ** cua.el, cua-mode.el: remove old versions.
@@ -91,7 +91,7 @@ Emacs with Leim.
 
 The Emacs Lisp Reference Manual in Info format is built as part of the
 Emacs build procedure and installed together with the Emacs User
-Manual.  A menu item was added to the menu bar that makes it easy
+Manual.  A menu item was added to the menu bar to make it easily
 accessible (Help->More Manuals->Emacs Lisp Reference).
 
 ---
@@ -100,7 +100,7 @@ the distribution.
 
 This manual is now part of the standard distribution and is installed,
 together with the Emacs User Manual, into the Info directory.  A menu
-item was added to the menu bar that makes it easy accessible
+item was added to the menu bar to make it easily accessible
 (Help->More Manuals->Introduction to Emacs Lisp).
 
 ---
@@ -144,12 +144,8 @@ See the files mac/README and mac/INSTALL for build instructions.
 ** Support for GNU/Linux systems on X86-64 machines was added.
 
 ---
-** Support for HP 9000 series 800 and Hitachi SR2001/SR2201 machines
-was removed.
-
----
 ** Mac OS 9 port now uses the Carbon API by default.  You can also
-create non-Carbon build by specifying `NonCarbon' as a target.  See
+create a non-Carbon build by specifying `NonCarbon' as a target.  See
 the files mac/README and mac/INSTALL for build instructions.
 
 ---
@@ -160,6 +156,7 @@ types any more.  Add -DUSE_LISP_UNION_TYPE if you want union types.
 ** When pure storage overflows while dumping, Emacs now prints how
 much pure storage it will approximately need.
 
+---
 ** The script etc/emacs-buffer.gdb can be used with gdb to retrieve the
 contents of buffers from a core dump and save them to files easily, should
 Emacs crash.
@@ -230,10 +227,10 @@ affects the initial frame.
 
 ---
 ** Emacs built for MS-Windows now behaves like Emacs on X does,
-wrt its frame position: if you don't specify a position (in your
-.emacs init file, in the Registry, or with the --geometry command-line
-option), Emacs leaves the frame position to the Windows' window
-manager.
+with respect to its frame position: if you don't specify a position
+(in your .emacs init file, in the Registry, or with the --geometry
+command-line option), Emacs leaves the frame position to the Windows'
+window manager.
 
 +++
 ** Emacs can now be invoked in full-screen mode on a windowed display.
@@ -246,12 +243,12 @@ screen size.  (For now, this does not work with some window managers.)
 ** Emacs now displays a splash screen by default even if command-line
 arguments were given.  The new command-line option --no-splash
 disables the splash screen; see also the variable
-`inhibit-startup-message' (which is also aliased as
-`inhibit-splash-screen').
+`inhibit-splash-screen' (which is also aliased as
+`inhibit-startup-message').
 
 +++
 ** The default is now to use a bitmap as the icon, so the command-line options
---icon-type, -i has been replaced with options --no-bitmap-icon, -nbi to turn
+--icon-type, -i have been replaced with options --no-bitmap-icon, -nbi to turn
 the bitmap icon off.
 
 +++
@@ -365,6 +362,7 @@ too.  If you want to use just plain `*' as a wildcard, type `*""'; the
 doublequotes make no difference in the shell, but they prevent
 special treatment in `dired-do-shell-command'.
 
+---
 ** Adaptive filling misfeature removed.
 It no longer treats `NNN.' or `(NNN)' as a prefix.
 
@@ -880,9 +878,11 @@ The variable `automatic-hscrolling' was renamed to
 the window now works sensibly, by automatically adjusting the window's
 vscroll property.
 
++++
 *** New customize option `overline-margin' controls the space between
 overline and text.
 
++++
 *** New variable `x-underline-at-descent-line' controls the relative
 position of the underline.  When set, it overrides the
 `x-use-underline-position-properties' variables.
@@ -991,6 +991,7 @@ uses the "very visible" cursor (the default) or the normal cursor.
 elements on mode-line (and header-line) like `highlight' face on text
 areas.
 
++++
 *** `mode-line-buffer-id' is the standard face for buffer identification
 parts of the mode line.
 
@@ -1011,7 +1012,7 @@ so package-specific faces can inherit from it.
 *** New option `ebnf-arrow-extra-width' which specify extra width for arrow
 shape drawing.
 The extra width is used to avoid that the arrowhead and the terminal border
-overlap.  It depens on `ebnf-arrow-shape' and `ebnf-line-width'.
+overlap.  It depends on `ebnf-arrow-shape' and `ebnf-line-width'.
 
 +++
 *** New option `ebnf-arrow-scale' which specify the arrow scale.
@@ -1118,7 +1119,7 @@ and "Open File...".  "Open File..." now opens only existing files.  This is
 to support existing GUI file selection dialogs better.
 
 +++
-*** The file selection dialog for Gtk+, Mac, W32 and Motif/Lesstif can be
+*** The file selection dialog for Gtk+, Mac, W32 and Motif/LessTif can be
 disabled by customizing the variable `use-file-dialog'.
 
 ---
@@ -1126,7 +1127,7 @@ disabled by customizing the variable `use-file-dialog'.
 be navigated with the arrow keys (like Gtk+, Mac and W32).
 
 +++
-*** The menu bar for Motif/Lesstif/Lucid/Gtk+ can be navigated with keys.
+*** The menu bar for Motif/LessTif/Lucid/Gtk+ can be navigated with keys.
 Pressing F10 shows the first menu in the menu bar.  Navigation is done with
 the arrow keys, select with the return key and cancel with the escape keys.
 
@@ -1136,7 +1137,7 @@ to explicitly specify a fontSet resource for this to work, for example
 `-xrm "Emacs*fontSet:  -*-helvetica-medium-r-*--*-120-*-*-*-*-*-*,*"'.
 
 ---
-*** Dialogs for Lucid/Athena and Lesstif/Motif now pops down when pressing
+*** Dialogs for Lucid/Athena and LessTif/Motif now pop down on pressing
 ESC, like they do for Gtk+, Mac and W32.
 
 +++
@@ -1167,7 +1168,7 @@ Traditionally, Emacs uses a Mouse-1 click to set point and a Mouse-2
 click to follow a link, whereas most other applications use a Mouse-1
 click for both purposes, depending on whether you click outside or
 inside a link.  Now the behavior of a Mouse-1 click has been changed
-to match this context-sentitive dual behavior.  (If you prefer the old
+to match this context-sensitive dual behavior.  (If you prefer the old
 behavior, set the user option `mouse-1-click-follows-link' to nil.)
 
 Depending on the current mode, a Mouse-2 click in Emacs can do much
@@ -1220,6 +1221,7 @@ mouse-wheel-inhibit-click-time variables.
 
 ** Multilingual Environment (Mule) changes:
 
++++
 *** You can disable character translation for a file using the -*-
 construct.  Include `enable-character-translation: nil' inside the
 -*-...-*- to disable any character translation that may happen by
@@ -1618,7 +1620,7 @@ people knowing `find-grep-dired' would probably expect it.
 *** New commands `lgrep' (local grep) and `rgrep' (recursive grep) are
 more user-friendly versions of `grep' and `grep-find', which prompt
 separately for the regular expression to match, the files to search,
-and the base directory for the search.  Case sensitivitivy of the
+and the base directory for the search.  Case sensitivity of the
 search is controlled by the current value of `case-fold-search'.
 
 These commands build the shell commands based on the new variables
@@ -1748,6 +1750,7 @@ colors as on X.
 
 * New Modes and Packages in Emacs 22.1
 
+---
 ** ERC is now part of the Emacs distribution.
 
 ERC is a powerful, modular, and extensible IRC client for Emacs.
@@ -2020,6 +2023,7 @@ table editing available in modern word processors.  The package also
 can generate a table source in typesetting and markup languages such
 as latex and html from the visually laid out text table.
 
++++
 ** The tumme.el package allows you to easily view, tag and in other ways
 manipulate image files and their thumbnails, using dired as the main interface.
 Tumme provides functionality to generate simple image galleries.
@@ -2072,6 +2076,7 @@ recognized.
 ** The TCL package tcl-mode.el was replaced by tcl.el.
 This was actually done in Emacs-21.1, and was not documented.
 
+---
 ** The new package scroll-lock.el provides the Scroll Lock minor mode
 for pager-like scrolling.  Keys which normally move point by line or
 paragraph will scroll the buffer by the respective amount of lines
@@ -2087,6 +2092,7 @@ for Emacs 22.  In particular, the mode-line is now position sensitive.
 
 ** Changes in Shell Mode
 
+---
 *** Shell output normally scrolls so that the input line is at the
 bottom of the window -- thus showing the maximum possible text.  (This
 is similar to the way sequential output to a terminal works.)
@@ -2121,7 +2127,7 @@ asterisk - for instance, the comment close of some languages (eg, c's "*/"
 or mathematica's "*)") - at the beginning of line are no longer are
 interpreted as level 1 topics in those modes.
 
-*** Many or most commonly occuring "accidental" topics are disqualified.
+*** Many or most commonly occurring "accidental" topics are disqualified.
 Text in item bodies that looks like a low-depth topic is no longer mistaken
 for one unless its first offspring (or that of its next sibling with
 offspring) is only one level deeper.
@@ -2211,6 +2217,7 @@ handling of edits of concealed text, undo concerns, etc.
    - many, many other, more minor tweaks, fixes, and refinements.
    - version number incremented to 2.2
 
++++
 ** The variable `woman-topic-at-point' was renamed
 to `woman-use-topic-at-point' and behaves differently: if this
 variable is non-nil, the `woman' command uses the word at point
@@ -2730,6 +2737,7 @@ line is left untouched.
 The function `c-toggle-syntactic-indentation' can be used to toggle
 syntactic indentation.
 
+---
 ** In sh-script, a continuation line is only indented if the backslash was
 preceded by a SPC or a TAB.
 
@@ -2861,6 +2869,7 @@ i.e., there is always a closing tag.
 By default, its setting is inferred on a buffer-by-buffer basis
 from the file name or buffer contents.
 
+---
 *** The variable `sgml-transformation' has been renamed to
 `sgml-transformation-function'.  The old name is still available as
 alias.
@@ -2886,6 +2895,7 @@ and super/sub-scripts are made into super/sub-scripts.
 +++
 *** New major mode Doctex mode, for *.dtx files.
 
+---
 ** BibTeX mode:
 
 *** The new command `bibtex-url' browses a URL for the BibTeX entry at
@@ -2942,6 +2952,7 @@ extracting the content of a BibTeX field.
 `bibtex-autokey-titleword-case-convert-function'.  The old names are
 still available as aliases.
 
++++
 ** In Artist mode the variable `artist-text-renderer' has been
 renamed to `artist-text-renderer-function'.  The old name is still
 available as alias.
@@ -2973,6 +2984,7 @@ breakpoints.
 To use this package just type M-x gdb.  See the Emacs manual if you want the
 old behaviour.
 
+---
 *** The variable tooltip-gud-tips-p has been removed.  GUD tooltips can now be
 toggled independently of normal tooltips with the minor mode
 `gud-tooltip-mode'.
@@ -3339,6 +3351,7 @@ See the documentation of the user option
 ---
 *** Rmail now displays 5-digit message ids in its summary buffer.
 
++++
 *** The new commands rmail-end-of-message and rmail-summary end-of-message,
 by default bound to `/', go to the end of the current mail message in
 Rmail and Rmail summary buffers.
@@ -3705,6 +3718,7 @@ variable `calculator-radix-grouping-mode'.
 ---
 ** cplus-md.el has been deleted.
 
+---
 ** Ewoc changes
 
 *** The new function `ewoc-delete' deletes specified nodes.
@@ -3850,6 +3864,7 @@ w32-use-full-screen-buffer to t.
 `kTextEncodingMacRoman', `kTextEncodingISOLatin1', and
 `kTextEncodingISOLatin2' are obsolete.
 
++++
 ** The variable `mac-command-key-is-meta' is obsolete.  Use
 `mac-command-modifier' and `mac-option-modifier' instead.
 
@@ -3919,6 +3934,7 @@ display tables.
 
 ** General Lisp changes:
 
++++
 *** The function `expt' handles negative exponents differently.
 The value for `(expt A B)', if both A and B are integers and B is
 negative, is now a float.  For example: (expt 2 -2) => 0.25.
@@ -4050,6 +4066,12 @@ inside timer functions and `post-command-hook' functions.
 This combines `defalias' and `make-obsolete'.
 
 +++
+*** New macro `with-case-table'
+
+This executes the body with the case table temporarily set to a given
+case table.
+
++++
 *** New function `unsafep' determines whether a Lisp form is safe.
 
 It returns nil if the given Lisp form can't possibly do anything
@@ -4063,6 +4085,7 @@ it evaluates those expressions immediately.
 
 This is useful in packages that can be preloaded.
 
++++
 *** `list-faces-display' takes an optional argument, REGEXP.
 
 If it is non-nil, the function lists only faces matching this regexp.
@@ -4406,6 +4429,7 @@ binding of VARIABLE (a symbol) in buffer BUFFER.  If VARIABLE does not
 have a buffer-local binding in buffer BUFFER, it returns the default
 value of VARIABLE instead.
 
+---
 *** The function `frame-or-buffer-changed-p' now lets you maintain
 various status records in parallel.
 
@@ -5405,7 +5429,7 @@ override incorrect graphical display dimensions returned by functions
 ** Mouse pointer features:
 
 +++ (lispref)
-??? (man)
+--- (man)
 *** The mouse pointer shape in void text areas (i.e. after the end of a
 line or below the last line in the buffer) of the text window is now
 controlled by the new variable `void-text-area-pointer'.  The default
@@ -5848,6 +5872,12 @@ to examine a file being visited and deduce the proper coding system
 for it.  (If the coding system is detected incorrectly for a specific
 file, you can put a `coding:' tags to override it.)
 
++++
+*** The new variable `ascii-case-table' stores the case table for the
+ascii character set.  Language environments (such as Turkish) may
+alter the case correspondences of ASCII characters.  This variable
+saves the original ASCII case table before any such changes.
+
 ---
 *** The new function `merge-coding-systems' fills in unspecified aspects
 of one coding system from another coding system.
diff --git a/etc/ORDERS b/etc/ORDERS
index 8c612a1b1b6..e08931e7ead 100644
--- a/etc/ORDERS
+++ b/etc/ORDERS
@@ -8,6 +8,6 @@ For more information, see the order form on the web at
 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
+You can also make tax-deductible donations to the Free Software
 Foundation, a not-for-profit organization (assuming you pay US taxes)
 - see <http://www.gnu.org/help/donate.html>.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 9ce3b8e9602..6c72bacae11 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -213,15 +213,15 @@ configuring your compiler to use the native linker instead of GNU ld.
 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.
+** Emacs compiled with Gtk+ crashes on startup on Cygwin.
 
 A typical error message is
-  ***MEMORY-ERROR***: emacs[5172]: GSlice: failed to allocate 504 bytes 
+  ***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
+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
@@ -1198,7 +1198,7 @@ The problems seem to depend on the version of LessTif and the Motif
 emulation for which it is set up.
 
 Only the Motif 1.2 emulation seems to be stable enough in LessTif.
-Lesstif 0.92-17's Motif 1.2 emulation seems to work okay on FreeBSD.
+LessTif 0.92-17's Motif 1.2 emulation seems to work okay on FreeBSD.
 On GNU/Linux systems, lesstif-0.92.6 configured with "./configure
 --enable-build-12 --enable-default-12" is reported to be the most
 successful.  The binary GNU/Linux package
@@ -1295,7 +1295,7 @@ be carried out at the same time:
    improves performance dramatically, at the slight expense of correctness
    of the X protocol.  lbxproxy acheives the performance gain by grouping
    several X requests in one TCP packet and sending them off together,
-   instead of requiring a round-trip for each X request in a seperate
+   instead of requiring a round-trip for each X request in a separate
    packet.  The switches that seem to work best for emacs are:
     -noatomsfile  -nowinattr  -cheaterrors -cheatevents
    Note that the -nograbcmap option is known to cause problems.
@@ -1401,7 +1401,7 @@ The easy way to do this is to put
 
 in your site-init.el file.
 
-* Runtime problems on character termunals
+* Runtime problems on character terminals
 
 ** Emacs spontaneously displays "I-search: " at the bottom of the screen.
 
@@ -2102,6 +2102,18 @@ pop-up menu interaction.
 Windows 95 and Windows NT up to version 4.0 do not support help text
 for menus.  Help text is only available in later versions of Windows.
 
+When "ClearType" method is selected as the "method to smooth edges of
+screen fonts" (in Display Properties, Appearance tab, under
+"Effects"), there are various problems related to display of
+characters: 2-pixel trace is left behind when moving overlays, bold
+fonts can be hard to read, small portions of some characters could
+appear chopped, etc.  This happens because, under ClearType,
+characters are drawn outside their advertised bounding box.  Emacs 21
+disabled the use of ClearType, whereas Emacs 22 allows it and has some
+code to enlarge the width of the bounding box.  Apparently, this
+display feature needs more changes to get it 100% right.  A workaround
+is to disable ClearType.
+
 There are problems with display if mouse-tracking is enabled and the
 mouse is moved off a frame, over another frame then back over the first
 frame.  A workaround is to click the left mouse button inside the frame
@@ -2113,16 +2125,32 @@ not as severely as in 21.1.
 An inactive cursor remains in an active window after the Windows
 Manager driven switch of the focus, until a key is pressed.
 
-Windows input methods are not recognized by Emacs.  Some
+Windows input methods are not recognized by Emacs.  However, some
 of these input methods cause the keyboard to send characters encoded
 in the appropriate coding system (e.g., ISO 8859-1 for Latin-1
-characters, ISO 8859-8 for Hebrew characters, etc.).  To make this
-work, set the keyboard coding system to the appropriate value after
-you activate the Windows input method.  For example, if you activate
-the Hebrew input method, type "C-x RET k iso-8859-8 RET".  (Emacs
-ought to recognize the Windows language-change event and set up the
-appropriate keyboard encoding automatically, but it doesn't do that
-yet.)
+characters, ISO 8859-8 for Hebrew characters, etc.).  To make these
+input methods work with Emacs, set the keyboard coding system to the
+appropriate value after you activate the Windows input method.  For
+example, if you activate the Hebrew input method, type this:
+
+   C-x RET k hebrew-iso-8bit RET
+
+(Emacs ought to recognize the Windows language-change event and set up
+the appropriate keyboard encoding automatically, but it doesn't do
+that yet.)  In addition, to use these Windows input methods, you
+should set your "Language for non-Unicode programs" (on Windows XP,
+this is on the Advanced tab of Regional Settings) to the language of
+the input method.
+
+To bind keys that produce non-ASCII characters with modifiers, you
+must specify raw byte codes. For instance, if you want to bind
+META-a-grave to a command, you need to specify this in your `~/.emacs':
+
+  (global-set-key [?\M-\340] ...)
+
+The above example is for the Latin-1 environment where the byte code
+of the encoded a-grave is 340 octal.  For other environments, use the
+encoding appropriate to that environment.
 
 The %b specifier for format-time-string does not produce abbreviated
 month names with consistent widths for some locales on some versions
@@ -2295,12 +2323,36 @@ the Emacs configure script, which should now find the jpeg library.
 Alternatively, modify the generated src/Makefile to link the .a file
 explicitly, and edit src/config.h to define HAVE_JPEG.
 
+*** `configure' warns ``accepted by the compiler, rejected by the preprocessor''.
+
+This indicates a mismatch between the C compiler and preprocessor that
+configure is using.  For example, on Solaris 10 trying to use
+CC=/opt/SUNWspro/bin/cc (the Sun Studio compiler) together with
+CPP=/usr/ccs/lib/cpp can result in errors of this form (you may also
+see the error ``"/usr/include/sys/isa_defs.h", line 500: undefined control'').
+
+The solution is to tell configure to use the correct C preprocessor
+for your C compiler (CPP="/opt/SUNWspro/bin/cc -E" in the above
+example).
+
+*** `configure' fails with ``"junk.c", line 660: invalid input token: 8.elc''
+
+The final stage of the Emacs configure process uses the C preprocessor
+to generate the Makefiles.  Errors of this form can occur if the C
+preprocessor inserts extra whitespace into its output.  The solution
+is to find the switches that stop your preprocessor from inserting extra
+whitespace, add them to CPPFLAGS, and re-run configure.  For example,
+this error can occur on Solaris 10 when using the Sun Studio compiler
+``Sun C 5.8'' with its preprocessor CPP="/opt/SUNWspro/bin/cc -E".
+The relevant switch in this case is "-Xs" (``compile assuming
+(pre-ANSI) K & R C style code'').
+
 ** Compilation
 
 *** Building Emacs over NFS fails with ``Text file busy''.
 
 This was reported to happen when building Emacs on a GNU/Linux system
-(RedHat Linux 6.2) using a build directory automounted from Solaris
+(Red Hat Linux 6.2) using a build directory automounted from Solaris
 (SunOS 5.6) file server, but it might not be limited to that
 configuration alone.  Presumably, the NFS server doesn't commit the
 files' data to disk quickly enough, and the Emacs executable file is
@@ -2387,17 +2439,17 @@ files are installed. Then use:
 
 (using the location of the 32-bit X libraries on your system).
 
-*** Building the Cygwin port for MS-Windows can fail with some GCC version
+*** Building the Cygwin port for MS-Windows can fail with some GCC versions
 
 Building Emacs 22 with Cygwin builds of GCC 3.4.4-1 and 3.4.4-2 is
 reported to either fail or cause Emacs to segfault at run time.  In
 addition, the Cygwin GCC 3.4.4-2 has problems with generating debug
 info.  Cygwin users are advised not to use these versions of GCC for
-compiling Emacs.  GCC versions 4.0.3, 4.1.1, and 4.1.2 reportedly
-build a working Cygwin binary of Emacs, so we recommend these GCC
-versions.  Note that these three versions of GCC, 4.0.3, 4.1.1, and
-4.1.2, are currently the _only_ versions known to succeed in building
-Emacs (as of v22.1).
+compiling Emacs.  GCC versions 4.0.3, 4.0.4, 4.1.1, and 4.1.2
+reportedly build a working Cygwin binary of Emacs, so we recommend
+these GCC versions.  Note that these versions of GCC, 4.0.3, 4.0.4,
+4.1.1, and 4.1.2, are currently the _only_ versions known to succeed
+in building Emacs (as of v22.1).
 
 *** Building the native MS-Windows port with Cygwin GCC can fail.
 
@@ -2548,7 +2600,7 @@ The fix is to install a newer version of ncurses, such as version 4.2.
 
 *** Linux: Segfault during `make bootstrap' under certain recent versions of the Linux kernel.
 
-With certain recent Linux kernels (like the one of Redhat Fedora Core
+With certain recent Linux kernels (like the one of Red Hat Fedora Core
 1 and newer), the new "Exec-shield" functionality is enabled by default, which
 creates a different memory layout that breaks the emacs dumper.  Emacs tries
 to handle this at build time, but if the workaround used fails, these
@@ -2718,6 +2770,13 @@ should now succeed.
 You need to install a recent version of Texinfo; that package
 supplies the `install-info' command.
 
+*** Installing to a directory with spaces in the name fails.
+
+For example, if you call configure with a directory-related option
+with spaces in the value, eg --enable-locallisppath='/path/with\ spaces'.
+Using directory paths with spaces is not supported at this time: you
+must re-configure without using spaces.
+
 ** First execution
 
 *** Emacs binary is not in executable format, and cannot be run.
diff --git a/etc/SERVICE b/etc/SERVICE
index 4d6009e9f36..3a057b98af1 100644
--- a/etc/SERVICE
+++ b/etc/SERVICE
@@ -1,1378 +1,10 @@
--*- text -*-
 GNU Service Directory
 ---------------------
 
-See the end of file for copyright information.
+Please see <http://www.fsf.org/resources/service/> for a list of
+people who have asked to be listed as offering support services for
+GNU software, including GNU Emacs, for a fee or in some cases at no
+charge.
 
-This is a list of people who have asked to be listed as offering
-support services for GNU software, including GNU Emacs, for a fee
-or in some cases at no charge.
-
-The information comes from the people who asked to be listed;
-we do not include any information we know to be false, but we
-cannot check out any of the information; we are transmitting it to
-you as it was given to us and do not promise it is correct.
-Also, this is not an endorsement of the people listed here.
-We have no opinions and usually no information about the abilities of
-any specific person.  We provide this list to enable you to contact
-service providers and decide for yourself whether to hire one.
-
-Before FSF will list your name in the GNU Service Directory, we ask
-that you agree informally to the following terms:
-
-1. You will not restrict (except by copyleft) the use or distribution
-of any software, documentation, or other technical information you
-supply anyone in the course of modifying, extending, or supporting GNU
-software.  This includes any information specifically designed to
-ameliorate the use of GNU software.
-
-2. You will not take advantage of contact made through the Service
-Directory to advertise an unrelated business (e.g., sales of
-non-GNU-related proprietary information).  You may spontaneously
-mention your availability for general consulting, but you should not
-promote a specific unrelated business unless the client asks.
-
-Please include some indication of your rates, because otherwise users
-have nothing to go by.  Please put each e-mail address inside "<>".
-Please put nothing else inside "<>".  Thanks!
-
-For a current copy of this directory, or to have yourself listed, ask:
-        service@gnu.org
-
-** Please keep the entries in this file alphabetical **
-^_
-Aaronsen Group, Ltd.    <gnu@aaronsen.com>
-600 Grant St.
-Suite 5345
-Pittsburgh, PA 15219 US
-+1 412 391 6000 voice
-+1 412 361 5991 fax
-http://www.aaronsen.com/gnu
-
-The Aaronsen Group provides several levels of service in the free software
-arena, from simple configuration and installation to large extensions and
-new development.  We specialize in unique applications, but have the
-experience to handle all manner of prospects, from database-backed
-web-sites to high-end multiprocessor clusters.
-
-Our service area covers the US, with key offices in Pittsburgh, PA; San
-Jose, CA; and New York, NY.
-
-We are available for both hourly work (at $300 per hour, some qualified
-discounts are available) and fixed-price projects.  Work is done on the
-client site, at our offices, or remote via Internet or telephone
-connection
-
-Updated: 2001-05-08
-^_
-Alcôve
-------
-
-Alcôve, Centre Paris Pleyel, 153 bld Anatole France
-93200 Saint-Denis France
-
-Email:  <infos@alcove.fr>
-
-Web:    http://www.alcove.com
-Tél.:   +33 1 49 22 68 00
-Fax:    +33 1 49 22 68 01
-
-Founded in 1996, Alcôve's main purpose is to promote and support the
-use of GNU/Linux and OSS on the European market.
-Expertise in OSS innovation is the foundation of all Alcôve's
-activities.
-We provide key accounts and leading businesses in the field of IT with :
-
-        Consultancy
-        Engineering
-        Training
-        Support
-        Technical watching brief
-        OSS Certification - Validation - Guarantee
-        Drivers for the linux kernel
-        Company directory and unified messaging
-        Linux Firewall Security Package
-
-Keys: support services, consulting, open source software, GNU/Linux,
-Apache, Perl, GNU, Samba, Zope, Imp, OpenLDAP
-
-Average daily rate, depending on the job : 1000 euros.
-
-Updated:  2001-06-26
-^_
-Allegro Consultants, Inc.         <info@gccsupport.com>
-1072 De Anza Blvd., Suite B101
-San Jose, CA  95129-3532
-USA
-+1 408 252-2330 voice
-+1 408 252-2334 fax
-http://www.gccsupport.com
-
-Allegro Consultants, Inc, in association with DIS International, is
-now offering annual support contracts covering the GNU Compiler
-Collection and related tools, including the GCC C and C++ compilers
-for MPE/iX.
-
-The free GCC C and C++ compilers have been available on MPE/iX for
-several years now, and are used for mission-critical applications by
-many organizations including Hewlett-Packard. Until now, assistance
-was available only from Mark Klein of DIS on a limited, voluntary
-basis. Mark is the person who originally ported GCC to the HP e3000,
-and he continues to maintain the software and port new versions.
-
-Support contracts start at $1,995.00/year for an organization
-(unlimited number of HP e3000 computer systems) with two designated
-callers.  Additional options are available for large organizations who
-need to designate more than two authorized callers, or who want the
-additional security of 24x7 coverage.
-
-Updated: 2001-06-12
-^_
-Amazonia Computing
-
-<rick@viclink.com>
-http://www.viclink.com/~rick
-
-1981 NW Thomsen Lane
-McMinnville, OR  97128
-503-474-0572
-
-I provide development and technical support for free software
-and open source systems including embedded programming, GNU/Linux, the
-GNU development suite..
-
-I have over 10 years experience building and maintaining systems ranging
-from medical patient monitoring systems to Linux device drivers for
-custom PCI plug in cards.
-
-Rates range from $75.00/hr to $90/hr USD.  Will work for a lower rate
-if in involves working in either Brazil, Vietnam, Indonesia, or Cuba.
-I am also willing to work on fixed price contracts.
-
-Updated: 2001-05-08
-^_
-Dipl.-Inform. Gerd Aschemann                     <gerd@aschemann.net>
-Osannstr. 49
-D-64285 Darmstadt
-Tel.: +49 173 3264070
-http://www.aschemann.net/
-
-- Consultant
-  + Unix Network and System Administration
-  + Distributed Systems and Middleware Infrastructures
-- former System Administrator (UNIX and NT) at CS Department, TU Darmstadt, Germany
-- 20 years working in the CS field, System administration on different platforms
-- 13 years with UNIX/Networking/FreeWare/GNU/X11
-- 10 years courses on Operating Systems and Distributed Systems
-- Lectures on System and Network Administration
-- Platforms: Solaris, GNU/Linux, SunOS, Ultrix, HP-UX, Digital Unix, AIX, SCO, FreeBSDs
-- Distributed Platforms and Information Systems (CORBA, WWW, Java, SOAP)
-
-Rates are at 180,-- DM (~85 US$) per hour minimum, depending on the job.
-I am willing to travel for sufficiently large jobs.
-
-Updated: 2001-05-09
-^_
-Baker Research, Ltd.
-P. O. Box 10036, Alexandria, VA   22310
-Phone:  (703) 960-9500 (Voice)
-        (703) 960-8700 (Fax)
-Web:    http://www.baker-research.com
-email:  <solutions@baker-research.com>
-Rate:   $75.00/hr to $150.00/hr, or fixed-price projects.
-
-Services:
-
-    --Customization of systems for user needs
-    --Software product evaluation and recommendation
-    --Full-lifecycle software development
-    --Programming (C/C++, tcl/tk, bash, perl)
-    --Custom backup and archival systems
-    --GNU/Linux system installation, configuration, and management
-    --Cluster systems support
-        -Installation, configuration, and management
-        -MPI and Myrinet support
-    --Data acquisition, management, visualization, and archival
-
-Updated:  2001-05-11
-^_
-Don Barry, Ph.D.       <don@astro.cornell.edu>
-Ithaca, NY
-
-Astrophysicist with extensive and varied hacker background.  Substantial
-expertise in mathematical modeling, instrument interface, low-level and
-high-level hardware control, statistical analysis, automated/mathematical
-typesetting.  Also fluent in opto/electro/mechanical design.  I try to find
-solutions using free software when possible and specialize in GNU/Linux
-platforms.  Degrees also in chemistry and mathematics.
-
-Speak: C, APL, Fortran, J, Perl, Emacs Lisp, IDL, variety of machine
-languages from CDC CYBER (!) to x86 families, TeX/LaTeX, sendmail, and
-quite a few others.  Experience on platforms from PDP to present.
-
-Rates: $75--$150 per hour + travel (if required) depending on the needs of
-the project, the level of support and availability required, and its
-interest to me.
-
-Services: consulting, design, porting, lecturing, support, project definition,
-system implementation.
-
-Updated: 2001-05-09
-^_
-James Craig Burley
-97 Arrowhead Circle
-Ashland, MA 01721
-Email: <craig@jcb-sc.com>
-Web:   http://world.std.com/~burley/
-
-Expertise (mainly Development and Maintenance):
-    Compilers for Imperative Languages (author of GNU Fortran, aka g77)
-    Operating System Kernels
-    Tools/Utilities
-    Microcode (mainly VLIW) and Assembler
-    Software-Development-System Architecture (including APIs, IDEs)
-    Debugging
-    Technical Writing (Manager of Documentation)
-
-Experience:
-    Programming Languages C, PL/I, Fortran, PostScript
-    Operating Systems Unix, GNU/Linux, Solaris, HP-UX, VAX/VMS, PRIMOS,
-      MIT ITS, TOPS-10, TSS/8, IBM MVS
-    Assembler/Microcode Languages for Sun SPARC, HP-PA RISC, Numerix VLIWs,
-      VAX, Pr1me, IBM 360, PDP-10, PDP-8
-    Scripting Languages (many)
-    APIs (many)
-
-Rate: $180/hour
-
-Updated: 2001-05-08
-^_
-   C2V                          Michel Delval <mfd@c2v.com>
-   82 bd Haussmann              Jean-Alain Le Borgne <jalb@c2v.com>
-   75008 Paris
-   France
-   Tel (33 1) 40.08.07.07
-   Fax (33 1) 43.87.35.99
-   http://www.c2v.com/freesoft.htm
-   e-mail: <consult@c2v.com>
-
-   Services: we offer source or source+binary distribution,
-   installation, training, maintenance, technical support,
-   consulting, specific development and followup on the GNU software
-   development environment: Emacs, gcc/g++, binutils, gas, gdb.
-
-   Porting on new platforms, and professionally developing software
-   with the GNU tools in the Unix/X11 environment since they were
-   first available.
-
-   Experience: GNU C Compilation toolchain for the SGS-Thomson D950
-   and ST20 DSP chips.
-
-   GNU C compilation toolchain (cross-compiler, compiler, linker,
-   assembler, debugger) for SparcV7 ERC32 based space systems
-   (Sextant Avionique / Alcatel Espace).
-
-   Feasability study, analysis and prototyping of a complete
-   compilation toolchain based on the GNU programming tools for the
-   CSEM RISC microprocessor family.
-
-   Rates: from 5000 FF/day to 750 000 FF/year, 40% discount for
-   educational institutions, add taxes and expenses.  Ask for list.
-
-Updated: 2001-05-09
-^_
-Cendio Systems AB       <info@cendio.com>
-Teknikringen 3
-SE-583 30 Linkoping
-SWEDEN
-+46 13 21 46 00 voice
-+46 13 21 47 00 fax
-http://www.cendio.com/  <international site>
-
-Cendio Systems develops, implements and integrates solutions based on
-Open Source Software. We also develop and market the Fuego
-Firewall(TM), an award winning and easy-to-use firewall, based on
-GNU/Linux.
-
-We offer professional services, including support, maintenance,
-integration and development in the following areas:
-
-* Embedded Linux
-* Client/Server Solutions GNU/Linux/BSD
-* Professional Training GNU/Linux, certifications from SAIR Linux/GNU
-* Open Source Strategy
-* Development/Adaptation of free software
-
-Cendio Systems have deep roots in Linkoping University, and was
-founded 1992 as Signum Support. Our headquarters resides in Mjardevi
-Science Park in Linkoping and we have an office in Stockholm. We are
-currently about fifty employees at both locations.
-
-Cendio Systems won the Lotus 'Tux Award' at LotusSphere 2000 for "the
-partner who best exemplifies a unique dedication to Lotus and Linux
-technologies and has successfully executed their vision in the
-marketplace."
-
-Cendio Systems have the following certifications and memberships:
-
-Association of Computing Machinery, Professional Membership
-COMPAQ System Specialist (Intel and Alpha Systems)
-Embedded Linux Consortium, Founding Member
-IBM Value Added Reseller (Netfinity)
-IBM Solution Provider (RS/6000)
-SAIR GNU/Linux, Accredited Center for education
-SGI Systems Integrator
-
-Rates: Please request our price list.
-
-Updated: 2001-05-09
-^_
-Alex Cherepanov
-111 McDade Blvd, Apt. A-205, Folsom, PA 19033
-Phone: 610 529 3475
-email: <alexcher@erols.com>
-Web:   http://users.erols.com/alexcher/
-
-Services: Support and maintenance of free PostScript and PDF
-software including Ghostscript, ps2pdf, a2ps, tiff2ps, pdfopt.
-General imaging, font, and PDL consulting.
-
-Experience: 12 years experience in software engineering, 5 years
-in PostScript and digital color printing.
-
-Rates: $50-75/hour, depending on contract length.
-
-Updated: 2001-05-22
-^_
-CodeSourcery, LLC <info@codesourcery.com>
-9978 Granite Point Ct
-Granite Bay, CA 95746
-(650) 364-5360
-http://www.codesourcery.com
-
-CodeSourcery specializes in customization of, enhancements to, and
-support for all GNU software.  We have particular experience in the
-field of programming tools, and have been responsible for many
-features in the GNU C and C++ compilers including the implementation
-of member templates and type-based alias analysis.  Mark Mitchell, one
-of our co-founders, is a co-maintainer of the GNU Compiler Collection.
-
-We also have experience with GNU tools ranging from emacs to binutils
-to gdb to autoconf, and are willing to work on any and all free
-software projects.
-
-Please see our web page at www.codesourcery.com for more information
-about our products, services, and prices.
-
-Updated: 2001-05-16
-^_
-Stuart Cracraft         <cracraft@gnu.org>
-P.O. Box 6061
-Laguna Niguel, CA, 92607, USA
-Phone: 714-347-8106 (prefer email)
-Rate: negotiable
-
-Consultation topics:
-Entire GNU suite - porting, compilation, installation,
-user-training, administrator-training.
-
-Method: via any combination of telephone, dialup, Internet, in-person, email.
-
-Experience: supporting GNU since project inception, original port of
-GNU Emacs to Sun Solaris, original author of GNU Emacs online tutorial.
-Expertise in C, Emacs Lisp, Perl, Expect, Oracle, Informix, SunOS, Solaris,
-NIS, NFS, system-monitoring via paging. Unix System and Database
-administration or development.
-
-Updated: 2000-12-13
-^_
-Bruce Dawson    -    <jbd@codemeta.com>
-CodeMeta, Inc.
-Manchester, NH  USA
-800-354-2209
-
-Specializing in GNU tools such as CVS, gnats, bash, gawk, fileutils...
-
-Services:
-
-  o 800 phone support.
-
-  o Modification and development.
-
-  o Training.
-
-Rate: Fixed rate deliverables or $110/hour for hourly work.
-
-http://www.codemeta.com
-
-Updated: 2001-05-09
-^_
-Martin Deen Consulting
-<sunra@mail.hypermart.net>
-426 Marietta St. #503
-Atlanta, GA 30313
-(V) 404-931-5392
-http://sunra.hypermart.net
-
-Consultant with many years supporting the GNU/Linux environment and
-working with Open Source solutions.  Available for hourly and per
-project work.  Hourly rates start at $100/hr.  Work can be done on
-client site, offsite, or remotely via Internet.  Can take engagements
-in Atlanta with little notice, call for arangements elsewhere.
-
-Updated: 2001-04-20
-^_
-DSS Distributed Systems Software, Inc.
-3253 Georgia St.                         <dss@dss.bc.ca>
-Richmond, British Columbia V7E 2R4       http://www.dss.bc.ca
-CANADA                                   (604) 270-9559
-
-GNU-related services:
-  We specialize in support for GCC (mainly C and C++), including porting,
-  retargeting, and customizing.
-  Also, GNU and other free software that falls within our areas of expertise.
-
-Expertise:
-  DSS provides software design, implementation, and consulting services.
-
-  Distributed systems:
-    o Client/Server architectures, computer networking, communication
-protocols
-    o Directory systems, including X.500 and LDAP
-    o High-performance and special-purpose distributed systems and databases:
-      scalability, reliability, availability, transactions
-    o Computer systems performance analysis
-
-  Compilers, translators, and interpreters, including "small" and
-  special-purpose languages
-
-Rates:
-  Consulting rates are $65-$200 USD per hour, plus
-  applicable taxes.  Fixed-cost projects are also possible.
-
-Updated: 2001-05-10
-^_
-John W. Eaton
-<jwe@gnu.org>, <jwe@net66.com>
-
-Experience:   Original author and current maintainer of GNU Octave
-              (http://www.octave.org).
-
-              Derivatives of the Unix man utility that I wrote in 1990
-              are currently distributed with several GNU/Linux systems.
-
-              Improved GNU Make's support for VPATH and object
-              libraries on VMS systems.
-
-              Various other enhancements and bug fixes for other free
-              software tools.
-
-              I have more than 18 years experience programming various
-              languages and systems, more than 13 years as a user and
-              system mangler of Unix systems, including Ultrix, SunOS,
-              AIX, HP/UX, BSD, IRIX, Digital Unix, and GNU/Linux.
-              Long-time user of GNU tools on all these platforms.
-
-Programming:  Octave, Matlab, C++, C, Fortran, Emacs Lisp, TeX/LaTeX,
-              AWK, M4, Autoconf, Make, Lex & YACC, Unix shell
-              programming, etc.
-
-Services:     Anything related to programming and extending Octave.
-              Porting, installation, and customization of GNU/Linux and
-              GNU tools.  Unix system administration.
-
-Rates:        $100/hour + travel and expenses (if required).  Will
-              consider travel for short periods and/or sufficiently
-              interesting jobs, but prefer to work via the net or email.
-              Lower rates for non-profits.
-
-Updated: 2001-05-14
-^_
- Echo Labs                  <echo@iinet.net.au>
- 29 Weld St,                 http://www.iinet.net.au/~echo/
- Nedlands, WA 6009
- Perth, Australia
- +61 (0) 41 356 0008
-
- Echo Labs is a software consultancy that also provides support and
- development skills.  Specialising in GNU software, particularly Tcl/Tk
- and Linux. We can deliver systems at a fraction of the cost of those
- based on more traditional technologies.  Internet/intranet, telephony
- and data communications solutions, for all platforms are undertaken.
- GUI front-ends done quickly in rapid development process.
-
- While typically involved in engineering and technical areas, any
- GNU/Open Source software will be supported.
-
- For further details see: http://www.iinet.net.au/~echo/
-
- Experience: 15+ years C/Unix, Sun, SCO, GNU/Linux, Win/NT.
-             Secure WWW servers (Apache SSL), Ecommerce solutions.
-             Systems programming, device drivers, hardware interfacing.
-             GNU tools/utilities, telephony and Embedded & realtime
-             systems. Communications protocols and implementation.
-
- Degrees:    BAppSc (CS) (Distinction), Curtin University, Perth
-
- Rates:      AUS $50-75/hr neg.
-
-Updated:    2001-05-09
-^_
-Noah Friedman                   <friedman@splode.com>
-6114 La Salle Ave. #739
-Oakland, CA 94611-2802
-
-Author of several Emacs Lisp packages and parts of Emacs, as well as
-numerous network and unix system utilities.  Co-maintained GNU Texinfo and
-Autoconf for a couple of years.  Experienced unix systems engineer.
-FSF employee Feb 1991--Sep 1994.
-
-I can perform installation, porting, and enhancement of all GNU software
-and any other free software, especially for Linux/GNU systems; design
-high-capacity hardware-redundant servers for production environments;
-provide consulting on the use of version control management with CVS; and I
-am willing to provide handholding for shell programming and Emacs Lisp
-development.
-
-Fees negotiable, averaging $100-$150/hour.  I can work in the California
-bay area or anywhere accessible on the Internet.  For larger jobs I may be
-willing to travel.
-
-Updated: 2001-05-08
-^_
-Brian Gough                         <bjg@network-theory.co.uk>
-Network Theory Limited              http://www.network-theory.co.uk/
-Bristol, United Kingdom
-
-Tel: 0117 3179309 (in UK), +44 117 3179309 (outside UK)
-
-I provide support and development of free software on a contract
-basis.  I can work at your site, over the internet, or by phone/email.
-I have extensive experience with many free software packages,
-particularly for web development.
-
-I can also provide specialized consulting in numerical software
-development for scientific and quantitative applications.
-
-Rate: 40-60 pounds/hour, depending on location.
-
-Updated: 2001-09-05
-^_
-Ronald F. Guilmette    <rfg@monkeys.com>
-RG Consulting
-1751 East Roseville Pkwy. #1828
-Roseville, CA 95661
-Tel: +1 916 786 7945
-FAX: +1 916 786 5311
-
-Services:      Development & porting of GNU software development tools.
-
-GNU Contributions:
-               Invented, designed, and implemented the protoize and
-               unprotoize tools supplied with GCC2.
-
-               Designed and developed all code to support the generation
-               of Dwarf symbolic debugging information for System V Release
-               4 in GCC2.
-
-               Performed original port of GNU compilers to SVr4 system.
-
-               Finished port of GNU compilers to Intel i860 RISC
-               processor.
-
-Experience:    13+ years UNIX systems experience, all working on compilers
-               and related tools.
-
-               7+ years working professionally on GCC, G++, and GDB under
-               contract to various firms including the Microelectronics
-               and Computer Technology Corporation (MCC), Data General (DG),
-               Network Computing Devices (NCD), and Intel Corp.
-
-Other qualifications:
-               Developer of the RoadTest (tm) C and C++ commercial
-               compiler test suites.
-
-               Former vice-chairman of UNIX International Programming
-               Languages Special Interest Group (UI/PLSIG).
-
-               Bachelor's and a Master's degrees, both in Computer Science.
-
-Rates:         Variable depending upon contract duration.  Call for quote.
-
-Updated: 2000-12-13
-^_
-IDEALX
-15-17 avenue de ségur
-75007 Paris
-France
-
-Tel - +33144420000  Fax - +33144420001
-http://www.IDEALX.com, http://www.IDEALX.org
-
-IDEALX is involved in the development of Open Source solutions,and
-ensures their deployment and maintenance.
-Development
-Technical support
-Technology watch
-Consulting
-Engineering
-Training
-
-Rates - Variable
-
-Updated: 2000-12-13
-^_
-Ehud Karni     <kehud@iname.com>
-Israel
-
-Support of Emacs & Emacs lisp, GNU/Linux, Cygwin.
-
-Fee:  $75/hour.
-
-Updated: 2001-05-09
-^_
-Bradley M. Kuhn
-<bkuhn@ebb.org>
-http://www.ebb.org/bkuhn
-
-I am available for part-time system administration, software development
-and training.  I have extensive experience with system administration of
-GNU/Linux systems, and Free Software development.  I have also taught
-courses in C++ and Perl.  As an employee of the FSF, I have a unique
-perspective on the free software community.
-
-Please visit my homepage for more information on my background and skills.
-My resume is also available there.
-
-I am available for both 1099 and W2 on-site contracting in the Boston, MA,
-USA metropolitan area, as well as remote consulting via dialup or Internet
-connection anywhere in the USA.  I am not interested in relocation.
-However, temporary (two week maximum) jobs with paid expenses at other
-locations will be considered.
-
-My rate varies greatly (between $25-$60/hour) depending on the
-circumstances.  Rates for non-profit organizations will be on the lower end
-of the spectrum, if I support your cause.
-
-Updated: 2001-06-14
-^_
-Paul Gillingwater, CEO
-CSO Lanifex Unternehmensberatungs & Softwareentwicklung GmbH
-Praterstrasse 60
-A-1020 Vienna, Austria
-http://www.lanifex.com
-Phone.: +43/1/2699293-21
-Fax.: +43/1/2699293-13
-Mobile.: +43/699/19223085
-
- CSO Lanifex is an effective team of software developers who are
-actively implementing Web-based database systems, using a variety of
-Open Source technologies, including GNU/Linux, PHP, MySQL, Perl and
-especially the Midgard Project.
-
- Our speciality is Web development with content management, especially
-for larger Web portals and e-Commerce systems.  We're very much
-in-favour of Free (as in speech) software, and have used it for almost
-all of our customers.
-
- We have eight staff, with a variety of skills, including RHCE, PHP,
-Perl, C, Java, SQL, network design, security consulting, Internet
-routing, UMS etc.  The CEO personally has over 20 years of experience
-with UNIX, and more than 10 years experience with a variety of
-Internet technologies.  For a more complete list, please refer to our
-Web site listed below.
-
-For further details see: http://www.lanifex.com
-
-Rates: ATS 1.500/hr neg.
-
-Updated: 2000-12-19
-^_
-Greg Lehey
-LEMIS
-PO Box 460
-Echunga SA 5153
-Australia
-
-Phone:  +61-8-8388-8286
-Fax:    +61-8-8388-8725
-Mobile: +61-418-838-708
-Mail    <grog@lemis.com>
-
-Services: Supply, porting, installation, consultation on all GNU
-products.
-
-Experience: 25 years OS and compiler experience, ports of most GNU
-products.  Author of ported software CD-ROM for UNIX System V.4.2,
-"Porting UNIX Software" (O'Reilly), "Installing and Running FreeBSD"
-and "The Complete FreeBSD" (both Walnut Creek).
-
-Rates: Choice of AUD 300 per hour or hotline rates AUD 6 per minute.
-Outside Australia, $US 180 per hour or $US 3.50 per minute.  Quick,
-well prepared questions by mail may be free.
-
-Updated: 2001-05-09
-^_
-Alan Lehotsky                                               <apl@alum.mit.edu>
-Quality Software Management
-634 West St
-Carlisle, MA 01741
-
-Phone:  (978)287-0435
-Fax:    (978)287-0436
-
-Services:
-                 -  Support for GNU compilers, including rehost/retarget
-                 -  GNU Binutils rehost/retarget.
-                 -  cgen/sim
-                 -  Perl internals hacking
-                 -  General system software work (SW tools, O/S, device drivers)
-                 -  runtime library (especially floating point)
-                 -  project management
-                 -  software process improvement
-
-Experience:     20+ years of design and implementation of optimizing
-                compilers.  "Mr. Bliss" at Digital in the 70's and early
-                80's.  Experience with Motorola 68k, PowerPC, SPARC, Intel
-                x86 and IA64 (Merced), MIPS, NS32K, ADI SHARC DSP, VAX, PDP-11,
-                PDP-10.  Wrote or maintained compilers for Ada, BLISS, C, C++,
-                FORTRAN, Pascal, Modula/2,  O/S experience includes Unix (OSF/1,
-                SunOS, Solaris, AIX, HP/UX), VAX/VMS, Windows/NT, MacOS.
-
-                8 years experience with GCC internals, including major changes to
-                support 8 bit bytes on word-address Analog Devices SHARC DSP and
-                general support of PowerPC code generation. Retargetted gcc/binutils
-                cross-tools to ASIC used in optical switch.  Retargeted gcc to 8 bit "internet toaster"
-                micro-computer.
-
-References available
-
-Rates:          $110/hr.
-                 fixed price possible for well-defined deliverables.
-
-Updated: 2001-05-08
-^_
-Reuven M. Lerner
-Lerner Communications Consulting Ltd.
-PO Box 518
-105 Nahar Ha-Yarden Street
-Modi'in 71700
-Israel                          <reuven@lerner.co.il>
-
-Phone:     08-973-2225 (within Israel)
-       +972-8-973-2225 (outside of Israel)
-
-Fax:       08-973-0477 (within Israel)
-       +972-8-973-0477 (outside of Israel)
-
-WWW: http://www.lerner.co.il
-
-We specialize in writing custom Web and Internet applications.  In
-particular:
-
-- We create database-backed Web sites using Perl, Tcl, Python, Java,
-  Apache, mod_perl, MySQL, PostgreSQL, and (when free software doesn't
-  suffice) Oracle.
-
-- We offer support and service for system administrators who need help
-  with their GNU/Linux systems.
-
-- We offer training in a variety of programming languages (Perl, Tcl,
-  Python, and Java) and in GNU/Linux administration.
-
-Consulting rates: $150/hour, or $100/hour for non-profits
-
-Updated: 2001-05-09
-^_
-Richard Levitte             (in TeX: Richard Levitte
-Levitte Programming                  Levitte Programming
-Spannvagen 38, I                     Spannv\"agen 28, I
-S-168 35  Bromma                     S-168 35  Bromma
-Sweden                               Sweden)
-Tel.nr.:  +46 (8) 26 52 47      (there is an answering machine)
-Cellular: +46 (708) 26 53 44
-e-mail:   <levitte@lp.se>
-
-What I do:
-        Primarily I work on GNU software for VMS, both VAX and AXP.  I've
-        been porting GNU Emacs to VMS since spring 1991.  I've  ported a
-        bunch of other GNU programs as well.  I maintain GNU vmslib.
-        For further info, see http://www.lp.se/~levitte/prof/resume.html
-
-Programs supported:
-        To a varying degree (ranging from extension and porting to
-        installation and simple questions) at the time of updating this
-        entry:
-        - GNU vmslib, emacs, autoconf, zip, diffutils, m4, patch, texinfo,
-          C/C++; on both VMS and Unix.
-        - Other GNU programs to a small degree; on Unix.
-        For further info, look at http://www.lp.se/products/gnu.html
-
-Experience:
-        Fluent in TeX/LaTeX and many programming languages.
-        Modified key elements in Emacs (e.g., memory and process management)
-        to work transparently on VMS.  I have very good knowledge in the VMS
-        operating system.  I'm also knowledged in the a few Unix flavors.
-        For further info, see http://www.lp.se/~levitte/prof/resume.html
-
-Your Rate:
-        $70-$100/hour (500-800 SEK in sweden), plus expenses.  My rates
-        are negotiable, depending on how interesting the project is to me.
-
-Updated: 2000-05-28
-^_
-Gordon Matzigkeit                 <gord@gnu.org>
-Box 325                           http://fig.org/~gord/
-Lumsden, Saskatchewan  S0G 3C0    Voice: (306) 731-3011
-CANADA
-
-I will gladly help novice and intermediate computer users to install,
-understand, and use free software, whether or not I have prior
-experience with that software.  I know my limitations well, and will
-freely give other contacts if I cannot solve your problem myself.
-
-I have over 5 years of experience with several of the major free OSes:
-GNU/Linux (Debian, Red Hat), NetBSD, FreeBSD, and GNU/Hurd.  Some of
-my specialties are networking, Emacs, Automake, Autoconf, C, Perl, and
-shell script programming.
-
-My rates are negotiable depending on the task: usually $40-$60
-(Canadian) per hour.  Flat rates preferred.
-
-Updated:  2000-12-19
-^_
- NetGuide Scandinavia AB <info@netg.se>
- Tankeg=E5ngen 4
- S-417 56 G=F6teborg, Sweden
- +46 31 50 79 00 voice
- +46 31 50 79 39 fax
- http://www.netg.se
-
-NetGuide Scandinavia AB is a company that does consultant jobs and holds
-courses in the fields of Unix software, TCP/IP networking and Internet
-applications. The people behind NetGuide Scandinavia AB have many years of
-general Unix experience, both as system administrators and as
-programmers, and also extensive experience in maintaining the GNU
-programs; in administration as well as finding and fixing bugs.
-
-Services offered:
-
- - Installation and customizing GNU and other free software.  We will
-   make free software as easy to install and use as shrink wrapped
-   programs.
- - Service and support subscriptions.
- - Warranty protection.
- - Customization and porting.
- - Subscriptions to new versions which we will send monthly or with
-   any other interval.
- - Finding, recommending and investigating free software in any
-   area of the customers choice.
- - Regular consulting.
- - Support on Internet service software, especially the free
- - Support on GNU/Linux.
- - Freeware based courses in Unix usage, C, C++, or any GNU tools
-
- Rates: For courses, contact us for a quote,
- For consulting, $60-120/hour, depending on contract length.
-
-Updated: 2000-12-13
-^_
-Thien-Thi Nguyen
-ttn@glug.org
-San Diego, CA, USA
-
- - scheme, common lisp, elisp, c, perl, verilog, sh, etc
- - software architecture / implementation / testing
- - hardware design / verification
- - tools flow / environment tweaking / scripting
- - simulators / transactors / stimulus generators
- - glue code / integration
-
-Resume: http://www.glug.org/people/ttn/resume.html
-
-Rate: $100/hr, possibly less
-
-Updated: 2001-05-08
-^_
-David Nicol
-Post office box 45163
-Kansas City, Missouri 64171
-<david@tipjar.com>
-http://www.tipjar.com/dnconsult
-
-Unix, GNU/Linux, Perl installation, C, C++, Lisp, Perl programming.
-
-CGI programming.
-
-Installation, porting.
-
-Specification development, design, implementation, documentation.
-
-Rate: $60/hour, or fixed contract.  On-site support available in
-greater Kansas City area.
-
-Updated: 2001-05-08
-^_
-Jonas Oberg                  (TeX: Jonas \"Oberg
-Skalangsgatan 11B                  Sk\"al\"angsgatan 11B
-S-723 36  Vasteras                 S-723 36 V\"aster\.as
-Sweden                             Sweden)
-
-Phone: +46-21-144831
-E-mail: <jonas@gnu.org>
-
-I offer support for most GNU software including the GNU
-Hurd and also do system administration on GNU systems.
-I can do free software development and have a good
-understanding of automake, autoconf, flex, bison, guile,
-texinfo and much more. Rates around USD$100.
-
-Updated: 2001-05-09
-^_
-  Peter Olsen
-  P.O. Box 410
-  Simpsonville, MD 21150
-
-  <p@sigmaxi.org>
-
-  What I do:  Mathematical modeling and model building using Gnu
-          and other Free Software.  Scientific and engineering
-          analysis, modeling, and programming in FORTRAN, C, LISP,
-          and Java.  Statistical analysis.  Emacs customization.
-
-  Examples of my previous work:
-               1. I built the model used predict the
-          amount of work required to clean up the Exxon Valdez oil
-          spill.  Model was completed in ten days, used to allocate
-          resources for $2 billion summer cleanup, predictions were
-          accurate.
-               2. I built a model applying commercial capital
-          investment standards to a Federal Agency budget, helped
-          support $250 Million budget increase.
-
-  Credo:  Engineering is the art of applying a professional
-          knowledge of mathematics and the physical sciences to
-          improve the quality of life.
-
-  Rates:  $135/hour (+ travel and expenses) on site,
-           $95/hour remote access.
-
-  Notes:  1. Visiting Lecturer for Society for Industrial and Applied
-          Mathematics:  Will speak without fee about Valdez model
-          (or other work) to Educational and not-for-profit
-          organizations (plus most-economical travel and living
-          expenses or travel or living arrangements in kind).
-
-          2. I do not accept offers which pose the danger
-          of conflict of interest with any present or former client
-          or employer.
-
-
-Updated: 2000-12-13
-^_
-    Open Systems Computing AS       Open Systems Computing AS
-    Kongensgate 9                   Rogaland Kunnskapspark, PB 8034
-    N-0153 Oslo                     Prof. Olav Hanssensvei 11
-    Norway                          N-4068 Stavanger
-                                    Norway
-
-Phone:               Fax:
-  +47 22 20 40 50    +47 22 20 02 85
-
-Web:                 E-mail:
-  http://www.osc.no  <gnu-support@osc.no>
-
-Open Systems Computing AS can provide programming support for all
-GNU software -- extending or adopting it to meet customer needs.
-Prices vary with software and project.  Hourly fees are in the $80-120
-range.  Fixed-priced projects are also available.  Phone support is
-available only for customers with support contracts.
-
-Updated:  2001-05-09
-^_
-Francesco Potortì <pot@gnu.org>
-Via S.Stefano, 8
-56123 Pisa, Italy
-Tel. (050)560671
-
-Emacs:  installation and maintenance, training and tutorials,
-        customisation, extensions, troubleshooting.  Author of some of
-        the packages in the emacs distribution, has made the porting
-        of emacs to the Motorola Delta architecture.
-
-Other:  installation and maintenance of GNU software.  Experience with
-        hylafax, RCS, gperf, etags, smail, indent, diff, gawk, gcc,
-        screen.  Is the current maintainer of etags.
-
-Rates:  100 E/hour.
-        Prefer e-mail communication to telephone.
-
-Qualifications: Electronic Engineering degree, Pisa.  Full time
-        researcher in CNUCE-CNR.
-        Familiar with elisp programming, porting of C programs,
-        low-level TCP/IP programming for embedded systems.
-
-Updated:  2001-05-09
-^_
-Quoll Systems Pty Ltd, see http://quoll.com.au
-8 Brown St, Fannie Bay, Darwin, NT, Australia.
-Phone: +61 8 8941 7150 Fax: +61 8 8941 7151 Mobile: 0409 691 399
-e-mail: <pjm@gnu.org> or <info@quoll.com.au>
-
-QS is a small (4 full-time staff + 15 part-timers) which does a variety
-of things in the *IX, technical computing area including:
-
-           o Systems development/maintainence (in most programming languages)
-           o Training (GNU/Linux, FreeBSD, OpenBSD, Apache, Perl, ...)
-           o Consulting in areas such as security, reliability,
-
-Recent projects have included wind turbine generator control, water
-quality databases, remote area satelliate communications, Apache Web
-serving, ISP configurations, *nix training. Staff have provided some
-small contributions to the GNU and BSD projects over the years. We
-also have a bit of expertise in the embedded(inside people) systems
-area in addition to the standard building work.
-
-We can provide local (i.e. southern hemisphere/south east asia) support
-for most of the vast range of free software systems including: GNU/Linux,
-FreeBSD, OpenBSD , OpenSSH, Sendmail, various compilers and networking
-tools. Remote support can also be arranged.
-
-Rates: vary depending on the work, period and staff provided but let
-       us pick 100$US/hr as a starting point for senior staff.
-
-Updated: 2000-12-13
-^_
-Red Hat, Inc.
-<embedded-info@redhat.com>
-1325 Chesapeake Terrace
-Sunnyvale, CA 94089 USA
-Toll free: 866-2REDHAT ext. 3005
-+1 408 542 9600 voice
-+1 408 542 9699 fax
-
-GNUPro Tools
-Red Hat provides supported and maintained versions of gcc, g++, gdb
-with GUI, GNU linker and GNU macro assembler.  In addition, Red Hat
-provides these GNU software development tools for well over many
-popular host-target configurations.  Support includes bug fixes and
-semi-annual releases of the toolset.  Each release is regression
-tested and includes substantial improvements and additions to the
-current release.  Support is available through Incident support
-packages, or Unlimited support for specific user groups.  GNUPro is
-available with standard, custom, and vintage toolchains for both
-native and embedded application development.  New target processors
-are being added regularly.  Rates for support for standard products
-start at $12,500.
-
-Embedded Linux
-Red Hat offers Red Hat Embedded Linux to companies looking for an open
-source and royalty-free runtime solution.  Red Hat Embedded Linux
-currently supports certain ARM, StrongARM, and MIPS families of
-processors.  Embedded Linux supports multiple graphics APIs, is
-compliant with POSIX APIs and thread support, can be configured as low
-as 512k memory footprint including TCP/IP and NFS built into the
-kernel, and supports journaling and transparent compression in
-filesystems.  Support for new processors is available via Red Hat
-Professional Services.
-
-Updated: 2001-05-16
-^_
-Relogic AB
-Pipersgatan 26
-Box 868
-SE-112 28  Stockholm
-SWEDEN
-
-web http://www.relogic.se
-e-mail info@relogic.se
-phone +46 708 800 000
-fax +46 708 800 580
-
-Relogic provides experienced unix developers that know and love GNU
-products. We can take on anything from single contractor support to
-full scale projects. We know all programming languages and all Unix
-dialects.
-
-Updated: 2000-12-14
-^_
-Phillip Rulon
-122 Blossom Rd.
-Westport, MA 02790
-USA
-508.672.3007
-<pjr@gnu.org>
-
-15 years experience with GNU systems and tools.  Available for any free
-software project.  Most useful for network design and construction or
-dynamic web development.  Very good Debian, Perl, and Apache.
-
-Boston, travel OK.
-$100/hr, flat rate possible.
-
-Updated: 2000-12-18
-^_
-Stanislav Shalunov <shalunov@mccme.ru>
-
-Customizing GNU Emacs (new modes OK).  Installing and troubleshooting
-free software.  Rate: $60-100/hour.  NYC area, telecommuting preferred.
-References available.
-
-Updated: 2000-12-12
-^_
-SRA (Software Research Associates, Inc., Japan)      <info-wingnut@sra.co.jp>
-1-1-1, Hirakawa-cho, Chiyoda-ku
-Tokyo 102-8605 Japan
-
-+81-3-3234-5610 voice
-+81-3-3234-5556 fax
-
-http://www.sra.co.jp/wingnut/
-http://www.sra.co.jp/wingnut/chirashi-e.html
-http://www.sra.co.jp/wingnut/service.html
-http://osb.sra.co.jp/WingnutSupport/
-
-We provide GNU software support at a reasonable charge,
-aiming to promote the sound growth of free software and to
-create a new culture in the software world.
-
-News:
-
-   We have just started "GCC and CVS membership support service".
-   We provide various support menus.  Please refer to
-   http://osb.sra.co.jp/WingnutSupport/ for details.
-
-What we provide is:
-
-   1. Research and development of GNU software.
-   2. Development, porting, and customization of GNU software itself.
-   3. Helping people who are willing to port and provide GNU software
-      to their customers, but are unable to do so due to  a lack of resources.
-   4. Providing a variety of educational and training services including
-      how to port or to customize.
-   5. The result of the work will become free software covered under the
-      GNU licenses (GPL or LGPL), so it will be possible not only to share
-      the results with others but to eliminate unnecessary investment also.
-   6. Passing the result to the program package maintainers (if needed).
-   7. Also, making contributions to FSF (Free Software Foundation, Inc.)
-      which is the organization that develops and distributes GNU software
-      worldwide.
-
-   Furthermore, we provide services *native to Japan*, that is,
-   services for Japanese-speaking people --- receiving inquiries and
-   answering in Japanese.
-
-Rates:
-   Determined by estimation.
-
-Updated: 2001-05-21
-^_
-Andre Spiegel    <spiegel@gnu.org>
-Dipl.-Inform.
-Berlin, Germany
-
-Maintainer of the GNU Emacs version control package (VC).
-
-I can provide consulting and practical help for the installation and
-administration of GNU/Linux systems, in particular Debian.  Also
-knowledgeable on many other Unix derivates, and network technology.
-Installation, porting and customization of GNU software is possible; I
-have programming experience in C, C++, Java, and Emacs Lisp, among
-others.  Expertise in version control using RCS or CVS.  I also give
-seminars on the above subjects.
-
-Rates: 150 DM/hr (US$ 85)
-
-Updated: 2001-05-09
-^_
-Name:           Julian Stacey <jhs@freebsd.org> <jhs@bim.bsn.com> <jhs@muc.de>
-Location:       Muenchen, Deutschland   (Munich, Germany).
-Qualifications: University Degree,  BSc Hons Computers & Cybernetics,  1980.
-Phone:          +49.89.268616   Fax: +49.89.2608126   Data: +49.89.26023276
-Resume:         http://bim.bsn.com/~jhs/  Older: http://www.freebsd.org/~jhs/
-Time Zone:      +01:00
-Rate:           DM 200 - DM 160 / Hour.
-Specialisation: Unix (Pref. BSD or Linux), C, X-Windows, FSF tools, firewalls,
-                systems engineering, hardware interfacing, real time/embedded,
-                custom design & porting. No { Emacs, Cobol, Microsoft }.
-Free Sources:   All BSD sources (updated daily), X-Windows, XFree86, FSF.
-                Personal sources are here:  http://bim.bsn.com/~jhs/src/
-                Copy Charge dependent on time+postage+media
-Free GCC-1.40:  For Symmetric Computer Systems Model 375 (native cc is broken).
-Languages:      I am English. Ich verstehe Deutsch. Je comprend Francais,
-                (mais je ecris une response en Anglais).  Avoid dialect,
-                (use Hoch Deutsch,  not Bayerisch);  Spell slowly & clearly,
-                (umlauts are not recognised);  Use single digits:  avoid
-                inverted German pairs (EG "eight hundred, two and thirty",
-                & convoluted French ("four twenties and fifteen").
-Contact:        State aprox. days/weeks/months you want professional
-                consultancy at full commercial rates,  .. OR ..
-Note I am NOT a free help desk !
-                Post your questions to an Internet newsgroup, & let those with
-                most time, best knowledge, & inclination answer.  If you must
-                phone me (& I'd much prefer you did Not), Rules apply: First
-                ask for a few minutes advice "Free Of Charge".  (Do not swamp
-                me with your problem & leave me to deduce you are not a paying
-                customer).  Use some English.  Give an email address for
-                forwarding later info.  Volunteer to phone back later to hear
-                subsequent info/solutions I/friends/net come up with. I do not
-                pay phone charges to call strangers.
-
-Updated: 2001-05-09
-^_
-Richard M. Stallman     <rms@gnu.org>
-545 Tech Sq, Rm 430
-Cambridge, MA 02139
-
-Emacs: anything whatever
-Is anyone interested in courses in using or extending GNU Emacs?
-
-Original inventor of Emacs and main author of GNU Emacs and GCC.
-
-Rates: $6/min or $250/hr.
-
-Updated: 2000-12-13
-^_
-Static Free Software
-4119 Alpine Road
-Portola Valley, Ca 94028
-(650) 851-2927
-http://www.staticfreesoft.com
-
-Static Free Software developed and supports the "Electric VLSI Design
-System".  Steven Rubin, the founder of the company and author of
-Electric, is available for enhancements, support, and training.
-
-Please see our web page at www.staticfreesoft.com for more information
-about our products, services, and prices.
-
-Updated: 2000-12-12
-^_
-Swing Digital Ltd. <hello@swingdigital.com>
-15-17 Middle Street
-Brighton
-BN1 1AL
-United Kingdom
-Tel +44 (0) 1273 20 11 66
-Fax +44 (0) 1273 20 11 68
-http://www.swingdigital.com
-
-Swing Digital actively supports the development of the GNU.FREE
-Internet Voting system. Through this support we have gained the
-unique expertise to support, install and run GUN.FREE-based Internet
-votes. We are also available in a consultancy basis to offer advice
-for organisations wishing to run GNU.FREE themselves.
-
-Our consultancy fees start at 900 Euro (550 UK pounds) per day. We
-are also able to securely host Internet Votes, prices on application.
-
-Updated: 2001-07-23
-^_
-Kayvan A. Sylvan <kayvan@sylvan.com>
-Sylvan Associates, Inc.
-879 Lewiston Drive
-San Jose, CA 95136-1517
-Phone: (408) 978-1407
-Fax:   (408) 978-0472
-
-I will help you port, install and customize GNU Emacs, GCC, G++, GNUmake,
-bison, and other GNU tools on almost any architecture and operating
-system. Questions answered. GNU C/C++, Java and lisp hacking available.
-
-I will also do ongoing support and periodic upgrades if you get on my GNU
-software subscription list.
-
-Rates: $100-$125/hour, depending on type and quantity of work.
-Substantial discounts for long-term contracts and also for educational or
-non-profit institutions.
-
-Experience: Many different Unix systems (2.9BSD to 4.4BSD, Xenix, SVR3 and
-SVR4, Solaris, Linux, FreeBSD). Systems programming and system
-administration on all brands of Unix.
-
-Kernel hacking experience. Lots of porting experience.
-
-Updated:  2001-05-08
-^_
-Alfredo Tomasini
-<alto555@earthlink.net>, <alfredo.tomasini@c-cube.com>
-
-GNU/Linux Intel desktop/laptop installation, setup, and networking.
-Installation of GNU tools on SunOS and GNU/Linux.
-Sed and Gawk script development.
-
-Languages:  English and Italian.
-
-Fee:  $50/hour.
-
-Updated: 2000-12-13
-^_
-Leonard H. Tower Jr.    <tower@ai.mit.edu>      <tower@art.net>
-36 Porter Street
-Somerville, MA  02143-2313
-USA
-+1-617-623-7739
-
-Will work on most GNU, GPLed, and Open Source software.
-Installation, handholding, trouble shooting, extensions, teaching, etc.
-
-Rates: $ 225.00/hour + travel expenses.  Fixed fee quotes available.
-         Negotiable for non-profits.
-
-Experience: Have hacked on over a dozen architectures in many languages.  Have
-system mothered too many varieties of Unixes.  Assisted rms with the front end
-of GCC and its back-end support.  Installed and worked with many GNU
-programs including GNU Emacs.  Resume available on request.
-
-Updated: 2001-05-10
-^_
-Jody Winston
-xprt Computer Consulting, Inc.
-731 Voyager
-Houston, TX, 77062
-(281) 480-UNIX, <josephwinston@mac.com>
-
-We have supported, installed, and used the entire GNU software suite
-for over 10 years on many different Unix platforms.  We have written
-character device drivers and proc file systems for custom hardware
-running on GNU/Linux.  We have developed extensions for tcl and Python.
-In addition, we have developed a custom X11 server and X input
-extensions. Our consulting rate is $150.00 US dollars per hour,
-negotiable, plus a per diem for out of town work.
-
-Updated: 2001-05-08
-^_
-The Written Word
-Web:   http://thewrittenword.com
-Email: info@thewrittenword.com
-Tel:   (800) 372-7476
-
-The Written Word provides CDs of pre-compiled Open Source applications
-on popular UNIX variants.  Clients can purchase a one-time CD set
-($149/set), or a subscription, which provides four quarterly releases.
-Two types of subscription are available: "media only" ($550/year), or
-"media and updates" ($1459/year).  The "media and updates"
-subscription entitles the subscriber, via a web site, to patches,
-security fixes, new releases to existing packages, new packages,
-online documentation, and changelog information, between releases, and
-a central bug tracking system for all packages.
-
-Updated:  2000-11-27
-^_
-
-For a current copy of this directory, or to have yourself listed, ask:
-        fsforder@gnu.org
-
-A current version should be available on our web site at http://www.gnu.org.
-
-** Please keep the entries in this file alphabetical **
-
-
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
-
-    Verbatim copying and distribution of this document are permitted
-    worldwide, without royalty, in any medium, provided this notice is
-    preserved.
 
 arch-tag: 1253ce32-1cbd-428a-ac36-70ed9e3999fc
diff --git a/etc/TODO b/etc/TODO
index 345e15fafa8..302500884f4 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -14,6 +14,10 @@ to the FSF.
 
 * Small but important fixes needed in existing features:
 
+** Compute the list of active keymaps *after* reading the first event.
+
+** Avoid using "iff" in doc strings.
+
 ** mouse-autoselect-window should wait to select the window until
 the mouse is put to rest or after a delay or both, so that moving over
 a window doesn't select it.
@@ -82,8 +86,6 @@ current buffer.
 
 ** Add function to redraw the tool bar.
 
-** Modify allout.el to use overlays, like outline.el.
-
 ** M-! M-n should fetch the buffer-file-name as the default.
 
 ** Redesign the load-history data structure so it can cope better
@@ -178,6 +180,8 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
 
 ** Make byte-compile warn when a doc string is too wide.
 
+** Make byte-optimization warnings issue accurate line numbers.
+
 ** A function to check for customizable options that have been
   set but not saved, and ask the user whether to save them.
   This could go in kill-emacs-query-functions, to remind people
@@ -232,6 +236,24 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
   user-selected input method, with the default being the union of
   latin-1-prefix and latin-1-postfix.
 
+** Switch the Windows port to using Unicode keyboard input (maybe).
+  Based on http://msdn2.microsoft.com/en-us/library/ms633586.aspx,
+  this boils down to (1) calling RegisterClassW function to register
+  Emacs windows, and (2) modifying ALL system messages to use Unicode.
+  In particular, WM_CHAR messages, which result from keyboard input,
+  will then come in encoded in UTF-16.
+
+  One advantage of switching to Unicode is to toss encoded-kbd usage,
+  which will solve the problem with binding non-ASCII keys with
+  modifiers.
+
+  Problem: using this on Windows 9x/ME requires installing the
+  Microsoft Layer for Unicode (MSLU), which might not implement all
+  the required functionality that is available built-in on Windows XP
+  and later.  We should not make this change if it would pressure
+  users of unauthorized copies of older versions of Windows to
+  downgrade to versions that require activation.
+
 ** Implement a clean way to use different major modes for
   different parts of a buffer.  This could be useful in editing
   Bison input files, for instance, or other kinds of text
@@ -287,7 +309,7 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
   what else ?
 
 ** Provide real menus on ttys.  The MS-DOS implementation can serve as
-  an example how to do part of this.
+  an example how to do part of this; see the XMenu* functions on msdos.c.
 
 ** Implement popular parts of the rest of the CL functions as compiler
   macros in cl-macs.
@@ -489,9 +511,6 @@ when the body only calls primitives.
 ** Let LEIM handle the Mode_switch key like XIM does (i.e. a toggle like C-\
 but which can also be used as a modifier).
 
-** Provide the toolbar on ttys. This could map a bit like tmm-menubar
-   for the menubar and buttons could look a bit like those used by customize.
-
 ** Improve Help buffers: Change the face of previously visited links (like
    Info, but also with regard to namespace), add a forward button to make the
    Help buffer more browser like and gives the value of lisp expressions
@@ -509,7 +528,7 @@ but which can also be used as a modifier).
 
 * Internal changes
 
-** Cleanup all the GC_ mark bit stuff -- there is no longer any distiction
+** Cleanup all the GC_ mark bit stuff -- there is no longer any distinction
    since the mark bit is no longer stored in the Lisp_Object itself.
 
 ** Merge ibuffer.el and buff-menu.el.
diff --git a/etc/calccard.ps b/etc/calccard.ps
index fc44461a35a..909f6ba8712 100644
--- a/etc/calccard.ps
+++ b/etc/calccard.ps
@@ -4,15 +4,15 @@
 %%Pages: 2
 %%PageOrder: Ascend
 %%Orientation: Landscape
-%%BoundingBox: 0 0 595 842
+%%BoundingBox: 0 0 612 792
 %%DocumentFonts: CMBX10 CMR8 CMTT8 CMBX8 CMR6 CMSY6 CMTI8 CMMI8 CMSY8
 %%+ CMMI5 CMR5 CMMI7
-%%DocumentPaperSizes: a4
+%%DocumentPaperSizes: Letter
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips -t landscape calccard.dvi
+%DVIPSCommandLine: dvips -t letter -t landscape calccard.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2007.02.22:0040
+%DVIPSSource:  TeX output 2007.03.22:0020
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -2583,7 +2583,7 @@ B66411138280D7BDE5D23A23C8C5598AADF95F62B4AD41DDE7614971C5D281C6
 0000000000000000000000000000000000000000000000000000000000000000
 cleartomark
 %%EndFont 
-TeXDict begin 55387786 39139632 1000 600 600 (calccard.dvi)
+TeXDict begin 52099146 40258431 1000 600 600 (calccard.dvi)
 @start /Fa 135[38 21[29 74[33 23[{}3 58.1154 /CMMI7 rf
 /Fb 204[28 28 28 28 48[{}4 41.511 /CMR5 rf /Fc 145[37
 31[45 19[19 58[{}3 41.511 /CMMI5 rf /Fd 143[59 75[71
@@ -2616,7 +2616,9 @@ rf /Fm 141[57 3[76 1[38 5[42 63 76 61 1[67 11[106 2[103
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
-%%PaperSize: A4
+%%BeginPaperSize: Letter
+letter
+%%EndPaperSize
  @landscape end
 %%EndSetup
 %%Page: 1 1
diff --git a/etc/dired-ref.ps b/etc/dired-ref.ps
index cd7c2c9a6ed..fa1a86f27ad 100644
--- a/etc/dired-ref.ps
+++ b/etc/dired-ref.ps
@@ -1,16 +1,16 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software
+%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software
 %%Title: dired-ref.dvi
 %%Pages: 1
 %%PageOrder: Ascend
-%%BoundingBox: 0 0 595 842
+%%BoundingBox: 0 0 612 792
 %%DocumentFonts: CMBX10 CMR8 CMBX8 CMTT8 CMR6 CMSY6
-%%DocumentPaperSizes: a4
+%%DocumentPaperSizes: Letter
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips dired-ref.dvi
+%DVIPSCommandLine: dvips -t letter dired-ref.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2007.03.19:1902
+%DVIPSSource:  TeX output 2007.03.22:2035
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -1723,7 +1723,7 @@ B41CB92E669C8D95250C3FC45A05478B2D6B7E01D6315E222E22509CEF3275E4
 0000000000000000000000000000000000000000000000000000000000000000
 cleartomark
 %%EndFont 
-TeXDict begin 39139632 55387786 1000 600 600 (dired-ref.dvi)
+TeXDict begin 40258431 52099146 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
@@ -1748,7 +1748,9 @@ rf end
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
-%%PaperSize: A4
+%%BeginPaperSize: Letter
+letter
+%%EndPaperSize
  end
 %%EndSetup
 %%Page: 1 1
diff --git a/etc/emacs.1 b/etc/emacs.1
index 4ebcd7c632c..7d90d5a4410 100644
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -19,8 +19,7 @@
 .\" Boston, MA 02110-1301, USA.
 .\"
 '\" t
-.TH EMACS 1 "2001 November 23"
-.UC 4
+.TH EMACS 1 "2007 April 13" "GNU Emacs 22.1"
 .SH NAME
 emacs \- GNU project Emacs
 .SH SYNOPSIS
@@ -40,11 +39,11 @@ written by the author of the original (PDP-10)
 Richard Stallman.
 .br
 The primary documentation of GNU Emacs is in the GNU Emacs Manual,
-which you can read on line using Info, a subsystem of Emacs.  Please
-look there for complete and up-to-date documentation.  This man page
-is updated only when someone volunteers to do so; the Emacs
-maintainers' priority goal is to minimize the amount of time this man
-page takes away from other more useful projects.
+which you can read using Info, either from Emacs or as a standalone
+program.  Please look there for complete and up-to-date documentation.
+This man page is updated only when someone volunteers to do so; the
+Emacs maintainers' priority goal is to minimize the amount of time
+this man page takes away from other more useful projects.
 .br
 The user functionality of GNU Emacs encompasses
 everything other
@@ -58,7 +57,7 @@ but the facility assumes that you know how to manipulate
 .I Emacs
 windows and buffers.
 CTRL-h or F1 enters the Help facility.  Help Tutorial (CTRL-h t)
-requests an interactive tutorial which can teach beginners the fundamentals
+starts an interactive tutorial which can teach beginners the fundamentals
 of
 .I Emacs
 in a few minutes.
@@ -77,7 +76,7 @@ outline editing (Outline), compiling (Compile), running subshells
 within
 .I Emacs
 windows (Shell), running a Lisp read-eval-print loop
-(Lisp-Interaction-Mode), and automated psychotherapy (Doctor).
+(Lisp-Interaction-Mode), automated psychotherapy (Doctor), and much more.
 .PP
 There is an extensive reference manual, but
 users of other Emacses
@@ -201,11 +200,6 @@ Display the
 .I Emacs
 window in reverse video.
 .TP
-.B \-i
-Use the "kitchen sink" bitmap icon when iconifying the
-.I Emacs
-window.
-.TP
 .BI \-font " font, " \-fn " font"
 Set the
 .I Emacs
@@ -262,8 +256,8 @@ with selecting or deselecting the tool bar and menu bar.
 .BI \-fg " color"
 On color displays, sets the color of the text.
 
-See the file
-.I /usr/lib/X11/rgb.txt
+Use the command
+.I M-x list-colors-display
 for a list of valid
 color names.
 .TP
@@ -299,7 +293,6 @@ switch when invoking
 from an
 .IR xterm (1)
 window, display is done in that window.
-This must be the first option specified in the command line.
 .PP
 You can set
 .I X
@@ -431,43 +424,31 @@ make and distribute copies of the Emacs manual.  The TeX source to the
 manual is also included in the Emacs source distribution.
 .PP
 .SH FILES
-/usr/local/share/info - files for the Info documentation browser
-(a subsystem of Emacs) to refer to.  Currently not much of Unix
-is documented here, but the complete text of the Emacs reference
-manual is included in a convenient tree structured form.
-
-/usr/local/share/emacs/$VERSION/src - C source files and object files
+/usr/local/share/info - files for the Info documentation browser.
+The complete text of the Emacs reference manual is included in a
+convenient tree structured form.  Also includes the Emacs Lisp
+Reference Manual, useful to anyone wishing to write programs in the
+Emacs Lisp extension language.
 
 /usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files
 that define most editing commands.  Some are preloaded;
 others are autoloaded from this directory when used.
 
-/usr/local/share/emacs/$VERSION/etc - various programs that are used with
-GNU Emacs, and some files of information.
+/usr/local/libexec/emacs/$VERSION/$ARCH - various programs that are
+used with GNU Emacs.
+
+/usr/local/share/emacs/$VERSION/etc - various files of information.
 
 /usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation
 strings for the Lisp primitives and preloaded Lisp functions
 of GNU Emacs.  They are stored here to reduce the size of
 Emacs proper.
 
-/usr/local/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
-vs. other versions of Emacs.
 .br
 /usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering
 various services to assist users of GNU Emacs, including education,
 troubleshooting, porting and customization.
-.br
-These files also have information useful to anyone wishing to write
-programs in the Emacs Lisp extension language, which has not yet been fully
-documented.
-
-/usr/local/com/emacs/lock - holds lock files that are made for all
-files being modified in Emacs, to prevent simultaneous modification
-of one file by two users.
 
-.\" START DELETING HERE IF YOU'RE NOT USING X
-/usr/lib/X11/rgb.txt - list of valid X color names.
-.\" STOP DELETING HERE IF YOU'RE NOT USING X
 .PP
 .SH BUGS
 There is a mailing list, bug-gnu-emacs@gnu.org, for reporting Emacs
@@ -488,9 +469,6 @@ For more information about Emacs mailing lists, see the
 file /usr/local/emacs/etc/MAILINGLISTS.  Bugs tend actually to be
 fixed if they can be isolated, so it is in your interest to report
 them in such a way that they can be easily reproduced.
-.PP
-Bugs that I know about are: shell will not work with programs
-running in Raw mode on some Unix versions.
 .SH UNRESTRICTIONS
 .PP
 .I Emacs
@@ -519,11 +497,10 @@ Richard Stallman encourages you to improve and extend
 .I Emacs,
 and urges that
 you contribute your extensions to the GNU library.  Eventually GNU
-(Gnu's Not Unix) will be a complete replacement for Berkeley
-Unix.
+(Gnu's Not Unix) will be a complete replacement for Unix.
 Everyone will be free to use, copy, study and change the GNU system.
 .SH SEE ALSO
-X(1), xlsfonts(1), xterm(1), xrdb(1)
+emacsclient(1), etags(1), X(1), xlsfonts(1), xterm(1), xrdb(1)
 .SH AUTHORS
 .PP
 .I Emacs
@@ -532,7 +509,7 @@ Joachim Martillo and Robert Krawitz added the X features.
 .SH COPYING
 Copyright
 .if t \(co
-.if n (c)
+.if n (C)
 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
       2006, 2007 Free Software Foundation, Inc.
 .PP
diff --git a/etc/emacs.py b/etc/emacs.py
index e38ee70fab5..0d0f2e75ed3 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -25,20 +25,56 @@ from sets import Set
 
 __all__ = ["eexecfile", "eargs", "complete", "ehelp", "eimport", "modpath"]
 
+def format_exception (filename, should_remove_self):
+    type, value, tb = sys.exc_info ()
+    sys.last_type = type
+    sys.last_value = value
+    sys.last_traceback = tb
+    if type is SyntaxError:
+        try: # parse the error message
+            msg, (dummy_filename, lineno, offset, line) = value
+        except:
+            pass # Not the format we expect; leave it alone
+        else:
+            # Stuff in the right filename
+            value = SyntaxError(msg, (filename, lineno, offset, line))
+            sys.last_value = value
+    res = traceback.format_exception_only (type, value)
+    # There are some compilation errors which do not provide traceback so we
+    # should not massage it.
+    if should_remove_self:
+        tblist = traceback.extract_tb (tb)
+        del tblist[:1]
+        res = traceback.format_list (tblist)
+        if res:
+            res.insert(0, "Traceback (most recent call last):\n")
+        res[len(res):] = traceback.format_exception_only (type, value)
+    # traceback.print_exception(type, value, tb)
+    for line in res: print line,
+
 def eexecfile (file):
     """Execute FILE and then remove it.
     Execute the file within the __main__ namespace.
     If we get an exception, print a traceback with the top frame
     (ourselves) excluded."""
+    # We cannot use real execfile since it has a bug where the file stays
+    # locked forever (under w32) if SyntaxError occurs.
+    # --- code based on code.py and PyShell.py.
     try:
-       try: execfile (file, __main__.__dict__)
-       except:
-            (type, value, tb) = sys.exc_info ()
-            # Lose the stack frame for this location.
-            tb = tb.tb_next
-            if tb is None:      # print_exception won't do it
-                print "Traceback (most recent call last):"
-            traceback.print_exception (type, value, tb)
+        try:
+            source = open (file, "r").read()
+            code = compile (source, file, "exec")
+        # Other exceptions (shouldn't be any...) will (correctly) fall
+        # through to "final".
+        except (OverflowError, SyntaxError, ValueError):
+            # FIXME: When can compile() raise anything else than
+            # SyntaxError ????
+            format_exception (file, False)
+            return
+        try:
+            exec code in __main__.__dict__
+        except:
+            format_exception (file, True)
     finally:
         os.remove (file)
 
diff --git a/etc/fr-refcard.ps b/etc/fr-refcard.ps
index f9f5df21053..d1b8b4322ad 100644
--- a/etc/fr-refcard.ps
+++ b/etc/fr-refcard.ps
@@ -1,17 +1,18 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.92b Copyright 2002 Radical Eye Software
+%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software
 %%Title: fr-refcard.dvi
 %%Pages: 3
 %%PageOrder: Ascend
 %%Orientation: Landscape
-%%BoundingBox: 0 0 612 792
-%%DocumentFonts: CMBX10 CMR8 CMTT8 CMBX8 CMTI8 CMMI8 CMR6 CMSY6
+%%BoundingBox: 0 0 595 842
+%%DocumentFonts: CMBX10 CMR8 CMTT8 CMBX8 CMR6 CMSY6 CMTI8 CMMI8
+%%DocumentPaperSizes: a4
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips -t landscape fr-refcard.dvi
-%DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2007.03.20:1952
-%%BeginProcSet: texc.pro
+%DVIPSCommandLine: dvips -t a4 -t landscape fr-refcard.dvi
+%DVIPSParameters: dpi=600
+%DVIPSSource:  TeX output 2007.03.22:0018
+%%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
@@ -30,22 +31,10 @@ df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A
 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
@@ -69,202 +58,7 @@ p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
 rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
 
 %%EndProcSet
-%%BeginProcSet: f7b6d320.enc
-% Thomas Esser, Dec 2002. public domain
-%
-% Encoding for:
-%     cmb10 cmbx10 cmbx12 cmbx5 cmbx6 cmbx7 cmbx8 cmbx9 cmbxsl10
-%     cmdunh10 cmr10 cmr12 cmr17cmr6 cmr7 cmr8 cmr9 cmsl10 cmsl12 cmsl8
-%     cmsl9 cmss10cmss12 cmss17 cmss8 cmss9 cmssbx10 cmssdc10 cmssi10
-%     cmssi12 cmssi17 cmssi8cmssi9 cmssq8 cmssqi8 cmvtt10
-%
-/TeXf7b6d320Encoding [
-/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega
-/ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute /caron /breve
-/macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-/suppress /exclam /quotedblright /numbersign /dollar /percent /ampersand
-/quoteright /parenleft /parenright /asterisk /plus /comma /hyphen
-/period /slash /zero /one /two /three /four /five /six /seven /eight
-/nine /colon /semicolon /exclamdown /equal /questiondown /question /at
-/A /B /C /D /E /F /G /H /I /J /K /L /M /N /O /P /Q /R /S /T /U /V /W /X
-/Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-/quoteleft /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p /q /r /s /t /u
-/v /w /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis /suppress
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space
-/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /.notdef
-/.notdef /Omega /ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute
-/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE
-/OE /Oslash /suppress /dieresis /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-
-%%EndProcSet
-%%BeginProcSet: 09fbbfac.enc
-% Thomas Esser, Dec 2002. public domain
-%
-% Encoding for:
-%     cmsltt10 cmtt10 cmtt12 cmtt8 cmtt9
-/TeX09fbbfacEncoding [
-/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi
-/Omega /arrowup /arrowdown /quotesingle /exclamdown /questiondown
-/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring /cedilla
-/germandbls /ae /oe /oslash /AE /OE /Oslash /visiblespace /exclam
-/quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft
-/parenright /asterisk /plus /comma /hyphen /period /slash /zero /one
-/two /three /four /five /six /seven /eight /nine /colon /semicolon /less
-/equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N
-/O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash /bracketright
-/asciicircum /underscore /quoteleft /a /b /c /d /e /f /g /h /i /j /k /l
-/m /n /o /p /q /r /s /t /u /v /w /x /y /z /braceleft /bar /braceright
-/asciitilde /dieresis /visiblespace /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /space /Gamma /Delta /Theta /Lambda /Xi /Pi
-/Sigma /Upsilon /Phi /Psi /.notdef /.notdef /Omega /arrowup /arrowdown
-/quotesingle /exclamdown /questiondown /dotlessi /dotlessj /grave /acute
-/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE
-/OE /Oslash /visiblespace /dieresis /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-
-%%EndProcSet
-%%BeginProcSet: 74afc74c.enc
-% Thomas Esser, Dec 2002. public domain
-%
-% Encoding for:
-%     cmbxti10 cmff10 cmfi10 cmfib8 cmti10 cmti12 cmti7 cmti8cmti9 cmu10
-%
-/TeX74afc74cEncoding [
-/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega
-/ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute /caron /breve
-/macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-/suppress /exclam /quotedblright /numbersign /sterling /percent
-/ampersand /quoteright /parenleft /parenright /asterisk /plus /comma
-/hyphen /period /slash /zero /one /two /three /four /five /six /seven
-/eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-/at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O /P /Q /R /S /T /U /V /W
-/X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-/quoteleft /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p /q /r /s /t /u
-/v /w /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis /suppress
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space
-/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /.notdef
-/.notdef /Omega /ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute
-/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE
-/OE /Oslash /suppress /dieresis /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-
-%%EndProcSet
-%%BeginProcSet: aae443f0.enc
-% Thomas Esser, Dec 2002. public domain
-%
-% Encoding for:
-%     cmmi10 cmmi12 cmmi5 cmmi6 cmmi7 cmmi8 cmmi9 cmmib10
-%
-/TeXaae443f0Encoding [
-/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega
-/alpha /beta /gamma /delta /epsilon1 /zeta /eta /theta /iota /kappa
-/lambda /mu /nu /xi /pi /rho /sigma /tau /upsilon /phi /chi /psi
-/omega /epsilon /theta1 /pi1 /rho1 /sigma1 /phi1 /arrowlefttophalf
-/arrowleftbothalf /arrowrighttophalf /arrowrightbothalf /arrowhookleft
-/arrowhookright /triangleright /triangleleft /zerooldstyle /oneoldstyle
-/twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle
-/sevenoldstyle /eightoldstyle /nineoldstyle /period /comma /less /slash
-/greater /star /partialdiff /A /B /C /D /E /F /G /H /I /J /K /L /M /N
-/O /P /Q /R /S /T /U /V /W /X /Y /Z /flat /natural /sharp /slurbelow
-/slurabove /lscript /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p
-/q /r /s /t /u /v /w /x /y /z /dotlessi /dotlessj /weierstrass /vector
-/tie /psi /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/space /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi
-/.notdef /.notdef /Omega /alpha /beta /gamma /delta /epsilon1 /zeta /eta
-/theta /iota /kappa /lambda /mu /nu /xi /pi /rho /sigma /tau /upsilon
-/phi /chi /psi /tie /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-
-%%EndProcSet
-%%BeginProcSet: bbad153f.enc
-% Thomas Esser, Dec 2002. public domain
-%
-% Encoding for:
-%     cmsy10 cmsy5 cmsy6 cmsy7 cmsy8 cmsy9
-%
-/TeXbbad153fEncoding [
-/minus /periodcentered /multiply /asteriskmath /divide /diamondmath
-/plusminus /minusplus /circleplus /circleminus /circlemultiply
-/circledivide /circledot /circlecopyrt /openbullet /bullet
-/equivasymptotic /equivalence /reflexsubset /reflexsuperset /lessequal
-/greaterequal /precedesequal /followsequal /similar /approxequal
-/propersubset /propersuperset /lessmuch /greatermuch /precedes /follows
-/arrowleft /arrowright /arrowup /arrowdown /arrowboth /arrownortheast
-/arrowsoutheast /similarequal /arrowdblleft /arrowdblright /arrowdblup
-/arrowdbldown /arrowdblboth /arrownorthwest /arrowsouthwest /proportional
-/prime /infinity /element /owner /triangle /triangleinv /negationslash
-/mapsto /universal /existential /logicalnot /emptyset /Rfractur /Ifractur
-/latticetop /perpendicular /aleph /A /B /C /D /E /F /G /H /I /J /K
-/L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /union /intersection
-/unionmulti /logicaland /logicalor /turnstileleft /turnstileright
-/floorleft /floorright /ceilingleft /ceilingright /braceleft /braceright
-/angbracketleft /angbracketright /bar /bardbl /arrowbothv /arrowdblbothv
-/backslash /wreathproduct /radical /coproduct /nabla /integral
-/unionsq /intersectionsq /subsetsqequal /supersetsqequal /section
-/dagger /daggerdbl /paragraph /club /diamond /heart /spade /arrowleft
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/minus /periodcentered /multiply /asteriskmath /divide /diamondmath
-/plusminus /minusplus /circleplus /circleminus /.notdef /.notdef
-/circlemultiply /circledivide /circledot /circlecopyrt /openbullet
-/bullet /equivasymptotic /equivalence /reflexsubset /reflexsuperset
-/lessequal /greaterequal /precedesequal /followsequal /similar
-/approxequal /propersubset /propersuperset /lessmuch /greatermuch
-/precedes /follows /arrowleft /spade /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-
-%%EndProcSet
-%%BeginProcSet: texps.pro
+%%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
@@ -281,6 +75,256 @@ forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def
 end
 
 %%EndProcSet
+%%BeginFont: CMMI8
+%!PS-AdobeFont-1.1: CMMI8 1.100
+%%CreationDate: 1996 Jul 23 07:53:54
+% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
+11 dict begin
+/FontInfo 7 dict dup begin
+/version (1.100) readonly def
+/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
+/FullName (CMMI8) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle -14.04 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMMI8 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 58 /period put
+readonly def
+/FontBBox{-24 -250 1110 750}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE
+3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B
+532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470
+B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B
+986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE
+D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5
+5250011D19E9366EB6FD153D3A100CAA6212E3D5D93990737F8D326D347B7EDC
+4391C9DF440285B8FC159D0E98D4258FC57892DDF753642CD526A96ACEDA4120
+788F22B1D09F149794E66DD1AC2C2B3BC6FEC59D626F427CD5AE9C54C7F78F62
+C36F49B3C2E5E62AFB56DCEE87445A12A942C14AE618D1FE1B11A9CF9FAA1F32
+617B598CE5058715EF3051E228F72F651040AD99A741F247C68007E68C84E9D1
+D0BF99AA5D777D88A7D3CED2EA67F4AE61E8BC0495E7DA382E82DDB2B009DD63
+532C74E3BE5EC555A014BCBB6AB31B8286D7712E0E926F8696830672B8214E9B
+5D0740C16ADF0AFD47C4938F373575C6CA91E46D88DE24E682DEC44B57EA8AF8
+4E57D45646073250D82C4B50CBBB0B369932618301F3D4186277103B53B3C9E6
+DB42D6B30115F67B9D078220D5752644930643BDF9FACF684EBE13E39B65055E
+B1BD054C324962025EC79E1D155936FE32D9F2224353F2A46C3558EF216F6BB2
+A304BAF752BEEC36C4440B556AEFECF454BA7CBBA7537BCB10EBC21047333A89
+8936419D857CD9F59EBA20B0A3D9BA4A0D3395336B4CDA4BA6451B6E4D1370FA
+D9BDABB7F271BC1C6C48D9DF1E5A6FAE788F5609DE3C48D47A67097C547D9817
+AD3A7CCE2B771843D69F860DA4059A71494281C0AD8D4BAB3F67BB6739723C04
+AE05F9E35B2B2CB9C7874C114F57A185C8563C0DCCA93F8096384D71A2994748
+A3C7C8B8AF54961A8838AD279441D9A5EB6C1FE26C98BD025F353124DA68A827
+AE2AF8D25CA48031C242AA433EEEBB8ABA4B96821786C38BACB5F58C3D5DA011
+85B385124C2B6534F3CD1866AF92009D93B97F763AA3D16684AA65F029E776DA
+3BFB75EDD46D562E6A284DB4F2FDBF7CDE7C1F3772CD7B6FD372842A0E07E3EF
+68A98AB9278ADC2D35891543F57ED6DCFE8923368D556F1A8B3E35863112F409
+FBE67FC270328312BAA43A9A372C510717B50AAB01A1E02A9982113E2D7C601C
+B0BDA1C0E081E546A97647B74EE5194C57ACD62502B329FED4D966BDEB4028F0
+F082EDD5DFC8387653D620E9E73FDCE3C155347D5929C3A24D6121AEA46BBF3A
+B1C8A4793FB7F21C84400912C27D9AB0845537103553BF8F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
+%%BeginFont: CMTI8
+%!PS-AdobeFont-1.1: CMTI8 1.0
+%%CreationDate: 1991 Aug 18 21:07:42
+% 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 (CMTI8) readonly def
+/FamilyName (Computer Modern) readonly def
+/Weight (Medium) readonly def
+/ItalicAngle -14.04 def
+/isFixedPitch false def
+end readonly def
+/FontName /CMTI8 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 45 /hyphen put
+dup 97 /a put
+dup 98 /b 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 114 /r put
+dup 115 /s put
+dup 116 /t put
+dup 117 /u put
+dup 121 /y put
+readonly def
+/FontBBox{-35 -250 1190 750}readonly def
+currentdict end
+currentfile eexec
+D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE
+3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B
+532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470
+B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B
+986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE
+D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5
+525003F3DAD7933EB57E7DB1462E9D906F6D8F5BF740206C1EC5F36E00AAFF68
+F3EF6F3A2540E5F9564D1C215BC1E7E69C7D04DA5DB1CF195613C9CBF4BAA360
+84AEF3E10E24877FBE36AD731DC97305BDE6DB1F934909FAF60B8E28561FBC57
+0F5B6225425BFDE8F0C71CD4507B82FF803E9A301397975E38A259DE1E1B4FC0
+06BB1DC2D45B987A2268A77CE8DC025CB0D1B39788BBEE149103950650171C94
+5FED1063050A90BD38605BD9365D1C2AE42A7DA3DDB9A263FE10BD487F63D908
+D4F02758BD9D7BE53E6353A25BEFA29E42B50C1D078A8B3A746EEDB381CCE36C
+93FC4BD1A8D1D6ACD0D355E948CFE397B74D243EB51597D251D0BAE6884D70E8
+FEE119462E1939A9783414DF59EEA5FF1529F13869D1FF0A44935C5198CC5DAA
+E1FD2A17AEEBF4974052D06734A409E26C457C06700C55896C90BB33E044A737
+46590D9FA242819B9527FD59818D8829D4EB2D26A34CC05A2CC063E66F2DF193
+8E4F9670014BC243180E45B51DDB05AD1E6A7F619EE1CE09CFC1A4F02CB7270E
+4482FEDF673EDED38EF3173C475C34BFB3F6623C5E942A7797FEDDD0EF1D54E9
+1D90D7076C0A9687E334907C22F2E7C603388D8D626B0E5A62B7543DCBB575D7
+9A6BE1528EC9BC18570001092524E4FBB02F3B29293BCB4F0EF14A2DD9DB22A5
+BB33455799E8120D2A4862424AA4A382972E2845E042506FC8F6E201D11DD0F2
+09FAD8DC29C3E12B66293ACBFB13FA0F26238981F2CD52B47A8CDE6DF5CDFAAF
+3113E1A6366B806EABA9C34E5D41167CD10D7B639021FB4CFDAE28CE72A93F3C
+E8929A4BB6D48613A88F926E0EB1BE5F6E29CA5350841244E1718987727B7245
+E7DDE2528073015C64AEE3BF18734A0C48AFF16A354C14E1A6D9D5DC96C06E02
+3A1FE4AF93E8349C3293F62C3466B67D25A9533C6DAA4514EA201B79042CB220
+43B3B60E13200B4F47011F95BA2EF1D6548218DCDBC1B00CCAE375F91EB60E32
+9F1198D74BC3768101AB5F2E7BDEA9FE5C1379341C604D835B50B671793DD7EF
+605F60048FC9761FE50647C15C2424EABDC9AF4257F915282EFF1CF447EA3F0B
+EE81FB67B04703215DB6AB3E47B7EE06435234C834DF84A3E0F99D753D596305
+85DD514BA3C5ACCD8BF6BC804AEA170A32B2080B694CF7FE994228ECCAD86C4B
+CB8B963E84D46ED86B2D43DADB277A79DD100777CB0F2022C8AC9DA77D500C73
+D6E15540121B6D82457096083526C7E2697F776239E02C3E64D25AFBFB58474E
+E82672F2FBEA78ED5DCA1BB4FCD627BAAB6AB50232EDBE99D6CC51A287F80DCF
+14CC7DE3DCFF47A1DFA130CF7F502193C6C00B1A7A1515FF7374351238158B97
+AA26F0F2773E81CD03F4A398BEFBDCB450F0FA6450FD48B5A69E37B036BE5F85
+0F0B1AAAB2CF3098AEF32B0902398A6A9E1DB5A0C42DD39E3208C4F8BBEC0A98
+35FC84FF5EB2293644F7E6EF28FAF5F6E5205029CCFF7342BC276958EFFD7817
+5D9F367C6FF151B12353BE9DDCF75196F2C8C8C889BB097A3D9D8FF5D77A7184
+D9F3EAC4493E94DC73886AFD7652ADBF562189B0B85FA5AEA4CA44558D70A408
+4A276D6B0BCF6ED2F5E42E97933AEC978D286B3D0A99C6C7AB10AC6D1C36B07D
+EA2F47489D4C2A55A6902C665B7321DD5324C6CE172349E5C6561B5F1CBBFD6E
+B5FBBB914307020B218D68C45BB2E9A0BE81C9E8D5D71BC7851CD2922656337A
+9659E8E0A8F240903FC34DA589EC6D1FE6CF17D238576472C0CD1E0EB21A46B5
+5B9DACB6CA3B094E51386E45C506D55EE3AC95AF333EBD0305084697383F054D
+61680900B82CB80D030270CA9C614A373B0B5B26F8465AE581967C6A336D8C44
+21CED60606DF99F05AFC4C37F53D2D97450B78F1211A2682414780DFF7F6AC6E
+750071385D6DC87B58D3D13E286F70B11A692F4BF57BC828C6AA98C44EFE13F8
+44535F79F5458B03AAE3ECEBF2EFD4AA83316E839EF7EBADEA22C17FF039FA85
+498379D857AE78AC68CCC7D1EB2FE84D465AA452F43EC1AFEFE568E42F13E0BC
+1CDF5C873F8E3952713BD9A472E6FC9CDE8DDD9281EE3554C22A0D591C91D3E4
+0B3162930BB6F0AC229EE1C847EC39BF81DDDE1A0B0EC7BC51A05AE93B3A891A
+3FEB85C68C88AADD29FD39F9DB30FB250D41EBB1124ED0069CDC49B3359D8689
+05DCE2A27EFF35751E51E2C4AEA7DC8B2AF546AB58D6BE81DDD38A3A0833AB62
+E54F54ABC2BB67EF06678D0AA3AB0B240FDFD510404D87A1EA75D5005984B7D0
+DE9EE818E8F99BA9FD646FEAB795E5048E0710CEB0CBD8CA39754BCF7957C646
+532525C2B94D55B1AF534778D653BD50DCECF8DFA4CFD08092AA4DD3D8BB43E9
+6F40CE1B0B25287C46AA961061A0AE3714A465E39694B6E62410ECB1F409F939
+51CE57A12C3CB5B4332A3BDEF4C13917982A0A4527440CAD427F1284E6534D68
+201DA7E10B4DC25CCD025DB0D7E0906C59E235CBF747ED10C3300C1BA42BF434
+1A3C9605F0D568CD938B0DEB5C5E8390309BDFA89EFA3E5F226A24910EAB3791
+0361A08FE539B158072E96BC988AB061736F7DD19DEB61DB5738F2B43682C3E7
+12D709F9E149DA4602201AD24F42BBBEDA49118A93A7F26B703AECDE574441EE
+DAF7C634669C0D907B18BF4EAE198E9F3DD8F743FDBDBB2FF8C6650F17115FFF
+890F0FA7B873022FABADAD05C42B65FE98E870568D2CF828CDFF7C1EEEB5BF4B
+5E695EA05518191A5E8D34EB22091935E0816F8B49AFDCC44811D12D3CA85A57
+8C67D67D400ECEBADAABDC5F7D4E1DE4E330FD1A954B925E2A5B1D0CFF2D80D5
+F668367C28480C7EC3359C781279E8928DB03E274855F7001ABCCE243ED7C259
+67D4705EE2211FEF30D8E82F9EA0838B905A9FB986D1DD200524B74EC4B1AF8B
+A0216BBCE594588D8C28A527BC85306960D73D85D96B652B88462881EA065E0C
+84485D21B22E71768A81037FA08C48EA83AEC7118DA808CC62783E7DFB121A87
+0A8DA5BC6AD5B8C8ABD057D94DCD627E2CF3D6AACC031BCD50FF49C658EABCF1
+E6ED48E7B3A550782F077CCE21EFB7368B0D12EDF21BDA1DCD30D523A8B94729
+1E339B18677721963F0F9FF961CA6B065A881546683125114FB8BFBF996BA299
+9CA4E3F5BD5C0D614E2515BB6AAFD9D16E1F0C0409A524D91DAD55BB9630C810
+B1DF32BC5820AA059559A5095BF09750F21E3AECAD39CDB3277D06B78E2A0A08
+533EF557F6815F1C361B2417D27F7D9EFA5C2DB0B2655938C8E9E1E36C411E70
+7D57FD9EAFA6FD2C4D3A40D2F35C176E0522C6D0969A2DB598553D9C0A1940D2
+F3D8241AB8DB63E8426BF19B093D99DECC9E2633FE5C77EE55951036A7E19CC6
+27A2DDA74A95F870306ACF9945AA4FE9E10F1FBC43830B2D817016290E50F988
+7283F8E409B5BD2048CF8E8465DC3EC57EE47A7BB678093183B453FC60A8CD67
+6CE6E21A859B1EEACCB9E0A3DC1AEF41C74FE0E0245587A5E1F107BBA11C2B86
+91690DB7158BDAA3F2D82A820A36B3684CC11CCC4802C5F8135FAABDDD50091E
+97AE58FE38F088A7348D08F1B9A14BFEB8E97D81066D5C244DBDD9ABECECE72C
+6A91E31A815E2B22652F7813BDF07DEF9CBD0E8BB6E7999511289A0CE3CCF502
+14D9A77E29615479657F8BE9AA3EBAC9DD08A04EE7A160A1C528BD6C2CE79E67
+8913543117C32977841E710DCE7C0DAE68888C8EBEBD9883B9F9AF86B1C5790E
+E520337D14F18FB14686356E4F1248B3E884634480E683DDDFE4B0221AF0825C
+AF3B27DC3156F1E0B5E8D75063A10A81A78698BE4E1A4C2F49D2E530AF1ED966
+8EF252D3CBEACAD0394B9546D51768C195A23A041EC1E3F21AC91C498515EDCF
+5A9977F9D72ADBBED88D5E3FFEC64A087FAB9DBDB268608247B977E435E4CE34
+F0C543383384541FF88669E53446065864769D5D3957C64011D7C93FC147B093
+9FA961A60BDDF97F1A3BF53CC18D306DFCFE04DF980F026428E84140542171F0
+F706A48EDEC416DC58F006761686EBA99598962F6E1BEC8E78AEA474CF0AD890
+A72B9906BC891564ECD5440FE6047DB452171AF35C33C24D8A23E41C112D93B5
+F1B422386DFBE80ABBF7BD43F152F0451B7B0DB2D71B75575CB5256C94F40AE2
+E8DB4CABF990502BD74BE028E14C1972E666932E04E79B743B3357737F31D08B
+EB9755DF6C89C185A7F13DA21A6E6E526A9089B11C6BB1F5247E31685B028F52
+555F98CAB929558BA7BCDEAE76F93E7B00B214543EBEA0FA375B624B4553C133
+16D6E2B846FAA862F9DCBD8FCB2A59EADE462BC8FDF8DC56B888C6C5ECF9BBB2
+4197F4DDA197A9405F639643A4334545A8004F05963A05747B4905A319411086
+9A691FF410F400E7E569CF8EA99102A57A569C223B8CF8A4B285ADAEDB238FB4
+5FCCC3A9EB063BFB1F9263D8B31D8AE580B6B8F1F311388B509E224F7E600A98
+DE394C80D1CC6391D45160FC7CE92B0CD7E74B0844DD0F3562B14833A563FE6A
+E5942191AA6BAE176278E9EC30533FE310F0694745C024929A65E4C411DAAF0C
+F3539203284EDADDC1E27FF0EC2FED41AAD7A3CDCBF2B4177647CAEFA2FDD380
+F6483BB02F87E1B66F1F5F8B23DE0ED2EAF4C540A5D392D6B49B0BDF15DEDC09
+13DF0F14E0E49389A82445230CB58704CDF21591EC4E721119F4786523A16BA1
+95F9288C0704DE543FD38496FC59B15143CA8BA06584BE7E6C9F09DD4F207C09
+F2086D39D48B652E45BD2FC4E2C4BC1FE534CC1109E177C7494E0914CD0E45BB
+C8461B6A6FEAC2A2742CB9B3441DB0340DA91F6C6BA5EF79D6363F68A52F3300
+7CF46E9F6D5A7E33762852D4BA13A1825AFCF10B00CF175EB0059D272DBAB911
+30D027A1C1AAF745E0D69B71FB455C1363AF42B7A00B142D9C8ADDF4CE9801AF
+71C666C1A6773BF48F35076FED27423E1CD18139F3D8B0A3E1AE44C55382FC66
+942021B7C1E3451D679218810F816DA083A644A378D6ADEECCC212169B96FEBF
+744AD8C249E092F87CE696C926ED9E61B728674F39DFB645FF5AA6D742B73CF3
+37536ABDB80094DD7CB7D0FC30B6370F8CF9B145F65F4220FA592AF67383108C
+3739E4FD2E0878AF00DDEE092CCD14B1E749941F342701F07097A4DF0EE5AB3A
+B3D9BFE0B1060ADAFA7D4E3392218E5A7AEFE4CC01827ACD6903C2412270367B
+FC75D8C1E290C5489BF2ADE1B3FA6E11B5BCF37FFBC42D0B3E7A7435D6AA7E8F
+62B96A05C15CF7025EE1B0D9CC2580A11A1F187DE686E6F8ABBE658382B212CC
+D9BAB099DD7ED5EC269FF8CAC8C16E101B7AFE3BF9854884FF0746A1B0423FFC
+468342D5D31CEA0EDD7EB5FEEDDB129B7C55DDA20291A18592079BD75D8DCFA1
+2182EB1AB128A319FFB027164B5F9505754A4B1C8DFAD7FF0C892D97FEA8F506
+C65585142BB9F986886117C7CFC66EE962D1609DC1DD36930A6525D1ED03AA93
+282605FCC5C7C651D657EB8ED0A55EE348994C18FF6AEF1D8D669273B6EE450E
+709E6F60358F225E209AD70E96778E8375F41BCEFF74D46D595C0819C85E60DC
+DB702C6AB7E90FEA2EB9EC299FDA15BE8A807EEBEB1BAFD628BB94B1E28EBD60
+B6DAFF828C2C80821C8ECE963DC90E750EB00E3418BD0858AC6595012D32C308
+DDF9F30191779BFD58D93AF0DFEDE67AD6902FCF8C953CF52188311EDD0D005C
+BD31ADEE0825CE1C25725EA2D6C9E5D8D9034C
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndFont 
 %%BeginFont: CMSY6
 %!PS-AdobeFont-1.1: CMSY6 1.0
 %%CreationDate: 1991 Aug 15 07:21:34
@@ -301,10 +345,9 @@ end readonly 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 0 /.notdef put
+dup 13 /circlecopyrt put
 readonly def
 /FontBBox{-4 -948 1329 786}readonly def
-/UniqueID 5000816 def
 currentdict end
 currentfile eexec
 D9D66F633B846A97B686A97E45A3D0AA052F09F9C8ADE9D907C058B87E9B6964
@@ -358,10 +401,60 @@ end readonly 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 0 /.notdef put
+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 65 /A put
+dup 66 /B put
+dup 67 /C 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 83 /S 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 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 121 /y put
+dup 122 /z put
 readonly def
 /FontBBox{-20 -250 1193 750}readonly def
-/UniqueID 5000789 def
 currentdict end
 currentfile eexec
 D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
@@ -645,241 +738,6 @@ C7C3F47741E0C8427FA2511D5FDB08F03555E7D4B2CFE592EF027D7FF58199A6
 0000000000000000000000000000000000000000000000000000000000000000
 cleartomark
 %%EndFont 
-%%BeginFont: CMMI8
-%!PS-AdobeFont-1.1: CMMI8 1.100
-%%CreationDate: 1996 Jul 23 07:53:54
-% Copyright (C) 1997 American Mathematical Society. All Rights Reserved.
-11 dict begin
-/FontInfo 7 dict dup begin
-/version (1.100) readonly def
-/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def
-/FullName (CMMI8) readonly def
-/FamilyName (Computer Modern) readonly def
-/Weight (Medium) readonly def
-/ItalicAngle -14.04 def
-/isFixedPitch false def
-end readonly def
-/FontName /CMMI8 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 0 /.notdef put
-readonly def
-/FontBBox{-24 -250 1110 750}readonly def
-/UniqueID 5087383 def
-currentdict end
-currentfile eexec
-D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE
-3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B
-532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470
-B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B
-986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE
-D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5
-5250011D19E9366EB6FD153D3A100CAA6212E3D5D93990737F8D326D347B7EDC
-4391C9DF440285B8FC159D0E98D4258FC57892DDF753642CD526A96ACEDA4120
-788F22B1D09F149794E66DD1AC2C2B3BC6FEC59D626F427CD5AE9C54C7F78F62
-C36F49B3C2E5E62AFB56DCEE87445A12A942C14AE618D1FE1B11A9CF9FAA1F32
-617B598CE5058715EF3051E228F72F651040AD99A741F247C68007E68C84E9D1
-D0BF99AA5D777D88A7D3CED2EA67F4AE61E8BC0495E7DA382E82DDB2B009DD63
-532C74E3BE5EC555A014BCBB6AB31B8286D7712E0E926F8696830672B8214E9B
-5D0740C16ADF0AFD47C4938F373575C6CA91E46D88DE24E682DEC44B57EA8AF8
-4E57D45646073250D82C4B50CBBB0B369932618301F3D4186277103B53B3C9E6
-DB42D6B30115F67B9D078220D5752644930643BDF9FACF684EBE13E39B65055E
-B1BD054C324962025EC79E1D155936FE32D9F2224353F2A46C3558EF216F6BB2
-A304BAF752BEEC36C4440B556AEFECF454BA7CBBA7537BCB10EBC21047333A89
-8936419D857CD9F59EBA20B0A3D9BA4A0D3395336B4CDA4BA6451B6E4D1370FA
-D9BDABB7F271BC1C6C48D9DF1E5A6FAE788F5609DE3C48D47A67097C547D9817
-AD3A7CCE2B771843D69F860DA4059A71494281C0AD8D4BAB3F67BB6739723C04
-AE05F9E35B2B2CB9C7874C114F57A185C8563C0DCCA93F8096384D71A2994748
-A3C7C8B8AF54961A8838AD279441D9A5EB6C1FE26C98BD025F353124DA68A827
-AE2AF8D25CA48031C242AA433EEEBB8ABA4B96821786C38BACB5F58C3D5DA011
-85B385124C2B6534F3CD1866AF92009D93B97F763AA3D16684AA65F029E776DA
-3BFB75EDD46D562E6A284DB4F2FDBF7CDE7C1F3772CD7B6FD372842A0E07E3EF
-68A98AB9278ADC2D35891543F57ED6DCFE8923368D556F1A8B3E35863112F409
-FBE67FC270328312BAA43A9A372C510717B50AAB01A1E02A9982113E2D7C601C
-B0BDA1C0E081E546A97647B74EE5194C57ACD62502B329FED4D966BDEB4028F0
-F082EDD5DFC8387653D620E9E73FDCE3C155347D5929C3A24D6121AEA46BBF3A
-B1C8A4793FB7F21C84400912C27D9AB0845537103553BF8F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndFont 
-%%BeginFont: CMTI8
-%!PS-AdobeFont-1.1: CMTI8 1.0
-%%CreationDate: 1991 Aug 18 21:07:42
-% 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 (CMTI8) readonly def
-/FamilyName (Computer Modern) readonly def
-/Weight (Medium) readonly def
-/ItalicAngle -14.04 def
-/isFixedPitch false def
-end readonly def
-/FontName /CMTI8 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 0 /.notdef put
-readonly def
-/FontBBox{-35 -250 1190 750}readonly def
-/UniqueID 5000826 def
-currentdict end
-currentfile eexec
-D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE
-3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B
-532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470
-B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B
-986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE
-D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5
-525003F3DAD7933EB57E7DB1462E9D906F6D8F5BF740206C1EC5F36E00AAFF68
-F3EF6F3A2540E5F9564D1C215BC1E7E69C7D04DA5DB1CF195613C9CBF4BAA360
-84AEF3E10E24877FBE36AD731DC97305BDE6DB1F934909FAF60B8E28561FBC57
-0F5B6225425BFDE8F0C71CD4507B82FF803E9A301397975E38A259DE1E1B4FC0
-06BB1DC2D45B987A2268A77CE8DC025CB0D1B39788BBEE149103950650171C94
-5FED1063050A90BD38605BD9365D1C2AE42A7DA3DDB9A263FE10BD487F63D908
-D4F02758BD9D7BE53E6353A25BEFA29E42B50C1D078A8B3A746EEDB381CCE36C
-93FC4BD1A8D1D6ACD0D355E948CFE397B74D243EB51597D251D0BAE6884D70E8
-FEE119462E1939A9783414DF59EEA5FF1529F13869D1FF0A44935C5198CC5DAA
-E1FD2A17AEEBF4974052D06734A409E26C457C06700C55896C90BB33E044A737
-46590D9FA242819B9527FD59818D8829D4EB2D26A34CC05A2CC063E66F2DF193
-8E4F9670014BC243180E45B51DDB05AD1E6A7F619EE1CE09CFC1A4F02CB7270E
-4482FEDF673EDED38EF3173C475C34BFB3F6623C5E942A7797FEDDD0EF1D54E9
-1D90D7076C0A9687E334907C22F2E7C603388D8D626B0E5A62B7543DCBB575D7
-9A6BE1528EC9BC18570001092524E4FBB02F3B29293BCB4F0EF14A2DD9DB22A5
-BB33455799E8120D2A4862424AA4A382972E2845E042506FC8F6E201D11DD0F2
-09FAD8DC29C3E12B66293ACBFB13FA0F26238981F2CD52B47A8CDE6DF5CDFAAF
-3113E1A6366B806EABA9C34E5D41167CD10D7B639021FB4CFDAE28CE72A93F3C
-E8929A4BB6D48613A88F926E0EB1BE5F6E29CA5350841244E1718987727B7245
-E7DDE2528073015C64AEE3BF18734A0C48AFF16A354C14E1A6D9D5DC96C06E02
-3A1FE4AF93E8349C3293F62C3466B67D25A9533C6DAA4514EA201B79042CB220
-43B3B60E13200B4F47011F95BA2EF1D6548218DCDBC1B00CCAE375F91EB60E32
-9F1198D74BC3768101AB5F2E7BDEA9FE5C1379341C604D835B50B671793DD7EF
-605F60048FC9761FE50647C15C2424EABDC9AF4257F915282EFF1CF447EA3F0B
-EE81FB67B04703215DB6AB3E47B7EE06435234C834DF84A3E0F99D753D596305
-85DD514BA3C5ACCD8BF6BC804AEA170A32B2080B694CF7FE994228ECCAD86C4B
-CB8B963E84D46ED86B2D43DADB277A79DD100777CB0F2022C8AC9DA77D500C73
-D6E15540121B6D82457096083526C7E2697F776239E02C3E64D25AFBFB58474E
-E82672F2FBEA78ED5DCA1BB4FCD627BAAB6AB50232EDBE99D6CC51A287F80DCF
-14CC7DE3DCFF47A1DFA130CF7F502193C6C00B1A7A1515FF7374351238158B97
-AA26F0F2773E81CD03F4A398BEFBDCB450F0FA6450FD48B5A69E37B036BE5F85
-0F0B1AAAB2CF3098AEF32B0902398A6A9E1DB5A0C42DD39E3208C4F8BBEC0A98
-35FC84FF5EB2293644F7E6EF28FAF5F6E5205029CCFF7342BC276958EFFD7817
-5D9F367C6FF151B12353BE9DDCF75196F2C8C8C889BB097A3D9D8FF5D77A7184
-D9F3EAC4493E94DC73886AFD7652ADBF562189B0B85FA5AEA4CA44558D70A408
-4A276D6B0BCF6ED2F5E42E97933AEC978D286B3D0A99C6C7AB10AC6D1C36B07D
-EA2F47489D4C2A55A6902C665B7321DD5324C6CE172349E5C6561B5F1CBBFD6E
-B5FBBB914307020B218D68C45BB2E9A0BE81C9E8D5D71BC7851CD2922656337A
-9659E8E0A8F240903FC34DA589EC6D1FE6CF17D238576472C0CD1E0EB21A46B5
-5B9DACB6CA3B094E51386E45C506D55EE3AC95AF333EBD0305084697383F054D
-61680900B82CB80D030270CA9C614A373B0B5B26F8465AE581967C6A336D8C44
-21CED60606DF99F05AFC4C37F53D2D97450B78F1211A2682414780DFF7F6AC6E
-750071385D6DC87B58D3D13E286F70B11A692F4BF57BC828C6AA98C44EFE13F8
-44535F79F5458B03AAE3ECEBF2EFD4AA83316E839EF7EBADEA22C17FF039FA85
-498379D857AE78AC68CCC7D1EB2FE84D465AA452F43EC1AFEFE568E42F13E0BC
-1CDF5C873F8E3952713BD9A472E6FC9CDE8DDD9281EE3554C22A0D591C91D3E4
-0B3162930BB6F0AC229EE1C847EC39BF81DDDE1A0B0EC7BC51A05AE93B3A891A
-3FEB85C68C88AADD29FD39F9DB30FB250D41EBB1124ED0069CDC49B3359D8689
-05DCE2A27EFF35751E51E2C4AEA7DC8B2AF546AB58D6BE81DDD38A3A0833AB62
-E54F54ABC2BB67EF06678D0AA3AB0B240FDFD510404D87A1EA75D5005984B7D0
-DE9EE818E8F99BA9FD646FEAB795E5048E0710CEB0CBD8CA39754BCF7957C646
-532525C2B94D55B1AF534778D653BD50DCECF8DFA4CFD08092AA4DD3D8BB43E9
-6F40CE1B0B25287C46AA961061A0AE3714A465E39694B6E62410ECB1F409F939
-51CE57A12C3CB5B4332A3BDEF4C13917982A0A4527440CAD427F1284E6534D68
-201DA7E10B4DC25CCD025DB0D7E0906C59E235CBF747ED10C3300C1BA42BF434
-1A3C9605F0D568CD938B0DEB5C5E8390309BDFA89EFA3E5F226A24910EAB3791
-0361A08FE539B158072E96BC988AB061736F7DD19DEB61DB5738F2B43682C3E7
-12D709F9E149DA4602201AD24F42BBBEDA49118A93A7F26B703AECDE574441EE
-DAF7C634669C0D907B18BF4EAE198E9F3DD8F743FDBDBB2FF8C6650F17115FFF
-890F0FA7B873022FABADAD05C42B65FE98E870568D2CF828CDFF7C1EEEB5BF4B
-5E695EA05518191A5E8D34EB22091935E0816F8B49AFDCC44811D12D3CA85A57
-8C67D67D400ECEBADAABDC5F7D4E1DE4E330FD1A954B925E2A5B1D0CFF2D80D5
-F668367C28480C7EC3359C781279E8928DB03E274855F7001ABCCE243ED7C259
-67D4705EE2211FEF30D8E82F9EA0838B905A9FB986D1DD200524B74EC4B1AF8B
-A0216BBCE594588D8C28A527BC85306960D73D85D96B652B88462881EA065E0C
-84485D21B22E71768A81037FA08C48EA83AEC7118DA808CC62783E7DFB121A87
-0A8DA5BC6AD5B8C8ABD057D94DCD627E2CF3D6AACC031BCD50FF49C658EABCF1
-E6ED48E7B3A550782F077CCE21EFB7368B0D12EDF21BDA1DCD30D523A8B94729
-1E339B18677721963F0F9FF961CA6B065A881546683125114FB8BFBF996BA299
-9CA4E3F5BD5C0D614E2515BB6AAFD9D16E1F0C0409A524D91DAD55BB9630C810
-B1DF32BC5820AA059559A5095BF09750F21E3AECAD39CDB3277D06B78E2A0A08
-533EF557F6815F1C361B2417D27F7D9EFA5C2DB0B2655938C8E9E1E36C411E70
-7D57FD9EAFA6FD2C4D3A40D2F35C176E0522C6D0969A2DB598553D9C0A1940D2
-F3D8241AB8DB63E8426BF19B093D99DECC9E2633FE5C77EE55951036A7E19CC6
-27A2DDA74A95F870306ACF9945AA4FE9E10F1FBC43830B2D817016290E50F988
-7283F8E409B5BD2048CF8E8465DC3EC57EE47A7BB678093183B453FC60A8CD67
-6CE6E21A859B1EEACCB9E0A3DC1AEF41C74FE0E0245587A5E1F107BBA11C2B86
-91690DB7158BDAA3F2D82A820A36B3684CC11CCC4802C5F8135FAABDDD50091E
-97AE58FE38F088A7348D08F1B9A14BFEB8E97D81066D5C244DBDD9ABECECE72C
-6A91E31A815E2B22652F7813BDF07DEF9CBD0E8BB6E7999511289A0CE3CCF502
-14D9A77E29615479657F8BE9AA3EBAC9DD08A04EE7A160A1C528BD6C2CE79E67
-8913543117C32977841E710DCE7C0DAE68888C8EBEBD9883B9F9AF86B1C5790E
-E520337D14F18FB14686356E4F1248B3E884634480E683DDDFE4B0221AF0825C
-AF3B27DC3156F1E0B5E8D75063A10A81A78698BE4E1A4C2F49D2E530AF1ED966
-8EF252D3CBEACAD0394B9546D51768C195A23A041EC1E3F21AC91C498515EDCF
-5A9977F9D72ADBBED88D5E3FFEC64A087FAB9DBDB268608247B977E435E4CE34
-F0C543383384541FF88669E53446065864769D5D3957C64011D7C93FC147B093
-9FA961A60BDDF97F1A3BF53CC18D306DFCFE04DF980F026428E84140542171F0
-F706A48EDEC416DC58F006761686EBA99598962F6E1BEC8E78AEA474CF0AD890
-A72B9906BC891564ECD5440FE6047DB452171AF35C33C24D8A23E41C112D93B5
-F1B422386DFBE80ABBF7BD43F152F0451B7B0DB2D71B75575CB5256C94F40AE2
-E8DB4CABF990502BD74BE028E14C1972E666932E04E79B743B3357737F31D08B
-EB9755DF6C89C185A7F13DA21A6E6E526A9089B11C6BB1F5247E31685B028F52
-555F98CAB929558BA7BCDEAE76F93E7B00B214543EBEA0FA375B624B4553C133
-16D6E2B846FAA862F9DCBD8FCB2A59EADE462BC8FDF8DC56B888C6C5ECF9BBB2
-4197F4DDA197A9405F639643A4334545A8004F05963A05747B4905A319411086
-9A691FF410F400E7E569CF8EA99102A57A569C223B8CF8A4B285ADAEDB238FB4
-5FCCC3A9EB063BFB1F9263D8B31D8AE580B6B8F1F311388B509E224F7E600A98
-DE394C80D1CC6391D45160FC7CE92B0CD7E74B0844DD0F3562B14833A563FE6A
-E5942191AA6BAE176278E9EC30533FE310F0694745C024929A65E4C411DAAF0C
-F3539203284EDADDC1E27FF0EC2FED41AAD7A3CDCBF2B4177647CAEFA2FDD380
-F6483BB02F87E1B66F1F5F8B23DE0ED2EAF4C540A5D392D6B49B0BDF15DEDC09
-13DF0F14E0E49389A82445230CB58704CDF21591EC4E721119F4786523A16BA1
-95F9288C0704DE543FD38496FC59B15143CA8BA06584BE7E6C9F09DD4F207C09
-F2086D39D48B652E45BD2FC4E2C4BC1FE534CC1109E177C7494E0914CD0E45BB
-C8461B6A6FEAC2A2742CB9B3441DB0340DA91F6C6BA5EF79D6363F68A52F3300
-7CF46E9F6D5A7E33762852D4BA13A1825AFCF10B00CF175EB0059D272DBAB911
-30D027A1C1AAF745E0D69B71FB455C1363AF42B7A00B142D9C8ADDF4CE9801AF
-71C666C1A6773BF48F35076FED27423E1CD18139F3D8B0A3E1AE44C55382FC66
-942021B7C1E3451D679218810F816DA083A644A378D6ADEECCC212169B96FEBF
-744AD8C249E092F87CE696C926ED9E61B728674F39DFB645FF5AA6D742B73CF3
-37536ABDB80094DD7CB7D0FC30B6370F8CF9B145F65F4220FA592AF67383108C
-3739E4FD2E0878AF00DDEE092CCD14B1E749941F342701F07097A4DF0EE5AB3A
-B3D9BFE0B1060ADAFA7D4E3392218E5A7AEFE4CC01827ACD6903C2412270367B
-FC75D8C1E290C5489BF2ADE1B3FA6E11B5BCF37FFBC42D0B3E7A7435D6AA7E8F
-62B96A05C15CF7025EE1B0D9CC2580A11A1F187DE686E6F8ABBE658382B212CC
-D9BAB099DD7ED5EC269FF8CAC8C16E101B7AFE3BF9854884FF0746A1B0423FFC
-468342D5D31CEA0EDD7EB5FEEDDB129B7C55DDA20291A18592079BD75D8DCFA1
-2182EB1AB128A319FFB027164B5F9505754A4B1C8DFAD7FF0C892D97FEA8F506
-C65585142BB9F986886117C7CFC66EE962D1609DC1DD36930A6525D1ED03AA93
-282605FCC5C7C651D657EB8ED0A55EE348994C18FF6AEF1D8D669273B6EE450E
-709E6F60358F225E209AD70E96778E8375F41BCEFF74D46D595C0819C85E60DC
-DB702C6AB7E90FEA2EB9EC299FDA15BE8A807EEBEB1BAFD628BB94B1E28EBD60
-B6DAFF828C2C80821C8ECE963DC90E750EB00E3418BD0858AC6595012D32C308
-DDF9F30191779BFD58D93AF0DFEDE67AD6902FCF8C953CF52188311EDD0D005C
-BD31ADEE0825CE1C25725EA2D6C9E5D8D9034C
-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
@@ -900,10 +758,34 @@ end readonly 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 0 /.notdef put
+dup 12 /fi put
+dup 18 /grave put
+dup 19 /acute put
+dup 39 /quoteright put
+dup 45 /hyphen 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{-59 -250 1235 750}readonly def
-/UniqueID 5000766 def
 currentdict end
 currentfile eexec
 D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
@@ -1079,10 +961,82 @@ end readonly 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 0 /.notdef put
+dup 33 /exclam put
+dup 34 /quotedbl put
+dup 35 /numbersign put
+dup 36 /dollar put
+dup 37 /percent put
+dup 39 /quoteright put
+dup 40 /parenleft put
+dup 41 /parenright put
+dup 42 /asterisk put
+dup 43 /plus put
+dup 44 /comma put
+dup 45 /hyphen put
+dup 46 /period put
+dup 47 /slash put
+dup 48 /zero put
+dup 49 /one put
+dup 50 /two put
+dup 51 /three put
+dup 52 /four put
+dup 53 /five put
+dup 58 /colon put
+dup 60 /less 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 68 /D put
+dup 69 /E put
+dup 70 /F put
+dup 71 /G put
+dup 76 /L put
+dup 77 /M put
+dup 80 /P put
+dup 82 /R put
+dup 83 /S put
+dup 84 /T put
+dup 87 /W put
+dup 91 /bracketleft put
+dup 92 /backslash put
+dup 93 /bracketright put
+dup 94 /asciicircum put
+dup 95 /underscore 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 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
+dup 123 /braceleft put
+dup 124 /bar put
+dup 125 /braceright put
 readonly def
 /FontBBox{-5 -232 545 699}readonly def
-/UniqueID 5000830 def
 currentdict end
 currentfile eexec
 D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
@@ -1481,10 +1435,54 @@ end readonly 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 0 /.notdef put
+dup 12 /fi put
+dup 18 /grave put
+dup 19 /acute put
+dup 39 /quoteright put
+dup 45 /hyphen put
+dup 65 /A 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 76 /L put
+dup 77 /M put
+dup 78 /N put
+dup 79 /O put
+dup 80 /P put
+dup 81 /Q put
+dup 82 /R put
+dup 83 /S put
+dup 84 /T put
+dup 85 /U put
+dup 86 /V 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
-/UniqueID 5000768 def
 currentdict end
 currentfile eexec
 D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
@@ -1794,10 +1792,69 @@ end readonly 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 0 /.notdef put
+dup 11 /ff put
+dup 12 /fi put
+dup 14 /ffi put
+dup 16 /dotlessi put
+dup 18 /grave put
+dup 19 /acute put
+dup 27 /oe put
+dup 34 /quotedblright 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 49 /one put
+dup 50 /two put
+dup 57 /nine put
+dup 58 /colon put
+dup 65 /A 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 76 /L put
+dup 78 /N put
+dup 80 /P put
+dup 82 /R put
+dup 83 /S put
+dup 85 /U put
+dup 88 /X put
+dup 92 /quotedblleft 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 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
+dup 123 /endash put
 readonly def
 /FontBBox{-36 -250 1070 750}readonly def
-/UniqueID 5000791 def
 currentdict end
 currentfile eexec
 D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
@@ -2130,496 +2187,496 @@ E1A74AC8024558EE17551D308B1593F1E2A4D23FD570BC70E035B232D946FB9C
 0000000000000000000000000000000000000000000000000000000000000000
 cleartomark
 %%EndFont 
-TeXDict begin 52099146 40258431 1000 600 600 (fr-refcard.dvi)
-@start /Fa 242[61 13[{ TeXbbad153fEncoding ReEncodeFont }1
-49.8132 /CMSY6 rf /Fb 133[27 32 1[43 32 34 24 24 24 32
+TeXDict begin 55387786 39139632 1000 600 600 (fr-refcard.dvi)
+@start /Fa 197[20 58[{}1 66.4176 /CMMI8 rf /Fb 134[35
+3[38 24 29 30 1[36 36 40 58 18 2[22 1[33 1[33 36 33 33
+36 51[26 45[{}18 66.4176 /CMTI8 rf /Fc 242[61 13[{}1
+49.8132 /CMSY6 rf /Fd 133[27 32 1[43 32 34 24 24 24 32
 34 30 34 50 18 32 1[18 34 30 19 27 34 27 34 30 10[45
 45 1[34 2[41 1[45 54 2[31 22 1[47 39 41 1[43 42 45 9[30
-30 30 1[30 30 30 30 1[18 21 18 4[18 14[27 4[30 30 18[{
- TeXf7b6d320Encoding ReEncodeFont }52 49.8132 /CMR6 rf
-/Fc 197[20 58[{ TeXaae443f0Encoding ReEncodeFont }1 66.4176
-/CMMI8 rf /Fd 134[35 3[38 24 29 30 1[36 36 40 58 18 2[22
-1[33 1[33 36 33 33 36 51[26 45[{ TeX74afc74cEncoding ReEncodeFont }18
-66.4176 /CMTI8 rf /Fe 135[43 1[43 45 32 32 34 43 45 41
+30 30 1[30 30 30 30 1[18 21 18 4[18 14[27 4[30 30 18[{}52
+49.8132 /CMR6 rf /Fe 135[43 1[43 45 32 32 34 43 45 41
 45 68 23 2[23 45 41 25 37 45 36 45 40 51[27 5[23 19[41
-41 5[45 12[{ TeXf7b6d320Encoding ReEncodeFont }26 66.4176
-/CMBX8 rf /Ff 130[35 35 35 35 35 35 35 35 35 35 35 35
+41 5[45 12[{}26 66.4176 /CMBX8 rf /Ff 130[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 3[35 2[35 35 35 1[35 2[35 35 4[35 35 35
-35 35 35 35 35 35 35 1[35 1[35 4[35 35 35 35 35 35 35
-35 35 35 35 35 35 35 35 1[35 35 35 35 35 33[{
- TeX09fbbfacEncoding ReEncodeFont }74 66.4176 /CMTT8
-rf /Fg 135[60 1[60 64 45 45 47 60 64 57 64 95 32 2[32
-64 57 35 53 64 51 64 56 2[57 7[87 1[80 64 86 86 78 86
-1[109 69 1[59 43 2[72 75 88 83 1[87 19[38 5[32 19[57
-57 5[64 12[{ TeXf7b6d320Encoding ReEncodeFont }43 99.6264
+35 35 35 35 35 35 35 35 35 35 35 35 35 3[35 2[35 35 35
+1[35 2[35 35 4[35 35 35 35 35 35 35 35 35 35 1[35 1[35
+4[35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 1[35 35
+35 35 35 33[{}74 66.4176 /CMTT8 rf /Fg 135[60 1[60 64
+45 45 47 60 64 57 64 95 32 2[32 64 57 35 53 64 51 64
+56 2[57 7[87 1[80 64 86 86 78 86 1[109 69 1[59 43 2[72
+75 88 83 1[87 19[38 5[32 19[57 57 5[64 12[{}43 99.6264
 /CMBX10 rf /Fh 132[35 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 2[53 1[39 52 1[48 1[53 1[44 2[25 1[55 46 48 54 51
 1[53 6[20 35 6[35 35 2[20 24 20 2[27 27 20 4[35 6[55
-7[35 35 1[20 1[59 1[39 41 11[{ TeXf7b6d320Encoding ReEncodeFont }61
-66.4176 /CMR8 rf /Fi 139[53 54 57 3[76 115 6[42 63 76
-61 1[67 11[106 6[108 6[108 1[90 1[99 47[69 19[{
- TeXf7b6d320Encoding ReEncodeFont }16 119.552 /CMBX10
-rf end
+7[35 35 1[20 1[59 1[39 41 11[{}61 66.4176 /CMR8 rf /Fi
+139[53 54 57 3[76 115 6[42 63 76 61 1[67 11[106 6[108
+6[108 1[90 1[99 47[69 19[{}16 119.552 /CMBX10 rf end
 %%EndProlog
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
+%%BeginPaperSize: a4
+a4
+%%EndPaperSize
  @landscape end
 %%EndSetup
 %%Page: 1 1
 TeXDict begin @landscape 1 0 bop -540 -364 a Fi(Carte)46
 b(de)g(r)m(\023)-66 b(ef)m(\023)g(erence)46 b(de)g(GNU)f(Emacs)205
--272 y Fh(\(p)r(our)24 b(la)f(v)n(ersion)h(22\))-450
--65 y Fg(Lancemen)m(t)36 b(d'Emacs)-450 85 y Fh(P)n(our)22
+-280 y Fh(\(p)r(our)24 b(la)f(v)n(ersion)h(22\))-450
+-101 y Fg(Lancemen)m(t)36 b(d'Emacs)-450 12 y Fh(P)n(our)22
 b(lancer)h(GNU)g(Emacs)f(22,)h(il)f(su\016t)h(de)g(tap)r(er)g(son)f
-(nom)h(:)31 b Ff(emacs)-450 177 y Fh(P)n(our)24 b(c)n(harger)g(un)g
+(nom)h(:)31 b Ff(emacs)-450 106 y Fh(P)n(our)24 b(c)n(harger)g(un)g
 (\014c)n(hier)f(\022)-35 b(a)22 b(\023)-33 b(editer,)24
-b(v)n(oir)f(Fic)n(hiers,)g(ci-dessous.)-450 380 y Fg(Quitter)37
-b(Emacs)-450 563 y Fh(susp)r(end)24 b(Emacs)g(\(ou)h(l'iconi\014e)e
-(sous)h(X\))379 b Ff(C-z)-450 669 y Fh(quitter)24 b(d)n(\023)-33
+b(v)n(oir)f(Fic)n(hiers,)g(ci-dessous.)-450 280 y Fg(Quitter)37
+b(Emacs)-450 434 y Fh(susp)r(end)24 b(Emacs)g(\(ou)h(l'iconi\014e)e
+(sous)h(X\))379 b Ff(C-z)-450 540 y Fh(quitter)24 b(d)n(\023)-33
 b(e\014nitiv)n(emen)n(t)26 b(Emacs)616 b Ff(C-x)36 b(C-c)-450
-888 y Fg(Fic)m(hiers)-450 1051 y Fe(lire)23 b Fh(un)h(\014c)n(hier)f
-(dans)h(Emacs)694 b Ff(C-x)36 b(C-f)-450 1157 y Fe(sauv)n(egarder)22
+731 y Fg(Fic)m(hiers)-450 866 y Fe(lire)23 b Fh(un)h(\014c)n(hier)f
+(dans)h(Emacs)694 b Ff(C-x)36 b(C-f)-450 972 y Fe(sauv)n(egarder)22
 b Fh(un)i(\014c)n(hier)g(sur)f(disque)439 b Ff(C-x)36
-b(C-s)-450 1264 y Fh(sauv)n(egarder)25 b Fe(tous)e Fh(les)g(\014c)n
-(hiers)633 b Ff(C-x)36 b(s)-450 1370 y Fe(ins)n(\023)-39
+b(C-s)-450 1078 y Fh(sauv)n(egarder)25 b Fe(tous)e Fh(les)g(\014c)n
+(hiers)633 b Ff(C-x)36 b(s)-450 1184 y Fe(ins)n(\023)-39
 b(erer)23 b Fh(le)h(con)n(ten)n(u)h(d'un)f(autre)g(\014c)n(hier)g(dans)
-g(ce)-379 1476 y(tamp)r(on)1204 b Ff(C-x)36 b(i)-450
-1582 y Fh(remplacer)24 b(ce)g(\014c)n(hier)g(par)f(le)h(\014c)n(hier)f
-(v)n(oulu)312 b Ff(C-x)36 b(C-v)-452 1689 y Fh(\023)-33
+g(ce)-379 1291 y(tamp)r(on)1204 b Ff(C-x)36 b(i)-450
+1397 y Fh(remplacer)24 b(ce)g(\014c)n(hier)g(par)f(le)h(\014c)n(hier)f
+(v)n(oulu)312 b Ff(C-x)36 b(C-v)-452 1503 y Fh(\023)-33
 b(ecrire)23 b(le)h(tamp)r(on)g(dans)g(un)g(\014c)n(hier)g(donn)n(\023)
--33 b(e)324 b Ff(C-x)36 b(C-w)-450 1795 y Fh(bascule)24
+-33 b(e)324 b Ff(C-x)36 b(C-w)-450 1609 y Fh(bascule)24
 b(du)g(mo)r(de)g(lecture-seule)h(du)f(tamp)r(on)229 b
-Ff(C-x)36 b(C-q)-450 2014 y Fg(Obtenir)h(de)g(l'aide)-450
-2164 y Fh(Le)27 b(syst)n(\022)-33 b(eme)27 b(d'aide)g(est)g(simple.)40
+Ff(C-x)36 b(C-q)-450 1800 y Fg(Obtenir)h(de)g(l'aide)-450
+1913 y Fh(Le)27 b(syst)n(\022)-33 b(eme)27 b(d'aide)g(est)g(simple.)40
 b(F)-6 b(aites)27 b Ff(C-h)h Fh(\(ou)f Ff(F1)p Fh(\))h(et)f(suiv)n(ez)g
-(les)-450 2228 y(instructions.)38 b(Si)26 b(v)n(ous)g(d)n(\023)-33
+(les)-450 1982 y(instructions.)38 b(Si)26 b(v)n(ous)g(d)n(\023)-33
 b(ebutez,)28 b(faites)e Ff(C-h)36 b(t)26 b Fh(p)r(our)g(suivre)g(un)g
-Fe(di-)-450 2291 y(dacticiel)p Fh(.)-450 2397 y(supprimer)d(la)g(fen)n
-(^)-33 b(etre)24 b(d'aide)682 b Ff(C-x)36 b(1)-450 2503
+Fe(di-)-450 2048 y(dacticiel)p Fh(.)-450 2154 y(supprimer)d(la)g(fen)n
+(^)-33 b(etre)24 b(d'aide)682 b Ff(C-x)36 b(1)-450 2260
 y Fh(faire)23 b(d)n(\023)-33 b(e\014ler)24 b(la)f(fen)n(^)-33
-b(etre)24 b(d'aide)645 b Ff(C-M-v)-450 2638 y Fh(aprop)r(os)24
+b(etre)24 b(d'aide)645 b Ff(C-M-v)-450 2395 y Fh(aprop)r(os)24
 b(:)35 b(mon)n(trer)24 b(les)f(commandes)i(con)n(tenan)n(t)-379
-2745 y(une)f(certaine)h(c)n(ha)-8 b(^)-27 b(\020ne)847
-b Ff(C-h)36 b(a)-450 2851 y Fh(d)n(\023)-33 b(ecrire)23
+2501 y(une)f(certaine)h(c)n(ha)-8 b(^)-27 b(\020ne)847
+b Ff(C-h)36 b(a)-450 2608 y Fh(d)n(\023)-33 b(ecrire)23
 b(la)h(fonction)g(lanc)n(\023)-33 b(ee)25 b(par)f(une)g(touc)n(he)258
-b Ff(C-h)36 b(k)-450 2957 y Fh(d)n(\023)-33 b(ecrire)23
-b(une)i(fonction)898 b Ff(C-h)36 b(f)-450 3063 y Fh(obtenir)24
+b Ff(C-h)36 b(k)-450 2714 y Fh(d)n(\023)-33 b(ecrire)23
+b(une)i(fonction)898 b Ff(C-h)36 b(f)-450 2820 y Fh(obtenir)24
 b(des)g(informations)f(sp)n(\023)-33 b(eci\014ques)25
-b(au)f(mo)r(de)124 b Ff(C-h)36 b(m)-450 3283 y Fg(R)n(\023)-55
-b(ecup)n(\023)g(eration)36 b(des)h(erreurs)-450 3465
+b(au)f(mo)r(de)124 b Ff(C-h)36 b(m)-450 3011 y Fg(R)n(\023)-55
+b(ecup)n(\023)g(eration)36 b(des)h(erreurs)-450 3165
 y Fe(a)n(v)n(orter)21 b Fh(une)k(commande)f(partiellemen)n(t)h(tap)n
-(\023)-33 b(ee)-379 3571 y(ou)24 b(ex)n(\023)-33 b(ecut)n(\023)g(ee)
-1084 b Ff(C-g)-450 3678 y Fe(r)n(\023)-39 b(ecup)n(\023)g(erer)24
-b Fh(les)f(\014c)n(hier)h(p)r(erdus)g(par)f(un)-379 3784
+(\023)-33 b(ee)-379 3271 y(ou)24 b(ex)n(\023)-33 b(ecut)n(\023)g(ee)
+1084 b Ff(C-g)-450 3377 y Fe(r)n(\023)-39 b(ecup)n(\023)g(erer)24
+b Fh(les)f(\014c)n(hier)h(p)r(erdus)g(par)f(un)-379 3483
 y(crash)g(du)h(syst)n(\022)-33 b(eme)669 b Ff(M-x)36
-b(recover-session)-450 3890 y Fe(ann)n(uler)23 b Fh(une)h(mo)r
+b(recover-session)-450 3590 y Fe(ann)n(uler)23 b Fh(une)h(mo)r
 (di\014cation)h(non)f(souhait)n(\023)-33 b(ee)16 b Ff(C-x)36
-b(u,)g(C-_)g Fh(ou)g Ff(C-/)-450 3996 y Fh(restaurer)24
+b(u,)g(C-_)g Fh(ou)g Ff(C-/)-450 3696 y Fh(restaurer)24
 b(un)f(tamp)r(on)i(a)n(v)n(ec)g(son)f(con)n(ten)n(u)-379
-4103 y(initial)1015 b Ff(M-x)36 b(revert-buffer)-450
-4209 y Fh(r)n(\023)-33 b(ea\016c)n(her)24 b(un)e(\023)-33
-b(ecran)24 b(p)r(erturb)n(\023)-33 b(e)653 b Ff(C-l)1746
--364 y Fg(Rec)m(herc)m(he)36 b(incr)n(\023)-55 b(emen)m(tale)1746
--201 y Fh(rec)n(herc)n(her)24 b(v)n(ers)g(l'a)n(v)l(an)n(t)823
-b Ff(C-s)1746 -95 y Fh(rec)n(herc)n(her)24 b(v)n(ers)g(l'arri)n(\022)
--33 b(ere)787 b Ff(C-r)1746 12 y Fh(rec)n(herc)n(her)24
+3802 y(initial)1015 b Ff(M-x)36 b(revert-buffer)-450
+3908 y Fh(r)n(\023)-33 b(ea\016c)n(her)24 b(un)e(\023)-33
+b(ecran)24 b(p)r(erturb)n(\023)-33 b(e)653 b Ff(C-l)-341
+4131 y Fd(c)-358 4133 y Fc(\015)20 b Fd(2007)j(F)-5 b(ree)21
+b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)27 b(P)n(ermissions)21
+b(au)g(dos.)27 b(v2.3)1746 -364 y Fg(Rec)m(herc)m(he)36
+b(incr)n(\023)-55 b(emen)m(tale)1746 -230 y Fh(rec)n(herc)n(her)24
+b(v)n(ers)g(l'a)n(v)l(an)n(t)823 b Ff(C-s)1746 -123 y
+Fh(rec)n(herc)n(her)24 b(v)n(ers)g(l'arri)n(\022)-33
+b(ere)787 b Ff(C-r)1746 -17 y Fh(rec)n(herc)n(her)24
 b(v)n(ers)g(l'a)n(v)l(an)n(t)g(par)g(expression)1817
-118 y(rationnelle)1115 b Ff(C-M-s)1746 224 y Fh(rec)n(herc)n(her)24
+89 y(rationnelle)1115 b Ff(C-M-s)1746 196 y Fh(rec)n(herc)n(her)24
 b(v)n(ers)g(l'arri)n(\022)-33 b(ere)22 b(par)h(expression)1817
-330 y(rationnelle)1115 b Ff(C-M-r)1746 465 y Fh(s)n(\023)-33
+302 y(rationnelle)1115 b Ff(C-M-r)1746 437 y Fh(s)n(\023)-33
 b(electionner)25 b(la)e(c)n(ha)-8 b(^)-27 b(\020ne)25
 b(de)f(rec)n(herc)n(he)h(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)101
-b Ff(M-p)1746 571 y Fh(s)n(\023)-33 b(electionner)25
+b Ff(M-p)1746 543 y Fh(s)n(\023)-33 b(electionner)25
 b(la)e(c)n(ha)-8 b(^)-27 b(\020ne)25 b(de)f(rec)n(herc)n(he)h(suiv)l
-(an)n(te)176 b Ff(M-n)1746 678 y Fh(sortir)23 b(de)h(la)f(rec)n(herc)n
+(an)n(te)176 b Ff(M-n)1746 649 y Fh(sortir)23 b(de)h(la)f(rec)n(herc)n
 (he)i(incr)n(\023)-33 b(emen)n(tale)451 b Ff(RET)1746
-784 y Fh(ann)n(uler)24 b(l'e\013et)g(du)g(dernier)f(caract)n(\022)-33
-b(ere)446 b Ff(DEL)1746 890 y Fh(ann)n(uler)24 b(la)f(rec)n(herc)n(he)i
-(en)f(cours)615 b Ff(C-g)1746 1001 y Fh(Refaites)17 b
+755 y Fh(ann)n(uler)24 b(l'e\013et)g(du)g(dernier)f(caract)n(\022)-33
+b(ere)446 b Ff(DEL)1746 862 y Fh(ann)n(uler)24 b(la)f(rec)n(herc)n(he)i
+(en)f(cours)615 b Ff(C-g)1746 972 y Fh(Refaites)17 b
 Ff(C-s)g Fh(ou)g Ff(C-r)h Fh(p)r(our)e(r)n(\023)-33 b(ep)n(\023)g(eter)
 18 b(la)e(rec)n(herc)n(he)i(dans)f(une)g(direction)1746
-1064 y(quelconque.)67 b(Si)34 b(Emacs)h(est)h(encore)g(en)f(train)g(de)
-g(c)n(herc)n(her,)j Ff(C-g)1746 1128 y Fh(n'ann)n(ule)24
+1038 y(quelconque.)67 b(Si)34 b(Emacs)h(est)h(encore)g(en)f(train)g(de)
+g(c)n(herc)n(her,)j Ff(C-g)1746 1105 y Fh(n'ann)n(ule)24
 b(que)h(ce)f(qui)f(n'a)h(pas)e(\023)-33 b(et)n(\023)g(e)25
-b(fait.)1746 1331 y Fg(D)n(\023)-55 b(eplacemen)m(ts)1746
-1489 y Fe(en)n(tit)n(\023)-39 b(e)26 b(sur)i(laquelle)e(se)h(d)n(\023)
+b(fait.)1746 1280 y Fg(D)n(\023)-55 b(eplacemen)m(ts)1746
+1409 y Fe(en)n(tit)n(\023)-39 b(e)26 b(sur)i(laquelle)e(se)h(d)n(\023)
 -39 b(eplacer)210 b(en)28 b(arri)n(\022)-39 b(ere)69
-b(en)27 b(a)n(v)-5 b(an)n(t)1746 1553 y Fh(caract)n(\022)-33
-b(ere)992 b Ff(C-b)313 b(C-f)1746 1617 y Fh(mot)1148
-b Ff(M-b)313 b(M-f)1746 1681 y Fh(ligne)1124 b Ff(C-p)313
-b(C-n)1746 1752 y Fh(aller)23 b(au)h(d)n(\023)-33 b(ebut)25
+b(en)27 b(a)n(v)-5 b(an)n(t)1746 1475 y Fh(caract)n(\022)-33
+b(ere)992 b Ff(C-b)313 b(C-f)1746 1531 y Fh(mot)1148
+b Ff(M-b)313 b(M-f)1746 1586 y Fh(ligne)1124 b Ff(C-p)313
+b(C-n)1746 1658 y Fh(aller)23 b(au)h(d)n(\023)-33 b(ebut)25
 b(\(ou)f(\022)-35 b(a)24 b(la)g(\014n\))g(de)g(la)f(ligne)105
-b Ff(C-a)313 b(C-e)1746 1816 y Fh(phrase)1069 b Ff(M-a)313
-b(M-e)1746 1879 y Fh(paragraphe)925 b Ff(M-{)313 b(M-})1746
-1943 y Fh(page)1129 b Ff(C-x)36 b([)242 b(C-x)36 b(])1746
-2007 y Fh(s-expression)901 b Ff(C-M-b)243 b(C-M-f)1746
-2071 y Fh(fonction)1021 b Ff(C-M-a)243 b(C-M-e)1746 2134
+b Ff(C-a)313 b(C-e)1746 1727 y Fh(phrase)1069 b Ff(M-a)313
+b(M-e)1746 1793 y Fh(paragraphe)925 b Ff(M-{)313 b(M-})1746
+1858 y Fh(page)1129 b Ff(C-x)36 b([)242 b(C-x)36 b(])1746
+1922 y Fh(s-expression)901 b Ff(C-M-b)243 b(C-M-f)1746
+1988 y Fh(fonction)1021 b Ff(C-M-a)243 b(C-M-e)1746 2044
 y Fh(aller)23 b(au)h(d)n(\023)-33 b(ebut)25 b(\(ou)f(\022)-35
 b(a)24 b(la)g(\014n\))g(du)g(tamp)r(on)84 b Ff(M-<)313
-b(M->)1746 2257 y Fh(passer)24 b(\022)-35 b(a)23 b(l')n(\023)-33
-b(ecran)24 b(suiv)l(an)n(t)793 b Ff(C-v)1746 2363 y Fh(passer)24
+b(M->)1746 2166 y Fh(passer)24 b(\022)-35 b(a)23 b(l')n(\023)-33
+b(ecran)24 b(suiv)l(an)n(t)793 b Ff(C-v)1746 2273 y Fh(passer)24
 b(\022)-35 b(a)23 b(l')n(\023)-33 b(ecran)24 b(pr)n(\023)-33
-b(ec)n(\023)g(eden)n(t)718 b Ff(M-v)1746 2469 y Fh(d)n(\023)-33
+b(ec)n(\023)g(eden)n(t)718 b Ff(M-v)1746 2379 y Fh(d)n(\023)-33
 b(e\014ler)24 b(l')n(\023)-33 b(ecran)23 b(v)n(ers)h(la)f(droite)668
-b Ff(C-x)36 b(<)1746 2576 y Fh(d)n(\023)-33 b(e\014ler)24
+b Ff(C-x)36 b(<)1746 2485 y Fh(d)n(\023)-33 b(e\014ler)24
 b(l')n(\023)-33 b(ecran)23 b(v)n(ers)h(la)f(gauc)n(he)640
-b Ff(C-x)36 b(>)1746 2682 y Fh(placer)24 b(la)f(ligne)h(couran)n(te)h
+b Ff(C-x)36 b(>)1746 2591 y Fh(placer)24 b(la)f(ligne)h(couran)n(te)h
 (au)f(cen)n(tre)h(de)f(l')n(\023)-33 b(ecran)162 b Ff(C-u)36
-b(C-l)1746 2901 y Fg(D)n(\023)-55 b(etruire)36 b(et)i(supprimer)1746
-3059 y Fe(en)n(tit)n(\023)-39 b(e)26 b(\022)-40 b(a)26
+b(C-l)1746 2782 y Fg(D)n(\023)-55 b(etruire)36 b(et)i(supprimer)1746
+2911 y Fe(en)n(tit)n(\023)-39 b(e)26 b(\022)-40 b(a)26
 b(supprimer)648 b(en)28 b(arri)n(\022)-39 b(ere)69 b(en)28
-b(a)n(v)-5 b(an)n(t)1746 3123 y Fh(caract)n(\022)-33
+b(a)n(v)-5 b(an)n(t)1746 2981 y Fh(caract)n(\022)-33
 b(ere)25 b(\(suppression,)f(pas)g(destruction\))84 b
-Ff(DEL)313 b(C-d)1746 3187 y Fh(mot)1187 b Ff(M-DEL)243
-b(M-d)1746 3250 y Fh(ligne)24 b(\(jusqu'\022)-35 b(a)23
-b(la)h(\014n\))685 b Ff(M-0)37 b(C-k)171 b(C-k)1746 3314
-y Fh(phrase)1108 b Ff(C-x)37 b(DEL)171 b(M-k)1746 3378
+Ff(DEL)313 b(C-d)1746 3045 y Fh(mot)1187 b Ff(M-DEL)243
+b(M-d)1746 3101 y Fh(ligne)24 b(\(jusqu'\022)-35 b(a)23
+b(la)h(\014n\))685 b Ff(M-0)37 b(C-k)171 b(C-k)1746 3170
+y Fh(phrase)1108 b Ff(C-x)37 b(DEL)171 b(M-k)1746 3234
 y Fh(s-expression)940 b Ff(M--)37 b(C-M-k)101 b(C-M-k)1746
-3497 y Fh(d)n(\023)-33 b(etruire)24 b(une)g Fe(r)n(\023)-39
-b(egion)890 b Ff(C-w)1746 3603 y Fh(copier)24 b(une)g(r)n(\023)-33
+3353 y Fh(d)n(\023)-33 b(etruire)24 b(une)g Fe(r)n(\023)-39
+b(egion)890 b Ff(C-w)1746 3459 y Fh(copier)24 b(une)g(r)n(\023)-33
 b(egion)24 b(dans)g(le)f(kill)g(ring)477 b Ff(M-w)1746
-3709 y Fh(d)n(\023)-33 b(etruire)24 b(jusqu'\022)-35
-b(a)23 b(l'o)r(ccurrence)h(suiv)l(an)n(te)h(de)f Fd(c)l(ar)147
-b Ff(M-z)36 b Fd(c)l(ar)1746 3844 y Fh(r)n(\023)-33 b(ecup)n(\023)g
+3565 y Fh(d)n(\023)-33 b(etruire)24 b(jusqu'\022)-35
+b(a)23 b(l'o)r(ccurrence)h(suiv)l(an)n(te)h(de)f Fb(c)l(ar)147
+b Ff(M-z)36 b Fb(c)l(ar)1746 3700 y Fh(r)n(\023)-33 b(ecup)n(\023)g
 (erer)24 b(la)f(derni)n(\022)-33 b(ere)24 b(c)n(hose)h(d)n(\023)-33
-b(etruite)423 b Ff(C-y)1746 3950 y Fh(remplacer)24 b(la)f(derni)n(\022)
+b(etruite)423 b Ff(C-y)1746 3807 y Fh(remplacer)24 b(la)f(derni)n(\022)
 -33 b(ere)24 b(r)n(\023)-33 b(ecup)n(\023)g(eration)24
-b(par)g(ce)g(qui)1817 4057 y(a)d(\023)-33 b(et)n(\023)g(e)25
+b(par)g(ce)g(qui)1817 3913 y(a)d(\023)-33 b(et)n(\023)g(e)25
 b(d)n(\023)-33 b(etruit)24 b(a)n(v)l(an)n(t)868 b Ff(M-y)3942
--364 y Fg(Marquer)3942 -182 y Fh(placer)24 b(la)f(marque)h(ici)901
-b Ff(C-@)36 b Fh(ou)f Ff(C-SPC)3940 -75 y Fh(\023)-33
+-364 y Fg(Marquer)3942 -210 y Fh(placer)24 b(la)f(marque)h(ici)901
+b Ff(C-@)36 b Fh(ou)f Ff(C-SPC)3940 -104 y Fh(\023)-33
 b(ec)n(hanger)25 b(le)f(p)r(oin)n(t)g(et)g(la)g(marque)570
-b Ff(C-x)36 b(C-x)3942 60 y Fh(placer)24 b(la)f(marque)h
-Fd(ar)l(g)30 b Fe(mots)23 b Fh(plus)g(loin)388 b Ff(M-@)3942
-166 y Fh(marquer)23 b(le)h Fe(paragraphe)755 b Ff(M-h)3942
-272 y Fh(marquer)23 b(la)h Fe(page)989 b Ff(C-x)36 b(C-p)3942
-378 y Fh(marquer)23 b(la)h Fe(s-expression)724 b Ff(C-M-@)3942
-485 y Fh(marquer)23 b(la)h Fe(fonction)864 b Ff(C-M-h)3942
-591 y Fh(marquer)23 b(tout)i(le)f Fe(tamp)r(on)730 b
-Ff(C-x)36 b(h)3942 810 y Fg(Remplacemen)m(t)g(in)m(teractif)3942
-993 y Fh(remplacer)24 b(in)n(teractiv)n(emen)n(t)h(une)g(c)n(ha)-8
+b Ff(C-x)36 b(C-x)3942 31 y Fh(placer)24 b(la)f(marque)h
+Fb(ar)l(g)30 b Fe(mots)23 b Fh(plus)g(loin)388 b Ff(M-@)3942
+137 y Fh(marquer)23 b(le)h Fe(paragraphe)755 b Ff(M-h)3942
+243 y Fh(marquer)23 b(la)h Fe(page)989 b Ff(C-x)36 b(C-p)3942
+350 y Fh(marquer)23 b(la)h Fe(s-expression)724 b Ff(C-M-@)3942
+456 y Fh(marquer)23 b(la)h Fe(fonction)864 b Ff(C-M-h)3942
+562 y Fh(marquer)23 b(tout)i(le)f Fe(tamp)r(on)730 b
+Ff(C-x)36 b(h)3942 753 y Fg(Remplacemen)m(t)g(in)m(teractif)3942
+907 y Fh(remplacer)24 b(in)n(teractiv)n(emen)n(t)h(une)g(c)n(ha)-8
 b(^)-27 b(\020ne)24 b(de)g(texte)86 b Ff(M-\045)3942
-1099 y Fh(en)24 b(utilisan)n(t)g(les)f(expressions)4013
-1205 y(rationnelles)594 b Ff(M-x)36 b(query-replace-regexp)3942
-1315 y Fh(Les)22 b(r)n(\023)-33 b(ep)r(onses)23 b(admises)f(dans)h(le)f
+1013 y Fh(en)24 b(utilisan)n(t)g(les)f(expressions)4013
+1119 y(rationnelles)594 b Ff(M-x)36 b(query-replace-regexp)3942
+1230 y Fh(Les)22 b(r)n(\023)-33 b(ep)r(onses)23 b(admises)f(dans)h(le)f
 (mo)r(de)h(de)g(remplacemen)n(t)h(in)n(teractif)3942
-1379 y(son)n(t)g(:)3942 1485 y Fe(remplacer)f Fh(celle-l\022)-35
+1285 y(son)n(t)g(:)3942 1391 y Fe(remplacer)f Fh(celle-l\022)-35
 b(a,)22 b(passer)i(\022)-35 b(a)24 b(la)f(suiv)l(an)n(te)280
-b Ff(SPC)3942 1591 y Fh(remplacer)24 b(celle-l\022)-35
-b(a,)22 b(rester)i(l\022)-35 b(a)679 b Ff(,)3942 1698
+b Ff(SPC)3942 1498 y Fh(remplacer)24 b(celle-l\022)-35
+b(a,)22 b(rester)i(l\022)-35 b(a)679 b Ff(,)3942 1604
 y Fe(passer)23 b Fh(\022)-35 b(a)24 b(la)g(suiv)l(an)n(te)g(sans)g
-(remplacer)400 b Ff(DEL)3942 1804 y Fh(remplacer)24 b(toutes)h(les)e
-(corresp)r(ondances)4013 1910 y(suiv)l(an)n(tes)1162
-b Ff(!)3942 2016 y Fe(rev)n(enir)23 b Fh(\022)-35 b(a)24
+(remplacer)400 b Ff(DEL)3942 1710 y Fh(remplacer)24 b(toutes)h(les)e
+(corresp)r(ondances)4013 1816 y(suiv)l(an)n(tes)1162
+b Ff(!)3942 1923 y Fe(rev)n(enir)23 b Fh(\022)-35 b(a)24
 b(la)f(corresp)r(ondance)i(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)279
-b Ff(^)3942 2123 y Fe(sortir)22 b Fh(du)i(remplacemen)n(t)h(in)n
-(teractif)460 b Ff(RET)3942 2229 y Fh(en)n(trer)24 b(dans)g(l')n(\023)
+b Ff(^)3942 2029 y Fe(sortir)22 b Fh(du)i(remplacemen)n(t)h(in)n
+(teractif)460 b Ff(RET)3942 2135 y Fh(en)n(trer)24 b(dans)g(l')n(\023)
 -33 b(edition)23 b(r)n(\023)-33 b(ecursiv)n(e)24 b(\()p
-Ff(C-M-c)h Fh(p)r(our)4013 2335 y(sortir\))1247 b Ff(C-r)3942
-2554 y Fg(F)-10 b(en)n(^)-55 b(etres)37 b(m)m(ultiples)3942
-2712 y Fh(Lorsqu'il)25 b(y)i(a)f(deux)i(commandes,)g(la)e(seconde)i
-(est)f(une)g(commande)3942 2776 y(iden)n(tique)e(\022)-35
+Ff(C-M-c)h Fh(p)r(our)4013 2241 y(sortir\))1247 b Ff(C-r)3942
+2432 y Fg(F)-10 b(en)n(^)-55 b(etres)37 b(m)m(ultiples)3942
+2561 y Fh(Lorsqu'il)25 b(y)i(a)f(deux)i(commandes,)g(la)e(seconde)i
+(est)f(une)g(commande)3942 2627 y(iden)n(tique)e(\022)-35
 b(a)24 b(la)f(premi)n(\022)-33 b(ere)23 b(p)r(our)h(un)g(cadre)g(au)g
-(lieu)f(d'une)i(fen)n(^)-33 b(etre.)3942 2868 y(supprimer)23
+(lieu)f(d'une)i(fen)n(^)-33 b(etre.)3942 2721 y(supprimer)23
 b(toutes)i(les)e(autres)h(fen)n(^)-33 b(etres)117 b Ff(C-x)36
-b(1)212 b(C-x)37 b(5)e(1)3942 2932 y Fh(diviser)23 b(la)g(fen)n(^)-33
+b(1)212 b(C-x)37 b(5)e(1)3942 2787 y Fh(diviser)23 b(la)g(fen)n(^)-33
 b(etre)25 b(horizon)n(talemen)n(t)184 b Ff(C-x)36 b(2)212
-b(C-x)37 b(5)e(2)3942 2996 y Fh(supprimer)23 b(cette)i(fen)n(^)-33
+b(C-x)37 b(5)e(2)3942 2843 y Fh(supprimer)23 b(cette)i(fen)n(^)-33
 b(etre)499 b Ff(C-x)36 b(0)212 b(C-x)37 b(5)e(0)3942
-3115 y Fh(diviser)23 b(la)g(fen)n(^)-33 b(etre)25 b(v)n(erticalemen)n
-(t)561 b Ff(C-x)36 b(3)3942 3250 y Fh(faire)23 b(d)n(\023)-33
+2962 y Fh(diviser)23 b(la)g(fen)n(^)-33 b(etre)25 b(v)n(erticalemen)n
+(t)561 b Ff(C-x)36 b(3)3942 3096 y Fh(faire)23 b(d)n(\023)-33
 b(e\014ler)24 b(l'autre)f(fen)n(^)-33 b(etre)708 b Ff(C-M-v)3942
-3360 y Fh(placer)24 b(le)f(curseur)h(dans)g(une)g(autre)h(fen)n(^)-33
-b(etre)25 b Ff(C-x)36 b(o)212 b(C-x)37 b(5)e(o)3942 3424
+3207 y Fh(placer)24 b(le)f(curseur)h(dans)g(une)g(autre)h(fen)n(^)-33
+b(etre)25 b Ff(C-x)36 b(o)212 b(C-x)37 b(5)e(o)3942 3273
 y Fh(s)n(\023)-33 b(electionner)25 b(le)e(tamp)r(on)i(dans)4025
-3488 y(l'autre)f(fen)n(^)-33 b(etre)731 b Ff(C-x)36 b(4)g(b)141
-b(C-x)37 b(5)e(b)3942 3551 y Fh(a\016c)n(her)24 b(le)g(tamp)r(on)g
+3338 y(l'autre)f(fen)n(^)-33 b(etre)731 b Ff(C-x)36 b(4)g(b)141
+b(C-x)37 b(5)e(b)3942 3394 y Fh(a\016c)n(her)24 b(le)g(tamp)r(on)g
 (dans)g(l'autre)g(fen)n(^)-33 b(etre)69 b Ff(C-x)36 b(4)g(C-o)71
-b(C-x)37 b(5)e(C-o)3942 3615 y Fh(c)n(harger)24 b(un)g(\014c)n(hier)g
+b(C-x)37 b(5)e(C-o)3942 3460 y Fh(c)n(harger)24 b(un)g(\014c)n(hier)g
 (dans)g(l'autre)f(fen)n(^)-33 b(etre)89 b Ff(C-x)36 b(4)g(f)141
-b(C-x)37 b(5)e(f)3942 3679 y Fh(c)n(harger)24 b(un)g(\014c)n(hier)g(en)
-g(lecture)g(seule)4025 3743 y(dans)g(l'autre)g(fen)n(^)-33
+b(C-x)37 b(5)e(f)3942 3525 y Fh(c)n(harger)24 b(un)g(\014c)n(hier)g(en)
+g(lecture)g(seule)4025 3591 y(dans)g(l'autre)g(fen)n(^)-33
 b(etre)566 b Ff(C-x)36 b(4)g(r)141 b(C-x)37 b(5)e(r)3942
-3806 y Fh(lancer)24 b(Dired)f(dans)h(l'autre)g(fen)n(^)-33
+3647 y Fh(lancer)24 b(Dired)f(dans)h(l'autre)g(fen)n(^)-33
 b(etre)246 b Ff(C-x)36 b(4)g(d)141 b(C-x)37 b(5)e(d)3942
-3870 y Fh(trouv)n(er)24 b(un)g(tag)h(dans)f(l'autre)f(fen)n(^)-33
+3703 y Fh(trouv)n(er)24 b(un)g(tag)h(dans)f(l'autre)f(fen)n(^)-33
 b(etre)179 b Ff(C-x)36 b(4)g(.)141 b(C-x)37 b(5)e(.)3942
-3989 y Fh(agrandir)23 b(la)h(fen)n(^)-33 b(etre)941 b
-Ff(C-x)36 b(^)3942 4095 y Fh(rap)r(etisser)23 b(la)h(fen)n(^)-33
-b(etre)903 b Ff(C-x)36 b({)3940 4201 y Fh(\023)-33 b(elargir)23
+3821 y Fh(agrandir)23 b(la)h(fen)n(^)-33 b(etre)941 b
+Ff(C-x)36 b(^)3942 3928 y Fh(rap)r(etisser)23 b(la)h(fen)n(^)-33
+b(etre)903 b Ff(C-x)36 b({)3940 4034 y Fh(\023)-33 b(elargir)23
 b(la)g(fen)n(^)-33 b(etre)1004 b Ff(C-x)36 b(})p eop
 end
 %%Page: 2 2
 TeXDict begin @landscape 2 1 bop -450 -364 a Fg(F)-10
-b(ormater)-450 -233 y Fh(inden)n(ter)24 b(la)g Fe(ligne)f
+b(ormater)-450 -268 y Fh(inden)n(ter)24 b(la)g Fe(ligne)f
 Fh(couran)n(te)i(\(d)n(\023)-33 b(ep)r(end)25 b(du)f(mo)r(de\))109
-b Ff(TAB)-450 -127 y Fh(inden)n(ter)24 b(la)g Fe(r)n(\023)-39
+b Ff(TAB)-450 -161 y Fh(inden)n(ter)24 b(la)g Fe(r)n(\023)-39
 b(egion)22 b Fh(couran)n(te)k(\(d)n(\023)-33 b(ep)r(end)25
-b(du)-379 -21 y(mo)r(de\))1247 b Ff(C-M-\\)-450 86 y
+b(du)-379 -55 y(mo)r(de\))1247 b Ff(C-M-\\)-450 51 y
 Fh(inden)n(ter)24 b(la)g Fe(s-expression)g Fh(couran)n(te)h(\(d)n(\023)
--33 b(ep)r(end)-379 192 y(du)24 b(mo)r(de\))1145 b Ff(C-M-q)-450
-298 y Fh(inden)n(ter)24 b(la)g(r)n(\023)-33 b(egion)24
-b(sur)f Fd(ar)l(g)30 b Fh(colonnes)443 b Ff(C-x)36 b(TAB)-450
-425 y Fh(ins)n(\023)-33 b(erer)23 b(un)h(newline)g(apr)n(\022)-33
-b(es)23 b(le)h(p)r(oin)n(t)507 b Ff(C-o)-450 531 y Fh(d)n(\023)-33
+-33 b(ep)r(end)-379 157 y(du)24 b(mo)r(de\))1145 b Ff(C-M-q)-450
+264 y Fh(inden)n(ter)24 b(la)g(r)n(\023)-33 b(egion)24
+b(sur)f Fb(ar)l(g)30 b Fh(colonnes)443 b Ff(C-x)36 b(TAB)-450
+389 y Fh(ins)n(\023)-33 b(erer)23 b(un)h(newline)g(apr)n(\022)-33
+b(es)23 b(le)h(p)r(oin)n(t)507 b Ff(C-o)-450 495 y Fh(d)n(\023)-33
 b(eplacer)24 b(le)g(reste)g(de)g(la)f(ligne)h(v)n(ers)g(le)f(bas)326
-b Ff(C-M-o)-450 637 y Fh(supprimer)23 b(les)g(lignes)g(blanc)n(hes)i
+b Ff(C-M-o)-450 601 y Fh(supprimer)23 b(les)g(lignes)g(blanc)n(hes)i
 (autour)g(du)e(p)r(oin)n(t)105 b Ff(C-x)36 b(C-o)-450
-744 y Fh(joindre)23 b(la)h(ligne)f(\022)-35 b(a)24 b(la)f(pr)n(\023)-33
+708 y Fh(joindre)23 b(la)h(ligne)f(\022)-35 b(a)24 b(la)f(pr)n(\023)-33
 b(ec)n(\023)g(eden)n(te)26 b(\(\022)-35 b(a)25 b(la)e(suiv)l(an)n(te)
--379 850 y(a)n(v)n(ec)h(arg\))1161 b Ff(M-^)-450 956
+-379 814 y(a)n(v)n(ec)h(arg\))1161 b Ff(M-^)-450 920
 y Fh(supprimer)23 b(tous)h(les)f(espaces)i(autour)g(du)f(p)r(oin)n(t)
-184 b Ff(M-\\)-450 1062 y Fh(mettre)24 b(exactemen)n(t)j(un)d(espace)h
-(\022)-35 b(a)24 b(l'emplacemen)n(t)-379 1169 y(du)g(p)r(oin)n(t)1178
-b Ff(M-SPC)-450 1295 y Fh(remplir)22 b(le)i(paragraphe)845
-b Ff(M-q)-450 1402 y Fh(placer)24 b(la)f(marge)h(droite)833
-b Ff(C-x)36 b(f)-450 1508 y Fh(d)n(\023)-33 b(e\014nir)24
+184 b Ff(M-\\)-450 1027 y Fh(mettre)24 b(exactemen)n(t)j(un)d(espace)h
+(\022)-35 b(a)24 b(l'emplacemen)n(t)-379 1133 y(du)g(p)r(oin)n(t)1178
+b Ff(M-SPC)-450 1258 y Fh(remplir)22 b(le)i(paragraphe)845
+b Ff(M-q)-450 1364 y Fh(placer)24 b(la)f(marge)h(droite)833
+b Ff(C-x)36 b(f)-450 1471 y Fh(d)n(\023)-33 b(e\014nir)24
 b(le)f(pr)n(\023)-33 b(e\014xe)24 b(par)g(lequel)g(commencera)-379
-1614 y(c)n(haque)h(ligne)1060 b Ff(C-x)36 b(.)-450 1741
+1577 y(c)n(haque)h(ligne)1060 b Ff(C-x)36 b(.)-450 1702
 y Fh(d)n(\023)-33 b(e\014nir)24 b(la)f(fon)n(te)1061
-b Ff(M-o)-450 1920 y Fg(Mo)s(di\014er)37 b(la)h(casse)-450
-2051 y Fh(mettre)24 b(le)g(mot)g(en)g(ma)t(juscules)634
-b Ff(M-u)-450 2157 y Fh(mettre)24 b(le)g(mot)g(en)g(min)n(uscules)638
-b Ff(M-l)-450 2263 y Fh(mettre)24 b(le)g(mot)g(en)g(capitales)704
-b Ff(M-c)-450 2390 y Fh(mettre)24 b(la)g(r)n(\023)-33
+b Ff(M-o)-450 1845 y Fg(Mo)s(di\014er)37 b(la)h(casse)-450
+1941 y Fh(mettre)24 b(le)g(mot)g(en)g(ma)t(juscules)634
+b Ff(M-u)-450 2048 y Fh(mettre)24 b(le)g(mot)g(en)g(min)n(uscules)638
+b Ff(M-l)-450 2154 y Fh(mettre)24 b(le)g(mot)g(en)g(capitales)704
+b Ff(M-c)-450 2279 y Fh(mettre)24 b(la)g(r)n(\023)-33
 b(egion)24 b(en)g(ma)t(juscules)563 b Ff(C-x)36 b(C-u)-450
-2496 y Fh(mettre)24 b(la)g(r)n(\023)-33 b(egion)24 b(en)g(min)n
-(uscules)567 b Ff(C-x)36 b(C-l)-450 2675 y Fg(Le)i(mini-tamp)s(on)-450
-2801 y Fh(Les)24 b(touc)n(hes)h(suiv)l(an)n(tes)g(son)n(t)f
-(utilisables)f(dans)h(le)g(mini-tamp)r(on)f(:)-450 2911
+2386 y Fh(mettre)24 b(la)g(r)n(\023)-33 b(egion)24 b(en)g(min)n
+(uscules)567 b Ff(C-x)36 b(C-l)-450 2529 y Fg(Le)i(mini-tamp)s(on)-450
+2620 y Fh(Les)24 b(touc)n(hes)h(suiv)l(an)n(tes)g(son)n(t)f
+(utilisables)f(dans)h(le)g(mini-tamp)r(on)f(:)-450 2729
 y(compl)n(\023)-33 b(eter)24 b(autan)n(t)i(que)e(p)r(ossible)587
-b Ff(TAB)-450 3018 y Fh(compl)n(\023)-33 b(eter)24 b(un)g(mot)963
-b Ff(SPC)-450 3124 y Fh(compl)n(\023)-33 b(eter)24 b(et)h(ex)n(\023)-33
-b(ecuter)848 b Ff(RET)-450 3230 y Fh(mon)n(trer)24 b(les)f(compl)n
+b Ff(TAB)-450 2835 y Fh(compl)n(\023)-33 b(eter)24 b(un)g(mot)963
+b Ff(SPC)-450 2941 y Fh(compl)n(\023)-33 b(eter)24 b(et)h(ex)n(\023)-33
+b(ecuter)848 b Ff(RET)-450 3048 y Fh(mon)n(trer)24 b(les)f(compl)n
 (\023)-33 b(etions)25 b(p)r(ossibles)481 b Ff(?)-450
-3336 y Fh(rec)n(herc)n(her)24 b(l'en)n(tr)n(\023)-33
+3154 y Fh(rec)n(herc)n(her)24 b(l'en)n(tr)n(\023)-33
 b(ee)24 b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)26 b(du)e(mini-tamp)r
-(on)74 b Ff(M-p)-450 3443 y Fh(rec)n(herc)n(her)24 b(l'en)n(tr)n(\023)
+(on)74 b Ff(M-p)-450 3260 y Fh(rec)n(herc)n(her)24 b(l'en)n(tr)n(\023)
 -33 b(ee)24 b(suiv)l(an)n(te)h(du)f(mini-tamp)r(on)-379
-3549 y(ou)g(le)f(d)n(\023)-33 b(efaut)1075 b Ff(M-n)-450
-3655 y Fh(rec)n(herc)n(her)24 b(\022)-35 b(a)24 b(reb)r(ours)g(par)f
-(expr.)35 b(rationnelle)-379 3761 y(dans)24 b(l'historique)931
-b Ff(M-r)-450 3868 y Fh(rec)n(herc)n(her)24 b(v)n(ers)g(l'a)n(v)l(an)n
-(t)g(par)g(expr.)35 b(rationnelle)-379 3974 y(dans)24
-b(l'historique)931 b Ff(M-s)-450 4080 y Fh(ann)n(uler)24
-b(la)f(commande)852 b Ff(C-g)-450 4183 y Fh(F)-6 b(aites)39
+3367 y(ou)g(le)f(d)n(\023)-33 b(efaut)1075 b Ff(M-n)-450
+3473 y Fh(rec)n(herc)n(her)24 b(\022)-35 b(a)24 b(reb)r(ours)g(par)f
+(expr.)35 b(rationnelle)-379 3579 y(dans)24 b(l'historique)931
+b Ff(M-r)-450 3685 y Fh(rec)n(herc)n(her)24 b(v)n(ers)g(l'a)n(v)l(an)n
+(t)g(par)g(expr.)35 b(rationnelle)-379 3792 y(dans)24
+b(l'historique)931 b Ff(M-s)-450 3898 y Fh(ann)n(uler)24
+b(la)f(commande)852 b Ff(C-g)-450 3999 y Fh(F)-6 b(aites)39
 b Ff(C-x)d(ESC)g(ESC)j Fh(p)r(our)d(\023)-33 b(editer)39
 b(et)g(r)n(\023)-33 b(ep)n(\023)g(eter)39 b(la)f(derni)n(\022)-33
-b(ere)38 b(com-)-450 4246 y(mande)33 b(a)n(y)n(an)n(t)g(utilis)n(\023)
+b(ere)38 b(com-)-450 4064 y(mande)33 b(a)n(y)n(an)n(t)g(utilis)n(\023)
 -33 b(e)32 b(le)g(minitamp)r(on.)56 b(F)-6 b(aites)32
-b Ff(F10)h Fh(p)r(our)f(activ)n(er)-450 4310 y(la)23
+b Ff(F10)h Fh(p)r(our)f(activ)n(er)-450 4130 y(la)23
 b(barre)h(de)g(men)n(u)g(utilisan)n(t)g(le)f(minitamp)r(on.)1656
 -364 y Fi(Carte)46 b(de)g(r)m(\023)-66 b(ef)m(\023)g(erence)46
-b(de)g(GNU)f(Emacs)1746 -146 y Fg(T)-10 b(amp)s(ons)1746
-36 y Fh(s)n(\023)-33 b(electionner)25 b(un)f(autre)g(tamp)r(on)604
-b Ff(C-x)36 b(b)1744 143 y Fh(\023)-33 b(en)n(um)n(\023)g(erer)24
+b(de)g(GNU)f(Emacs)1746 -175 y Fg(T)-10 b(amp)s(ons)1746
+-21 y Fh(s)n(\023)-33 b(electionner)25 b(un)f(autre)g(tamp)r(on)604
+b Ff(C-x)36 b(b)1744 85 y Fh(\023)-33 b(en)n(um)n(\023)g(erer)24
 b(tous)g(les)f(tamp)r(ons)684 b Ff(C-x)36 b(C-b)1746
-249 y Fh(supprimer)23 b(un)h(tamp)r(on)839 b Ff(C-x)36
-b(k)1746 467 y Fg(T)-10 b(ransp)s(oser)1746 650 y Fh(transp)r(oser)24
+192 y Fh(supprimer)23 b(un)h(tamp)r(on)839 b Ff(C-x)36
+b(k)1746 382 y Fg(T)-10 b(ransp)s(oser)1746 535 y Fh(transp)r(oser)24
 b(des)g Fe(caract)n(\022)-39 b(eres)687 b Ff(C-t)1746
-756 y Fh(transp)r(oser)24 b(des)g Fe(mots)872 b Ff(M-t)1746
-862 y Fh(transp)r(oser)24 b(des)g Fe(lignes)844 b Ff(C-x)36
-b(C-t)1746 969 y Fh(transp)r(oser)24 b(des)g Fe(s-expressions)585
-b Ff(C-M-t)1746 1188 y Fg(V)n(\023)-55 b(eri\014er)37
-b(l'orthographe)1746 1370 y Fh(v)n(\023)-33 b(eri\014er)23
+642 y Fh(transp)r(oser)24 b(des)g Fe(mots)872 b Ff(M-t)1746
+748 y Fh(transp)r(oser)24 b(des)g Fe(lignes)844 b Ff(C-x)36
+b(C-t)1746 854 y Fh(transp)r(oser)24 b(des)g Fe(s-expressions)585
+b Ff(C-M-t)1746 1045 y Fg(V)n(\023)-55 b(eri\014er)37
+b(l'orthographe)1746 1199 y Fh(v)n(\023)-33 b(eri\014er)23
 b(l'orthographe)i(du)f(mot)g(couran)n(t)359 b Ff(M-$)1746
-1476 y Fh(v)n(\023)-33 b(eri\014er)23 b(l'orthographe)i(de)f(tous)g
-(les)f(mots)1817 1583 y(d'une)h(r)n(\023)-33 b(egion)816
-b Ff(M-x)36 b(ispell-region)1746 1689 y Fh(v)n(\023)-33
+1305 y Fh(v)n(\023)-33 b(eri\014er)23 b(l'orthographe)i(de)f(tous)g
+(les)f(mots)1817 1411 y(d'une)h(r)n(\023)-33 b(egion)816
+b Ff(M-x)36 b(ispell-region)1746 1517 y Fh(v)n(\023)-33
 b(eri\014er)23 b(l'orthographe)i(de)f(tout)h(le)e(tamp)r(on)37
-b Ff(M-x)f(ispell-buffer)1746 1907 y Fg(T)-10 b(ags)1746
-2090 y Fh(trouv)n(er)24 b(un)g(tag)h(\(une)f(d)n(\023)-33
-b(e\014nition\))564 b Ff(M-.)1746 2196 y Fh(trouv)n(er)24
+b Ff(M-x)f(ispell-buffer)1746 1707 y Fg(T)-10 b(ags)1746
+1861 y Fh(trouv)n(er)24 b(un)g(tag)h(\(une)f(d)n(\023)-33
+b(e\014nition\))564 b Ff(M-.)1746 1967 y Fh(trouv)n(er)24
 b(l'o)r(ccurrence)g(suiv)l(an)n(te)h(du)f(tag)400 b Ff(C-u)36
-b(M-.)1746 2302 y Fh(sp)n(\023)-33 b(eci\014er)24 b(un)g(nouv)n(eau)h
+b(M-.)1746 2074 y Fh(sp)n(\023)-33 b(eci\014er)24 b(un)g(nouv)n(eau)h
 (\014c)n(hier)f(de)g(tags)187 b Ff(M-x)36 b(visit-tags-table)1746
-2437 y Fh(rec)n(herc)n(her)24 b(par)g(expr.)35 b(rationnelles)24
-b(dans)1817 2543 y(tous)g(les)f(\014c)n(hiers)h(du)g(tableau)h(de)f
-(tags)131 b Ff(M-x)36 b(tags-search)1746 2650 y Fh(lancer)24
-b(un)g(remplacemen)n(t)h(in)n(teractif)f(sur)1817 2756
+2208 y Fh(rec)n(herc)n(her)24 b(par)g(expr.)35 b(rationnelles)24
+b(dans)1817 2315 y(tous)g(les)f(\014c)n(hiers)h(du)g(tableau)h(de)f
+(tags)131 b Ff(M-x)36 b(tags-search)1746 2421 y Fh(lancer)24
+b(un)g(remplacemen)n(t)h(in)n(teractif)f(sur)1817 2527
 y(tous)g(les)f(\014c)n(hiers)652 b Ff(M-x)37 b(tags-query-replace)1746
-2862 y Fh(con)n(tin)n(uer)25 b(la)e(derni)n(\022)-33
+2633 y Fh(con)n(tin)n(uer)25 b(la)e(derni)n(\022)-33
 b(ere)24 b(rec)n(herc)n(he)h(de)f(tags)g(ou)g(le)1817
-2969 y(remplacemen)n(t)g(in)n(teractif)710 b Ff(M-,)1746
-3188 y Fg(Shells)1746 3351 y Fh(ex)n(\023)-33 b(ecuter)25
-b(une)g(commande)g(shell)606 b Ff(M-!)1746 3457 y Fh(lancer)24
+2740 y(remplacemen)n(t)g(in)n(teractif)710 b Ff(M-,)1746
+2930 y Fg(Shells)1746 3065 y Fh(ex)n(\023)-33 b(ecuter)25
+b(une)g(commande)g(shell)606 b Ff(M-!)1746 3171 y Fh(lancer)24
 b(une)g(commande)h(shell)e(sur)g(la)h(r)n(\023)-33 b(egion)271
-b Ff(M-|)1746 3563 y Fh(\014ltrer)23 b(la)h(r)n(\023)-33
+b Ff(M-|)1746 3277 y Fh(\014ltrer)23 b(la)h(r)n(\023)-33
 b(egion)23 b(a)n(v)n(ec)i(une)f(commande)h(shell)246
-b Ff(C-u)36 b(M-|)1746 3670 y Fh(lancer)24 b(un)g(shell)f(dans)h(la)f
+b Ff(C-u)36 b(M-|)1746 3384 y Fh(lancer)24 b(un)g(shell)f(dans)h(la)f
 (fen)n(^)-33 b(etre)25 b Ff(*shell*)318 b(M-x)36 b(shell)3942
--364 y Fg(Rectangles)3942 -182 y Fh(copier)24 b(le)f(rectangle)i(dans)f
-(le)g(registre)459 b Ff(C-x)36 b(r)f(r)3942 -75 y Fh(d)n(\023)-33
+-364 y Fg(Rectangles)3942 -210 y Fh(copier)24 b(le)f(rectangle)i(dans)f
+(le)g(registre)459 b Ff(C-x)36 b(r)f(r)3942 -104 y Fh(d)n(\023)-33
 b(etruire)24 b(le)f(rectangle)893 b Ff(C-x)36 b(r)f(k)3942
-31 y Fh(r)n(\023)-33 b(ecup)n(\023)g(erer)24 b(le)f(rectangle)850
-b Ff(C-x)36 b(r)f(y)3942 137 y Fh(ouvrir)23 b(le)g(rectangle,)i(en)f(d)
+2 y Fh(r)n(\023)-33 b(ecup)n(\023)g(erer)24 b(le)f(rectangle)850
+b Ff(C-x)36 b(r)f(y)3942 109 y Fh(ouvrir)23 b(le)g(rectangle,)i(en)f(d)
 n(\023)-33 b(ecalan)n(t)25 b(le)f(texte)h(\022)-35 b(a)4013
-243 y(droite)1260 b Ff(C-x)36 b(r)f(o)3942 350 y Fh(vider)23
-b(le)h(rectangle)981 b Ff(C-x)36 b(r)f(c)3942 456 y Fh(pr)n(\023)-33
+215 y(droite)1260 b Ff(C-x)36 b(r)f(o)3942 321 y Fh(vider)23
+b(le)h(rectangle)981 b Ff(C-x)36 b(r)f(c)3942 427 y Fh(pr)n(\023)-33
 b(e\014xer)24 b(c)n(haque)h(ligne)f(a)n(v)n(ec)h(une)f(c)n(ha)-8
-b(^)-27 b(\020ne)369 b Ff(C-x)36 b(r)f(t)3942 675 y Fg(Abr)n(\023)-55
-b(eviations)3942 838 y Fh(a)t(jouter)24 b(une)g(abr)n(\023)-33
+b(^)-27 b(\020ne)369 b Ff(C-x)36 b(r)f(t)3942 618 y Fg(Abr)n(\023)-55
+b(eviations)3942 752 y Fh(a)t(jouter)24 b(une)g(abr)n(\023)-33
 b(eviation)25 b(globale)547 b Ff(C-x)36 b(a)f(g)3942
-945 y Fh(a)t(jouter)24 b(une)g(abr)n(\023)-33 b(eviation)25
+859 y Fh(a)t(jouter)24 b(une)g(abr)n(\023)-33 b(eviation)25
 b(lo)r(cale)f(au)g(mo)r(de)300 b Ff(C-x)36 b(a)f(l)3942
-1051 y Fh(a)t(jouter)24 b(une)g(expansion)h(globale)f(p)r(our)g(cette)
-4013 1157 y(abr)n(\023)-33 b(eviation)1094 b Ff(C-x)36
-b(a)f(i)h(g)3942 1263 y Fh(a)t(jouter)24 b(une)g(expansion)h(lo)r(cale)
-f(au)g(mo)r(de)g(p)r(our)4013 1370 y(cette)h(abr)n(\023)-33
-b(eviation)922 b Ff(C-x)36 b(a)f(i)h(l)3942 1476 y Fh(faire)23
-b(une)h(expansion)h(explicite)f(de)g(cette)4013 1582
+965 y Fh(a)t(jouter)24 b(une)g(expansion)h(globale)f(p)r(our)g(cette)
+4013 1071 y(abr)n(\023)-33 b(eviation)1094 b Ff(C-x)36
+b(a)f(i)h(g)3942 1178 y Fh(a)t(jouter)24 b(une)g(expansion)h(lo)r(cale)
+f(au)g(mo)r(de)g(p)r(our)4013 1284 y(cette)h(abr)n(\023)-33
+b(eviation)922 b Ff(C-x)36 b(a)f(i)h(l)3942 1390 y Fh(faire)23
+b(une)h(expansion)h(explicite)f(de)g(cette)4013 1496
 y(abr)n(\023)-33 b(eviation)1094 b Ff(C-x)36 b(a)f(e)3942
-1717 y Fh(faire)23 b(une)h(expansion)h(dynamique)g(du)f(mot)4013
-1823 y(pr)n(\023)-33 b(ec)n(\023)g(eden)n(t)1146 b Ff(M-/)3942
-2043 y Fg(Expressions)39 b(rationnelles)3942 2225 y Fh(un)24
+1631 y Fh(faire)23 b(une)h(expansion)h(dynamique)g(du)f(mot)4013
+1737 y(pr)n(\023)-33 b(ec)n(\023)g(eden)n(t)1146 b Ff(M-/)3942
+1928 y Fg(Expressions)39 b(rationnelles)3942 2082 y Fh(un)24
 b(unique)g(caract)n(\022)-33 b(ere)25 b(quelconque,)g(sauf)f(une)g
-(\014n)4013 2331 y(de)g(ligne)1201 b Ff(.)70 b Fh(\(p)r(oin)n(t\))3942
-2437 y(z)n(\023)-33 b(ero)24 b(r)n(\023)-33 b(ep)n(\023)g(etition)25
-b(ou)f(plus)816 b Ff(*)3942 2544 y Fh(une)24 b(r)n(\023)-33
+(\014n)4013 2188 y(de)g(ligne)1201 b Ff(.)70 b Fh(\(p)r(oin)n(t\))3942
+2294 y(z)n(\023)-33 b(ero)24 b(r)n(\023)-33 b(ep)n(\023)g(etition)25
+b(ou)f(plus)816 b Ff(*)3942 2401 y Fh(une)24 b(r)n(\023)-33
 b(ep)n(\023)g(etition)25 b(ou)f(plus)832 b Ff(+)3942
-2650 y Fh(z)n(\023)-33 b(ero)24 b(ou)g(une)g(r)n(\023)-33
-b(ep)n(\023)g(etition)834 b Ff(?)3942 2756 y Fh(caract)n(\022)-33
+2507 y Fh(z)n(\023)-33 b(ero)24 b(ou)g(une)g(r)n(\023)-33
+b(ep)n(\023)g(etition)834 b Ff(?)3942 2613 y Fh(caract)n(\022)-33
 b(ere)25 b(sp)n(\023)-33 b(ecial)24 b(p)r(our)f(quoter)i(l'expression)e
-(ra-)4013 2863 y(tionnelle)h Fd(c)1121 b Ff(\\)p Fd(c)3942
-2969 y Fh(alternativ)n(e)25 b(\(\\ou"\))960 b Ff(\\|)3942
-3075 y Fh(regroup)r(emen)n(t)1089 b Ff(\\\()35 b Fc(:)12
-b(:)f(:)35 b Ff(\\\))3942 3181 y Fh(le)23 b(m)n(^)-33
-b(eme)24 b(texte)i(que)e(dans)g(le)g Fd(n)5 b Fh(i)n(\022)-33
-b(eme)24 b(group)r(e)264 b Ff(\\)p Fd(n)3942 3288 y Fh(limite)23
-b(de)h(mot)1096 b Ff(\\b)3942 3394 y Fh(non)24 b(limite)f(de)h(mot)959
-b Ff(\\B)3942 3504 y Fe(en)n(tit)n(\023)-39 b(e)499 b(d)n(\023)-39
-b(ebut)258 b(\014n)3942 3568 y Fh(ligne)558 b Ff(^)427
-b($)3942 3632 y Fh(mot)582 b Ff(\\<)392 b(\\>)3942 3696
-y Fh(tamp)r(on)467 b Ff(\\`)392 b(\\')3942 3759 y Fe(classe)27
+(ra-)4013 2720 y(tionnelle)h Fb(c)1121 b Ff(\\)p Fb(c)3942
+2826 y Fh(alternativ)n(e)25 b(\(\\ou"\))960 b Ff(\\|)3942
+2932 y Fh(regroup)r(emen)n(t)1089 b Ff(\\\()35 b Fa(:)12
+b(:)f(:)35 b Ff(\\\))3942 3038 y Fh(le)23 b(m)n(^)-33
+b(eme)24 b(texte)i(que)e(dans)g(le)g Fb(n)5 b Fh(i)n(\022)-33
+b(eme)24 b(group)r(e)264 b Ff(\\)p Fb(n)3942 3145 y Fh(limite)23
+b(de)h(mot)1096 b Ff(\\b)3942 3251 y Fh(non)24 b(limite)f(de)h(mot)959
+b Ff(\\B)3942 3361 y Fe(en)n(tit)n(\023)-39 b(e)499 b(d)n(\023)-39
+b(ebut)258 b(\014n)3942 3417 y Fh(ligne)558 b Ff(^)427
+b($)3942 3483 y Fh(mot)582 b Ff(\\<)392 b(\\>)3942 3539
+y Fh(tamp)r(on)467 b Ff(\\`)392 b(\\')3942 3604 y Fe(classe)27
 b(de)g(caract)n(\022)-39 b(ere)41 b(corresp)r(ond)70
 b(corresp)r(ond)27 b(\022)-40 b(a)26 b(d'autres)3942
-3823 y Fh(ensem)n(ble)e(explicite)147 b Ff([)35 b Fc(:)12
-b(:)f(:)35 b Ff(])239 b([^)36 b Fc(:)12 b(:)f(:)35 b
-Ff(])3942 3887 y Fh(caract)n(\022)-33 b(ere)25 b(de)f(mot)186
-b Ff(\\w)392 b(\\W)3942 3951 y Fh(caract)n(\022)-33 b(ere)25
-b(a)n(v)n(ec)g(la)3984 4014 y(syn)n(taxe)g Fd(c)371 b
-Ff(\\s)p Fd(c)359 b Ff(\\S)p Fd(c)p eop end
+3670 y Fh(ensem)n(ble)e(explicite)147 b Ff([)35 b Fa(:)12
+b(:)f(:)35 b Ff(])239 b([^)36 b Fa(:)12 b(:)f(:)35 b
+Ff(])3942 3736 y Fh(caract)n(\022)-33 b(ere)25 b(de)f(mot)186
+b Ff(\\w)392 b(\\W)3942 3791 y Fh(caract)n(\022)-33 b(ere)25
+b(a)n(v)n(ec)g(la)3984 3847 y(syn)n(taxe)g Fb(c)371 b
+Ff(\\s)p Fb(c)359 b Ff(\\S)p Fb(c)p eop end
 %%Page: 3 3
 TeXDict begin @landscape 3 2 bop -450 -364 a Fg(Jeux)38
 b(de)f(caract)n(\022)-55 b(eres)37 b(in)m(ternationaux)-450
--201 y Fh(indiquer)23 b(la)h(langue)g(principale)631
-b Ff(C-x)36 b(RET)g(l)-450 -95 y Fh(mon)n(trer)24 b(toutes)h(les)e(m)n
+-230 y Fh(indiquer)23 b(la)h(langue)g(principale)631
+b Ff(C-x)36 b(RET)g(l)-450 -123 y Fh(mon)n(trer)24 b(toutes)h(les)e(m)n
 (\023)-33 b(etho)r(des)25 b(de)f(saisie)29 b Ff(M-x)36
-b(list-input-methods)-450 12 y Fh(activ)n(er)24 b(ou)g(d)n(\023)-33
+b(list-input-methods)-450 -17 y Fh(activ)n(er)24 b(ou)g(d)n(\023)-33
 b(esactiv)n(er)25 b(la)f(m)n(\023)-33 b(etho)r(de)25
-b(de)f(saisie)229 b Ff(C-\\)-450 118 y Fh(c)n(hoisir)23
+b(de)f(saisie)229 b Ff(C-\\)-450 89 y Fh(c)n(hoisir)23
 b(le)g(syst)n(\022)-33 b(eme)25 b(de)f(co)r(dage)h(p)r(our)f(la)f(com-)
--379 224 y(mande)h(suiv)l(an)n(te)963 b Ff(C-x)36 b(RET)g(c)-450
-330 y Fh(mon)n(trer)24 b(tous)g(les)f(syst)n(\022)-33
+-379 196 y(mande)h(suiv)l(an)n(te)963 b Ff(C-x)36 b(RET)g(c)-450
+302 y Fh(mon)n(trer)24 b(tous)g(les)f(syst)n(\022)-33
 b(emes)25 b(de)f(co)r(dage)64 b Ff(M-x)36 b(list-coding-systems)-450
-437 y Fh(c)n(hoisir)23 b(le)g(syst)n(\022)-33 b(eme)25
+408 y Fh(c)n(hoisir)23 b(le)g(syst)n(\022)-33 b(eme)25
 b(de)f(co)r(dage)h(pr)n(\023)-33 b(ef)n(\023)g(er)n(\023)g(e)85
-b Ff(M-x)36 b(prefer-coding-system)-450 656 y Fg(Info)-450
-819 y Fh(en)n(trer)24 b(dans)g(le)f(visualisateur)h(de)g(la)g(do)r
-(cumen)n(ta-)-379 925 y(tion)g(Info)1174 b Ff(C-h)36
-b(i)-450 1031 y Fh(c)n(herc)n(her)24 b(une)h(fonction)f(ou)g(une)h(v)l
-(ariable)e(pr)n(\023)-33 b(ecise)-379 1138 y(dans)24
-b(Info)1154 b Ff(C-h)36 b(S)-450 1248 y Fh(Se)24 b(d)n(\023)-33
-b(eplacer)25 b(dans)f(un)f(n\033ud)i(:)-379 1367 y(une)f(page)h(plus)e
-(bas)891 b Ff(SPC)-379 1473 y Fh(une)24 b(page)h(plus)e(haut)853
-b Ff(DEL)-379 1579 y Fh(d)n(\023)-33 b(ebut)25 b(du)e(n\033ud)967
-b Ff(.)70 b Fh(\(p)r(oin)n(t\))-450 1690 y(P)n(asser)23
-b(de)h(n\033ud)g(en)h(n\033ud)f(:)-379 1796 y(n\033ud)g
-Fe(suiv)-5 b(an)n(t)991 b Ff(n)-379 1902 y Fh(n\033ud)24
+b Ff(M-x)36 b(prefer-coding-system)-450 599 y Fg(Info)-450
+733 y Fh(en)n(trer)24 b(dans)g(le)f(visualisateur)h(de)g(la)g(do)r
+(cumen)n(ta-)-379 839 y(tion)g(Info)1174 b Ff(C-h)36
+b(i)-450 946 y Fh(c)n(herc)n(her)24 b(une)h(fonction)f(ou)g(une)h(v)l
+(ariable)e(pr)n(\023)-33 b(ecise)-379 1052 y(dans)24
+b(Info)1154 b Ff(C-h)36 b(S)-450 1162 y Fh(Se)24 b(d)n(\023)-33
+b(eplacer)25 b(dans)f(un)f(n\033ud)i(:)-379 1281 y(une)f(page)h(plus)e
+(bas)891 b Ff(SPC)-379 1387 y Fh(une)24 b(page)h(plus)e(haut)853
+b Ff(DEL)-379 1494 y Fh(d)n(\023)-33 b(ebut)25 b(du)e(n\033ud)967
+b Ff(.)70 b Fh(\(p)r(oin)n(t\))-450 1604 y(P)n(asser)23
+b(de)h(n\033ud)g(en)h(n\033ud)f(:)-379 1710 y(n\033ud)g
+Fe(suiv)-5 b(an)n(t)991 b Ff(n)-379 1816 y Fh(n\033ud)24
 b Fe(pr)n(\023)-39 b(ec)n(\023)g(eden)n(t)898 b Ff(p)-379
-2008 y Fh(aller)22 b Fe(plus)i(haut)953 b Ff(u)-379 2114
+1922 y Fh(aller)22 b Fe(plus)i(haut)953 b Ff(u)-379 2029
 y Fh(c)n(hoisir)23 b(un)g(sujet)h(de)g(men)n(u)h(par)e(son)h(nom)277
-b Ff(m)-379 2221 y Fh(c)n(hoisir)23 b(le)g Fd(n)5 b Fh(i)n(\022)-33
-b(eme)24 b(sujet)g(de)g(men)n(u)g(par)g(son)-379 2327
-y(n)n(um)n(\023)-33 b(ero)23 b(\(1{9\))1029 b Fd(n)-379
-2433 y Fh(suivre)23 b(une)h(r)n(\023)-33 b(ef)n(\023)g(erence)24
+b Ff(m)-379 2135 y Fh(c)n(hoisir)23 b(le)g Fb(n)5 b Fh(i)n(\022)-33
+b(eme)24 b(sujet)g(de)g(men)n(u)g(par)g(son)-379 2241
+y(n)n(um)n(\023)-33 b(ero)23 b(\(1{9\))1029 b Fb(n)-379
+2347 y Fh(suivre)23 b(une)h(r)n(\023)-33 b(ef)n(\023)g(erence)24
 b(crois)n(\023)-33 b(ee)24 b(\(on)h(revien)n(t)f(a)n(v)n(ec)-379
-2539 y Ff(l)p Fh(\))1378 b Ff(f)-379 2646 y Fh(rev)n(enir)23
+2454 y Ff(l)p Fh(\))1378 b Ff(f)-379 2560 y Fh(rev)n(enir)23
 b(au)h(dernier)f(n\033ud)h(visit)n(\023)-33 b(e)509 b
-Ff(l)-379 2752 y Fh(rev)n(enir)23 b(au)h(n\033ud)g(du)g(r)n(\023)-33
-b(ep)r(ertoire)509 b Ff(d)-379 2858 y Fh(aller)22 b(au)i(n\033ud)g(de)h
-(plus)e(haut)i(niv)n(eau)f(du)-379 2965 y(\014c)n(hier)f(Info)1110
-b Ff(t)-379 3071 y Fh(aller)22 b(sur)i(n'imp)r(orte)f(quel)h(n\033ud)g
-(par)f(son)h(nom)111 b Ff(g)-450 3181 y Fh(Autres)24
-b(:)-379 3286 y(lancer)f(le)h Fe(didacticiel)e Fh(Info)652
-b Ff(h)-379 3393 y Fh(c)n(herc)n(her)24 b(un)g(sujet)g(dans)g(l'index)
-518 b Ff(i)-379 3499 y Fh(rec)n(herc)n(her)24 b(les)f(n\033uds)h(a)n(v)
-n(ec)h(une)f(expression)-379 3605 y(rationnelle)1115
-b Ff(s)-379 3711 y Fe(quitter)22 b Fh(Info)1051 b Ff(q)1746
--364 y Fg(Registres)1746 -227 y Fh(sauv)n(er)24 b(la)f(r)n(\023)-33
+Ff(l)-379 2666 y Fh(rev)n(enir)23 b(au)h(n\033ud)g(du)g(r)n(\023)-33
+b(ep)r(ertoire)509 b Ff(d)-379 2773 y Fh(aller)22 b(au)i(n\033ud)g(de)h
+(plus)e(haut)i(niv)n(eau)f(du)-379 2879 y(\014c)n(hier)f(Info)1110
+b Ff(t)-379 2985 y Fh(aller)22 b(sur)i(n'imp)r(orte)f(quel)h(n\033ud)g
+(par)f(son)h(nom)111 b Ff(g)-450 3095 y Fh(Autres)24
+b(:)-379 3201 y(lancer)f(le)h Fe(didacticiel)e Fh(Info)652
+b Ff(h)-379 3307 y Fh(c)n(herc)n(her)24 b(un)g(sujet)g(dans)g(l'index)
+518 b Ff(i)-379 3413 y Fh(rec)n(herc)n(her)24 b(les)f(n\033uds)h(a)n(v)
+n(ec)h(une)f(expression)-379 3519 y(rationnelle)1115
+b Ff(s)-379 3626 y Fe(quitter)22 b Fh(Info)1051 b Ff(q)1746
+-364 y Fg(Registres)1746 -244 y Fh(sauv)n(er)24 b(la)f(r)n(\023)-33
 b(egion)24 b(dans)g(un)g(registre)506 b Ff(C-x)36 b(r)f(s)1746
--121 y Fh(ins)n(\023)-33 b(erer)23 b(le)g(con)n(ten)n(u)j(du)e
+-138 y Fh(ins)n(\023)-33 b(erer)23 b(le)g(con)n(ten)n(u)j(du)e
 (registre)f(dans)h(le)g(tamp)r(on)117 b Ff(C-x)36 b(r)f(i)1746
-2 y Fh(sauv)n(er)24 b(la)f(v)l(aleur)h(du)g(p)r(oin)n(t)g(dans)g(un)g
-(registre)222 b Ff(C-x)36 b(r)f(SPC)1746 109 y Fh(sauter)24
+-11 y Fh(sauv)n(er)24 b(la)f(v)l(aleur)h(du)g(p)r(oin)n(t)g(dans)g(un)g
+(registre)222 b Ff(C-x)36 b(r)f(SPC)1746 95 y Fh(sauter)24
 b(au)g(p)r(oin)n(t)g(sauv)n(\023)-33 b(e)25 b(dans)f(le)f(registre)355
-b Ff(C-x)36 b(r)f(j)1746 271 y Fg(Macros)j(cla)m(vier)1746
-388 y Fe(lancer)23 b Fh(la)g(d)n(\023)-33 b(e\014nition)25
+b Ff(C-x)36 b(r)f(j)1746 244 y Fg(Macros)j(cla)m(vier)1746
+344 y Fe(lancer)23 b Fh(la)g(d)n(\023)-33 b(e\014nition)25
 b(d'une)f(macro)g(cla)n(vier)277 b Ff(C-x)36 b(\()1746
-494 y Fe(terminer)23 b Fh(la)g(d)n(\023)-33 b(e\014nition)25
+451 y Fe(terminer)23 b Fh(la)g(d)n(\023)-33 b(e\014nition)25
 b(d'une)f(macro)f(cla)n(vier)183 b Ff(C-x)36 b(\))1746
-601 y Fe(ex)n(\023)-39 b(ecuter)24 b Fh(la)f(derni)n(\022)-33
+557 y Fe(ex)n(\023)-39 b(ecuter)24 b Fh(la)f(derni)n(\022)-33
 b(ere)24 b(macro)g(cla)n(vier)f(d)n(\023)-33 b(e\014nie)203
-b Ff(C-x)36 b(e)1746 707 y Fh(a)t(jouter)24 b(\022)-35
+b Ff(C-x)36 b(e)1746 663 y Fh(a)t(jouter)24 b(\022)-35
 b(a)24 b(la)f(derni)n(\022)-33 b(ere)24 b(macro)g(cla)n(vier)446
-b Ff(C-u)36 b(C-x)g(\()1746 813 y Fh(donner)24 b(un)g(nom)g(\022)-35
+b Ff(C-u)36 b(C-x)g(\()1746 770 y Fh(donner)24 b(un)g(nom)g(\022)-35
 b(a)24 b(la)f(derni)n(\022)-33 b(ere)24 b(macro)1817
-919 y(cla)n(vier)996 b Ff(M-x)36 b(name-last-kbd-macro)1746
-1026 y Fh(ins)n(\023)-33 b(erer)23 b(une)h(d)n(\023)-33
-b(e\014nition)25 b(Lisp)e(dans)h(le)1817 1132 y(tamp)r(on)960
-b Ff(M-x)36 b(insert-kbd-macro)1746 1294 y Fg(Commandes)i(de)f(gestion)
-h(d'Emacs)g(Lisp)1744 1431 y Fh(\023)-33 b(ev)l(aluer)24
+876 y(cla)n(vier)996 b Ff(M-x)36 b(name-last-kbd-macro)1746
+982 y Fh(ins)n(\023)-33 b(erer)23 b(une)h(d)n(\023)-33
+b(e\014nition)25 b(Lisp)e(dans)h(le)1817 1088 y(tamp)r(on)960
+b Ff(M-x)36 b(insert-kbd-macro)1746 1237 y Fg(Commandes)i(de)f(gestion)
+h(d'Emacs)g(Lisp)1744 1357 y Fh(\023)-33 b(ev)l(aluer)24
 b(la)g Fe(s-expression)f Fh(situ)n(\023)-33 b(ee)25 b(a)n(v)l(an)n(t)g
-(le)e(p)r(oin)n(t)115 b Ff(C-x)36 b(C-e)1744 1537 y Fh(\023)-33
+(le)e(p)r(oin)n(t)115 b Ff(C-x)36 b(C-e)1744 1463 y Fh(\023)-33
 b(ev)l(aluer)24 b(la)g Fe(defun)g Fh(couran)n(te)707
-b Ff(C-M-x)1744 1643 y Fh(\023)-33 b(ev)l(aluer)24 b(la)g
+b Ff(C-M-x)1744 1570 y Fh(\023)-33 b(ev)l(aluer)24 b(la)g
 Fe(r)n(\023)-39 b(egion)726 b Ff(M-x)36 b(eval-region)1746
-1750 y Fh(lire)23 b(et)f(\023)-33 b(ev)l(aluer)24 b(le)g(mini-tamp)r
-(on)593 b Ff(M-:)1746 1856 y Fh(c)n(harger)24 b(\022)-35
+1676 y Fh(lire)23 b(et)f(\023)-33 b(ev)l(aluer)24 b(le)g(mini-tamp)r
+(on)593 b Ff(M-:)1746 1782 y Fh(c)n(harger)24 b(\022)-35
 b(a)24 b(partir)f(du)h(r)n(\023)-33 b(ep)r(ertoire)23
-b(syst)n(\022)-33 b(eme)1817 1962 y(standard)926 b Ff(M-x)36
-b(load-library)1746 2124 y Fg(P)m(ersonnalisation)g(simple)1746
-2261 y Fh(p)r(ersonnaliser)23 b(les)h(v)l(ariables)f(et)h(les)g(fon)n
-(tes)81 b Ff(M-x)36 b(customize)1746 2364 y Fh(Cr)n(\023)-33
+b(syst)n(\022)-33 b(eme)1817 1888 y(standard)926 b Ff(M-x)36
+b(load-library)1746 2037 y Fg(P)m(ersonnalisation)g(simple)1746
+2157 y Fh(p)r(ersonnaliser)23 b(les)h(v)l(ariables)f(et)h(les)g(fon)n
+(tes)81 b Ff(M-x)36 b(customize)1746 2263 y Fh(Cr)n(\023)-33
 b(eation)23 b(de)g(liaisons)f(de)h(touc)n(hes)h(globales)f(en)g(Emacs)g
-(Lisp)f(\(exem-)1746 2437 y(ples\):)1746 2518 y Ff(\(global-set-key)40
-b("\\C-cg")d('goto-line\))1746 2581 y(\(global-set-key)j("\\M-#")d
-('query-replace-regexp\))1755 2729 y Fg(\023)1746 2753
-y(Ecriture)g(de)h(commandes)1746 2857 y Ff(\(defun)f
-Fd(nom-c)l(ommande)43 b Ff(\()p Fd(ar)l(gs)5 b Ff(\))1817
-2921 y(")p Fd(do)l(cumentation)g Ff(")38 b(\(interactive)g(")p
-Fd(template)5 b Ff("\))1817 2985 y Fd(b)l(o)l(dy)h Ff(\))1746
-3066 y Fh(Exemple)24 b(:)1746 3146 y Ff(\(defun)37 b
+(Lisp)f(\(exem-)1746 2336 y(ples\):)1746 2425 y Ff(\(global-set-key)40
+b("\\C-cg")d('goto-line\))1746 2493 y(\(global-set-key)j("\\M-#")d
+('query-replace-regexp\))1755 2627 y Fg(\023)1746 2651
+y(Ecriture)g(de)h(commandes)1746 2731 y Ff(\(defun)f
+Fb(nom-c)l(ommande)43 b Ff(\()p Fb(ar)l(gs)5 b Ff(\))1817
+2796 y(")p Fb(do)l(cumentation)g Ff(")38 b(\(interactive)g(")p
+Fb(template)5 b Ff("\))1817 2862 y Fb(b)l(o)l(dy)h Ff(\))1746
+2948 y Fh(Exemple)24 b(:)1746 3034 y Ff(\(defun)37 b
 (cette-ligne-en-haut-de-)q(la-f)q(ene)q(tre)42 b(\(line\))1746
-3210 y("Repositionne)d(la)d(ligne)h(du)e(point)i(en)f(haut)g(de)g(la)g
-(fenetre.)1746 3274 y(Avec)g(ARG,)h(place)g(le)e(point)i(sur)f(la)g
-(ligne)h(ARG.")1817 3338 y(\(interactive)h("P"\))1817
-3401 y(\(recenter)f(\(if)g(\(null)f(line\))2311 3465
-y(0)2240 3529 y(\(prefix-numeric-value)41 b(line\)\)\)\))1746
-3610 y Fh(La)21 b(sp)n(\023)-33 b(eci\014cation)23 b
+3090 y("Repositionne)d(la)d(ligne)h(du)e(point)i(en)f(haut)g(de)g(la)g
+(fenetre.)1746 3145 y(Avec)g(ARG,)h(place)g(le)e(point)i(sur)f(la)g
+(ligne)h(ARG.")1817 3213 y(\(interactive)h("P"\))1817
+3269 y(\(recenter)f(\(if)g(\(null)f(line\))2311 3324
+y(0)2240 3380 y(\(prefix-numeric-value)41 b(line\)\)\)\))1746
+3468 y Fh(La)21 b(sp)n(\023)-33 b(eci\014cation)23 b
 Ff(interactive)h Fh(indique)d(commen)n(t)h(lire)e(in)n(teractiv)n(e-)
-1746 3674 y(men)n(t)28 b(les)f(param)n(\022)-33 b(etres.)42
+1746 3534 y(men)n(t)28 b(les)f(param)n(\022)-33 b(etres.)42
 b(F)-6 b(aites)28 b Ff(C-h)36 b(f)f(interactive)30 b
-Fh(p)r(our)e(plus)e(de)1746 3737 y(pr)n(\023)-33 b(ecisions.)2039
-3817 y Fb(Cop)n(yrigh)n(t)2342 3815 y(c)2325 3817 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.)2179 3868 y(v2.3)h(p)r(our)f(GNU)g(Emacs)h(v)n(ersion)h(22,)f
-(2006)2309 3919 y(conception)g(de)f(Stephen)g(Gildea)2220
-3983 y(traduction)h(fran\030)-27 b(caise)21 b(d')2831
-3970 y(\023)2826 3983 y(Eric)f(Jacob)r(oni)1746 4051
+Fh(p)r(our)e(plus)e(de)1746 3599 y(pr)n(\023)-33 b(ecisions.)2039
+3682 y Fd(Cop)n(yrigh)n(t)2342 3680 y(c)2325 3682 y Fc(\015)21
+b Fd(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20
+b(Inc.)2179 3727 y(v2.3)h(p)r(our)f(GNU)g(Emacs)h(v)n(ersion)h(22,)f
+(2006)2309 3771 y(conception)g(de)f(Stephen)g(Gildea)2220
+3835 y(traduction)h(fran\030)-27 b(caise)21 b(d')2831
+3822 y(\023)2826 3835 y(Eric)f(Jacob)r(oni)1746 3900
 y(V)-5 b(ous)22 b(p)r(ouv)n(ez)g(faire)g(et)g(distribuer)f(des)h
 (copies)g(de)f(cette)i(carte,)f(p)r(ourvu)f(que)h(la)1746
-4102 y(note)16 b(de)g(cop)n(yrigh)n(t)g(et)h(cette)f(note)g(de)g(p)r
+3944 y(note)16 b(de)g(cop)n(yrigh)n(t)g(et)h(cette)f(note)g(de)g(p)r
 (ermission)f(soien)n(t)h(conserv)n(\023)-29 b(ees)19
-b(sur)c(toutes)1746 4153 y(les)21 b(copies.)1746 4221
+b(sur)c(toutes)1746 3989 y(les)21 b(copies.)1746 4054
 y(P)n(our)e(les)g(copies)g(du)f(man)n(uel)g(GNU)g(Emacs,)g(\023)-29
 b(ecriv)n(ez)20 b(\022)-30 b(a)19 b(la)g(F)-5 b(ree)19
-b(Soft)n(w)n(are)i(F)-5 b(oun-)1746 4272 y(dation,)29
+b(Soft)n(w)n(are)i(F)-5 b(oun-)1746 4098 y(dation,)29
 b(Inc.,)g(51)g(F)-5 b(ranklin)28 b(Street,)h(Fifth)f(Flo)r(or,)h
-(Boston,)i(MA)d(02110-1301)1746 4323 y(USA.)p eop end
+(Boston,)i(MA)d(02110-1301)1746 4143 y(USA.)p eop end
 %%Trailer
 
 userdict /end-hook known{end-hook}if
diff --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex
index 0184064cccd..dcbed8347dc 100644
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@@ -11,7 +11,7 @@
 % Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
 % only when columnsperpage is 2 or 3.
 
-\letterpaper=1
+\letterpaper=0
 
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
@@ -216,8 +216,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 
 % section - new major section.  Argument is section name.
 \outer\def\section#1{\par\filbreak
-  \vskip 3ex plus 2ex minus 2ex {\headingfont #1}\mark{#1}%
-  \vskip 2ex plus 1ex minus 1.5ex}
+  \vskip 2ex plus 2ex minus 2ex {\headingfont #1}\mark{#1}%
+  \vskip 1ex plus 1ex minus 1.5ex}
 
 \newdimen\keyindent
 
@@ -327,6 +327,8 @@ les instructions. Si vous d\'ebutez, faites \kbd{C-h t} pour suivre un
 \metax{restaurer un tampon avec son contenu initial}{M-x revert-buffer}
 \key{r\'eafficher un \'ecran perturb\'e}{C-l}
 
+\shortcopyrightnotice
+
 \section{Recherche incr\'ementale}
 
 \key{rechercher vers l'avant}{C-s}
@@ -345,9 +347,6 @@ direction quelconque.
 Si Emacs est encore en train de chercher, \kbd{C-g} n'annule que ce
 qui n'a pas \'et\'e fait.
 
-%% Why was this here?
-%\shortcopyrightnotice
-
 \section{D\'eplacements}
 
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
diff --git a/etc/refcard.ps b/etc/refcard.ps
index 7e79f255048..3c124072686 100644
--- a/etc/refcard.ps
+++ b/etc/refcard.ps
@@ -4,14 +4,14 @@
 %%Pages: 2
 %%PageOrder: Ascend
 %%Orientation: Landscape
-%%BoundingBox: 0 0 595 842
+%%BoundingBox: 0 0 612 792
 %%DocumentFonts: CMBX10 CMR8 CMTT8 CMBX8 CMR6 CMSY6 CMTI8 CMMI8
-%%DocumentPaperSizes: a4
+%%DocumentPaperSizes: Letter
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips -t landscape refcard.dvi
+%DVIPSCommandLine: dvips -t letter -t landscape refcard.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2007.01.20:1513
+%DVIPSSource:  TeX output 2007.03.22:0022
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -2140,7 +2140,7 @@ B37C730F954856C8BB7DFED1ECDAF30AF7FDB675F727F6FFB931B81476DE3F0B
 0000000000000000000000000000000000000000000000000000000000000000
 cleartomark
 %%EndFont 
-TeXDict begin 55387786 39139632 1000 600 600 (refcard.dvi)
+TeXDict begin 52099146 40258431 1000 600 600 (refcard.dvi)
 @start /Fa 197[20 58[{}1 66.4176 /CMMI8 rf /Fb 134[35
 3[38 24 29 30 1[36 36 40 58 18 2[22 36 33 1[33 36 33
 33 36 51[26 45[{}19 66.4176 /CMTI8 rf /Fc 242[61 13[{}1
@@ -2169,7 +2169,9 @@ TeXDict begin 55387786 39139632 1000 600 600 (refcard.dvi)
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
-%%PaperSize: A4
+%%BeginPaperSize: Letter
+letter
+%%EndPaperSize
  @landscape end
 %%EndSetup
 %%Page: 1 1