update from 224023 Oct 24 05:43 cweb-3.64ad.tar.gz

git-svn-id: svn://tug.org/texlive/trunk@3417 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 24 insertions, 17 deletions

diff --git a/Build/source/texk/web2c/cwebdir/Makefile b/Build/source/texk/web2c/cwebdir/Makefile
index 31194f46bb0..528f05f9566 100644
--- a/Build/source/texk/web2c/cwebdir/Makefile
+++ b/Build/source/texk/web2c/cwebdir/Makefile
@@ -18,7 +18,7 @@
 #
 
 # directory for TeX inputs (cwebmac.tex goes here)
-MACROSDIR= /usr/local/texmf/tex/generic
+MACROSDIR= /usr/share/texmf/tex/generic
 
 # directory for CWEB inputs in @i files
 CWEBINPUTS= /usr/local/lib/cweb
@@ -28,13 +28,13 @@ MANEXT= l
 #MANEXT= 1
 
 # directory for manual pages (cweb.1 goes here)
-MANDIR= /usr/man/man$(MANEXT)
+MANDIR= /usr/share/man/man$(MANEXT)
 
 # destination directory for executables; must end in /
 DESTDIR= /usr/local/bin/
 
 # directory for GNU EMACS Lisp code (cweb.el goes here)
-EMACSDIR= /usr/local/emacs/lisp
+EMACSDIR= /usr/share/emacs/site-lisp
 
 # Set DESTPREF to null if you want to call the executables "tangle" and "weave"
 # (probably NOT a good idea; we recommend leaving DESTPREF=c)
diff --git a/Build/source/texk/web2c/cwebdir/ctangle.w b/Build/source/texk/web2c/cwebdir/ctangle.w
index 6cdcfd5db06..86d0d0a5103 100644
--- a/Build/source/texk/web2c/cwebdir/ctangle.w
+++ b/Build/source/texk/web2c/cwebdir/ctangle.w
@@ -831,7 +831,7 @@ speed in order to pass over comments, which \.{CTANGLE} does not transmit
 to the output. If the comment is introduced by \.{/*}, |skip_comment|
 proceeds until finding the end-comment token \.{*/} or a newline; in the
 latter case |skip_comment| will be called again by |get_next|, since the
-comment is not finished.  This is done so that the each newline in the
+comment is not finished.  This is done so that each newline in the
 \CEE/ part of a section is copied to the output; otherwise the \&{\#line}
 commands inserted into the \CEE/ file by the output routines become useless.
 On the other hand, if the comment is introduced by \.{//} (i.e., if it
diff --git a/Build/source/texk/web2c/cwebdir/cwebmac.tex b/Build/source/texk/web2c/cwebdir/cwebmac.tex
index 8eca77d71cd..8890b63b4dd 100644
--- a/Build/source/texk/web2c/cwebdir/cwebmac.tex
+++ b/Build/source/texk/web2c/cwebdir/cwebmac.tex
@@ -1,8 +1,8 @@
 % standard macros for CWEB listings (in addition to plain.tex)
-% Version 3.64 --- February 2002
-\ifx\documentstyle\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CWEB3.64}
-\chardef\cwebversion=3 \chardef\cwebrevision=64
+% Version 3.67 --- July 2006
+\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
+\xdef\fmtversion{\fmtversion+CWEB3.67}
+\chardef\cwebversion=3 \chardef\cwebrevision=67
 \newif\ifpdf
 \ifx\pdf+\pdftrue\fi
 % Uncomment the following line if you want PDF goodies to be the default
@@ -339,7 +339,8 @@
 % \S is section sign
 \def\T#1{\leavevmode % octal, hex or decimal constant
   \hbox{$\def\?{\kern.2em}%
-    \def\$##1{\egroup_{\,\rm##1}\bgroup}% suffix to constant
+%    \def\$##1{\egroup_{\,\rm##1}\bgroup}% suffix to constant % versions < 3.67
+    \def\$##1{\egroup_{\rm##1}\bgroup}% suffix to constant
     \def\_{\cdot 10^{\aftergroup}}% power of ten (via dirty trick)
     \let\~=\oct \let\^=\hex {#1}$}}
 \def\U{\note{This code is used in section}} % xref for use of a section
@@ -534,6 +535,11 @@
 \def\datethis{\def\startsection{\leftline{\sc\today\ at \hours}\bigskip
   \let\startsection=\stsec\stsec}}
   % say `\datethis' in limbo, to get your listing timestamped before section 1
-\def\datecontentspage{%
-  \def\topofcontents{\leftline{\sc\today\ at \hours}\bigskip
-   \centerline{\titlefont\title}\vfill}} % timestamps the contents page
+%\def\datecontentspage{% versions up to 3.65
+%  \def\topofcontents{\leftline{\sc\today\ at \hours}\bigskip
+%   \centerline{\titlefont\title}\vfill}} % timestamps the contents page
+\def\datecontentspage{% changed in version 3.66
+  \def\botofcontents{\vfill
+   \centerline{\covernote}
+   \bigskip
+   \leftline{\sc\today\ at \hours}}} % timestamps the contents page
diff --git a/Build/source/texk/web2c/cwebdir/cwebman.tex b/Build/source/texk/web2c/cwebdir/cwebman.tex
index 49f43531d8c..2bd52e3efd8 100644
--- a/Build/source/texk/web2c/cwebdir/cwebman.tex
+++ b/Build/source/texk/web2c/cwebdir/cwebman.tex
@@ -699,7 +699,7 @@ be passed verbatim to the \CEE/ program.
 be totally ignored---it's a comment for readers of the \.{CWEB} file only.
 A file intended to be included in
 limbo, with \.{@i}, can identify itself with \.{@q} comments.
-Another use is to balance unbalanced parentheses in C strings,
+Another use is to balance unbalanced parentheses in \CEE/ strings,
 so that your text editor's parenthesis matcher doesn't go into a tailspin.
 
 \@! [TMCc] $*$
@@ -910,7 +910,7 @@ occurs between \.{@y} and \.{@z} in a change file, individual lines
 of file \.{foo} and files it includes are not changeable; but changes
 can be made to lines from files that were included by unchanged input.
 
-\more On UNIX systems (and others that support environment variables),
+\more On \UNIX/ systems (and others that support environment variables),
 if the environment variable \.{CWEBINPUTS} is set, or if the compiler flag
 of the same name was defined at compile time,
 \.{CWEB} will look for include files in the directory thus named, if
@@ -1158,7 +1158,7 @@ to work a bit harder in cases where an identifier is multiply defined.
 \.{CTWILL} is intended primarily for hardcopy output, but its principles
 could be used for hypertext as well.
 See Chapter 11 of {\sl Digital Typography\/} by D.~E. Knuth (1999), and
-the program sources at \.{ftp://labrea.stanford.edu/pub/ctwill}.
+the program sources at \.{ftp://ftp.cs.stanford.edu/pub/ctwill}.
 
 \section Appendices.
 
@@ -1514,7 +1514,7 @@ is to explain some of the possibilities.
 
 \point 1. Four fonts have been declared in addition to the standard fonts of
 \.{PLAIN} format: You can say `\.{\{\\mc UNIX\}}' to get {\mc UNIX} in
-medium-size caps; you can say `\.{\{\\sc STUFF\}}' to get {\sc STUFF}
+xmedium-size caps; you can say `\.{\{\\sc STUFF\}}' to get {\sc STUFF}
 in small caps; and you can select the largish fonts \.{\\titlefont}
 and \.{\\ttitlefont} in the title of your document, where \.{\\ttitlefont}
 is a typewriter style of type. There are macros \.{\\UNIX/} and \.{\\CEE/}
@@ -1678,7 +1678,8 @@ $$\postdisplaypenalty=10000
 if you prefer the shorter notation \.{\\+}.
 
 \point 14. To get output in languages other than English, redefine the
-macros \.{\\A}, \.{\\As}, \.{\\ET}, \.{\\ETs}, \.{\\Q}, \.{\\Qs}, \.{\\U},
+macros \.{\\A}, \.{\\As}, \.{\\ATH},
+\.{\\ET}, \.{\\ETs}, \.{\\Q}, \.{\\Qs}, \.{\\U},
 \.{\\Us}, \.{\\ch}, \.{\\fin}, \.{\\con}, \.{\\today}, \.{\\datethis}, and
 \.{\\datecontentspage}. \.{CWEAVE} itself need not be changed.