From 05dfaaef40a4dc5ac8b48618d25a91cb95488b4c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Nov 2021 20:40:50 +0000 Subject: pwebmac (6nov21) git-svn-id: svn://tug.org/texlive/trunk@60979 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/plain/pwebmac/README.md | 2 +- Master/texmf-dist/doc/plain/pwebmac/makeall | 2 +- Master/texmf-dist/doc/plain/pwebmac/webman.ch | 34 ++++++++++++++++++++++++- Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex | 6 ++--- 4 files changed, 38 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/plain/pwebmac/README.md b/Master/texmf-dist/doc/plain/pwebmac/README.md index 030376e19d1..a876aaf212a 100644 --- a/Master/texmf-dist/doc/plain/pwebmac/README.md +++ b/Master/texmf-dist/doc/plain/pwebmac/README.md @@ -30,4 +30,4 @@ clickable links and bookmarks (depending on your PDF viewer). The `pwebmac` package is free software and may be used without constraints. -This is version “4.6.3” of the `pwebmac` package — 2021-08-12, Andreas Scherer. +This is version “4.6.4” of the `pwebmac` package — 2021-11-06, Andreas Scherer. diff --git a/Master/texmf-dist/doc/plain/pwebmac/makeall b/Master/texmf-dist/doc/plain/pwebmac/makeall index 08347f321ea..879ec912d43 100644 --- a/Master/texmf-dist/doc/plain/pwebmac/makeall +++ b/Master/texmf-dist/doc/plain/pwebmac/makeall @@ -157,7 +157,7 @@ do $SED_I -e "s/\(\\\\def\\\\title\)/\\\\datecontentspage\n\1/" $f.tex ;; mf | tex | pdftex | xetex ) - $SED_I -e "s/\(\\\\def\\\\botofcontents\)/\\\\datethis\n\1/" $f.tex + $SED_I -e "s/\(\\\\def\\\\botofcontents\)/\\\\datethis\n\\\\emergencystretch=.1\\\\hsize\1/" $f.tex # amend '\N' redefinition for PDF outlines in # Metafont and TeX (also pdfTeX and XeTeX) diff --git a/Master/texmf-dist/doc/plain/pwebmac/webman.ch b/Master/texmf-dist/doc/plain/pwebmac/webman.ch index 074af792e77..0ccae2847d1 100644 --- a/Master/texmf-dist/doc/plain/pwebmac/webman.ch +++ b/Master/texmf-dist/doc/plain/pwebmac/webman.ch @@ -56,7 +56,31 @@ \else Appendix~#1\fi} @z -@x +@x l.180 +\yskip\item{1)} A \TeX\ part, containing explanatory material about what +@y +\yskip\itemitem{1)} A \TeX\ part, containing explanatory material about what +@z + +@x l.183 +\item{2)} A definition part, containing macro definitions that serve as +@y +\itemitem{2)} A definition part, containing macro definitions that serve as +@z + +@x l.187 +\item{3)} A \PASCAL\ part, containing a piece of the program that +@y +\itemitem{3)} A \PASCAL\ part, containing a piece of the program that +@z + +@x l.358 + \.{which is a \\\&\{packed\}{ }\\\&\{array\}{ }\$ +@y + \.{which is a \\\&\{packed\}{ }\\\&\{array\}{ }\$% +@z + +@x l.447 program for \.{TANGLE}, in the appendix, gives precise details about this @y program for \.{TANGLE}, in \pdfURL{Appendix~E}{tangle.pdf}, @@ -361,6 +385,14 @@ Appendix~D that incorporates your changes. \pdfURL{Appendix~D}{weave.pdf} that incorporates your changes. @z +@x l.1632 +\def\substep(10.#1){\par\hangindent 4em\noindent + \hbox to 4em{\hfil(10.#1) }\ignorespaces} +@y +\def\substep(10.#1){\par\hangindent 3em\noindent + \hbox to 3em{\hfil(10.#1) }\ignorespaces} +@z + @x l.1666 computer by following Appendices D and E. Then you have to simulate the @y diff --git a/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex b/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex index 2eb713f8c0e..3dac11f4bc4 100644 --- a/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex +++ b/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex @@ -239,11 +239,11 @@ \message{*\modno} % progress report \def\stripprefix##1>{}\def\gtitletoks{#2}% \edef\gtitletoks{\expandafter\stripprefix\meaning\gtitletoks}% - \edef\next{\write\cont{\Z{#2}{\modno}% write to contents file + \edef\next{\write\cont{\Z{\gtitletoks}{\modno}% write to contents file {\noexpand\the\pageno}{\the\toksE}}}\next % \Z{title}{sec}{page}{ss} \ifpdf\special{pdf: outline 0 << /Title (\the\toksE) /Dest [ @thispage /FitH @ypos ] >>}\fi - \ifon\startsection{\bf#2.\quad}\ignorespaces} + \ifon\startsection{\bf\ignorespaces#2.\quad}\ignorespaces} \def\MN#1.{\par % common code for \M, \N {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}% remove \* from section name \ifx\modno\modstar \onmaybe \else\ontrue \fi @@ -339,7 +339,7 @@ \write\cont{\catcode `\noexpand\@=12\relax} % \makeatother \closeout\cont % the contents information has been fully gathered \output{\ifpagesaved\normaloutput{\box\sbox}\lheader\rheader\fi - \global\setbox\sbox=\page \global\pagesavedtrue} + \global\setbox\sbox=\page \global\pagesavedtrue \mark{\topmark}} \pagesavedfalse \eject % eject the page-so-far and predecessors \setbox\sbox\vbox{\unvbox\sbox} % take it out of its box \vsize=\pageheight \advance\vsize by -\ht\sbox % the remaining height -- cgit v1.2.3