refcard.tex: single file now includes what were formerly three files, to suit

             FSF preferences (format definitions, nee threecol.tex, and
             default font defs, nee rc-cm.tex, now both directly in this file).

lpsrc.sed, psrc.sed: alternate font defs, now sed scripts to modify refcard.tex

Makefile.in: use sed -f psrc.sed to produce refcard.ps target; new
             target lrefcard.ps for sites using long PS font names

Removed old auxiliary TeX files, no longer necessary with this scheme.

4 files changed, 115 insertions, 12 deletions

diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index 4d238a3007..cd7137284b 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -127,20 +127,26 @@ de-stage3: force
 clean:
 	rm -f gdb.dvi rluser.texinfo inc-hist.texi gdb-all* gdb.info* gdbVN.m4
 	rm -f gdb-internals gdbint.?? gdbint.??? gdbint.info
-	rm -f refcard.ps refcard.dvi rcfonts.tex refcard.log *~
+	rm -f refcard.ps refcard.dvi refcard.log *~
 
 # GDB QUICK REFERENCE (TeX dvi file, CM fonts)
 refcard.dvi : $(srcdir)/refcard.tex
-	rm -f rcfonts.tex; cp $(srcdir)/rc-cm.tex rcfonts.tex
 	TEXINPUTS=$(srcdir):.:$$TEXINPUTS tex refcard.tex; rm -f refcard.log 
 	rm -f rcfonts.tex
 
 # GDB QUICK REFERENCE (PostScript output, common PS fonts)
-refcard.ps : $(srcdir)/refcard.tex
-	rm -f rcfonts.tex; cp $(srcdir)/rc-ps.tex rcfonts.tex
-	TEXINPUTS=$(srcdir):.:$$TEXINPUTS tex refcard.tex
-	dvips -t landscape refcard -o; rm -f refcard.dvi refcard.log
-	rm -f rcfonts.tex
+refcard.ps : $(srcdir)/refcard.tex $(srcdir)/psrc.sed
+	sed -f $(srcdir)/psrc.sed refcard.tex >psref.tex
+	TEXINPUTS=$(srcdir):.:$$TEXINPUTS tex psref.tex
+	dvips -t landscape psref -o; mv psref.ps refcard.ps
+	rm -f psref.dvi psref.log
+
+# GDB QUICK REFERENCE (PostScript output, common PS fonts w/long names)
+lrefcard.ps : $(srcdir)/refcard.tex $(srcdir)/lpsrc.sed
+	sed -f $(srcdir)/lpsrc.sed refcard.tex >psref.tex
+	TEXINPUTS=$(srcdir):.:$$TEXINPUTS tex psref.tex
+	dvips -t landscape psref -o; mv psref.ps lrefcard.ps
+	rm -f psref.dvi psref.log
 
 #  "Readline" appendices.  Get them here so both TeX and texi2roff can find.
 rluser.texinfo: ${READLINE_DIR}/doc/rluser.texinfo
diff --git a/gdb/doc/lpsrc.sed b/gdb/doc/lpsrc.sed
new file mode 100644
index 0000000000..1c7af4aaf4
--- /dev/null
+++ b/gdb/doc/lpsrc.sed
@@ -0,0 +1,13 @@
+/font defs: ---/,/end font defs ---/c\
+%-------------------- PostScript (long names) font defs: -----------------\
+\\font\\bbf=Times-Bold at 10pt\
+\\font\\vbbf=Times-Bold at 12pt\
+\\font\\smrm=Times-Roman at 6pt\
+\\font\\brm=Times-Roman at 10pt\
+\\font\\rm=Times-Roman at 8pt\
+\\font\\it=Times-Italic at 8pt\
+\\font\\tt=Courier at 8pt\
+% Used only for \copyright, replacing plain TeX macro.\
+\\font\\sym=Symbol at 7pt\
+\\def\\copyright{{\\sym\\char'323}}\
+%-------------------- end font defs ---------------------------------
diff --git a/gdb/doc/psrc.sed b/gdb/doc/psrc.sed
new file mode 100644
index 0000000000..9bb557eae2
--- /dev/null
+++ b/gdb/doc/psrc.sed
@@ -0,0 +1,13 @@
+/font defs: ---/,/end font defs ---/c\
+%-------------------- PostScript (K Berry names) font defs: --------------\
+\\font\\bbf=ptmb at 10pt\
+\\font\\vbbf=ptmb at 12pt\
+\\font\\smrm=ptmr at 6pt\
+\\font\\brm=ptmr at 10pt\
+\\font\\rm=ptmr at 8pt\
+\\font\\it=ptmri at 8pt\
+\\font\\tt=pcrr at 8pt\
+% Used only for \copyright, replacing plain TeX macro.\
+\\font\\sym=psyr at 7pt\
+\\def\\copyright{{\\sym\\char'323}}\
+%-------------------- end font defs ---------------------------------
diff --git a/gdb/doc/refcard.tex b/gdb/doc/refcard.tex
index e1a717aeb4..6b354df9f7 100644
--- a/gdb/doc/refcard.tex
+++ b/gdb/doc/refcard.tex
@@ -1,3 +1,5 @@
+%%%%%%%%%%%%%%%% gdb-refcard.tex %%%%%%%%%%%%%%%%
+
 %This file is TeX source for a reference card describing GDB, the GNU debugger.
 %$Id$
 %Copyright (C) 1991 Free Software Foundation, Inc.
@@ -35,6 +37,14 @@
 %            support of free software.  For general information
 %            contact ``info@cygnus.com''
 %
+% Uncomment the following `magnification' command if you want to print
+% out in a larger font.  Caution!  You may need larger paper.  You had
+% best avoid using 3-column output if you try this.  See the ``Three
+% column format'' section below if you want to print in three column
+% format.
+%
+%\magnification=\magstep 1
+%
 % NOTE ON INTENTIONAL OMISSIONS: This reference card includes most GDB
 % commands, but due to space constraints there are some things I chose
 % to omit.  In general, not all synonyms for commands are covered, nor
@@ -50,8 +60,69 @@
 \def\$#1${{#1}}%   Kluge: collect RCS revision info without $...$
 \xdef\manvers{\$Revision$}%
 }%
-\input threecol
-\input rcfonts
+%-------------------- Three column format -----------------------
+
+%%%% --- To disable three column format, comment out this entire section
+
+% Three-column format for landscape printing on 8.5x11 paper
+
+% We want output .25 inch *from paper edge*; i.e. -.75in from TeX default
+\hoffset=-0.8in \voffset=-0.75in
+\newdimen\fullhsize
+\fullhsize=10.5in \hsize=3.3in
+\def\fulline{\hbox to \fullhsize}
+\let\lcr=L \newbox\leftcolumn\newbox\centercolumn
+\output={\if L\lcr
+            \global\setbox\leftcolumn=\columnbox \global\let\lcr=C
+	 \else
+            \if C\lcr
+               \global\setbox\centercolumn=\columnbox \global\let\lcr=R
+            \else \tripleformat \global\let\lcr=L
+            \fi
+         \fi
+%         \ifnum\outputpenalty>-20000 \else\dosupereject\fi
+      }
+%
+%ALTERNATIVE FOLDING GUIDES:
+%
+%For NO printed folding guide, comment out other \def\vdecor's and uncomment:
+%\def\vdecor{\hskip .2in plus1fil}
+%
+%For SOLID LINE folding guide, comment out other \def\vdecor's and uncomment:
+%\def\vdecor{\hskip .1in plus1fil \vrule width .1pt \hskip .1in plus1fil}
+%
+%For SMALL MARKS NEAR TOP AND BOTTOM as folding guide,
+%comment out other \def\vdecor's and uncomment:
+\def\vdecor{\hskip .1in plus1fil 
+\vbox to \vsize{\hbox to .1pt{\vrule height 2pt width .1pt}\vfill
+\hbox to .1pt{\vrule height 2pt width .1pt}}
+\hskip .1in plus1fil}
+%
+%END OF ALTERNATIVES FOR FOLDING GUIDES
+%
+\def\tripleformat{\shipout\vbox{\fulline{\box\leftcolumn\vdecor
+                                         \box\centercolumn\vdecor
+                                         \columnbox}
+			       }
+                 \advancepageno}
+\def\columnbox{\leftline{\pagebody}}
+\def\bye{\par\vfill
+         \supereject
+         \if R\lcr \null\vfill\eject\fi
+         \end}
+
+%-------------------- end three column format -----------------------
+
+%-------------------- Computer Modern font defs: --------------------
+\font\bbf=cmbx10
+\font\vbbf=cmbx12
+\font\smrm=cmr6
+\font\brm=cmr10
+\font\rm=cmr7
+\font\it=cmti7
+\font\tt=cmtt8
+%-------------------- end font defs ---------------------------------
+
 %
 \vsize=8in
 \hyphenpenalty=5000\tolerance=2000\raggedright\raggedbottom
@@ -140,9 +211,9 @@ shell {\it cmd}&execute arbitrary shell command string\cr
 \endsec
 
 \vfill
-\line{\smrm \opt{ } surround optional arguments \hfil $\ldots$ show
-one or more arguments\rm\qquad}
-
+\line{\smrm \opt{ } surround optional arguments \hfill $\ldots$ show
+one or more arguments}
+\vskip\baselineskip
 \centerline{\smrm \copyright 1991, 1992 Free Software Foundation, Inc.\qquad Permissions on back}
 \eject
 \sec Breakpoints and Watchpoints;