summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-19 22:02:20 +0000
committerKarl Berry <karl@freefriends.org>2020-07-19 22:02:20 +0000
commit1157a774c2ddb1e7f50b79213f58dcd829430377 (patch)
tree77be8941024f4c88515541802218a7dce2a9f94a
parent251c7e3b6d09d6b7758dc7a51652da095ba89e5c (diff)
pwebmac
git-svn-id: svn://tug.org/texlive/trunk@55882 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/plain/pwebmac/README.md2
-rw-r--r--Master/texmf-dist/doc/plain/pwebmac/makeall26
-rw-r--r--Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex2
3 files changed, 15 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/plain/pwebmac/README.md b/Master/texmf-dist/doc/plain/pwebmac/README.md
index 28bfe3fe777..cfb33f4cddf 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/README.md
+++ b/Master/texmf-dist/doc/plain/pwebmac/README.md
@@ -29,4 +29,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.5.4” of the `pwebmac` package — 2020-06-27, AS.
+This is version “4.5.5” of the `pwebmac` package — 2020-07-08, AS.
diff --git a/Master/texmf-dist/doc/plain/pwebmac/makeall b/Master/texmf-dist/doc/plain/pwebmac/makeall
index 228860f3c3b..3df890bf197 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/makeall
+++ b/Master/texmf-dist/doc/plain/pwebmac/makeall
@@ -59,23 +59,14 @@ do
if [ ctwill = $f ]
then
- # amend TeX Live's 'prod-twill.w' for (c)twill'ing
- if [ ! -e prod-twill.w ]
- then
- tie -m prod-twill.w prod-twill.w prod-mini.ch
- fi
# apply tons of editorial changes to 'ctwill.w'
- CWEBINPUTS=.:$CWEBINPUTS \
- ctie -m $f.w cweave.w $f-w2c.ch $f-mini.ch
+ ctie -m $f.w cweave.w $f-w2c.ch $f-mini.ch
cp -an $KNUTHWARE/cwebdir/*.bux .
$CTWILL $f
$CTWILL $f
elif $CHANGES
then
- # pdftex.ch and xetex.ch for TeX Live are assembled here
- WEBINPUTS=$KNUTHWARE/../../Work//:$WEBINPUTS:
-
case $f in
common ) $CWEAVE $f comm-w2c ;;
ctangle ) $CWEAVE $f ctang-w2c ;;
@@ -83,7 +74,9 @@ do
ctie ) $CWEAVE $f $f-k ;;
tie ) $CWEAVE $f $f-w2c ;;
- * ) weave $f $f ;;
+ * ) # pdftex.ch and xetex.ch for TeX Live are assembled here
+ WEBINPUTS=$KNUTHWARE/../../Work//:$WEBINPUTS: \
+ weave $f $f ;;
esac
# FIX: XeTeX uses '\pdfTeX' from section 114, which
@@ -216,14 +209,18 @@ if ! $CHANGES
then
export TEXINPUTS=./:$(kpsewhich --var-value=TEXMFDIST)//:$KNUTHWARE//
+ rm -f trapman.tex webman.tex cwebman.tex
+
# FIX: Prepare 'trapman' for automatic processing; several input
# files are renamed in TeX Live (in fact, there are additional
# files for MetaPost).
- rm -f trapman.tex cwebman.tex
-
f=$(kpsewhich -engine tex trapman)
tie -m $(basename $f) $f /opt/github/web/$(basename $f .tex).ch
+ # Prepare 'webman' with section links and bookmarks.
+ f=$(kpsewhich -engine tex webman)
+ tie -m $(basename $f) $f /opt/github/web/$(basename $f .tex).ch
+
# Prepare 'cwebman' with footnotes describing the extended CWEB.
f=$(kpsewhich -engine tex cwebman)
tie -m $(basename $f) $f $(basename $f .tex)-w2c.ch
@@ -241,6 +238,9 @@ then
then
for f in *.pdf
do
+ case $f in
+ *-changes.pdf ) rm -f $f
+ esac
mv $f $(basename $f .pdf)-changes.pdf
done
pax vftovp-changes.pdf vptovf-changes.pdf \
diff --git a/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex b/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
index 926bcd6f88d..39907b48c53 100644
--- a/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
+++ b/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
@@ -127,7 +127,7 @@
\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox
attr {/Border [0 0 0]} user { /Type /Action /Subtype /Link /A
- << /S /URI /URI (#2) >> } \PDFlinkcolor #1\Black \pdfendlink
+ << /S /URI /URI (#2) >> }\PDFlinkcolor #1\Black \pdfendlink
\else\ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
\special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight
\space depth \thedepth\space << /Border [0 0 0]