* Makefile.in: (REFEDITS) new var to control whether PS or CM

	fonts and whether US or A4 paper for GDB refcard; (refcard.dvi)
	collect sed edits if any, apply to refcard before formatting;
	(refcard.ps) stop implying PS fonts if PS output requested;
	(lrefcard.ps) delete extra target for variant PS fonts

	* refcard.tex: parametrize papersize dependent info, collect
	  in easily replaced spot

	* a4rc.sed: new file, edits to refcard for A4 paper

3 files changed, 64 insertions, 20 deletions

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index a16fcb5..8150bd1 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jun 25 16:15:10 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* Makefile.in: (REFEDITS) new var to control whether PS or CM
+	fonts and whether US or A4 paper for GDB refcard; (refcard.dvi)
+	collect sed edits if any, apply to refcard before formatting;
+	(refcard.ps) stop implying PS fonts if PS output requested;
+	(lrefcard.ps) delete extra target for variant PS fonts
+
+	* refcard.tex: parametrize papersize dependent info, collect
+	  in easily replaced spot
+
+	* a4rc.sed: new file, edits to refcard for A4 paper
+
 Fri Jun 25 14:21:46 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* stabs.texinfo (Negative Type Numbers): Type -16 is 4 bytes.
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index c8adafe..b3fdbcf 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -47,8 +47,27 @@ READLINE_DIR = ${gdbdir}/../readline/doc
 
 SET_TEXINPUTS = TEXINPUTS=${TEXIDIR}:.:$(srcdir):$(READLINE_DIR):$$TEXINPUTS
 
+# There may be alternate predefined collections of switches to configure
+# the GDB manual.  Normally this is not done in synch with the software
+# config system, since this choice tends to be independent; most people
+# want a doc config of `all' for a generic manual, regardless of sw config.
 DOC_CONFIG = all
 
+# This list of sed edits will edit the GDB reference card
+# for what fonts and what papersize to use.
+# By default (NO edits applied), the refcard uses:
+#    - Computer Modern (CM) fonts
+#    - US letter paper (8.5x11in)
+# List some of the following files for alternative fonts and paper:
+#  a4rc.sed     use A4 paper (297 x 210 mm)
+#  psrc.sed     use PostScript fonts (Karl Berry short TeX names)
+# lpsrc.sed     use PostScript fonts (full PostScript names in TeX)
+# e.g. for A4, Postscript:  REFEDITS = a4rc.sed psrc.sed
+#      for A4, CM fonts:    REFEDITS = a4rc.sed
+#      for US, PS fonts:    REFEDITS = psrc.sed
+#      for default:
+REFEDITS =
+
 # Don Knuth's TeX formatter
 TEX = tex
 
@@ -113,12 +132,12 @@ clean-info:
 	rm -f gdb.info* gdbint.info* stabs.info*
 
 clean-dvi:
-	rm -f gdb.dvi refcard.dvi gdbint.dvi stabs.dvi psref.dvi
+	rm -f gdb.dvi refcard.dvi gdbint.dvi stabs.dvi sedref.dvi
 	
 mostlyclean: clean-info clean-dvi
 	rm -f gdb.?? gdb.??? gdb.mm gdb.ms gdb.me
 	rm -f links2roff
-	rm -f refcard.ps lrefcard.ps refcard.log psref.* *~
+	rm -f refcard.ps lrefcard.ps refcard.log sedref.* *~
 	rm -f gdbint.?? gdbint.??? stabs.?? stabs.???
 
 clean: mostlyclean
@@ -129,25 +148,22 @@ distclean: clean
 
 realclean: distclean clean-dvi clean-info
 
+# GDB QUICK REFERENCE (dvi output)
+refcard.dvi : refcard.tex $(REFEDITS)
+	if [ -z "$(REFEDITS)" ]; then \
+		cp refcard.tex sedref.tex ; \
+	else \
+		echo > tmp.sed ; \
+		for f in "$(REFEDITS)" ; do \
+			cat $(srcdir)/$$f >>tmp.sed ; done ; \
+		sed -f tmp.sed $(srcdir)/refcard.tex >sedref.tex ; \
+	fi
+	$(SET_TEXINPUTS) $(TEX) sedref.tex
+	mv sedref.dvi refcard.dvi
+	rm -f sedref.log sedref.tex tmp.sed
 
-# GDB QUICK REFERENCE (TeX dvi file, CM fonts)
-refcard.dvi : $(srcdir)/refcard.tex
-	$(SET_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 $(srcdir)/psrc.sed
-	sed -f $(srcdir)/psrc.sed $(srcdir)/refcard.tex >psref.tex
-	$(SET_TEXINPUTS) $(TEX) psref.tex
-	dvips -t landscape psref -o; mv psref.ps refcard.ps
-	rm -f psref.dvi psref.log psref.tex
-
-# GDB QUICK REFERENCE (PostScript output, common PS fonts w/long names)
-lrefcard.ps : $(srcdir)/refcard.tex $(srcdir)/lpsrc.sed
-	sed -f $(srcdir)/lpsrc.sed $(srcdir)/refcard.tex >psref.tex
-	$(SET_TEXINPUTS) $(TEX) psref.tex
-	dvips -t landscape psref -o; mv psref.ps lrefcard.ps
-	rm -f psref.dvi psref.log psref.tex
+refcard.ps : refcard.dvi
+	dvips -t landscape refcard.dvi -o
 
 # File to record current GDB version number (copied from main dir Makefile.in)
 GDBvn.texi : ${gdbdir}/Makefile.in
diff --git a/gdb/doc/a4rc.sed b/gdb/doc/a4rc.sed
new file mode 100644
index 0000000..e4e5211
--- /dev/null
+++ b/gdb/doc/a4rc.sed
@@ -0,0 +1,15 @@
+/--- Papersize defs:/,/--- end papersize defs/c\
+%-------- Papersize defs:\
+% Dimensions for landscape printing on A4 paper\
+\
+% We want output 12mm *from paper edge*; i.e. -13.54mm from TeX default\
+\\hoffset=-13.54mm \\voffset=-15.54mm\
+\\fullhsize=272mm \\hsize=86mm % 27cm = 29.7cm (a4 heigth) - 2*12mm (margins)\
+\\vsize=19cm % 18.6cm = 21cm (a4 width) - 2* 10mm (margins).\
+\
+% Units for \\sec definition\
+\\secskip=.6pc % space between refcard secs\
+\\itmwid=29mm  % width of halign col 1\
+\\dfnwid=58mm  % width of halign col 2\
+\\lskip=1pt     % extra skip between \\sec entries\
+%-------- end papersize defs