summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-11-07 03:01:05 +0000
committerNorbert Preining <norbert@preining.info>2021-11-07 03:01:05 +0000
commit8389f0bb8e6af2c5dcbfe3cdad746a9c170d1157 (patch)
tree3b49c58b6652468cb2c68b4bc8b57356bb449ebb /web
parent2ea2cee6498139387ba3c0815d105b4344c0fb50 (diff)
CTAN sync 202111070301
Diffstat (limited to 'web')
-rw-r--r--web/pwebmac/README.md2
-rwxr-xr-xweb/pwebmac/makeall2
-rw-r--r--web/pwebmac/pwebmac.tex6
-rw-r--r--web/pwebmac/webman.ch34
4 files changed, 38 insertions, 6 deletions
diff --git a/web/pwebmac/README.md b/web/pwebmac/README.md
index 030376e19d..a876aaf212 100644
--- a/web/pwebmac/README.md
+++ b/web/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/web/pwebmac/makeall b/web/pwebmac/makeall
index 08347f321e..879ec912d4 100755
--- a/web/pwebmac/makeall
+++ b/web/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/web/pwebmac/pwebmac.tex b/web/pwebmac/pwebmac.tex
index 2eb713f8c0..3dac11f4bc 100644
--- a/web/pwebmac/pwebmac.tex
+++ b/web/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
diff --git a/web/pwebmac/webman.ch b/web/pwebmac/webman.ch
index 074af792e7..0ccae2847d 100644
--- a/web/pwebmac/webman.ch
+++ b/web/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