From e4913d599838771bb1b80c439d4c6f39c5b9bdf7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 20 Jan 2016 23:07:28 +0000 Subject: Jan 2016 cweb update to cwebmac.tex 3.68, with pdf fixes git-svn-id: svn://tug.org/texlive/trunk@39442 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/cwebdir/README | 12 +++++++++--- Build/source/texk/web2c/cwebdir/cwebmac.tex | 15 +++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/cwebdir/README b/Build/source/texk/web2c/cwebdir/README index 1f4add6dd09..e4dfc0de0ae 100644 --- a/Build/source/texk/web2c/cwebdir/README +++ b/Build/source/texk/web2c/cwebdir/README @@ -1,9 +1,9 @@ % This file is part of CWEB. % The CWEB programs by Silvio Levy are based on programs by D. E. Knuth. % They are distributed WITHOUT ANY WARRANTY, express or implied. -% This README file last updated May 2000 by Don Knuth +% This README file last updated January 2016 by Don Knuth -% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth +% Copyright (C) 1987,1990,1993,2000,2016 Silvio Levy and Donald E. Knuth % Permission is granted to make and distribute verbatim copies of this % document provided that the copyright notice and this permission notice @@ -14,7 +14,13 @@ % entire resulting derived work is given a different name and distributed % under the terms of a permission notice identical to this one. -% Please send comments, suggestions, etc. to levy@math.berkeley.edu. +% Please send comments, suggestions, etc. to tex-k@tug.org, and people +% there will verify and forward bug reports. +% +% DEK takes no responsibility for the changefiles; they should be +% maintained independently. His job is to correct errors in +% ctangle.w, cweave.w, common.w, cwebmac.tex, cwebman.tex, +% and in the files of examples/*.w, nothing more. This directory contains the following files: diff --git a/Build/source/texk/web2c/cwebdir/cwebmac.tex b/Build/source/texk/web2c/cwebdir/cwebmac.tex index 8890b63b4dd..d50987da9be 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.67 --- July 2006 +% Version 3.68 --- January 2016 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros -\xdef\fmtversion{\fmtversion+CWEB3.67} -\chardef\cwebversion=3 \chardef\cwebrevision=67 +\xdef\fmtversion{\fmtversion+CWEB3.68} +\chardef\cwebversion=3 \chardef\cwebrevision=68 \newif\ifpdf \ifx\pdf+\pdftrue\fi % Uncomment the following line if you want PDF goodies to be the default @@ -278,7 +278,8 @@ \sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50 \noindent{\let\*=\lapstar\bf\secstar.\quad}% \ifpdftex\smash{\raise\baselineskip\hbox to0pt{% - \let\*=\empty\pdfdest num \secstar fith}} +% \let\*=\empty\pdfdest num \secstar fith}} % bad space in versions < 3.68 + \let\*=\empty\pdfdest num \secstar fith}}% changed in version 3.68 \else\ifpdf\smash{\raise\baselineskip\hbox to0pt{% \let\*=\empty\special{% pdf: dest (\romannumeral\secstar) [ @thispage /FitH @ypos ]}}}\fi\fi} @@ -340,7 +341,7 @@ \def\T#1{\leavevmode % octal, hex or decimal constant \hbox{$\def\?{\kern.2em}% % \def\$##1{\egroup_{\,\rm##1}\bgroup}% suffix to constant % versions < 3.67 - \def\$##1{\egroup_{\rm##1}\bgroup}% suffix to constant + \def\$##1{\egroup_{\rm##1}\bgroup}% suffix to constant % in version 3.67 \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 @@ -457,6 +458,7 @@ \def\fin{\par\vfill\eject % this is done when we are ending the index \ifpagesaved\null\vfill\eject\fi % output a null index column \if L\lr\else\null\vfill\eject\fi % finish the current page + \ifpdftex \makebookmarks \fi % added in Version 3.68 \parfillskip 0pt plus 1fil \def\grouptitle{NAMES OF THE SECTIONS} \let\topsecno=\nullsec @@ -470,7 +472,8 @@ \def\Us{\note{Used in sections}} % crossref for uses of a section \def\I{\par\hangindent 2em}\let\*=* \ifacro \def\outsecname{Names of the sections} \let\Xpdf\X - \ifpdftex \makebookmarks \pdfdest name {NOS} fitb +% \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68 + \ifpdftex \pdfdest name {NOS} fitb % changed in version 3.68 \pdfoutline goto name {NOS} count -\secno {\outsecname} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}% -- cgit v1.2.3