texlive[60901] Master/texmf-dist: cutwin (30oct21)

commits+karl at tug.org commits+karl at tug.org
Sat Oct 30 21:39:59 CEST 2021


Revision: 60901
          http://tug.org/svn/texlive?view=revision&revision=60901
Author:   karl
Date:     2021-10-30 21:39:58 +0200 (Sat, 30 Oct 2021)
Log Message:
-----------
cutwin (30oct21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/cutwin/cutwin.pdf
    trunk/Master/texmf-dist/source/latex/cutwin/cutwin.dtx
    trunk/Master/texmf-dist/source/latex/cutwin/cutwin.ins
    trunk/Master/texmf-dist/tex/latex/cutwin/cutwin.sty

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/cutwin/README.md

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/latex/cutwin/README

Deleted: trunk/Master/texmf-dist/doc/latex/cutwin/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cutwin/README	2021-10-30 19:39:44 UTC (rev 60900)
+++ trunk/Master/texmf-dist/doc/latex/cutwin/README	2021-10-30 19:39:58 UTC (rev 60901)
@@ -1,60 +0,0 @@
-    The cutwin package enables you to create a window in a paragraph.
-Facilities are provided to assist in putting text or a logo into the
-space cutout.
-
-    IF THERE ARE ANY QUESTIONS PLEASE ASK THEM ON THE COMP.TEXT.TEX NEWSGROUP
-AS I AM AWAY MORE OFTEN THAN NOT.
-
-
-Changes in version 0.1 (2010/09/29)
-o First public release
-
-------------------------------------------------------------------
-  Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-          and Alan Hoenig
-  Copyright 2010 Peter R. Wilson
-
-  This work may be distributed and/or modified under the
-  conditions of the Latex Project Public License, either
-  version 1.3 of this license or (at your option) any
-  later version.
-  The latest version of the license is in
-    http://www.latex-project.org/lppl.txt
-  and version 1.3 or later is part of all distributions of
-  LaTeX version 2003/06/01 or later.
-
-  This work has the LPPL maintenance status "author-maintained".
-
-  This work consists of the files:
-    README (this file)
-    cutwin.dtx
-    cutwin.ins
-    cutwin.pdf
-  and the derived files
-    cutwin.sty
-
-------------------------------------------------------------------
-     The distribution consists of the following files:
-README (this file)
-cutwin.dtx
-cutwin.ins
-cutwin.pdf
-
-
-    To install the package:
-o run: latex cutwin.ins (which will generate cutwin.sty)
-o Move cutwin.sty to a location where LaTeX will find it,
-  for example /usr/TeX/texmf-local/tex/latex/cutwin/cutwin.sty
-  (for more information on installation see the FAQ).
-
-    To generate a second copy of the manual (which is already supplied as a PDF file):
-o run: (pdf)latex cutwin.dtx
-o (for an index run: makeindex -s gind.ist cutwin.idx)
-o run: (pdf)latex cutwin.dtx
-o Print cutwin.dvi (or cutwin.pdf) for a hardcopy of the package manual
-
-2010/09/29
-Peter Wilson
-herries dot press at earthlink dot net
-
- 

Added: trunk/Master/texmf-dist/doc/latex/cutwin/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cutwin/README.md	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/cutwin/README.md	2021-10-30 19:39:58 UTC (rev 60901)
@@ -0,0 +1,71 @@
+# The cutwin package
+
+The cutwin package enables you to create a window in a paragraph.
+Facilities are provided to assist in putting text or a logo into the
+space cutout.
+
+https://github.com/latex-package-repositories/cutwin/issues
+
+Changes in version 0.1 (2010/09/29)
+
+* First public release
+
+Changes in version 0.2 (2021/10/13)
+
+* Allocate package specific registers replacing \@tempdimb and \@tempdimc
+
+------------------------------------------------------------------
+  Author: Peter Wilson (Herries Press) and Alan Hoenig  
+  Copyright 2010 Peter R. Wilson
+  
+  Current Maintainer David Carlisle  
+  Copyright 2021 Peter R. Wilson, David Carlisle
+
+  This work may be distributed and/or modified under the
+  conditions of the Latex Project Public License, either
+  version 1.3 of this license or (at your option) any
+  later version.
+  The latest version of the license is in
+    http://www.latex-project.org/lppl.txt
+  and version 1.3 or later is part of all distributions of
+  LaTeX version 2003/06/01 or later.
+
+  This work has the LPPL maintenance status "maintained".
+
+This work consists of the files:
+
+    README (this file)  
+    cutwin.dtx  
+    cutwin.ins  
+    cutwin.pdf  
+	
+and the derived file
+
+    cutwin.sty
+
+------------------------------------------------------------------
+
+The distribution consists of the following files:
+
+README (this file)  
+cutwin.dtx  
+cutwin.ins  
+cutwin.pdf
+
+
+##    To install the package:
+
+* run: latex cutwin.ins (which will generate cutwin.sty)
+*  Move cutwin.sty to a location where LaTeX will find it,
+  for example /usr/TeX/texmf-local/tex/latex/cutwin/cutwin.sty
+  (for more information on installation see the FAQ).
+
+##   To generate a second copy of the manual
+* run: (pdf)latex cutwin.dtx
+* (for an index run: makeindex -s gind.ist cutwin.idx)
+* run: (pdf)latex cutwin.dtx
+* Print cutwin.dvi (or cutwin.pdf) for a hardcopy of the package manual
+
+
+
+ 


Property changes on: trunk/Master/texmf-dist/doc/latex/cutwin/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/cutwin/cutwin.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/cutwin/cutwin.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/cutwin/cutwin.dtx	2021-10-30 19:39:44 UTC (rev 60900)
+++ trunk/Master/texmf-dist/source/latex/cutwin/cutwin.dtx	2021-10-30 19:39:58 UTC (rev 60901)
@@ -1,13 +1,16 @@
 %% \iffalse meta-comment
 %
 % cutwin.dtx
-% Author: Peter Wilson, Herries Press (herries dot press at earthlink dot net)
+% Author: Peter Wilson, Herries Press
 %         and Alan Hoenig
 % Copyright 2010 Peter R. Wilson
 %
+% Current Maintainer David Carlisle
+% Copyright 2021 Peter R. Wilson, David Carlisle
+%
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any 
+% version 1.3 of this license or (at your option) any
 % later version.
 % The latest version of the license is in
 %    http://www.latex-project.org/lppl.txt
@@ -14,7 +17,7 @@
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2003/06/01 or later.
 %
-% This work has the LPPL maintenance status "author-maintained".
+% This work has the LPPL maintenance status "maintained".
 %
 % This work consists of the files listed in the README file.
 %
@@ -47,7 +50,6 @@
 %
 % \fi
 %
-% \CheckSum{720}
 %
 % \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
 % \DoNotIndex{\@centercr,\@cite}
@@ -54,7 +56,7 @@
 % \DoNotIndex{\@dotsep,\@empty,\@float,\@gobble,\@gobbletwo,\@ignoretrue}
 % \DoNotIndex{\@input,\@ixpt,\@m}
 % \DoNotIndex{\@minus,\@mkboth,\@ne,\@nil,\@nomath,\@plus,\@set at topoint}
-% \DoNotIndex{\@tempboxa,\@tempcnta,\@tempdima,\@tempdimb}
+% \DoNotIndex{\@tempboxa,\@tempcnta,\@tempdima,\c at twdima}
 % \DoNotIndex{\@tempswafalse,\@tempswatrue,\@viipt,\@viiipt,\@vipt}
 % \DoNotIndex{\@vpt,\@warning,\@xiipt,\@xipt,\@xivpt,\@xpt,\@xviipt}
 % \DoNotIndex{\@xxpt,\@xxvpt,\\,\ ,\addpenalty,\addtolength,\addvspace}
@@ -91,9 +93,10 @@
 % \DoNotIndex{\wd,\xiipt,\year,\z@}
 %
 % \changes{v0.1}{2010/09/29}{First public release}
+% \changes{v0.2}{2021/10/13}{Declare registers}
 %
 % \def\dtxfile{cutwin.dtx}
-% \def\fileversion{v0.1} \def\filedate{2010/09/29}
+% \def\fileversion{v0.2} \def\filedate{2021/10/13}
 % \newcommand*{\Lpack}[1]{\textsf {#1}}           ^^A typeset a package
 % \newcommand*{\Lopt}[1]{\textsf {#1}}            ^^A typeset an option
 % \newcommand*{\file}[1]{\texttt {#1}}            ^^A typeset a file
@@ -107,8 +110,8 @@
 %        \filedate.}}
 %
 % \author{%
-% Peter Wilson\thanks{Herries Press, \texttt{herries dot press at earthlink dot net}}
-% and Alan Hoenig 
+% Peter Wilson\thanks{Herries Press} and Alan Hoenig\and
+% Maintained by David Carlisle\thanks{https://github.com/latex-package-repositories/cutwin/issues}%
 % }
 % \date{\filedate}
 % \maketitle
@@ -119,8 +122,8 @@
 % \end{abstract}
 % \tableofcontents
 %
-% 
 %
+%
 % \section{Introduction}
 %
 %  ^^A  Based on Alan Hoenig, `TeX Does Windows --- The Conclusion',
@@ -131,8 +134,8 @@
 % \LaTeX{} \textsc{docstrip} utility which enables the automatic
 % extraction of the \LaTeX{} macro source files~\cite{COMPANION}.
 %
-%    Section~\ref{sec:usc} describes the usage of the \Lpack{cutwin} 
-% package and 
+%    Section~\ref{sec:usc} describes the usage of the \Lpack{cutwin}
+% package and
 % commented source code is in Section~\ref{sec:code}.
 %
 % \section{The \Lpack{cutwin} package} \label{sec:usc}
@@ -169,7 +172,7 @@
 %  \centering\bfseries
 %  Text \\ in \\Window \par}
 % \newcommand*{\qinwin}{%
-%   \centering\bfseries\Huge ?\, 
+%   \centering\bfseries\Huge ?\,
 %   \par}
 % \let\windowpagestuff\tinwin
 % \begin{cutout}{2}{0.2\textwidth}{0.4\textwidth}{3}
@@ -186,18 +189,18 @@
 %
 % \DescribeEnv{cutout}
 % The |cutout| environment, the body of which must be a single paragraph,
-% enables a rectangular window to be cut out of the paragraph with the 
+% enables a rectangular window to be cut out of the paragraph with the
 % text flowing across the cutout. Use as:\\
 % \verb?\begin{cutout}?\marg{numtop}\marg{leftwidth}\marg{rightwidth}\marg{numcut} \\
 % where \meta{numtop} is the number of full lines above the window
-% and \meta{numcut} is the number of lines to be cut (giving the height 
+% and \meta{numcut} is the number of lines to be cut (giving the height
 % of the window).
 % The meaning of the lengths \meta{leftwidth} and \meta{rightwidth} depend
 % on the location of the cutout:
 % \begin{itemize}
-% \item for a centered cutout \meta{leftwidth} and \meta{rightwidth} are the 
+% \item for a centered cutout \meta{leftwidth} and \meta{rightwidth} are the
 % lengths of the text lines at the left and right sides of the window;
-% \item for an open left cutout \meta{leftwidth} is ignored and 
+% \item for an open left cutout \meta{leftwidth} is ignored and
 % \meta{rightwidth} is the length of the lines to the right of the cutout; and
 % \item for an open right cutout \meta{rightwidth} is ignored and
 % \meta{leftwidth} is the length of the lines at the left of the cutout.
@@ -226,7 +229,7 @@
 % satisfaction.
 %
 % \subsection{Shaped cutouts}
-% 
+%
 % \newcommand*{\mycut}{%
 %   0.1\textwidth, 0.3\textwidth,
 %   0.2\textwidth, 0.4\textwidth,
@@ -240,7 +243,7 @@
 % bordering the cutout. Normally there is text on either side of the
 % window but it could be open at either the left or right side of
 % the paragraph. It is possible to put a logo or some text in the
-% window. In this paragraph with a shaped cutout I have used a large 
+% window. In this paragraph with a shaped cutout I have used a large
 % \$ sign as a simple logo.
 % \end{shapedcutout}
 %
@@ -247,20 +250,20 @@
 %
 % \DescribeEnv{shapedcutout}
 % The |shapedcutout| environment, the body of which must be a single paragraph,
-% enables an arbitrary shaped window to be cut out of the paragraph with the 
+% enables an arbitrary shaped window to be cut out of the paragraph with the
 % text flowing across the cutout. Use as:\\
 % \verb?\begin{shapedcutout}?\marg{numtop}\marg{numcut}\marg{shapespec}
 % where \meta{numtop} is the number of full lines above the window,
-% \meta{numcut} is the number of lines to be cut (giving the height of 
+% \meta{numcut} is the number of lines to be cut (giving the height of
 % the window) and
 % \meta{shapespec} is the specification of the length of the lines
 % bordering the cutout.
 %
-%    More precisely \meta{shapespec} is a comma-separated list of the 
-% lengths of the 
+%    More precisely \meta{shapespec} is a comma-separated list of the
+% lengths of the
 % text lines bordering the window.
 % \begin{itemize}
-% \item For a centered cutout one pair of entries are required for each cut 
+% \item For a centered cutout one pair of entries are required for each cut
 % line denoting the length of the left and right part of the cut line.
 % There must be exactly \meta{numcut} pairs.
 % \item
@@ -285,7 +288,7 @@
 % of the gap in the first line of the
 % cutout. The default \cs{picinwindow} is a zero-sized picture whose contents
 % is \cs{putstuffinpic}.
-% 
+%
 %    \cs{picinwindow} and \cs{putstuffinpic} are initially defined as
 % \begin{verbatim}
 % \newcommand*{\picinwindow}{%
@@ -293,8 +296,8 @@
 %     \putstuffinpic
 %   \end{picture}}
 % \newcommand*{\putstuffinpic}{}
-% \end{verbatim}  
-%    
+% \end{verbatim}
+%
 %    You can change \cs{putstuffinpic} to place what you want in the picture.
 % For example, to put the large \$ symbol in the shaped cutout paragraph above
 % I used:
@@ -333,8 +336,7 @@
 %    \begin{macrocode}
 %<*pkg>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cutwin}[2010/09/29 v0.1 cutout windows]
-
+\ProvidesPackage{cutwin}[2021/10/13 v0.2 cutout windows]
 %    \end{macrocode}
 %
 %
@@ -348,7 +350,6 @@
 \newcount\c at twwinlines % window lines
 \newcount\c at twtoplines % top lines
 \newcount\c at twcnt      % a count
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -364,7 +365,6 @@
 \newdimen\c at twrtside   % right width
 \newdimen\c at twtopht    % height of top text
 \newdimen\c at twvsilg    % Vertical Shift or InterLine Glue
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -377,7 +377,6 @@
 %    \begin{macrocode}
 \newtoks\c at twtoka      % build of parshape spec
 \newtoks\c at twtokb      % build of parshape spec
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -396,7 +395,6 @@
 \newbox\c at twfinaltext  % final assembled cutout paragraph
 \newbox\c at twslicea     % slice A of window text
 \newbox\c at twsliceb     % slice B of window text
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -405,6 +403,16 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\c at twdima}
+% \begin{macro}{\c at twdimb}
+% And some lengths.
+%    \begin{macrocode}
+\newdimen\c at twdima    % formally \@tempdimb
+\newdimen\c at twdimb    % formally \@tempdimc
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}{\opencutleft}
 % \begin{macro}{\opencutright}
 % \begin{macro}{\opencutcenter}
@@ -423,17 +431,15 @@
 % \end{macro}
 %    \begin{macrocode}
 \opencutcenter
-
 %    \end{macrocode}
 %
 % \begin{macro}{\cutfuzz}
 %  An attempt to stop TeX moaning about over/under full h/v boxes.
 %    \begin{macrocode}
-\newcommand{\cutfuzz}{\vbadness=50000 
+\newcommand{\cutfuzz}{\vbadness=50000
    \hbadness=50000
 %   \hfuzz=1pt
   \sloppy}
-
 %    \end{macrocode}
 % \end{macro}
 %
@@ -442,9 +448,8 @@
 %    \begin{macrocode}
 \newcommand*{\c at twcalcilg}{%
   \c at twvsilg=\baselineskip
-  \setbox0=\hbox{(} 
+  \setbox0=\hbox{(}%
   \advance\c at twvsilg-\ht0 \advance\c at twvsilg-\dp0}
-
 %    \end{macrocode}
 % \end{macro}
 %
@@ -454,20 +459,20 @@
 % \begin{macro}{\pageinwindow}
 % \begin{macro}{\windowpagestuff}
 % User modifiable macros for putting (\cs{pageinwindow}), via a
-% zero-sized picture, 
+% zero-sized picture,
 % stuff (\cs{windowpagestuff}) in a cutout window.
 %    \begin{macrocode}
 \newcommand*{\pageinwindow}{%
-  \@tempdimc=\c at twwinlines\baselineskip % cutout height
-  \@tempdimb=\hsize
+  \c at twdimb=\c at twwinlines\baselineskip % cutout height
+  \c at twdima=\hsize
   \ifnum\c at twl@c=\m at ne % openleft
-    \advance\@tempdimb -\c at twrtside
+    \advance\c at twdima -\c at twrtside
   \else
     \ifnum\c at twl@c=\@ne % openright
-      \advance\@tempdimb -\c at twlftside
+      \advance\c at twdima -\c at twlftside
     \else% center
-      \advance\@tempdimb - \c at twlftside
-      \advance\@tempdimb - \c at twrtside
+      \advance\c at twdima - \c at twlftside
+      \advance\c at twdima - \c at twrtside
     \fi
   \fi
   \begin{picture}(0,0)%
@@ -474,15 +479,14 @@
     \put(0,0){%
       \raisebox{4pt}{%
 %\fbox{%
-        \begin{minipage}[t][\@tempdimc][c]{\@tempdimb}
+        \begin{minipage}[t][\c at twdimb][c]{\c at twdima}%
           \windowpagestuff
-        \end{minipage}
+        \end{minipage}%
 %}% end fbox
       }% end raisebox
     }% end put
   \end{picture}}
 \newcommand*{\windowpagestuff}{}
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -493,13 +497,13 @@
 % \verb?\begin{cutout}?\marg{numtop}\marg{leftwidth}\marg{rightwidth}\marg{numcut} \\
 % where \meta{numtop} is the number of full lines above the window,
 % \meta{leftwidth} and \meta{rightwidth} are the widths of the text
-% at the sides of the window, 
-% and \meta{numcut} is the number of lines to be cut (giving the height 
+% at the sides of the window,
+% and \meta{numcut} is the number of lines to be cut (giving the height
 % of the window).
 %
 %    The basic method is to split the paragraph into three parts (a)
-% the top lines above the window, (b) the window lines and (c) the rest 
-% (which will be below the window).  \cs{parshape} is used to do the 
+% the top lines above the window, (b) the window lines and (c) the rest
+% (which will be below the window).  \cs{parshape} is used to do the
 % splitting. The top lines are left at their natural length, each line
 % crossing the window is treated as a pair of short lines, and the rest
 % are left at their natural length.
@@ -527,7 +531,7 @@
   \c at twwinlines=#4\relax
   \c at twcalcshift \vskip-\c at twvsilg
 %    \end{macrocode}
-% Open the \cs{c at twrawtext} box, call the \cs{parshape} and start 
+% Open the \cs{c at twrawtext} box, call the \cs{parshape} and start
 % collecting the text to be windowed.
 %    \begin{macrocode}
   \setbox\c at twrawtext=\vbox\bgroup
@@ -538,12 +542,12 @@
 % the interline glue.
 %    \begin{macrocode}
   {\egroup% end \box\c at twrawtext
-  \parshape=0 % reset parshape; 
+  \parshape=0 % reset parshape;
   \c at twcalcilg % find ILG using current font
 %    \end{macrocode}
 % If there are lines above the window, split them off from \cs{c at twrawtext}
 % into \cs{c at twfinaltext}.
-%    \begin{macrocode}    
+%    \begin{macrocode}
   \ifnum\c at twtoplines>\z@
     \setbox\c at twfinaltext=\vsplit\c at twrawtext to\c at twtoplines\baselineskip
   \fi
@@ -564,17 +568,17 @@
 %    \begin{macrocode}
   \setbox\c at twholdwin=\vsplit\c at twrawtext to\c at twtopht
 %    \end{macrocode}
-% Now `compose' the window side(s) text (\cs{c at twholdwin}) 
+% Now `compose' the window side(s) text (\cs{c at twholdwin})
 % into the final set of windowed lines (\cs{c at twwindow}).
-% The process depends on whether the cutout is at the left, right, or center. 
+% The process depends on whether the cutout is at the left, right, or center.
 %    \begin{macrocode}
   \ifnum\c at twl@c=\z@% center
-    \c at twcompctr{\c at twholdwin}{\c at twwindow}
+    \c at twcompctr{\c at twholdwin}{\c at twwindow}%
   \else% left or right
-    \c at twcomplftrt{\c at twholdwin}{\c at twwindow}
+    \c at twcomplftrt{\c at twholdwin}{\c at twwindow}%
   \fi
 %    \end{macrocode}
-% Assemble the various boxes into the final box (\cs{c at twfinaltext}) 
+% Assemble the various boxes into the final box (\cs{c at twfinaltext})
 % to be output.
 %    \begin{macrocode}
   \setbox\c at twfinaltext=
@@ -585,13 +589,12 @@
 % We're done, hand off the paragraph.
 %    \begin{macrocode}
   \box\c at twfinaltext}
-
 %    \end{macrocode}
 % \end{environment}
 %
 % \begin{macro}{\c at twcompctr}
 % \begin{macro}{\c at twfirst}
-%  \cs{c at twcompctr}\marg{linepairbox}\marg{composedbox} composes a 
+%  \cs{c at twcompctr}\marg{linepairbox}\marg{composedbox} composes a
 % center window box \meta{linepairbox} consisting of pairs of short
 % lines into a box \meta{composedbox} where the pairs have been assembled
 % into single lines.
@@ -599,7 +602,7 @@
 % \cs{c at twfirst} is used as a flag for indicating the first line of a cutout.
 %    \begin{macrocode}
 \newcommand*{\c at twcompctr}[2]{%
-  \def\c at twfirst{1}
+  \def\c at twfirst{1}%
   \loop\advance\c at twwinlines\m at ne
 %    \end{macrocode}
 % Get a pair of lines and remove skips.
@@ -626,9 +629,8 @@
   \fi
 %    \end{macrocode}
 %    \begin{macrocode}
-  \def\c at twfirst{2}
+  \def\c at twfirst{2}%
   \ifnum\c at twwinlines>\z@\repeat}
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -641,12 +643,12 @@
   \loop\advance\c at twwinlines\m at ne
 %    \end{macrocode}
 % For an open window we simply deal with one line at a time, not
-% pairs. In other respects the code is generally similar to that for 
+% pairs. In other respects the code is generally similar to that for
 % \cs{c at twcompctr}.
 %    \begin{macrocode}
   \setbox\c at twslicea=\vsplit#1 to\baselineskip
   \ifnum\c at twl@c=\m at ne%    open left, text at right
-    \c at twprune{\c at twslicea}{\c at twrtside}
+    \c at twprune{\c at twslicea}{\c at twrtside}%
     \ifnum\c at twfirst=\@ne
       \setbox#2=\vbox{\unvbox#2\hbox
       to\hsize{\pageinwindow\hfil\box\c at twslicea}}%
@@ -654,10 +656,10 @@
       \setbox#2=\vbox{\unvbox#2\hbox
       to\hsize{\mbox{}\hfil\box\c at twslicea}}%
     \fi
-    \def\c at twfirst{2}
+    \def\c at twfirst{2}%
   \else
     \ifnum\c at twl@c=\@ne% open right, text at left
-      \c at twprune{\c at twslicea}{\c at twlftside}
+      \c at twprune{\c at twslicea}{\c at twlftside}%
       \ifnum\c at twfirst=\@ne\relax
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\pageinwindow}}%
@@ -665,11 +667,10 @@
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea}}%
       \fi
-      \def\c at twfirst{2}
+      \def\c at twfirst{2}%
     \fi
   \fi
   \ifnum\c at twwinlines>\z@\repeat}
-
 %    \end{macrocode}
 % \end{macro}
 %
@@ -683,7 +684,6 @@
 \newcommand*{\c at twprune}[2]{%
   \unvbox#1 \setbox#1=\lastbox % \box#1 is now an \hbox
   \setbox#1=\hbox to#2{\strut\unhbox#1\unskip}}
-
 %    \end{macrocode}
 % \end{macro}
 %
@@ -697,7 +697,7 @@
 % the number of the top lines plus (twice) the number of window line
 % plus one for the remaining lines.
 %    \begin{macrocode}
-  \c at twcnt=\c at twwinlines 
+  \c at twcnt=\c at twwinlines
   \ifnum\c at twl@c=\z@
     \multiply \c at twcnt by \tw@
   \fi
@@ -706,7 +706,7 @@
 % If there are top lines generate a \verb?0pt \hsize? for each
 %    \begin{macrocode}
   \ifnum\c at twtoplines>\z@
-    \loop\c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}
+    \loop\c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}%
       \advance\c at twtoplines -1\relax
     \ifnum\c at twtoplines>\z@\repeat
   \fi
@@ -728,18 +728,18 @@
 %    \end{macrocode}
 % For open left generate a \verb?\c at twlftside \c at twrtside? for each.
 %    \begin{macrocode}
-      \expandafter{\the\c at twtoka \c at twlftside \c at twrtside} 
+      \expandafter{\the\c at twtoka \c at twlftside \c at twrtside}%
     \else
       \ifnum\c at twl@c=\@ne % openright
 %    \end{macrocode}
 % For open right generate a \verb?\0pt c at twlftside? for each
 %    \begin{macrocode}
-        \expandafter{\the\c at twtoka 0pt \c at twlftside} 
+        \expandafter{\the\c at twtoka 0pt \c at twlftside}%
       \else %center
 %    \end{macrocode}
 % For centered generate \verb?0pt \c at twlftside 0pt \c at twrtside? for each pair.
 %    \begin{macrocode}
-        \expandafter{\the\c at twtoka 0pt \c at twlftside 0pt \c at twrtside}
+        \expandafter{\the\c at twtoka 0pt \c at twlftside 0pt \c at twrtside}%
       \fi
     \fi
     \advance\c at twwinlines \m at ne
@@ -749,7 +749,6 @@
 % paragraph just generate a single \verb?0pt \hsize?.
 %    \begin{macrocode}
   \c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}}
-
 %    \end{macrocode}
 % \end{macro}
 %
@@ -767,7 +766,6 @@
   \ifnum\c at twl@c=\z@\else
     \c at twvsilg=0.5\c at twvsilg
   \fi}
-
 %    \end{macrocode}
 % \end{macro}
 %
@@ -789,7 +787,6 @@
 % Default \cs{putstuffinpic} is empty.
 %    \begin{macrocode}
 \newcommand*{\putstuffinpic}{}
-
 %    \end{macrocode}
 % \end{macro}
 %
@@ -798,9 +795,9 @@
 % A shaped cutout where the user defines the shape. \\
 % \verb?\begin{shapedcutout}?\marg{numtop}\marg{numcut}\marg{shapespec} \\
 % where \meta{numtop} is the number of full lines above the window,
-% \meta{numcut} is the number of lines to be cut (giving the height 
+% \meta{numcut} is the number of lines to be cut (giving the height
 % of the window) and
-% \meta{shapespec} is the user's specification of the shape of the 
+% \meta{shapespec} is the user's specification of the shape of the
 % surroundings of the cutout. This is in the form of a comma-separated
 % list of either the pairs of widths of the left and right texts of a centered
 % cutout or the widths of the left or right texts of an open cutout.
@@ -850,9 +847,9 @@
   \fi
   \setbox\c at twholdwin=\vsplit\c at twrawtext to\c at twtopht
   \ifnum\c at twl@c=\z@%    center
-    \c at twcompoddctr{\c at twholdwin}{\c at twwindow}
-  \else% open left or righyt
-    \c at twcompoddlftrt{\c at twholdwin}{\c at twwindow}
+    \c at twcompoddctr{\c at twholdwin}{\c at twwindow}%
+  \else% open left or right
+    \c at twcompoddlftrt{\c at twholdwin}{\c at twwindow}%
   \fi
   \setbox\c at twfinaltext=
     \vbox{\ifnum\c at twtoplines>\z@\unvbox\c at twfinaltext\vskip\c at twvsilg\fi
@@ -859,33 +856,31 @@
     \unvbox\c at twwindow%
     \vskip-\c at twvsilg\unvbox\c at twrawtext}%
   \box\c at twfinaltext}
-
 %    \end{macrocode}
 % \end{environment}
 %
 % \begin{macro}{\c at twmaketopoddspec}
-%  Make up the easy part of the odd \cs{parshape} specification; 
+%  Make up the easy part of the odd \cs{parshape} specification;
 % total number \cs{c at twcnt} and the toplines spec (\cs{c at twtoka}).
 %    \begin{macrocode}
 \newcommand*{\c at twmaketopoddspec}{%
-  \c at twcnt=\c at twwinlines 
+  \c at twcnt=\c at twwinlines
   \ifnum\c at twl@c=\z@
     \multiply \c at twcnt by \tw@
   \fi
   \advance\c at twcnt by \c at twtoplines \advance\c at twcnt by \@ne
 %% \c at twcnt is total of toplines + 2(window lines) + 1
-  \c at twtoka={}
+  \c at twtoka={}%
   \ifnum\c at twtoplines>\z@
-    \loop\c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}
+    \loop\c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}%
       \advance\c at twtoplines -1\relax
       \ifnum\c at twtoplines>\z@\repeat
   \fi}
-
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\c at twaddtospec}
-% Adds a `zero-indented line' to a parshape spec being assembled in 
+% Adds a `zero-indented line' to a parshape spec being assembled in
 % \cs{c at twtokb}.
 %    \begin{macrocode}
 \newcommand*{\c at twaddtospec}[1]{%
@@ -894,7 +889,7 @@
 % \end{macro}
 % \begin{macro}{\c at twbuildoddspec}
 % \begin{macro}{\c at twxpf}
-% \cs{c at twbuildoddspec}\marg{commalist} builds up the parshape spec for 
+% \cs{c at twbuildoddspec}\marg{commalist} builds up the parshape spec for
 % the odd cutout lines from the comma-separated list of lengths
 % in \meta{commalist}.
 %
@@ -901,7 +896,7 @@
 % \cs{c at twxpf} is a shorthand for \cs{expandafter}
 % to try and make the code shorter to read.
 % \begin{macro}{\c at twlspec}
-% \cs{c at twlspec} is used as a temporary variable when iterating over 
+% \cs{c at twlspec} is used as a temporary variable when iterating over
 % a comma-separated list.
 % \end{macro}
 %
@@ -908,10 +903,9 @@
 %    \begin{macrocode}
 \let\c at twxpf\expandafter
 \newcommand*{\c at twbuildoddspec}[1]{%
-  \c at twtokb={}
+  \c at twtokb={}%
   \@for\c at twlspec:=#1\do{%
     \c at twxpf\c at twxpf\c at twxpf\c at twaddtospec\c at twxpf{\c at twlspec}}}
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -919,7 +913,7 @@
 % \begin{macro}{\c at twcompoddctr}
 % \begin{macro}{\c at twrounds}
 % Compose the lines of an odd shaped center cutout.
-% 
+%
 % We go through the user's shape list an item at a time but we need to
 % collect pairs of items. The \cs{c at twrounds} variable is for managing the
 % pairing. \cs{c at twfirst} is a flag for positioning the \cs{picinwindow} in
@@ -926,13 +920,13 @@
 % the first line of the cutout.
 %    \begin{macrocode}
 \newcommand*{\c at twcompoddctr}[2]{%
-  \def\c at twrounds{1}
-  \def\c at twfirst{1}
+  \def\c at twrounds{1}%
+  \def\c at twfirst{1}%
   \@for\c at twlspec:=\c at twb\do{%
     \ifnum\c at twrounds=1
       \setbox\c at twslicea=\vsplit#1 to\baselineskip % first of pair
       \c at twprune{\c at twslicea}{\c at twlspec}%
-      \def\c at twrounds{2}
+      \def\c at twrounds{2}%
     \else
       \setbox\c at twsliceb=\vsplit#1 to\baselineskip % second of pair
       \c at twprune{\c at twsliceb}{\c at twlspec}%
@@ -939,14 +933,13 @@
       \ifnum\c at twfirst=1
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\hfil\picinwindow\hfil\box\c at twsliceb}}%
-        \def\c at twfirst{2}
+        \def\c at twfirst{2}%
       \else
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\hfil\box\c at twsliceb}}%
       \fi
-      \def\c at twrounds{1}
+      \def\c at twrounds{1}%
     \fi}}
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -955,7 +948,7 @@
 % Compose the open (left or right) lines of an odd shaped cutout.
 %    \begin{macrocode}
 \newcommand*{\c at twcompoddlftrt}[2]{%
-  \def\c at twfirst{1}
+  \def\c at twfirst{1}%
   \@for\c at twlspec:=\c at twb\do{%
     \setbox\c at twslicea=\vsplit#1 to\baselineskip % get a line
     \c at twprune{\c at twslicea}{\c at twlspec}%
@@ -963,7 +956,7 @@
       \ifnum\c at twfirst=1
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\mbox{}\hfil\picinwindow\hfil\box\c at twslicea}}%
-        \def\c at twfirst{2}
+        \def\c at twfirst{2}%
       \else
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\mbox{}\hfil\box\c at twslicea}}%
@@ -973,7 +966,7 @@
         \ifnum\c at twfirst=1
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\hfil\picinwindow\hfil}}%
-        \def\c at twfirst{2}
+        \def\c at twfirst{2}%
       \else
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\hfil}}%
@@ -980,7 +973,6 @@
       \fi
     \fi
   \fi}}
-
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1000,20 +992,3 @@
 %
 \endinput
 
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-
-

Modified: trunk/Master/texmf-dist/source/latex/cutwin/cutwin.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/cutwin/cutwin.ins	2021-10-30 19:39:44 UTC (rev 60900)
+++ trunk/Master/texmf-dist/source/latex/cutwin/cutwin.ins	2021-10-30 19:39:58 UTC (rev 60901)
@@ -1,8 +1,11 @@
 %% cutwin.ins
-%% Author: Peter Wilson, Herries Press (herries dot press at earthlink dot net)
+%% Author: Peter Wilson, Herries Press
 %%         and Alan Hoenig
 %% Copyright 2010 Peter R. Wilson
 %%
+%% Current Maintainer David Carlisle
+%% Copyright 2021 Peter R. Wilson, David Carlisle
+%%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
 %% version 1.3 of this license or (at your option) any 
@@ -12,7 +15,7 @@
 %% and version 1.3 or later is part of all distributions of
 %% LaTeX version 2003/06/01 or later.
 %%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "maintained".
 %%
 %% This work consists of the files listed in the README file.
 %%
@@ -34,6 +37,9 @@
           and Alan Hoenig
   Copyright 2010 Peter R. Wilson
  
+  Current Maintainer David Carlisle
+  Copyright 2021 Peter R. Wilson, David Carlisle
+
   This work may be distributed and/or modified under the
   conditions of the LaTeX Project Public License, either
   version 1.3 of this license or (at your option) any 
@@ -43,7 +49,7 @@
   and version 1.3 or later is part of all distributions of
   LaTeX version 2003/06/01 or later.
  
-  This work has the LPPL maintenance status "author-maintained".
+  This work has the LPPL maintenance status "maintained".
  
   This work consists of the files listed in the README file.
 ----------------------------------------------------------------- 

Modified: trunk/Master/texmf-dist/tex/latex/cutwin/cutwin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cutwin/cutwin.sty	2021-10-30 19:39:44 UTC (rev 60900)
+++ trunk/Master/texmf-dist/tex/latex/cutwin/cutwin.sty	2021-10-30 19:39:58 UTC (rev 60901)
@@ -11,6 +11,9 @@
 %%           and Alan Hoenig
 %%   Copyright 2010 Peter R. Wilson
 %% 
+%%   Current Maintainer David Carlisle
+%%   Copyright 2021 Peter R. Wilson, David Carlisle
+%% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
 %%   version 1.3 of this license or (at your option) any
@@ -20,7 +23,7 @@
 %%   and version 1.3 or later is part of all distributions of
 %%   LaTeX version 2003/06/01 or later.
 %% 
-%%   This work has the LPPL maintenance status "author-maintained".
+%%   This work has the LPPL maintenance status "maintained".
 %% 
 %%   This work consists of the files listed in the README file.
 %% -----------------------------------------------------------------
@@ -27,20 +30,16 @@
 %% 
 %% \iffalse meta-comment
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cutwin}[2010/09/29 v0.1 cutout windows]
-
+\ProvidesPackage{cutwin}[2021/10/13 v0.2 cutout windows]
 \newcount\c at twwinlines % window lines
 \newcount\c at twtoplines % top lines
 \newcount\c at twcnt      % a count
-
 \newdimen\c at twlftside  % left width
 \newdimen\c at twrtside   % right width
 \newdimen\c at twtopht    % height of top text
 \newdimen\c at twvsilg    % Vertical Shift or InterLine Glue
-
 \newtoks\c at twtoka      % build of parshape spec
 \newtoks\c at twtokb      % build of parshape spec
-
 \newbox\c at twrawtext    % text as input
 \newbox\c at twholdwin    % text for window sides
 \newbox\c at twwindow     % composed window
@@ -47,45 +46,42 @@
 \newbox\c at twfinaltext  % final assembled cutout paragraph
 \newbox\c at twslicea     % slice A of window text
 \newbox\c at twsliceb     % slice B of window text
-
+\newdimen\c at twdima    % formally \@tempdimb
+\newdimen\c at twdimb    % formally \@tempdimc
 \newcommand*{\opencutleft}{\def\c at twl@c{-1}}
 \newcommand*{\opencutright}{\def\c at twl@c{1}}
 \newcommand*{\opencutcenter}{\def\c at twl@c{0}}
 \opencutcenter
-
 \newcommand{\cutfuzz}{\vbadness=50000
    \hbadness=50000
   \sloppy}
-
 \newcommand*{\c at twcalcilg}{%
   \c at twvsilg=\baselineskip
-  \setbox0=\hbox{(}
+  \setbox0=\hbox{(}%
   \advance\c at twvsilg-\ht0 \advance\c at twvsilg-\dp0}
-
 \newcommand*{\pageinwindow}{%
-  \@tempdimc=\c at twwinlines\baselineskip % cutout height
-  \@tempdimb=\hsize
+  \c at twdimb=\c at twwinlines\baselineskip % cutout height
+  \c at twdima=\hsize
   \ifnum\c at twl@c=\m at ne % openleft
-    \advance\@tempdimb -\c at twrtside
+    \advance\c at twdima -\c at twrtside
   \else
     \ifnum\c at twl@c=\@ne % openright
-      \advance\@tempdimb -\c at twlftside
+      \advance\c at twdima -\c at twlftside
     \else% center
-      \advance\@tempdimb - \c at twlftside
-      \advance\@tempdimb - \c at twrtside
+      \advance\c at twdima - \c at twlftside
+      \advance\c at twdima - \c at twrtside
     \fi
   \fi
   \begin{picture}(0,0)%
     \put(0,0){%
       \raisebox{4pt}{%
-        \begin{minipage}[t][\@tempdimc][c]{\@tempdimb}
+        \begin{minipage}[t][\c at twdimb][c]{\c at twdima}%
           \windowpagestuff
-        \end{minipage}
+        \end{minipage}%
       }% end raisebox
     }% end put
   \end{picture}}
 \newcommand*{\windowpagestuff}{}
-
 \newenvironment{cutout}[4]{%
   \cutfuzz
   \c at twtoplines=#1\relax
@@ -111,9 +107,9 @@
   \fi
   \setbox\c at twholdwin=\vsplit\c at twrawtext to\c at twtopht
   \ifnum\c at twl@c=\z@% center
-    \c at twcompctr{\c at twholdwin}{\c at twwindow}
+    \c at twcompctr{\c at twholdwin}{\c at twwindow}%
   \else% left or right
-    \c at twcomplftrt{\c at twholdwin}{\c at twwindow}
+    \c at twcomplftrt{\c at twholdwin}{\c at twwindow}%
   \fi
   \setbox\c at twfinaltext=
     \vbox{\ifnum\c at twtoplines>\z@\unvbox\c at twfinaltext\vskip\c at twvsilg\fi
@@ -120,9 +116,8 @@
     \unvbox\c at twwindow%
     \vskip-\c at twvsilg\unvbox\c at twrawtext}%
   \box\c at twfinaltext}
-
 \newcommand*{\c at twcompctr}[2]{%
-  \def\c at twfirst{1}
+  \def\c at twfirst{1}%
   \loop\advance\c at twwinlines\m at ne
   \setbox\c at twslicea=\vsplit#1 to\baselineskip
   \setbox\c at twsliceb=\vsplit#1 to\baselineskip
@@ -135,15 +130,14 @@
     \setbox#2=\vbox{\unvbox#2\hbox
     to\hsize{\box\c at twslicea\hfil\box\c at twsliceb}}%
   \fi
-  \def\c at twfirst{2}
+  \def\c at twfirst{2}%
   \ifnum\c at twwinlines>\z@\repeat}
-
 \newcommand*{\c at twcomplftrt}[2]{%
   \def\c at twfirst{1}%
   \loop\advance\c at twwinlines\m at ne
   \setbox\c at twslicea=\vsplit#1 to\baselineskip
   \ifnum\c at twl@c=\m at ne%    open left, text at right
-    \c at twprune{\c at twslicea}{\c at twrtside}
+    \c at twprune{\c at twslicea}{\c at twrtside}%
     \ifnum\c at twfirst=\@ne
       \setbox#2=\vbox{\unvbox#2\hbox
       to\hsize{\pageinwindow\hfil\box\c at twslicea}}%
@@ -151,10 +145,10 @@
       \setbox#2=\vbox{\unvbox#2\hbox
       to\hsize{\mbox{}\hfil\box\c at twslicea}}%
     \fi
-    \def\c at twfirst{2}
+    \def\c at twfirst{2}%
   \else
     \ifnum\c at twl@c=\@ne% open right, text at left
-      \c at twprune{\c at twslicea}{\c at twlftside}
+      \c at twprune{\c at twslicea}{\c at twlftside}%
       \ifnum\c at twfirst=\@ne\relax
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\pageinwindow}}%
@@ -162,15 +156,13 @@
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea}}%
       \fi
-      \def\c at twfirst{2}
+      \def\c at twfirst{2}%
     \fi
   \fi
   \ifnum\c at twwinlines>\z@\repeat}
-
 \newcommand*{\c at twprune}[2]{%
   \unvbox#1 \setbox#1=\lastbox % \box#1 is now an \hbox
   \setbox#1=\hbox to#2{\strut\unhbox#1\unskip}}
-
 \newcommand*{\c at twmakeparspec}{%
   \c at twcnt=\c at twwinlines
   \ifnum\c at twl@c=\z@
@@ -178,7 +170,7 @@
   \fi
   \advance\c at twcnt by \c at twtoplines \advance\c at twcnt by \@ne
   \ifnum\c at twtoplines>\z@
-    \loop\c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}
+    \loop\c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}%
       \advance\c at twtoplines -1\relax
     \ifnum\c at twtoplines>\z@\repeat
   \fi
@@ -188,18 +180,17 @@
   \fi
   \loop\c at twtoka=%
     \ifnum\c at twl@c=\m at ne % openleft
-      \expandafter{\the\c at twtoka \c at twlftside \c at twrtside}
+      \expandafter{\the\c at twtoka \c at twlftside \c at twrtside}%
     \else
       \ifnum\c at twl@c=\@ne % openright
-        \expandafter{\the\c at twtoka 0pt \c at twlftside}
+        \expandafter{\the\c at twtoka 0pt \c at twlftside}%
       \else %center
-        \expandafter{\the\c at twtoka 0pt \c at twlftside 0pt \c at twrtside}
+        \expandafter{\the\c at twtoka 0pt \c at twlftside 0pt \c at twrtside}%
       \fi
     \fi
     \advance\c at twwinlines \m at ne
   \ifnum\c at twwinlines>\z@\repeat
   \c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}}
-
 \newcommand*{\c at twcalcshift}{% vertical shift
   \c at twvsilg=\c at twwinlines\baselineskip
   \ifnum\c at twtoplines<\@ne
@@ -209,13 +200,11 @@
   \ifnum\c at twl@c=\z@\else
     \c at twvsilg=0.5\c at twvsilg
   \fi}
-
 \newcommand*{\picinwindow}{%
   \begin{picture}(0,0)
   \putstuffinpic
   \end{picture}}
 \newcommand*{\putstuffinpic}{}
-
 \newenvironment{shapedcutout}[3]{%
   \cutfuzz
   \c at twtoplines=#1\relax
@@ -240,9 +229,9 @@
   \fi
   \setbox\c at twholdwin=\vsplit\c at twrawtext to\c at twtopht
   \ifnum\c at twl@c=\z@%    center
-    \c at twcompoddctr{\c at twholdwin}{\c at twwindow}
-  \else% open left or righyt
-    \c at twcompoddlftrt{\c at twholdwin}{\c at twwindow}
+    \c at twcompoddctr{\c at twholdwin}{\c at twwindow}%
+  \else% open left or right
+    \c at twcompoddlftrt{\c at twholdwin}{\c at twwindow}%
   \fi
   \setbox\c at twfinaltext=
     \vbox{\ifnum\c at twtoplines>\z@\unvbox\c at twfinaltext\vskip\c at twvsilg\fi
@@ -249,7 +238,6 @@
     \unvbox\c at twwindow%
     \vskip-\c at twvsilg\unvbox\c at twrawtext}%
   \box\c at twfinaltext}
-
 \newcommand*{\c at twmaketopoddspec}{%
   \c at twcnt=\c at twwinlines
   \ifnum\c at twl@c=\z@
@@ -257,29 +245,27 @@
   \fi
   \advance\c at twcnt by \c at twtoplines \advance\c at twcnt by \@ne
 %% \c at twcnt is total of toplines + 2(window lines) + 1
-  \c at twtoka={}
+  \c at twtoka={}%
   \ifnum\c at twtoplines>\z@
-    \loop\c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}
+    \loop\c at twtoka=\expandafter{\the\c at twtoka 0pt \hsize}%
       \advance\c at twtoplines -1\relax
       \ifnum\c at twtoplines>\z@\repeat
   \fi}
-
 \newcommand*{\c at twaddtospec}[1]{%
   \c at twtokb=\c at twxpf{\the\c at twtokb 0pt #1 }}
 \let\c at twxpf\expandafter
 \newcommand*{\c at twbuildoddspec}[1]{%
-  \c at twtokb={}
+  \c at twtokb={}%
   \@for\c at twlspec:=#1\do{%
     \c at twxpf\c at twxpf\c at twxpf\c at twaddtospec\c at twxpf{\c at twlspec}}}
-
 \newcommand*{\c at twcompoddctr}[2]{%
-  \def\c at twrounds{1}
-  \def\c at twfirst{1}
+  \def\c at twrounds{1}%
+  \def\c at twfirst{1}%
   \@for\c at twlspec:=\c at twb\do{%
     \ifnum\c at twrounds=1
       \setbox\c at twslicea=\vsplit#1 to\baselineskip % first of pair
       \c at twprune{\c at twslicea}{\c at twlspec}%
-      \def\c at twrounds{2}
+      \def\c at twrounds{2}%
     \else
       \setbox\c at twsliceb=\vsplit#1 to\baselineskip % second of pair
       \c at twprune{\c at twsliceb}{\c at twlspec}%
@@ -286,16 +272,15 @@
       \ifnum\c at twfirst=1
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\hfil\picinwindow\hfil\box\c at twsliceb}}%
-        \def\c at twfirst{2}
+        \def\c at twfirst{2}%
       \else
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\hfil\box\c at twsliceb}}%
       \fi
-      \def\c at twrounds{1}
+      \def\c at twrounds{1}%
     \fi}}
-
 \newcommand*{\c at twcompoddlftrt}[2]{%
-  \def\c at twfirst{1}
+  \def\c at twfirst{1}%
   \@for\c at twlspec:=\c at twb\do{%
     \setbox\c at twslicea=\vsplit#1 to\baselineskip % get a line
     \c at twprune{\c at twslicea}{\c at twlspec}%
@@ -303,7 +288,7 @@
       \ifnum\c at twfirst=1
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\mbox{}\hfil\picinwindow\hfil\box\c at twslicea}}%
-        \def\c at twfirst{2}
+        \def\c at twfirst{2}%
       \else
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\mbox{}\hfil\box\c at twslicea}}%
@@ -313,7 +298,7 @@
         \ifnum\c at twfirst=1
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\hfil\picinwindow\hfil}}%
-        \def\c at twfirst{2}
+        \def\c at twfirst{2}%
       \else
         \setbox#2=\vbox{\unvbox#2\hbox
         to\hsize{\box\c at twslicea\hfil}}%
@@ -320,7 +305,6 @@
       \fi
     \fi
   \fi}}
-
 \endinput
 %%
 %% End of file `cutwin.sty'.



More information about the tex-live-commits mailing list.