summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2022-01-09 10:40:50 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2022-01-09 10:40:50 +0000
commit35999177babe18f6dda1038483726fa7a4ad1b22 (patch)
tree567b584e69d19d18e0352b8240c9e9e83d836d5d /Build
parent3e1fda0e0fc34217e5d1901348231a98d737ab20 (diff)
[WEB] Add TWILL manpage.
We also rename the macros to 'twimac-web.tex' in order to distinguish them from DEK's original 'twimac.tex' on CTAN (https://mirrors.ctan.org/systems/knuth/local/lib/twimac.tex), which is specifically designed for Volumes B and D of "Computers & Typesetting". git-svn-id: svn://tug.org/texlive/trunk@61546 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/help.h2
-rw-r--r--Build/source/texk/web2c/man/ChangeLog5
-rw-r--r--Build/source/texk/web2c/man/twill.man75
-rw-r--r--Build/source/texk/web2c/man/weave.man4
-rw-r--r--Build/source/texk/web2c/weav-twill.ch20
6 files changed, 102 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index d289a0938d6..c7df0c68127 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-09 Andreas Scherer <https://ascherer.github.io>
+
+ * help.h,
+ * weav-twill.ch: Minor adaptions for TWILL.
+
2022-01-07 Karl Berry <karl@freefriends.org>
* (MFTHELP): consistent argument names. Report from
diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h
index 3b72fac9d04..38d3bd7950c 100644
--- a/Build/source/texk/web2c/help.h
+++ b/Build/source/texk/web2c/help.h
@@ -642,7 +642,7 @@ const_string WEAVEHELP[] = {
#ifdef TWILL
const_string TWILLHELP[] = {
"Usage: twill [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
- " Weave WEBFILE with CHANGEFILE into a TeX document.",
+ " Weave WEBFILE with CHANGEFILE into a TeX document with mini-indexes.",
" Default CHANGEFILE is " DEV_NULL ";",
" TeX output goes to the basename of WEBFILE extended with `.tex'.",
"",
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index b4d7b50c744..745cc661f7d 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-09 Andreas Scherer <https://ascherer.github.io>
+
+ * twill.man,
+ * weave.man:New manpage for TWILL.
+
2021-12-26 Andreas Scherer <https://ascherer.github.io>
* ctwill.man: CWEB 4.6 release.
diff --git a/Build/source/texk/web2c/man/twill.man b/Build/source/texk/web2c/man/twill.man
new file mode 100644
index 00000000000..a6420fb9d71
--- /dev/null
+++ b/Build/source/texk/web2c/man/twill.man
@@ -0,0 +1,75 @@
+.TH WEAVE 1 "09 January 2022" "Web2C @VERSION@"
+.\"=====================================================================
+.if n .ds MF Metafont
+.if t .ds MF Metafont
+.if n .ds TX TeX
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
+.el .ds OX TeX
+.\" BX definition must follow TX so BX can use TX
+.if n .ds BX BibTeX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.\" LX definition must follow TX so LX can use TX
+.if n .ds LX LaTeX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds WB Web
+.if t .ds WB W\s-2EB\s0
+.\"=====================================================================
+.SH NAME
+twill \- translate WEB to TeX
+.SH SYNOPSIS
+.B twill
+.RB [ \-x ]
+.IR webfile [ \fB.web\fP ]
+.RI [ changefile [ \fB.ch\fP ]]
+.\"=====================================================================
+.SH DESCRIPTION
+The
+.B twill
+program is used to create a \*(TX file for viewing a \*(WB program.
+It takes appropriate care of typographic details like page
+layout and the use of indentation, italics, boldface, etc., and it supplies
+extensive cross-index information in the form of 'mini-indexes' for each
+spread of pages and a 'master index' at the end that it gathers automatically.
+.PP
+The command line arguments are the same as for
+.B tangle
+except for the option:
+.B \-x
+says to omit the indexes, module name list, and table of contents pages.
+(A
+.I CONTENTS.tex
+file will still be written when the \*(TX file is processed,
+however, unless some macros in
+.I webmac.tex
+are redefined.)
+.PP
+The output \*(TX file name is formed by adding
+.B .tex
+to the root of the \*(WB file name.
+.PP
+There are several macros
+that probably should be redefined by
+the programmer at the beginning of the \*(WB file.
+It is a good idea to set \\title
+to the name of the program.
+And, to cause output of only changed modules, one can say
+\\let\\maybe=\\iffalse (usually as the first change in the
+change file).
+.\"=====================================================================
+.SH ENVIRONMENT
+The environment variable WEBINPUTS is used to search for the input files,
+or the system default if WEBINPUTS is not set. See
+.BR tex (1)
+for the details of the searching.
+.\"=====================================================================
+.SH FILES
+.TP \w'@@'u+2n
+.I $TEXMFMAIN/tex/plain/knuth-lib/twimac-web.tex
+\*(TX macros used by
+.B twill
+output.
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR tangle (1)
+for references, authors, and other information.
diff --git a/Build/source/texk/web2c/man/weave.man b/Build/source/texk/web2c/man/weave.man
index 9c79ff2559d..eb6282656d8 100644
--- a/Build/source/texk/web2c/man/weave.man
+++ b/Build/source/texk/web2c/man/weave.man
@@ -1,4 +1,4 @@
-.TH WEAVE 1 "16 June 2015" "Web2C @VERSION@"
+.TH WEAVE 1 "09 January 2022" "Web2C @VERSION@"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
@@ -68,7 +68,7 @@ for the details of the searching.
.\"=====================================================================
.SH FILES
.TP \w'@@'u+2n
-.I $TEXMFMAIN/tex/plain/base/webmac.tex
+.I $TEXMFMAIN/tex/plain/knuth-lib/webmac.tex
\*(TX macros used by
.B weave
output.
diff --git a/Build/source/texk/web2c/weav-twill.ch b/Build/source/texk/web2c/weav-twill.ch
index cf8a96996be..b530b9cdd6d 100644
--- a/Build/source/texk/web2c/weav-twill.ch
+++ b/Build/source/texk/web2c/weav-twill.ch
@@ -427,15 +427,15 @@ Section 124.
@.\\input webmac@>
@.webmac@>
@y
-`\.{\\input twimac}'.
-@.\\input twimac@>
-@.twimac@>
+`\.{\\input twimac-web}'.
+@.\\input twimac-web@>
+@.twimac-web@>
@z
@x 2204c2367
out_ptr:=1; out_line:=1; out_buf[1]:="c"; write(tex_file,'\input webma');
@y
-out_ptr:=1; out_line:=1; out_buf[1]:="c"; write(tex_file,'\input twima');
+out_ptr:=1; out_line:=1; out_buf[1]:="b"; write(tex_file,'\input twimac-we');
@z
Section 125.
@@ -497,6 +497,14 @@ Section 133.
end;
@z
+Section 146.
+
+@x 2888c...
+@ Token lists in |@!tok_mem| are composed of the following kinds of
+@y
+@ Token lists in |tok_mem| are composed of the following kinds of
+@z
+
Section 183.
@x 3522a3702
@@ -694,7 +702,7 @@ and sets |next_control| to the following token.
@<Functions |scan_const| and |scan_exp|@>=
function scan_const:integer;
label done;
-var radix,accum,p:integer;
+var radix,@!accum,p:integer;
begin if next_control=string then
begin accum:=buffer[id_first+1]; next_control:=get_next; goto done;
end
@@ -732,7 +740,7 @@ subroutine, which doesn't complain about certain syntactic errors.
@<Functions |scan_const| and |scan_exp|@>=
function scan_exp:integer;
label done;
-var accum,s:integer;
+var @!accum,s:integer;
begin if sign(next_control) then accum:=0
else accum:=scan_const;
loop begin if not sign(next_control) then goto done;