texlive[63704] Master/texmf-dist: chess-problem-diagrams (23jun22)
commits+karl at tug.org
commits+karl at tug.org
Thu Jun 23 22:55:46 CEST 2022
Revision: 63704
http://tug.org/svn/texlive?view=revision&revision=63704
Author: karl
Date: 2022-06-23 22:55:46 +0200 (Thu, 23 Jun 2022)
Log Message:
-----------
chess-problem-diagrams (23jun22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/chess-problem-diagrams/README
trunk/Master/texmf-dist/doc/latex/chess-problem-diagrams/diagram.pdf
trunk/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx
trunk/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.ins
trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/cpdparse.sty
Modified: trunk/Master/texmf-dist/doc/latex/chess-problem-diagrams/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/chess-problem-diagrams/README 2022-06-23 20:55:16 UTC (rev 63703)
+++ trunk/Master/texmf-dist/doc/latex/chess-problem-diagrams/README 2022-06-23 20:55:46 UTC (rev 63704)
@@ -1,5 +1,5 @@
diagram --- A package for typesetting chessproblems
-Version v1.15 / Stefan Hoening 1994-2019
+Version v1.21 / Stefan Hoening 1994-2022
CONTENTS
@@ -17,7 +17,7 @@
tex installation.
Run TeX/LaTeX on diagram.ins to unpack the dtx.
-Put the extracted 'diagram.sty' into tex/latex/diagram.
+Put the extracted 'cpdparse.sty' and 'diagram.sty' into tex/latex/diagram.
DOCUMENTATION
Modified: trunk/Master/texmf-dist/doc/latex/chess-problem-diagrams/diagram.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx 2022-06-23 20:55:16 UTC (rev 63703)
+++ trunk/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx 2022-06-23 20:55:46 UTC (rev 63704)
@@ -13,9 +13,9 @@
%%
%%
% \fi
-% \def\fileversion{v1.15}
-% \def\docdate{2019/12/28}
-% \CheckSum{4545}
+% \def\fileversion{v1.21}
+% \def\docdate{2022/06/14}
+% \CheckSum{4577}
% \changes{v0.1}{15 Februar 2004}{First Version}
% \changes{v0.2}{23 Februar 2004}{Added the documentation for the
% {\itshape information collecting} macros which may be used
@@ -76,6 +76,24 @@
% \changes{v1.14}{02 September 2019}{Fixed issue with stereo- and space-diagrams.}
% \changes{v1.15}{28 December 2019}{Fixed frame issue with stereo- and space-diagrams.\\
% Added hook commands for begin/end diagram.}
+% \changes{v1.16}{09 February 2020}{Fixed date display issue in
+% figurine environment.\\
+% Added hook commands to figurine environment.\\
+% Fixed documentation bug: separation character in themes command is
+% comma not semicolon.\\
+% command diagnumbering fixed: boolean is changed to true globally.}
+% \changes{v1.17}{27 December 2020}{Added generation of cpdparse.sty
+% containing generic command for parsing lists.}
+% \changes{v1.18}{04 February 2021}{03f/0be:om: Typo: above at newlne\\
+% 03f/035:om: solnamestype has no effect}
+% \changes{v1.19}{04 March 2021}{Minor fix in cl at arsol\\
+% Added (empty) command gerne.}
+% \changes{v1.20}{13 June 2022}{Introduced two booleans to better
+% control displaying diagram number globally and locally.\\
+% Removed the old boolean 'di at no'.}
+% \changes{v1.21}{14 June 2022}{Impletemted issue: 03f/309:\\
+% handle empty arguments in information collecting commands\\
+% Fixed typo in @dia at fidealbum command.}
%
% \DoNotIndex{\@arabic,\def,\@idxitem,\@ifnextchar,\@ifstar,
% \@ne,\@ptsize,\ ,\advance,\AtEndOfPackage,\begin,\begingroup,
@@ -284,7 +302,9 @@
% \item \DescribeMacro{\specialdiagnum}
% May be used to suppress the default diagram numbering (which
% uses a counter) and instead directly providing a diagram
-% "number" which may be an arbritary text.
+% "number" which may be an arbritary text. This may also be used to
+% suppress displaying a diagram number by providing an empty argument
+% \verb+{}+.
% \item \DescribeMacro{\sourcenr}
% May be used to specify the number which was used for the
% problem inside an originals section.
@@ -343,11 +363,22 @@
% authors original comment.)
% \item \DescribeMacro{\themes}
% May be used to specify themes displayed in the problem.
-% Different themes should be separated with ";~". When creating a
+% Different themes should be separated with ",~". When creating a
% theme index, the themes will automatically be used to create
% the register.
+% \item \DescribeMacro{\genre}
+% May be used to specify genre of the problem.
+% Different genres should be separated with ",~".
+% The values are intended to using \LaTeX\-import within the PDB.
% \end{itemize}
%
+% When providing an empty argument to commands \verb+\award+,
+% \verb+\after+, \verb+\dedic+, \verb+\correction+ and \verb+\version+
+% only a warning is issued to the logfile. In previous
+% versions of \verb+diagram.sty+ using empty arguments with the
+% mentioned commands produced empty lines above the diagram.
+%
+%
% There are some commands which not only collect information but
% normally direct result in a change of the diagram. These are:
%
@@ -526,7 +557,7 @@
% need smaller or larger boards. This can be achieved by
% specifying the rows and columns as an optional parameter to the
% |\begin{diagram}| environment. You first have to specify the
-% lines and then the rows as the following examples shows.
+% columns and then the rows as the following examples shows.
%
% \bigskip
% \begin{diagram}[17x11]
@@ -644,13 +675,13 @@
% \DescribeMacro{\noframe}
% \DescribeMacro{\noinnerframe}
% To stylize a cylindric board one typically does not show parts
-% of the frame. When using |\verticalcylinder| the horizontal
+% of the frame. When using |\verticalcylinder|\, the horizontal
% lines of the outer frame will not be drawn.
-% |\horizontalcylinder| suppresses the drawing of the vertical
-% lines of the outer frame. Using |\noframe| completely supresses
-% the outer frame. |\noinnerframe| suppresses the innerframe.
+% |\horizontalcylinder|\, suppresses the drawing of the vertical
+% lines of the outer frame. Using |\noframe|\, completely supresses
+% the outer frame. |\noinnerframe|\, suppresses the innerframe.
% In case of stereo- or space-chess-diagrams |\verticalcylinder|,
-% |\horizontalcylinder| and |\noframe| suppresses the inner
+% |\horizontalcylinder|\, and |\noframe|\, suppresses the inner
% frame.
%
% \subsection{Change the coloring of the fields}
@@ -985,7 +1016,7 @@
% Specifies the preamble of our style file.
% \begin{macrocode}
%<*style>
-\ProvidesPackage{diagram}[2019/12/28]
+\ProvidesPackage{diagram}[2022/06/19]
% \end{macrocode}
%
% \begin{macro}{\DefaultDiagramSize}
@@ -1043,7 +1074,9 @@
\newif\ifspace at vertical
\def\spacehorizontal{\space at verticalfalse}
-\newif\ifdi at no
+% \newif\ifdi at no
+\newboolean{@cpd at numbering@global}
+\newboolean{@cpd at numbering@local}
\newcounter{board at nr}
\renewcommand{\theboard at nr}{\thediag}
% \newif\iffigcnt
@@ -1278,6 +1311,7 @@
% \end{macro}
% \end{macro}
%
+%
% \begin{macro}{\diagram}
% \begin{macro}{\@diagram}
% Defines the code executed in |\begin{diagram}|. In case no
@@ -1550,6 +1584,7 @@
\let\month=\ds at month%
\let\year=\ds at year%
\let\label=\ds at label%
+ \cpd at begindiagram@hook%
}
\def\endfigurine{%
@@ -1578,6 +1613,7 @@
\fi%
%
\@show at figurine%
+ \cpd at enddiagram@hook%
\endgroup%
}
%
@@ -1727,10 +1763,15 @@
%
% \begin{macrocode}
\def\spacelayout#1{\csname space@#1\endcsname}
-\def\nodiagnumbering{\global\di at nofalse}
+\def\nodiagnumbering{%
+ % \global\di at nofalse
+ \setboolean{@cpd at numbering@global}{false}
+}
\newcommand*{\@dianumber at prefix}{}
\def\diagnumbering#1{%
- \di at notrue\diagnum{\@ne}%
+ \setboolean{@cpd at numbering@global}{true}%
+ % \global\di at notrue%
+ \diagnum{\@ne}%
\gdef\thediag{\@dianumber at prefix\csname @#1\endcsname\c at board@nr}%
}
% \end{macrocode}
@@ -1761,9 +1802,16 @@
%
% \begin{macrocode}
\def\specialdiagnum#1{%
- \@specialtrue%
- \number at tk={#1}\@numbertrue\def\thediag{#1}\def\@currentlabel{#1}%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ % We disable displaying the diagram number
+ \setboolean{@cpd at numbering@local}{false}%
+ }{%
+ \setboolean{@cpd at numbering@local}{true}%
+ \@specialtrue%
+ \number at tk={#1}\@numbertrue%
+ \def\thediag{#1}\def\@currentlabel{#1}%
+ \ignorespaces%
+ }
}
% \end{macrocode}
%
@@ -1841,24 +1889,44 @@
\ignorespaces%
}
\def\award#1{%
- \award at tk={#1}\@awardtrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'award' argument.^^J}%
+ }{%
+ \award at tk={#1}\@awardtrue%
+ \ignorespaces%
+ }%
}
\def\version#1{%
- \version at tk={#1}\@versiontrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'version' argument.^^J}%
+ }{%
+ \version at tk={#1}\@versiontrue%
+ \ignorespaces%
+ }%
}
\def\after#1{%
- \after at tk={#1}\@aftertrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'after' argument.^^J}%
+ }{%
+ \after at tk={#1}\@aftertrue%
+ \ignorespaces%
+ }%
}
\def\correction#1{%
- \correction at tk={#1}\@correctiontrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'correction' argument.^^J}%
+ }{%
+ \correction at tk={#1}\@correctiontrue%
+ \ignorespaces%
+ }%
}
\def\dedication#1{%
- \dedic at tk={#1}\@dedicationtrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'correction' argument.^^J}%
+ }{%
+ \dedic at tk={#1}\@dedicationtrue%
+ \ignorespaces%
+ }%
}
\def\fidealbum#1{%
\fidealbum at tk={#1}\@fidealbumtrue%
@@ -1968,6 +2036,9 @@
\theme at tk={#1}\@themetrue%
\ignorespaces%
}
+\def\genre#1{%
+ \relax% Currently not used within diagram.sty
+}
\long\def\comment#1{%
\comment at tk={#1}\@commenttrue%
\ignorespaces%
@@ -2173,7 +2244,10 @@
% single paragraph.
% \begin{macrocode}
\def\@dia at number{%
- \ifdi at no\above at newline{\authorfont\thediag}\fi%
+ %\ifdi at no\above at newline{\authorfont\thediag}\fi%
+ \ifthenelse{\boolean{@cpd at numbering@local}}{%
+ \above at newline{\authorfont\thediag}%
+ }{}%
}
% \end{macrocode}
% \end{macro}
@@ -2313,7 +2387,7 @@
\def\@dia at fidealbum{%
\if at fidealbum%
- \above at newlne%
+ \above at newline%
{\expandafter\@show at album\the\fidealbum at tk;}%
\fi%
}
@@ -2579,26 +2653,7 @@
\sourcefont%
\if at sourcenr\the\sourcenr at tk\ \fi%
\the\source at tk%
- \if at year%
- \ \ %
- \if at day%
- \ifnum\from at month>\z@%
- \the\day at tk.%
- \write at month\from at month%
- \ifnum\to at month>\z@%
- -\write at month\to at month%
- \fi%
- .%
- \fi%
- \else%
- \write at month\the\from at month%
- \ifnum\to at month>\z@%
- -\write at month\the\to at month%
- \fi%
- /%
- \fi%
- \the\year at tk%
- \fi%
+ \if at date\ \ \fi\@dia at date%
\if at issue , \the\issue at tk\fi%
\if at pages , \the\pages at tk\fi%
\fi}%
@@ -2681,7 +2736,7 @@
}
\def\@months#1-#2;{\from at month=#1\to at month=#2\@datetrue}
\def\@dia at writename#1; {\above at newline{\authorfont\@dianame#1; }\l@@klist}
-\def\@sol at writename#1; {\sep at names\@dianame#1; \l@@klist}
+\def\@sol at writename#1; {\sep at names\@solname#1; \l@@klist}
\def\name at sep{,\ }
\def\sep at names{\if at notfirst\name at sep\else\@notfirsttrue\fi}
\def\@checkshort#1/#2#3;{%
@@ -2720,7 +2775,7 @@
\def\@normalname#1; {#1}
\def\space at vertical{\space at verticaltrue}
\def\space at horizontal{\space at verticalfalse}
-\def\cl at arsol{\immediate\openout\s at lfd=\jobname.sol}
+\def\cl at arsol{\immediate\openout\s at lfd=\jobname.sol\relax}
\def\getc at lor#1{%
\if#1\ds at white%
\help at a\z@\global%
@@ -3032,6 +3087,11 @@
\def\@set at label#1;{\ifds at label\label{#1}\fi}
\def\init at vars{%
\global\s at lufalse
+ \ifthenelse{\boolean{@cpd at numbering@global}}{%
+ \setboolean{@cpd at numbering@local}{true}%
+ }{%
+ \setboolean{@cpd at numbering@local}{false}%
+ }%
\setboolean{cpd at checkPieceCounts}{false}%
\setcounter{cpd at defWhitePieces}{\z@}%
\setcounter{cpd at defBlackPieces}{\z@}%
@@ -3574,4 +3634,29 @@
%</style>
% \end{macrocode}
%
+% \section{The implementation of cpdparse.sty}
+%
+% The following contains the style file \emph{cpdparse.sty}, which
+% implements generic parsing of lists.
+%
+% \begin{macrocode}
+%<*cpdparse>
+\ProvidesPackage{cpdparse}[2020/12/27]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\cpd at parse@list{\futurelet\cpd at parse@lookahead\cpd at parse@check}
+\def\cpd at parse@check{%
+ \ifx\cpd at parse@lookahead\relax\relax%
+ \let\cpd at parse@next=\relax%
+ \else%
+ \let\cpd at parse@next=\cpd at parse@action%
+ \fi%
+ \cpd at parse@next%
+}
+% \end{macrocode}
+%
+%</cpdparse>
+%
+%
% \Finale
Modified: trunk/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.ins 2022-06-23 20:55:16 UTC (rev 63703)
+++ trunk/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.ins 2022-06-23 20:55:46 UTC (rev 63704)
@@ -2,5 +2,6 @@
\askforoverwritefalse
\generate{%
\file{diagram.sty}{\from{diagram.dtx}{style}}%
+ \file{cpdparse.sty}{\from{diagram.dtx}{cpdparse}}%
}
\endbatchfile
Added: trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/cpdparse.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/cpdparse.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/cpdparse.sty 2022-06-23 20:55:46 UTC (rev 63704)
@@ -0,0 +1,51 @@
+%%
+%% This is file `cpdparse.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% diagram.dtx (with options: `cpdparse')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from cpdparse.sty.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file diagram.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%% File 'diagram.dtx'
+%%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version
+%% 1.2 of this license or (at your option) any later version.
+%% The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.2 or later is part of all distributions of LaTeX
+%% version 1999/12/01 or later.
+%%
+%%
+%%
+%%
+
+\ProvidesPackage{cpdparse}[2020/12/27]
+\def\cpd at parse@list{\futurelet\cpd at parse@lookahead\cpd at parse@check}
+\def\cpd at parse@check{%
+ \ifx\cpd at parse@lookahead\relax\relax%
+ \let\cpd at parse@next=\relax%
+ \else%
+ \let\cpd at parse@next=\cpd at parse@action%
+ \fi%
+ \cpd at parse@next%
+}
+\endinput
+%%
+%% End of file `cpdparse.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/cpdparse.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty 2022-06-23 20:55:16 UTC (rev 63703)
+++ trunk/Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty 2022-06-23 20:55:46 UTC (rev 63704)
@@ -36,7 +36,7 @@
%%
%%
-\ProvidesPackage{diagram}[2019/12/28]
+\ProvidesPackage{diagram}[2022/06/19]
\newcommand*{\DefaultDiagramSize}{}
\DeclareOption{10pt}{\renewcommand*{\DefaultDiagramSize}{\diagramx}}
\DeclareOption{11pt}{\renewcommand*{\DefaultDiagramSize}{\diagramxi}}
@@ -77,7 +77,8 @@
\newif\ifspace at vertical
\def\spacehorizontal{\space at verticalfalse}
-\newif\ifdi at no
+\newboolean{@cpd at numbering@global}
+\newboolean{@cpd at numbering@local}
\newcounter{board at nr}
\renewcommand{\theboard at nr}{\thediag}
\newboolean{piececounter}
@@ -525,6 +526,7 @@
\let\month=\ds at month%
\let\year=\ds at year%
\let\label=\ds at label%
+ \cpd at begindiagram@hook%
}
\def\endfigurine{%
@@ -553,6 +555,7 @@
\fi%
%
\@show at figurine%
+ \cpd at enddiagram@hook%
\endgroup%
}
\gdef\selectelchfont#1{%
@@ -627,10 +630,15 @@
\def\any{\ifmmode\sim\else$\sim$\fi}
\def\further{\ifmmode\Rightarrow\else$\Rightarrow$\fi\ \ignorespaces}
\def\spacelayout#1{\csname space@#1\endcsname}
-\def\nodiagnumbering{\global\di at nofalse}
+\def\nodiagnumbering{%
+ % \global\di at nofalse
+ \setboolean{@cpd at numbering@global}{false}
+}
\newcommand*{\@dianumber at prefix}{}
\def\diagnumbering#1{%
- \di at notrue\diagnum{\@ne}%
+ \setboolean{@cpd at numbering@global}{true}%
+ % \global\di at notrue%
+ \diagnum{\@ne}%
\gdef\thediag{\@dianumber at prefix\csname @#1\endcsname\c at board@nr}%
}
\def\diagcenter{\def\he at dpos{\centering}}
@@ -638,9 +646,16 @@
\def\diagright{\def\he at dpos{\raggedleft}}
\def\setmonthstyle#1{\def\write at month{\csname @#1\endcsname}}
\def\specialdiagnum#1{%
- \@specialtrue%
- \number at tk={#1}\@numbertrue\def\thediag{#1}\def\@currentlabel{#1}%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ % We disable displaying the diagram number
+ \setboolean{@cpd at numbering@local}{false}%
+ }{%
+ \setboolean{@cpd at numbering@local}{true}%
+ \@specialtrue%
+ \number at tk={#1}\@numbertrue%
+ \def\thediag{#1}\def\@currentlabel{#1}%
+ \ignorespaces%
+ }
}
\def\ds at label{%
\@ifstar{\ds at labelfalse\ds at xlabel}{\ds at labeltrue\ds at xlabel}%
@@ -694,24 +709,44 @@
\ignorespaces%
}
\def\award#1{%
- \award at tk={#1}\@awardtrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'award' argument.^^J}%
+ }{%
+ \award at tk={#1}\@awardtrue%
+ \ignorespaces%
+ }%
}
\def\version#1{%
- \version at tk={#1}\@versiontrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'version' argument.^^J}%
+ }{%
+ \version at tk={#1}\@versiontrue%
+ \ignorespaces%
+ }%
}
\def\after#1{%
- \after at tk={#1}\@aftertrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'after' argument.^^J}%
+ }{%
+ \after at tk={#1}\@aftertrue%
+ \ignorespaces%
+ }%
}
\def\correction#1{%
- \correction at tk={#1}\@correctiontrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'correction' argument.^^J}%
+ }{%
+ \correction at tk={#1}\@correctiontrue%
+ \ignorespaces%
+ }%
}
\def\dedication#1{%
- \dedic at tk={#1}\@dedicationtrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'correction' argument.^^J}%
+ }{%
+ \dedic at tk={#1}\@dedicationtrue%
+ \ignorespaces%
+ }%
}
\def\fidealbum#1{%
\fidealbum at tk={#1}\@fidealbumtrue%
@@ -814,6 +849,9 @@
\theme at tk={#1}\@themetrue%
\ignorespaces%
}
+\def\genre#1{%
+ \relax% Currently not used within diagram.sty
+}
\long\def\comment#1{%
\comment at tk={#1}\@commenttrue%
\ignorespaces%
@@ -972,7 +1010,10 @@
\egroup%
}
\def\@dia at number{%
- \ifdi at no\above at newline{\authorfont\thediag}\fi%
+ %\ifdi at no\above at newline{\authorfont\thediag}\fi%
+ \ifthenelse{\boolean{@cpd at numbering@local}}{%
+ \above at newline{\authorfont\thediag}%
+ }{}%
}
\def\@dia at authors{%
\ifauth at r%
@@ -1098,7 +1139,7 @@
\def\@dia at fidealbum{%
\if at fidealbum%
- \above at newlne%
+ \above at newline%
{\expandafter\@show at album\the\fidealbum at tk;}%
\fi%
}
@@ -1364,26 +1405,7 @@
\sourcefont%
\if at sourcenr\the\sourcenr at tk\ \fi%
\the\source at tk%
- \if at year%
- \ \ %
- \if at day%
- \ifnum\from at month>\z@%
- \the\day at tk.%
- \write at month\from at month%
- \ifnum\to at month>\z@%
- -\write at month\to at month%
- \fi%
- .%
- \fi%
- \else%
- \write at month\the\from at month%
- \ifnum\to at month>\z@%
- -\write at month\the\to at month%
- \fi%
- /%
- \fi%
- \the\year at tk%
- \fi%
+ \if at date\ \ \fi\@dia at date%
\if at issue , \the\issue at tk\fi%
\if at pages , \the\pages at tk\fi%
\fi}%
@@ -1466,7 +1488,7 @@
}
\def\@months#1-#2;{\from at month=#1\to at month=#2\@datetrue}
\def\@dia at writename#1; {\above at newline{\authorfont\@dianame#1; }\l@@klist}
-\def\@sol at writename#1; {\sep at names\@dianame#1; \l@@klist}
+\def\@sol at writename#1; {\sep at names\@solname#1; \l@@klist}
\def\name at sep{,\ }
\def\sep at names{\if at notfirst\name at sep\else\@notfirsttrue\fi}
\def\@checkshort#1/#2#3;{%
@@ -1505,7 +1527,7 @@
\def\@normalname#1; {#1}
\def\space at vertical{\space at verticaltrue}
\def\space at horizontal{\space at verticalfalse}
-\def\cl at arsol{\immediate\openout\s at lfd=\jobname.sol}
+\def\cl at arsol{\immediate\openout\s at lfd=\jobname.sol\relax}
\def\getc at lor#1{%
\if#1\ds at white%
\help at a\z@\global%
@@ -1817,6 +1839,11 @@
\def\@set at label#1;{\ifds at label\label{#1}\fi}
\def\init at vars{%
\global\s at lufalse
+ \ifthenelse{\boolean{@cpd at numbering@global}}{%
+ \setboolean{@cpd at numbering@local}{true}%
+ }{%
+ \setboolean{@cpd at numbering@local}{false}%
+ }%
\setboolean{cpd at checkPieceCounts}{false}%
\setcounter{cpd at defWhitePieces}{\z@}%
\setcounter{cpd at defBlackPieces}{\z@}%
More information about the tex-live-commits
mailing list.