diff options
author | Karl Berry <karl@freefriends.org> | 2022-06-26 20:20:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-06-26 20:20:15 +0000 |
commit | abc2dcf35aec49abd426128b0ac9e1a3e7935dc9 (patch) | |
tree | ad8f9cbeae29e3886423e7f5e449d38561dbe173 /Master/texmf-dist/doc | |
parent | 8f3e5b949844727d4283390d93d432fe932c1fe4 (diff) |
pwebmac (26jun22)
git-svn-id: svn://tug.org/texlive/trunk@63731 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc')
-rw-r--r-- | Master/texmf-dist/doc/plain/pwebmac/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/plain/pwebmac/makeall | 19 | ||||
-rw-r--r-- | Master/texmf-dist/doc/plain/pwebmac/webman.ch | 14 |
3 files changed, 27 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/plain/pwebmac/README.md b/Master/texmf-dist/doc/plain/pwebmac/README.md index 470bba611dc..7468ba8092a 100644 --- a/Master/texmf-dist/doc/plain/pwebmac/README.md +++ b/Master/texmf-dist/doc/plain/pwebmac/README.md @@ -34,4 +34,4 @@ creates HINT output that can be viewed with the `hintview` program. The `pwebmac` package is free software and may be used without constraints. -This is version “4.8” of the `pwebmac` package — 2022-06-05, Andreas Scherer. +This is version “4.8.1” of the `pwebmac` package — 2022-06-25, Andreas Scherer. diff --git a/Master/texmf-dist/doc/plain/pwebmac/makeall b/Master/texmf-dist/doc/plain/pwebmac/makeall index eeed9c76bc4..0f857db24f3 100644 --- a/Master/texmf-dist/doc/plain/pwebmac/makeall +++ b/Master/texmf-dist/doc/plain/pwebmac/makeall @@ -19,13 +19,14 @@ Options are (--long options only with GNU getopt): -o, --outdir ARG Create tarballs in path ARG -p, --pdftocfront Place TOC page at the front (PDF only) -t, --tex ARG Use TeX variant ARG=[(hi|pdf|xe)]tex + -v, --validpdf Use correct number of entries in NOS node Public domain. Originally written by Andreas Scherer, 2020. HELP } -LONGOPTS=changes,files:,help,new,outdir:,pdftocfront,tex: -SHRTOPTS=cf:hno:pt: +LONGOPTS=changes,files:,help,new,outdir:,pdftocfront,tex:,validpdf +SHRTOPTS=cf:hno:pt:v CHANGES=false # apply changefile to C/WEB source FILESELECT=false # user-defined '--files' selection @@ -33,6 +34,7 @@ NEW=false # '\input pwebmac' instead of '\input webmac' for PDF et al. OUTDIR=. # path where the resulting tarballs are placed PDFTOCFRONT=false # push table-of-contents to front of PDF output TEX=tex # or 'pdftex' or 'xetex' or 'hitex' +VALID=false # give 'pdftex' a chance to produce valid output # Initial list of C/WEB sources to process, overridable with option '-f': KNUTHWHERE=$(locate /bibtex.web) @@ -78,6 +80,7 @@ do -o | --outdir ) OUTDIR="$2"; shift 2 ;; -p | --pdftocfront ) PDFTOCFRONT=true; shift ;; -t | --tex ) TEX=$2; shift 2 ;; + -v | --validpdf ) VALID=true; shift ;; -- ) shift; break ;; * ) usage; exit 1 ;; esac @@ -97,6 +100,13 @@ then PDF=hnt # default extension for 'knuth-hint' fi +# Valid PDF output from 'pdftex': In 'pwebmac.tex' set '\countD' to the actual +# number of @<named modules@>, not the number of all sections. +if ( [ pdftex = $TEX ] && $VALID ) +then + TEX="$TEX --shell-escape" +fi + # WEB and CWEB programs we want to get formatted for f in $FILES do @@ -185,7 +195,7 @@ do # active links in PDF outlines/bookmarks cat > texmf-pdf.patch << FI - \ifacro{\toksF={}\makeoutlinetoks{[#2] #3}\outlinedone\outlinedone}\fi + \ifpdf{\toksF={}\makeoutlinetoks{[#2] #3}\outlinedone\outlinedone}\fi FI $SED_I -e "/\\\\outer\\\\def\\\\N/ { r texmf-pdf.patch @@ -194,8 +204,9 @@ FI $SED_I -e "s/{\\\\the\\\\pageno}}}\\\\next/{\\\\the\\\\pageno}{\\\\the\\\\toksE}}}\\\\next/" $f.tex cat > texmf-pdf.patch << FI + \ifpdftex\relax\else \ifpdf\special{pdf: outline 0 << /Title (\the\toksE) /Dest - [ @thispage /FitH @ypos ] >>}\fi + [ @thispage /FitH @ypos ] >>}\fi\fi FI $SED_I -e "/ \\\\edef\\\\next/ { r texmf-pdf.patch diff --git a/Master/texmf-dist/doc/plain/pwebmac/webman.ch b/Master/texmf-dist/doc/plain/pwebmac/webman.ch index 0ccae2847d1..e781ee01dc3 100644 --- a/Master/texmf-dist/doc/plain/pwebmac/webman.ch +++ b/Master/texmf-dist/doc/plain/pwebmac/webman.ch @@ -2,7 +2,7 @@ \input webmac @y \input pwebmac -\ifacro +\ifpdf \pdfpagewidth=\pagewidth \advance\pdfpagewidth by 2cm \pdfpageheight=\pageheight \advance\pdfpageheight by 3cm \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm @@ -19,7 +19,7 @@ \def\bkminfo{} \outer\def\section #1.{\penalty-50\vskip 12pt plus 3pt minus 3pt - \noindent\ifacro\vbox to 0pt{\kern-2.5ex\relax + \noindent\ifpdf\vbox to 0pt{\kern-2.5ex\relax \ifpdftex\pdfdest num \destcount fitbh\relax \else\special{pdf: dest (\the\destcount) [ @thispage /FitBH @ypos ]}\fi \def\.##1{##1}% @@ -43,7 +43,7 @@ \def\Appendix#1{\leavevmode \ifnum\csname app#1\endcsname>0 % - \ifacro\ifpdftex + \ifpdf\ifpdftex \pdfstartlink attr{/Border[0 0 0]} goto num\csname app#1\endcsname\relax \PDFlinkcolor\hbox{Appendix}~#1\Black \pdfendlink @@ -56,6 +56,14 @@ \else Appendix~#1\fi} @z +@x l.34 +\vskip 15pt plus 3pt minus 3pt +\noindent This memo describes how to write programs in the +@y +\section Introduction. +This memo describes how to write programs in the +@z + @x l.180 \yskip\item{1)} A \TeX\ part, containing explanatory material about what @y |