summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-06 23:27:13 +0000
committerKarl Berry <karl@freefriends.org>2015-02-06 23:27:13 +0000
commit970ab76da64fc81430c87913150c65dad35e7665 (patch)
tree967880b01bebe5add7efddaf895a0b3ab82b34ba /Master/texmf-dist
parent2eb3feff3ee5b9dab06d26bde41a3b6ea0802738 (diff)
chess-problem-diagrams (6feb15)
git-svn-id: svn://tug.org/texlive/trunk@36223 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/chess-problem-diagrams/README2
-rw-r--r--Master/texmf-dist/doc/latex/chess-problem-diagrams/diagram.pdfbin347208 -> 347870 bytes
-rw-r--r--Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx63
-rw-r--r--Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty32
4 files changed, 59 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/latex/chess-problem-diagrams/README b/Master/texmf-dist/doc/latex/chess-problem-diagrams/README
index 28396c4bf36..15b8b8677c8 100644
--- a/Master/texmf-dist/doc/latex/chess-problem-diagrams/README
+++ b/Master/texmf-dist/doc/latex/chess-problem-diagrams/README
@@ -1,5 +1,5 @@
diagram --- A package for typesetting chessproblems
-Version 1.9 / Stefan Hoening 2015
+Version v1.11 / Stefan Hoening 2015
CONTENTS
diff --git a/Master/texmf-dist/doc/latex/chess-problem-diagrams/diagram.pdf b/Master/texmf-dist/doc/latex/chess-problem-diagrams/diagram.pdf
index 38751f8eb54..d5bb94102a9 100644
--- a/Master/texmf-dist/doc/latex/chess-problem-diagrams/diagram.pdf
+++ b/Master/texmf-dist/doc/latex/chess-problem-diagrams/diagram.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx b/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx
index 5ed17ca94da..8b1f2ff4414 100644
--- a/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx
+++ b/Master/texmf-dist/source/latex/chess-problem-diagrams/diagram.dtx
@@ -13,9 +13,9 @@
%%
%%
% \fi
-% \def\fileversion{1.9}
-% \def\docdate{2015/1/10}
-% \CheckSum{4281}
+% \def\fileversion{v1.11}
+% \def\docdate{2015/1/30}
+% \CheckSum{4285}
% \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
@@ -65,6 +65,10 @@
% \changes{v1.8.0}{27 November 2013}{Implemented issue '03f/f2a': Added code to display a legend around the board, controlled by the boolean 'legend'.}
% \changes{v1.8.1}{17 August 2014}{Implemented issue '03f/83c': changed tex boolean solafterdiagram to latex boolean.}
% \changes{v1.9}{10 Januar 2015}{Implemented issue '03f/932': Renamed boardfont to cpd@boardfont due to a naming collision with another chess package. Changed all font definitions to newcommand instead of def.}
+% \changes{v1.10}{26 January 2015}{Fixed issue: 03f/658:om: diagram.sty:
+% evaluation of options 11pt and 12pt does not work.}
+% \changes{v1.11}{30 January 2015}{Fixed issue 03f/e20:om: diagram.sty:
+% piecedefs should be written after twins and before remarks.}
%
% \DoNotIndex{\@arabic,\def,\@idxitem,\@ifnextchar,\@ifstar,
% \@ne,\@ptsize,\ ,\advance,\AtEndOfPackage,\begin,\begingroup,
@@ -963,12 +967,28 @@
% Specifies the preamble of our style file.
% \begin{macrocode}
%<*style>
-\ProvidesPackage{diagram}[2015/01/10]
-\DeclareOption{10pt}{\AtBeginDocument{}}
-\DeclareOption{11pt}{\AtBeginDocument{\renewcommand{\DefaultDiagramSize}{\diagramxi}}}
-\DeclareOption{12pt}{\AtBeginDocument{\renewcommand{\DefaultDiagramSize}{\diagramxii}}}
+\ProvidesPackage{diagram}[2015/01/30]
+% \end{macrocode}
+%
+% \begin{macro}{\DefaultDiagramSize}
+% The \verb+\DefaultDiagramSize+ may be used in code to switch to the
+% default diagram size. As this depends on the documents default font
+% size we use the same option and execute \textit{10pt} as default.
+% \begin{macrocode}
+\newcommand*{\DefaultDiagramSize}{}
+\DeclareOption{10pt}{\renewcommand*{\DefaultDiagramSize}{\diagramx}}
+\DeclareOption{11pt}{\renewcommand*{\DefaultDiagramSize}{\diagramxi}}
+\DeclareOption{12pt}{\renewcommand*{\DefaultDiagramSize}{\diagramxii}}
\ExecuteOptions{10pt}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macrocode}
\ProcessOptions
+\AtBeginDocument{\DefaultDiagramSize}
+% \end{macrocode}
+%
+% \begin{macrocode}
\RequirePackage{ifthen}
\RequirePackage{calc}
\RequirePackage{pstricks}
@@ -1605,15 +1625,6 @@
% \end{macro}
% \end{macro}
%
-% To switch to the default diagram size we have the following command. This
-% macro is executed in \verb+\begin{document}+ and is redefined when using
-% document options \verb+11pt+ or \verb+12pt+.
-% \begin{macro}{\DefaultDiagramSize}
-% \begin{macrocode}
-\newcommand{\DefaultDiagramSize}{\diagramx}
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\defaultelchfont}
% |\defaultelchfont| is used to define the fontsize used to
% typeset the diagrams depending on the documentsize.
@@ -2091,6 +2102,7 @@
\ifx@twins\else%
\@dia@twins%
\fi%
+ \@dia@piecedefs%
\@dia@remark%
\ifthenelse{\boolean{@solafterdiagram}}{%
\below@newline%
@@ -2360,6 +2372,17 @@
\l@@klist%
}
+\def\@dia@piecedefs{%
+ \if@piecedefs%
+ \bgroup%
+ \@lefttrue%
+ \let\below@newline\newline%
+ \remfont\let\@action=\write@piecedefs%
+ \@parseTokenlist\piecedefs@tk;%
+ \egroup%
+ \fi%
+}
+
\def\@dia@remark{%
\if@remark%
\bgroup%
@@ -2369,14 +2392,6 @@
\egroup%
\let\below@newline\newline%
\fi%
- \if@piecedefs%
- \bgroup%
- \@lefttrue%
- \let\below@newline\newline%
- \remfont\let\@action=\write@piecedefs%
- \@parseTokenlist\piecedefs@tk;%
- \egroup%
- \fi%
}
\def\parse@params#1{%
diff --git a/Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty b/Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty
index c72486da10e..3316bc21e78 100644
--- a/Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty
+++ b/Master/texmf-dist/tex/latex/chess-problem-diagrams/diagram.sty
@@ -36,12 +36,15 @@
%%
%%
-\ProvidesPackage{diagram}[2015/01/10]
-\DeclareOption{10pt}{\AtBeginDocument{}}
-\DeclareOption{11pt}{\AtBeginDocument{\renewcommand{\DefaultDiagramSize}{\diagramxi}}}
-\DeclareOption{12pt}{\AtBeginDocument{\renewcommand{\DefaultDiagramSize}{\diagramxii}}}
+\ProvidesPackage{diagram}[2015/01/30]
+\newcommand*{\DefaultDiagramSize}{}
+\DeclareOption{10pt}{\renewcommand*{\DefaultDiagramSize}{\diagramx}}
+\DeclareOption{11pt}{\renewcommand*{\DefaultDiagramSize}{\diagramxi}}
+\DeclareOption{12pt}{\renewcommand*{\DefaultDiagramSize}{\diagramxii}}
\ExecuteOptions{10pt}
+
\ProcessOptions
+\AtBeginDocument{\DefaultDiagramSize}
\RequirePackage{ifthen}
\RequirePackage{calc}
\RequirePackage{pstricks}
@@ -582,7 +585,6 @@
\dia@lineskip\tw@\p@
\dia@type\tw@
}
-\newcommand{\DefaultDiagramSize}{\diagramx}
\def\defaultelchfont{%
\ifcase\@ptsize\relax%
\diagramx\or%
@@ -932,6 +934,7 @@
\ifx@twins\else%
\@dia@twins%
\fi%
+ \@dia@piecedefs%
\@dia@remark%
\ifthenelse{\boolean{@solafterdiagram}}{%
\below@newline%
@@ -1180,6 +1183,17 @@
\l@@klist%
}
+\def\@dia@piecedefs{%
+ \if@piecedefs%
+ \bgroup%
+ \@lefttrue%
+ \let\below@newline\newline%
+ \remfont\let\@action=\write@piecedefs%
+ \@parseTokenlist\piecedefs@tk;%
+ \egroup%
+ \fi%
+}
+
\def\@dia@remark{%
\if@remark%
\bgroup%
@@ -1189,14 +1203,6 @@
\egroup%
\let\below@newline\newline%
\fi%
- \if@piecedefs%
- \bgroup%
- \@lefttrue%
- \let\below@newline\newline%
- \remfont\let\@action=\write@piecedefs%
- \@parseTokenlist\piecedefs@tk;%
- \egroup%
- \fi%
}
\def\parse@params#1{%