schwalbe-chess (11jan15)

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

2 files changed, 33 insertions, 38 deletions

diff --git a/Master/texmf-dist/tex/latex/schwalbe-chess/schwalbe.cls b/Master/texmf-dist/tex/latex/schwalbe-chess/schwalbe.cls
index ff8c6422188..ebcae890cad 100644
--- a/Master/texmf-dist/tex/latex/schwalbe-chess/schwalbe.cls
+++ b/Master/texmf-dist/tex/latex/schwalbe-chess/schwalbe.cls
@@ -34,10 +34,11 @@
 %%
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{schwalbe}[2013/03/13]
+\ProvidesClass{schwalbe}[2015/01/11]
 \LoadClass[11pt]{article}
 \RequirePackage{schwalbe}
 \RequirePackage{ifthen}
+\RequirePackage{url}
 \hoffset-25mm
 \voffset-25mm
 \textheight26cm
diff --git a/Master/texmf-dist/tex/latex/schwalbe-chess/schwalbe.sty b/Master/texmf-dist/tex/latex/schwalbe-chess/schwalbe.sty
index 47636ab9f23..ed80d8a7129 100644
--- a/Master/texmf-dist/tex/latex/schwalbe-chess/schwalbe.sty
+++ b/Master/texmf-dist/tex/latex/schwalbe-chess/schwalbe.sty
@@ -34,8 +34,10 @@
 %%
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{schwalbe}[2013/03/13]
-\RequirePackage[german]{babel}
+\ProvidesPackage{schwalbe}[2015/01/11]
+\RequirePackage[T2A,T1]{fontenc}% fsRUS 140121
+\RequirePackage[koi8-r,utf-8]{inputenc}% fsRUS 140121
+\RequirePackage[ngerman,english,german]{babel}
 \RequirePackage{ifthen}
 \RequirePackage{diagram}
 \usepackage{times}
@@ -75,28 +77,28 @@
 \setmonthstyle{Roman}
 \def\normaldia{%
    \font\chessfont=fselch16%
-   \def\authorfont{\bfseries}
-   \def\cityfont{\itshape}
-   \def\sourcefont{\slshape}
-   \def\awardfont{}
-   \def\dedicfont{\itshape}
-   \def\stipfont{}
-   \def\remfont{}
-   \def\labelfont{\footnotesize}
-   \def\boardfont{\footnotesize}
+   \renewcommand*\authorfont{\bfseries}
+   \renewcommand*\cityfont{\itshape}
+   \renewcommand*\sourcefont{\slshape}
+   \renewcommand*\awardfont{}
+   \renewcommand*\dedicfont{\itshape}
+   \renewcommand*\stipfont{}
+   \renewcommand*\remfont{}
+   \renewcommand*\labelfont{\footnotesize}
+   \renewcommand*\cpd@boardfont{\footnotesize}
    \setboardwidth%
 }
 \def\smalldia{%
    \font\chessfont=fselch12%
-   \def\authorfont{\small\bfseries}%
-   \def\cityfont{\small\itshape}%
-   \def\sourcefont{\small\slshape}%
-   \def\awardfont{\small}%
-   \def\dedicfont{\small\itshape}%
-   \def\stipfont{\small}%
-   \def\remfont{\small}%
-   \def\labelfont{\small\footnotesize}%
-   \def\boardfont{\small\footnotesize}%
+   \renewcommand*\authorfont{\small\bfseries}%
+   \renewcommand*\cityfont{\small\itshape}%
+   \renewcommand*\sourcefont{\small\slshape}%
+   \renewcommand*\awardfont{\small}%
+   \renewcommand*\dedicfont{\small\itshape}%
+   \renewcommand*\stipfont{\small}%
+   \renewcommand*\remfont{\small}%
+   \renewcommand*\labelfont{\small\footnotesize}%
+   \renewcommand*\cpd@boardfont{\small\footnotesize}%
    \setboardwidth%
 }
 \renewcommand*{\diagramxi}{\normaldia}
@@ -136,50 +138,42 @@
 }
 \def\@dia@authors{%
    \ifauth@r%
-      \bgroup%
-      \authorfont%
       \ifnormal@names%
          \def\@dianame{\@normalname}%
       \fi%
       \@firsttrue%
       \let\@action=\@dia@writename% Parse the list of authors
       \@parseTokenlist\aut@tk;%
-      \par%
-      \egroup%
    \else%
+      \above@newline
       {\authorfont\@dia@numberx}%
-      \if@special%
-         \par%
-      \else\ifdi@no%
-         \par%
-      \fi\fi%
    \fi%
 }
 \def\@dia@writename#1; {%
+   \above@newline
    \if@first%
       \@firstfalse%
       \setbox\@test@box=\hbox{%
+         \authorfont%
          \@dia@numberx\ %
          \@dianame#1; %
       }%
       \@test@dimen=\wd\@test@box%
       \ifdim\@test@dimen>\board@width\relax%
-         \noindent\hbox to\board@width{\@dia@numberx\hfill}\par%
-         \setbox\@test@box=\hbox{%
-            \@dianame#1; %
-         }%
+         \noindent\hbox to\board@width{\authorfont\@dia@numberx\hfill}\above@newline%
+         \setbox\@test@box=\hbox{\authorfont\@dianame#1; }%
          \@test@dimen=\wd\@test@box%
          \ifdim\@test@dimen>\board@width\relax%
-            \hbox to\board@width{\@dianame#1; \hss}%
+            \noindent\hbox to\board@width{\authorfont\@dianame#1; \hss}%
          \else%
-            \hfill\@dianame#1; %
+            {\authorfont\@dianame#1; }%
          \fi%
       \else%
-         \@dia@numberx\hfill\@dianame#1; %
+         {\authorfont\@dia@numberx\hfill\@dianame#1; }%
       \fi%
    \else%
       % Changed to get the resulting names centered.
-      \par\noindent\hbox to\board@width{\hss\@dianame#1; \hss}%
+      \hbox to\board@width{\hss\authorfont\@dianame#1; \hss}%
    \fi%
    \l@@klist%
 }