From 889075b5ef376c5eb3f87d3ae7c81497f0c7e00c Mon Sep 17 00:00:00 2001 From: wlemb Date: Mon, 3 Jun 2002 16:41:36 +0000 Subject: * Makefile.comm (CLEANNOTSRCDIRADD): New target for files which should be removed only if builddir is not srcdir. (mostlyclean): Handle `CLEANNOTSRCDIRADD'. (clean): Depend on `mostlyclean'. (distclean): Depend on `clean'. (realclean, extraclean): Depend on `distclean'. (.y.cc, .y.o): Simplified. The output files are no longer written to srcdir but to builddir. * Makefile.in (MDEFINES): Add `version' and `revision'. (uninstall_dirs): Fix order of directories. * doc/Makefile.sub (version, revision): Removed. (CLEANADD): Removed grnexmpl.g, groff, groff-*. Added `HTMLDOCFILES'. (CLEANNOTSRCDIRADD): New target for grnexmpl.h, groff, groff-*. * contrib/mom/Makefile.sub (uninstall_sub): Don't use `momdocdir' but `htmldocdir'. Add missing backslash. * src/preproc/eqn/Makefile.sub, src/preproc/pic/Makefile.sub, src/preproc/refer/Makefile.sub (YTABC, YTABH): Don't use `srcdir' as prefix. * doc/texinfo.tex (\authortt): New macro. (\shortcontt): Define. (\titlepage): Set \tt to \authortt while defining \authorfont. (\appendixbox): New macro. (\chapmacro, \appendixentry): Use \appendixbox to get even indentation for letters. (\summarycontents): Set \tt. (\internalpagesize): Add two arguments for real paper width and height as needed by pdfTeX. (\letterpaper, \smallbook, \afourpaper, \afivepaper, \afourlatex): Updated. (\tempdima, \tempdimb): New temporary dimensions. (\pagesizesyyy): Updated. --- ChangeLog | 39 +++++++++++++++++++++- Makefile.comm | 59 ++++++++++++++------------------- Makefile.in | 4 ++- contrib/mom/Makefile.sub | 6 ++-- doc/Makefile.sub | 14 ++++---- doc/texinfo.tex | 75 +++++++++++++++++++++++++++++++++--------- src/include/Makefile.sub | 1 - src/preproc/eqn/.cvsignore | 1 + src/preproc/eqn/Makefile.sub | 4 +-- src/preproc/pic/Makefile.sub | 4 +-- src/preproc/refer/Makefile.sub | 2 +- 11 files changed, 140 insertions(+), 69 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76817f68..415a4743 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +2002-06-03 Werner LEMBERG + + * Makefile.comm (CLEANNOTSRCDIRADD): New target for files which + should be removed only if builddir is not srcdir. + (mostlyclean): Handle `CLEANNOTSRCDIRADD'. + (clean): Depend on `mostlyclean'. + (distclean): Depend on `clean'. + (realclean, extraclean): Depend on `distclean'. + (.y.cc, .y.o): Simplified. The output files are no longer written + to srcdir but to builddir. + * Makefile.in (MDEFINES): Add `version' and `revision'. + (uninstall_dirs): Fix order of directories. + * doc/Makefile.sub (version, revision): Removed. + (CLEANADD): Removed grnexmpl.g, groff, groff-*. + Added `HTMLDOCFILES'. + (CLEANNOTSRCDIRADD): New target for grnexmpl.h, groff, groff-*. + * contrib/mom/Makefile.sub (uninstall_sub): Don't use `momdocdir' + but `htmldocdir'. + Add missing backslash. + * src/preproc/eqn/Makefile.sub, src/preproc/pic/Makefile.sub, + src/preproc/refer/Makefile.sub (YTABC, YTABH): Don't use `srcdir' + as prefix. + + * doc/texinfo.tex (\authortt): New macro. + (\shortcontt): Define. + (\titlepage): Set \tt to \authortt while defining \authorfont. + (\appendixbox): New macro. + (\chapmacro, \appendixentry): Use \appendixbox to get even + indentation for letters. + (\summarycontents): Set \tt. + (\internalpagesize): Add two arguments for real paper width and + height as needed by pdfTeX. + (\letterpaper, \smallbook, \afourpaper, \afivepaper, \afourlatex): + Updated. + (\tempdima, \tempdimb): New temporary dimensions. + (\pagesizesyyy): Updated. + 2002-06-02 Werner LEMBERG Adding a new keyword `papersize' to the DESC file format (similar @@ -6037,7 +6074,7 @@ Version 1.16 released Some other changes: - * Man pages no depend on the files `VERSION' and `REVISION'. + * Man pages now depend on the files `VERSION' and `REVISION'. * The added shell script `mkinstalldirs' will replace `mkdir' in almost all cases. diff --git a/Makefile.comm b/Makefile.comm index b2fec5ee..c86aa4c0 100644 --- a/Makefile.comm +++ b/Makefile.comm @@ -1,4 +1,4 @@ -# Copyright (C) 1989-2000 Free Software Foundation, Inc. +# Copyright (C) 1989-2000, 2002 Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # # This file is part of groff. @@ -39,6 +39,7 @@ GRAM= LIBCLEAN= CLEANADD= CLEANDIRADD= +CLEANNOTSRCDIRADD= MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS) $(GENHDRS) \ depend.temp core y.output $(CLEANADD) CLEANFILES=$(LIBCLEAN) @@ -71,20 +72,28 @@ prefix_must_exist: mostlyclean: -rm -f $(MOSTLYCLEANFILES) -rm -rf $(CLEANDIRADD) + -@if test `cd $(srcdir); pwd` = `pwd`; then \ + :; \ + else \ + rm -f $(CLEANNOTSRCDIRADD); \ + fi -clean: - -rm -f $(CLEANFILES) $(MOSTLYCLEANFILES) +clean: mostlyclean + -rm -f $(CLEANFILES) -distclean: - -rm -f $(DISTCLEANFILES) $(CLEANFILES) $(MOSTLYCLEANFILES) +distclean: clean + -rm -f $(DISTCLEANFILES) + -@if test `cd $(srcdir); pwd` = `pwd`; then \ + :; \ + else \ + rm -f $(YTABC) $(YTABH); \ + fi -realclean: - -rm -f $(REALCLEANFILES) $(DISTCLEANFILES) $(CLEANFILES) \ - $(MOSTLYCLEANFILES) +realclean: distclean + -rm -f $(REALCLEANFILES) -extraclean: - -rm -f $(DISTCLEANFILES) $(CLEANFILES) $(MOSTLYCLEANFILES) \ - \#* *~ =* core junk grot old temp tmp tem +extraclean: distclean + -rm -f \#* *~ =* core junk grot old temp tmp tem .SUFFIXES: .SUFFIXES: .o .cc .c .y .man .n @@ -103,16 +112,8 @@ extraclean: fi -test -f y.tab.h && mv y.tab.h y_tab.h -test -f y.tab.c && mv y.tab.c y_tab.c - mv y_tab.c $@ -# Avoid ending up with two versions of $(YTABH). - if test -n "$(YTABH)"; then \ - if test -f $(srcdir)/$(YTABH); then \ - rm -f $(YTABH); \ - mv y_tab.h $(srcdir)/$(YTABH); \ - else \ - mv y_tab.h $(YTABH); \ - fi; \ - fi + mv y_tab.c $(YTABC) + if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi # The next rule is needed for make of Solaris 2.5.1 to override its # built-in .y.o rule (which takes precedence over the .y.cc rule above). @@ -125,20 +126,8 @@ extraclean: -test -f y.tab.h && mv y.tab.h y_tab.h -test -f y.tab.c && mv y.tab.c y_tab.c mv y_tab.c $(YTABC) -# Avoid ending up with two versions of $(YTABH). - if test -n "$(YTABH)"; then \ - if test -f $(srcdir)/$(YTABH); then \ - rm -f $(YTABH); \ - mv y_tab.h $(srcdir)/$(YTABH); \ - else \ - mv y_tab.h $(YTABH); \ - fi; \ - fi - $(COMPILE.cc) -o $@ $(YTABC) - -version=`cat $(top_srcdir)/VERSION` -# No additional number for the groff archive if revision is zero -revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` + if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi + $(COMPILE.cc) $(YTABC) .man.n: @echo Making $@ from $< diff --git a/Makefile.in b/Makefile.in index d80ecccc..a0d36a13 100644 --- a/Makefile.in +++ b/Makefile.in @@ -312,6 +312,8 @@ MDEFINES= \ "OTHERDEVDIRS=$(OTHERDEVDIRS)" \ "PSPRINT=$(PSPRINT)" \ "DVIPRINT=$(DVIPRINT)" \ + "version=$(version)" \ + "revision=$(revision)" \ "top_srcdir=$(top_srcdir)" \ "top_builddir=$(top_builddir)" \ "prefix=$(prefix)" \ @@ -606,7 +608,7 @@ uninstall_dirs: -rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \ $(tmacdir) $(systemtmacdir) $(localtmacdir) $(fontdir) $(bindir) \ $(datasubdir) $(dataprogramdir) $(datadir) $(infodir) \ - $(docdir) $(exampledir) $(htmldocdir) \ + $(exampledir) $(htmldocdir) $(docdir) \ $(libprogramdir) $(libdir) diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub index c8042ca1..abe16622 100644 --- a/contrib/mom/Makefile.sub +++ b/contrib/mom/Makefile.sub @@ -113,9 +113,9 @@ uninstall_sub: rm -f $(tmacdir)/$$f; \ done -for f in $(HTMLDOCFILES); do \ - rm -f $(momdocdir)/$$f; \ + rm -f $(htmldocdir)/$$f; \ done - -rmdir $(momdocdir) + -rmdir $(htmldocdir)/momdoc -for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES); do \ - rm -f $(docdir)/$$f; + rm -f $(docdir)/$$f; \ done diff --git a/doc/Makefile.sub b/doc/Makefile.sub index faf49cfd..4cd96699 100644 --- a/doc/Makefile.sub +++ b/doc/Makefile.sub @@ -35,10 +35,6 @@ groff_bin_dirs=\ $(top_builddir)/src/devices/grohtml groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'` -version=`cat $(top_srcdir)/VERSION` -# No additional number if revision is zero. -revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` - FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac @@ -83,14 +79,18 @@ htmldocimagedir=$(htmldocdir)/$(imagedir) exampleimagedir=$(exampledir)/$(imagedir) CLEANADD=\ - `if test $(srcdir) = .; then :; \ - else echo grnexmpl.g groff groff-*; fi` \ $(PROCESSEDDOCFILES) \ - $(PROCESSEDEXAMPLEFILES) + $(PROCESSEDEXAMPLEFILES) \ + $(HTMLDOCFILES) CLEANDIRADD=\ $(imagedir) +CLEANNOTSRCDIRADD=\ + grnexmpl.g \ + groff \ + groff-* + .SUFFIXES: .me .ms .ps .html # For simplicity, we always call grn and eqn. diff --git a/doc/texinfo.tex b/doc/texinfo.tex index df62a127..c83af30e 100644 --- a/doc/texinfo.tex +++ b/doc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2002-03-26.08} +\def\texinfoversion{2002-03-26.08-wl} % % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, % 2000, 01, 02 Free Software Foundation, Inc. @@ -1231,6 +1231,7 @@ where each line of input produces a line of output.} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 \def\authorrm{\secrm} +\def\authortt{\sectt} % Chapter (and unnumbered) fonts (17.28pt). \setfont\chaprm\rmbshape{12}{\magstep2} @@ -1345,6 +1346,7 @@ where each line of input produces a line of output.} \setfont\shortcontrm\rmshape{12}{1000} \setfont\shortcontbf\bxshape{12}{1000} \setfont\shortcontsl\slshape{12}{1000} +\setfont\shortconttt\ttshape{12}{1000} %% Add scribe-like font environments, plus @l for inline lisp (usually sans %% serif) and @ii for TeX italic @@ -1592,7 +1594,8 @@ where each line of input produces a line of output.} \let\subtitlerm=\tenrm \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}% % - \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines}% + \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines + \let\tt=\authortt}% % % Leave some space at the very top of the page. \vglue\titlepagetopglue @@ -3549,13 +3552,18 @@ width0pt\relax} \fi \global\let\subsubsection = \numberedsubsubsec } +% we use \chapno to avoid indenting back +\def\appendixbox#1{% + \setbox0 = \hbox{\putwordAppendix{} \the\chapno}% + \hbox to \wd0{#1\hss}} + \outer\def\appendix{\parsearg\appendixyyy} \def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz \def\appendixzzz #1{% \secno=0 \subsecno=0 \subsubsecno=0 \global\advance \appendixno by 1 \message{\putwordAppendix\space \appendixletter}% -\chapmacro {#1}{\putwordAppendix{} \appendixletter}% +\chapmacro {#1}{\appendixbox{\putwordAppendix{} \appendixletter}}% \gdef\thissection{#1}% \gdef\thischaptername{#1}% \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}% @@ -4007,7 +4015,8 @@ width0pt\relax} \fi \let\unnumbchapentry = \shortunnumberedentry % We want a true roman here for the page numbers. \secfonts - \let\rm=\shortcontrm \let\bf=\shortcontbf \let\sl=\shortcontsl + \let\rm=\shortcontrm \let\bf=\shortcontbf + \let\sl=\shortcontsl \let\tt=\shortconttt \rm \hyphenpenalty = 10000 \advance\baselineskip by 1pt % Open it up a little. @@ -4049,7 +4058,8 @@ width0pt\relax} \fi } % Appendices, in the main contents. -\def\appendixentry#1#2#3{\dochapentry{\putwordAppendix{} #2\labelspace#1}{#3}} +\def\appendixentry#1#2#3{% + \dochapentry{\appendixbox{\putwordAppendix{} #2}\labelspace#1}{#3}} % % Appendices, in the short toc. \let\shortappendixentry = \shortchapentry @@ -6058,11 +6068,12 @@ should work if nowhere else does.} } % Parameters in order: 1) textheight; 2) textwidth; 3) voffset; -% 4) hoffset; 5) binding offset; 6) topskip. We also call -% \setleading{\textleading}, so the caller should define \textleading. -% The caller should also set \parskip. +% 4) hoffset; 5) binding offset; 6) topskip, 7) pdf pageheight; +% 8) pdf pagewidth. We also call \setleading{\textleading}, so +% the caller should define \textleading. The caller should also +% set \parskip. % -\def\internalpagesizes#1#2#3#4#5#6{% +\def\internalpagesizes#1#2#3#4#5#6#7#8{% \voffset = #3\relax \topskip = #6\relax \splittopskip = \topskip @@ -6085,6 +6096,11 @@ should work if nowhere else does.} % \parindent = \defaultparindent \setemergencystretch + % + \ifpdf + \pdfpageheight #7\relax + \pdfpagewidth #8\relax + \fi } % Use `small' versions. @@ -6102,7 +6118,10 @@ should work if nowhere else does.} \textleading = 13.2pt % % If page is nothing but text, make it come out even. - \internalpagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}% + \internalpagesizes{46\baselineskip}{6in}% + {\voffset}{.25in}% + {\bindingoffset}{36pt}% + {11in}{8.5in}% }} % Use @smallbook to reset parameters for 7x9.5 (or so) format. @@ -6110,7 +6129,10 @@ should work if nowhere else does.} \parskip = 2pt plus 1pt \textleading = 12pt % - \internalpagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}% + \internalpagesizes{7.5in}{5.in}% + {\voffset}{.25in}% + {\bindingoffset}{16pt}% + {9.25in}{7in}% % \lispnarrowing = 0.3in \tolerance = 700 @@ -6126,7 +6148,10 @@ should work if nowhere else does.} \parskip = 3pt plus 2pt minus 1pt \textleading = 12pt % - \internalpagesizes{53\baselineskip}{160mm}{\voffset}{4mm}{\bindingoffset}{44pt}% + \internalpagesizes{53\baselineskip}{160mm}% + {\voffset}{4mm}% + {\bindingoffset}{44pt}% + {297mm}{210mm}% % \tolerance = 700 \hfuzz = 1pt @@ -6139,7 +6164,10 @@ should work if nowhere else does.} \parskip = 2pt plus 1pt minus 0.1pt \textleading = 12.5pt % - \internalpagesizes{166mm}{120mm}{\voffset}{-8mm}{\bindingoffset}{8pt}% + \internalpagesizes{166mm}{120mm}% + {\voffset}{-8mm}% + {\bindingoffset}{8pt}% + {210mm}{148mm}% % \lispnarrowing = 0.2in \tolerance = 800 @@ -6158,7 +6186,10 @@ should work if nowhere else does.} \textleading = 13.6pt % \afourpaper - \internalpagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}% + \internalpagesizes{237mm}{150mm}% + {3.6mm}{3.6mm}% + {3mm}{7mm}% + {297mm}{210mm}% % % Must explicitly reset to 0 because we call \afourpaper, apparently, % although this does not entirely make sense. @@ -6168,13 +6199,18 @@ should work if nowhere else does.} % Use @afourwide to print on European A4 paper in wide format. \def\afourwide{% \afourpaper - \internalpagesizes{6.5in}{9.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}% + \internalpagesizes{6.5in}{9.5in}% + {\hoffset}{\normaloffset}% + {\bindingoffset}{7mm}% + {297mm}{210mm}% } % @pagesizes TEXTHEIGHT[,TEXTWIDTH] % Perhaps we should allow setting the margins, \topskip, \parskip, % and/or leading, also. Or perhaps we should compute them somehow. % +\newdimen \tempdima +\newdimen \tempdimb \def\pagesizes{\parsearg\pagesizesxxx} \def\pagesizesxxx#1{\pagesizesyyy #1,,\finish} \def\pagesizesyyy#1,#2,#3\finish{{% @@ -6184,7 +6220,14 @@ should work if nowhere else does.} \parskip = 3pt plus 2pt minus 1pt \setleading{\textleading}% % - \internalpagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}% + \tempdima #1\relax + \advance\tempdima by 1in + \tempdimb #2\relax + \advance\tempdimb by 1in + \internalpagesizes{#1}{\hsize}% + {\voffset}{\normaloffset}% + {\bindingoffset}{44pt}% + {\tempdima}{\tempdimb}% }} % Set default to letter. diff --git a/src/include/Makefile.sub b/src/include/Makefile.sub index cb484c0c..620d3453 100644 --- a/src/include/Makefile.sub +++ b/src/include/Makefile.sub @@ -24,7 +24,6 @@ HDRS=\ searchpath.h \ stringclass.h GENHDRS=defs.h -CLEANADD=$(GENHDRS) all depend: $(GENHDRS) diff --git a/src/preproc/eqn/.cvsignore b/src/preproc/eqn/.cvsignore index 8ec2d188..8f8f92fc 100644 --- a/src/preproc/eqn/.cvsignore +++ b/src/preproc/eqn/.cvsignore @@ -4,3 +4,4 @@ eqn.n neqn neqn.n eqn.cc +eqn_tab.h diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub index 945a8425..759d47bd 100644 --- a/src/preproc/eqn/Makefile.sub +++ b/src/preproc/eqn/Makefile.sub @@ -37,8 +37,8 @@ HDRS=\ $(srcdir)/eqn.h \ $(srcdir)/pbox.h GRAM=$(srcdir)/eqn.y -YTABC=$(srcdir)/eqn.cc -YTABH=$(srcdir)/eqn_tab.h +YTABC=eqn.cc +YTABH=eqn_tab.h NAMEPREFIX=$(g) CLEANADD=neqn diff --git a/src/preproc/pic/Makefile.sub b/src/preproc/pic/Makefile.sub index ec4251f9..72bad744 100644 --- a/src/preproc/pic/Makefile.sub +++ b/src/preproc/pic/Makefile.sub @@ -26,6 +26,6 @@ HDRS=\ $(srcdir)/position.h \ $(srcdir)/text.h GRAM=$(srcdir)/pic.y -YTABC=$(srcdir)/pic.cc -YTABH=$(srcdir)/pic_tab.h +YTABC=pic.cc +YTABH=pic_tab.h NAMEPREFIX=$(g) diff --git a/src/preproc/refer/Makefile.sub b/src/preproc/refer/Makefile.sub index 5ed5ec53..440eb0c6 100644 --- a/src/preproc/refer/Makefile.sub +++ b/src/preproc/refer/Makefile.sub @@ -19,5 +19,5 @@ HDRS=\ $(srcdir)/command.h \ $(srcdir)/ref.h GRAM=$(srcdir)/label.y -YTABC=$(srcdir)/label.cc +YTABC=label.cc NAMEPREFIX=$(g) -- cgit v1.2.1