X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3ef97fb6a70598253c4f7f293b516f449389ff7e..565f0b98c20501d33d8f8112891d72888b559b67:/etc/calccard.tex

diff --git a/etc/calccard.tex b/etc/calccard.tex
index 7dec45450f..189942c429 100644
--- a/etc/calccard.tex
+++ b/etc/calccard.tex
@@ -13,13 +13,14 @@
 % Typical command to format:  tex calccard.tex
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
-% Copyright (c) 1987, 1992, 2001 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004,
+%   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 1, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
@@ -58,9 +59,8 @@
 %  UUCP: mit-erl!gildea
 %  Internet: gildea@stop.mail-abuse.org
 
-\def\versionnumber{2.03}
-\def\versiondate{November 2001}
-\def\year{2001}
+\def\versionnumber{2.1}
+\def\year{2008}                 % latest copyright year
 \def\version{v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
@@ -71,7 +71,7 @@
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
 \centerline{designed by Dave Gillespie and Stephen Gildea, \version}
-\centerline{for GNU Emacs Calc version \versionnumber\ (\versiondate)}
+\centerline{for GNU Emacs Calc version \versionnumber}
 
 Permission is granted to make and distribute copies of
 this card provided the copyright notice and this permission notice
@@ -254,7 +254,7 @@ MA 02110-1301, USA.
 \def\S#1{$S_{\scriptscriptstyle #1}$}
 \def\swap{$\leftrightarrow$}
 
-\def\mhash{M-\#\ }
+\def\calcprefix{C-x *\ }
 \def\,{{\rm ,\hskip.55em}\ignorespaces}
 \def\lesssectionskip{\vskip-1.5ex}
 
@@ -273,18 +273,18 @@ MA 02110-1301, USA.
 
 \title{GNU Calc Reference Card}
 
-\centerline{(for version \versionnumber\ of \versiondate)}
+\centerline{(for version \versionnumber)}
 
 \section{Starting and Stopping}
 
-\wkey{start/stop standard Calc}{\mhash c}
-\wkey{start/stop X keypad Calc}{\mhash k}
-\wkey{\quad start/stop either: \kbd{\mhash \#} or \kbd{\mhash \mhash}}{}
+\wkey{start/stop standard Calc}{\calcprefix c}
+\wkey{start/stop X keypad Calc}{\calcprefix k}
+\wkey{\quad start/stop either: \kbd{\calcprefix *}}{}
 \wkey{stop standard Calc}{q}
 
-\wkey{Calc tutorial}{\mhash t}
-\wkey{run Calc in other window}{\mhash o}
-\wkey{quick calculation in minibuffer}{\mhash q}
+\wkey{Calc tutorial}{\calcprefix t}
+\wkey{run Calc in other window}{\calcprefix o}
+\wkey{quick calculation in minibuffer}{\calcprefix q}
 
 \section{Getting Help}
 
@@ -295,8 +295,8 @@ The \kbd{h} prefix key is Calc's analogue of \kbd{C-h} in Emacs.
 \key{describe key briefly}{h c}
 \key{describe key fully}{h k}
 \key{describe function or command}{h f}
-\key{read on-line manual}{h i{\rm\enskip or\enskip}\mhash i}
-\key{read full Calc summary}{h s{\rm\enskip or\enskip}\mhash s}
+\key{read on-line manual}{h i{\rm\enskip or\enskip}\calcprefix i}
+\key{read full Calc summary}{h s{\rm\enskip or\enskip}\calcprefix s}
 
 \section{Error Recovery}
 
@@ -306,16 +306,16 @@ The \kbd{h} prefix key is Calc's analogue of \kbd{C-h} in Emacs.
 \key{redo last operation}{D}
 \key{recall last arguments}{M-RET}
 \key{edit top of stack}{`}
-\wkey{reset Calc to default state}{\mhash 0 {\rm (zero)}}
+\wkey{reset Calc to initial state}{\calcprefix 0 {\rm (zero)}}
 
 \section{Transferring Data}
 
-\wkey{grab region from a buffer}{\mhash g}
-\wkey{grab rectangle from a buffer}{\mhash r}
-\wkey{grab rectangle, summing columns}{\mhash :}
-\wkey{grab rectangle, summing rows}{\mhash \_}
+\wkey{grab region from a buffer}{\calcprefix g}
+\wkey{grab rectangle from a buffer}{\calcprefix r}
+\wkey{grab rectangle, summing columns}{\calcprefix :}
+\wkey{grab rectangle, summing rows}{\calcprefix \_}
 
-\wkey{yank data to a buffer}{\mhash y}
+\wkey{yank data to a buffer}{\calcprefix y}
 
 Also, try \kbd{C-k}/\kbd{C-y} or X cut and paste.
 
@@ -557,7 +557,7 @@ Variable names are single digits or whole words.
 
 \key{``Big'' display mode}{d B}
 \key{C, Pascal, FORTRAN modes}{d C\, d P\, d F}
-\key{\TeX, eqn modes}{d T\, d E}
+\key{\TeX, La\TeX, eqn modes}{d T\, d L\, d E}
 \key{Unformatted mode}{d U}
 \key{Normal language mode}{d N}
 
@@ -645,13 +645,12 @@ Variable names are single digits or whole words.
 
 \key{begin, end recording a macro}{C-x (\, C-x )}
 \key{replay keyboard macro}{X}
-\wkey{read region as written-out macro}{\mhash m}
+\wkey{read region as written-out macro}{\calcprefix m}
 \key{if, else, endif}{Z [\, Z :\, Z ]}
 \key{equal to, less than, member of}{a =\, a <\, a \{}
 \key{repeat {\it n} times, break from loop}{Z <\, Z >\, Z /}
 \key{``for'' loop: start, end; body, step}{Z (\, Z )}
 \key{save, restore mode settings}{Z `\, Z '}
-\key{display message during macro}{Z =}
 \key{query user during macro}{Z \#}
 \key{put finished macro on a key}{Z K}