texlive[55271] Master/texmf-dist: crossword (25may20)
commits+karl at tug.org
commits+karl at tug.org
Mon May 25 23:11:36 CEST 2020
Revision: 55271
http://tug.org/svn/texlive?view=revision&revision=55271
Author: karl
Date: 2020-05-25 23:11:36 +0200 (Mon, 25 May 2020)
Log Message:
-----------
crossword (25may20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/crossword/cwpuzzle.pdf
trunk/Master/texmf-dist/source/latex/crossword/cwpuzzle.dtx
trunk/Master/texmf-dist/source/latex/crossword/cwpuzzle.ins
trunk/Master/texmf-dist/tex/latex/crossword/cwpuzzle.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/crossword/LICENSE
trunk/Master/texmf-dist/doc/latex/crossword/README.md
trunk/Master/texmf-dist/doc/latex/crossword/makefile
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/crossword/Makefile
trunk/Master/texmf-dist/doc/latex/crossword/README
Added: trunk/Master/texmf-dist/doc/latex/crossword/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/latex/crossword/LICENSE (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/crossword/LICENSE 2020-05-25 21:11:36 UTC (rev 55271)
@@ -0,0 +1,9 @@
+cwpuzzle.dtx is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY. No author or distributor accepts
+responsibility to anyone for the consequences of using it or for
+whether it serves any particular purpose or works at all, unless
+he says so in writing.
+
+Everyone is granted permission to copy, modify and redistribute
+cwpuzzle.dtx, provided this copyright notice is preserved and
+any modifications are indicated.
Deleted: trunk/Master/texmf-dist/doc/latex/crossword/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/crossword/Makefile 2020-05-25 15:11:03 UTC (rev 55270)
+++ trunk/Master/texmf-dist/doc/latex/crossword/Makefile 2020-05-25 21:11:36 UTC (rev 55271)
@@ -1,56 +0,0 @@
-#******************************************************************************
-#* $Id: Makefile,v 1.9 2009/09/13 08:37:19 gene Exp gene $
-#******************************************************************************
-#* Author: Gerd Neugebauer
-#*=============================================================================
-
-INSTALLDIR = /usr/local/lib/texmf/tex/latex/cwpuzzle
-
-FILES = cwpuzzle.dtx \
- cwpuzzle.ins \
- Makefile \
- README
-
-LATEX = latex
-PDFLATEX = pdflatex
-MAKEINDEX = makeindex
-RM = rm -f
-INSTALL = install
-MKDIR = mkdir
-
-#*=============================================================================
-
-all: cwpuzzle.pdf
-
-cwpuzzle.sty sty: cwpuzzle.dtx cwpuzzle.ins
- $(RM) cwpuzzle.cls cwpuzzle.sty
- $(PDFLATEX) cwpuzzle.ins
-
-cwpuzzle.dvi dvi: cwpuzzle.dtx cwpuzzle.sty
- $(LATEX) cwpuzzle.dtx
- $(LATEX) cwpuzzle.dtx
- $(MAKEINDEX) -s gind.ist cwpuzzle
- $(MAKEINDEX) -s gglo.ist -o cwpuzzle.gls cwpuzzle.glo
- $(LATEX) cwpuzzle.dtx
-
-cwpuzzle.pdf pdf: cwpuzzle.sty cwpuzzle.gls
- $(PDFLATEX) cwpuzzle.dtx
- $(PDFLATEX) cwpuzzle.dtx
- $(MAKEINDEX) -s gind.ist cwpuzzle
- $(MAKEINDEX) -s gglo.ist -o cwpuzzle.gls cwpuzzle.glo
- $(PDFLATEX) cwpuzzle.dtx
-
-cwpuzzle.gls:
-
-zip dist: ${FILES} cwpuzzle.pdf
- zip cwpuzzle-` perl -n -e 'print $$1 if m/\\\\def\\\\fileversion[{](.*)[}]/' cwpuzzle.dtx`.zip \
- ${FILES} cwpuzzle.pdf
-
-clean:
- $(RM) cwpuzzle.log cwpuzzle.aux cwpuzzle.glo cwpuzzle.gls \
- cwpuzzle.idx cwpuzzle.ilg cwpuzzle.ind cwpuzzle.toc
-
-veryclean: clean
- $(RM) cwpuzzle.cls cwpuzzle.sty cwpuzzle.dvi cwpuzzle.pdf
-
-#
Deleted: trunk/Master/texmf-dist/doc/latex/crossword/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/crossword/README 2020-05-25 15:11:03 UTC (rev 55270)
+++ trunk/Master/texmf-dist/doc/latex/crossword/README 2020-05-25 21:11:36 UTC (rev 55271)
@@ -1,88 +0,0 @@
-
- cwpuzzle.sty
- -
- a LaTeX package for typesetting crossword puzzles and more
-
- Gerd Neugebauer
-
-
-CROSSWORD PUZZLES
-
-Since I know only of one additional package for typesetting crossword
-puzzles on CTAN -- named crosswrd.sty -- I will compare it against
-this package to show the advantages and disadvantages of both
-packages.
-
-I have developed cwpuzzle.sty because I needed to typeset a puzzle
-which required more features than those provided by crosswrd. The
-feature I was missing was the inclusion of rectangular regions in the
-puzzles containing ads or other texts not directly related to the
-characters to be filled in.
-
-I have generalized this requirement by allowing arbitrary rectangles
-to be left free. Thus it is possible to typeset puzzles which have no
-rectangular border (See the documentation for examples).
-
-Another idea was to have different types of puzzles generated from the
-same source:
-
-- The classical puzzle contains numbers for the words and clues for
- the words to be filled in.
-
-- The numbered puzzle contains numbers in each cell where identical
- numbers represent identical letters. The goal is to find out which
- number corresponds to which letter.
-
-- The fill-in type of puzzle consists of a grid and a list of words.
- The goal is to place all words in the grid.
-
-crosswrd supports the first type of puzzle only. cwpuzzle supports all
-of them.
-
-The input for both packages is completely different. crosswrd assumes
-that a user uses this package to develop a puzzle. Thus it is tailored
-towards a human user. It checks for consistency and requires
-non-redundant input. (As a unpleasant side effect fragile macros used
-in clues have to be protected)
-
-cwpuzzle needs some redundancy in the input for the sake of
-flexibility. But it seems quite natural to specify the frame of the
-puzzle and the clues separately. Especially for those types where no
-clues are needed at all.
-
-cwpuzzle currently assumes that words are terminated by a black block
-(or the border of the puzzle). crosswrd also supports also the variant
-where words are terminated by a thicker border. This might also be
-incorporated into a future release of cwpuzzle.
-
-In cwpuzzle it is also possible to specify whether the crossword
-puzzle or it's solution should be produced (from the same
-source). Thus it is possible to include the puzzle in one issue of a
-journal and the solution into another, or to typeset the solution
-several pages after the puzzle.
-
-cwpuzzle provides a larger number of options and hooks which can be
-used to customize the result. E.g it is possible to modify the size of
-the boxes or the fonts used as well as the appearance of graphical
-elements like the black blocks.
-
-
-MORE CELL-BASED PUZZLES
-
-In addition to crossword puzzles Sudoku and Kakuro are supported. They
-are also grid-based. Thus it was easy to facilityte the infrastructure
-already in place for them.
-
-There is a package for sudoku on CTAN. But it does not support
-solutions yet.
-
-
-LOCATION
-
-cwpuzzle is located in the CTAN directory
-
- tex-archive/macros/latex/contrib/gene/crossword
-
-Run tex on cwpuzzle.ins to produce the package and (pdf)latex on
-cwpuzzle.dtx to get the documentation (or the Makefile to do both).
-Per default the Makefile produces the documentation as PDF.
Added: trunk/Master/texmf-dist/doc/latex/crossword/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/crossword/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/crossword/README.md 2020-05-25 21:11:36 UTC (rev 55271)
@@ -0,0 +1,131 @@
+
+# cwpuzzle.sty
+---
+a LaTeX package for typesetting crossword puzzles and more
+
+Gerd Neugebauer
+
+
+## Crossword Puzzles
+
+Since I know only of one additional package for typesetting crossword
+puzzles on CTAN -- named `crosswrd.sty` -- I will compare it against
+this package to show the advantages and disadvantages of both
+packages.
+
+I have developed `cwpuzzle.sty` because I needed to typeset a puzzle
+which required more features than those provided by `crosswrd`. The
+feature I was missing was the inclusion of rectangular regions in the
+puzzles containing ads or other texts not directly related to the
+characters to be filled in.
+
+I have generalized this requirement by allowing arbitrary rectangles
+to be left free. Thus it is possible to typeset puzzles which have no
+rectangular border (See the documentation for examples).
+
+Another idea was to have different types of puzzles generated from the
+same source:
+
+- The classical puzzle contains numbers for the words and clues for
+ the words to be filled in.
+
+- The numbered puzzle contains numbers in each cell where identical
+ numbers represent identical letters. The goal is to find out which
+ number corresponds to which letter.
+
+- The fill-in type of puzzle consists of a grid and a list of words.
+ The goal is to place all words in the grid.
+
+`crosswrd` supports the first type of puzzle only. c wpuzzle supports
+all of them.
+
+The input for both packages is completely different. crosswrd assumes
+that a user uses this package to develop a puzzle. Thus it is tailored
+towards a human user. It checks for consistency and requires
+non-redundant input. (As a unpleasant side effect fragile macros used
+in clues have to be protected)
+
+`cwpuzzle` needs some redundancy in the input for the sake of
+flexibility. But it seems quite natural to specify the frame of the
+puzzle and the clues separately. Especially for those types where no
+clues are needed at all.
+
+cwpuzzle currently assumes that words are terminated by a black block
+(or the border of the puzzle). crosswrd also supports also the variant
+where words are terminated by a thicker border. This might also be
+incorporated into a future release of cwpuzzle.
+
+In `cwpuzzle` it is also possible to specify whether the crossword
+puzzle or it's solution should be produced (from the same
+source). Thus it is possible to include the puzzle in one issue of a
+journal and the solution into another, or to typeset the solution
+several pages after the puzzle.
+
+`cwpuzzle` provides a larger number of options and hooks which can be
+used to customize the result. E.g it is possible to modify the size of
+the boxes or the fonts used as well as the appearance of graphical
+elements like the black blocks.
+
+
+## More Cell-based Puzzles
+
+In addition to crossword puzzles **Sudoku** and **Kakuro** are
+supported. They are also grid-based. Thus it was easy to facilityte
+the infrastructure already in place for them.
+
+There is a package for sudoku on CTAN. But it does not support
+solutions yet.
+
+
+## Location
+
+cwpuzzle is located in the CTAN directory
+
+ https://ctan.org/tex-archive/macros/latex/contrib/gene/crossword
+
+The source repository can be found under
+
+ https://sourceforge.net/p/gene-tex-lib/svn/HEAD/tree/cwpuzzle
+
+
+## Installation
+
+### ... in TeX distributions
+
+If you are lucky then cwpuzzle is already installed in your TeX
+distribution or available via the package manager:
+
+- in TeX Live as `crossword`
+- in MiKTeX as `crossword`
+
+
+### ... manually
+
+Run tex on `cwpuzzle.ins` to produce the package and latex and
+makeindex on `cwpuzzle.dtx` to get the documentation
+
+```
+ tex cwpuzzle.ins
+ lualatex cwpuzzle.dtx
+ lualatex cwpuzzle.dtx
+ makeindex -s gind.ist cwpuzzle
+ makeindex -s gglo.ist -o cwpuzzle.gls cwpuzzle.glo
+ lualatex cwpuzzle.dtx
+
+```
+
+Or use the `Makefile` to do both.
+Per default the `Makefile` produces the documentation as PDF.
+
+```
+ make -f Makefile
+```
+
+Finally move the file `cwpuzzle.sty` into a directory where your TeX
+distribution searches for style files.
+
+
+## Version and copyright
+
+The relevant information about version and copyright are contained in
+the file `cwpuzzle.dtx`.
Property changes on: trunk/Master/texmf-dist/doc/latex/crossword/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/crossword/cwpuzzle.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/crossword/makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/crossword/makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/crossword/makefile 2020-05-25 21:11:36 UTC (rev 55271)
@@ -0,0 +1,61 @@
+#******************************************************************************
+#* $Id: Makefile,v 1.9 2009/09/13 08:37:19 gene Exp gene $
+#******************************************************************************
+#* Author: Gerd Neugebauer
+#*=============================================================================
+
+INSTALLDIR = /usr/local/lib/texmf/tex/latex/cwpuzzle
+
+FILES = cwpuzzle.dtx \
+ cwpuzzle.ins \
+ makefile \
+ README.md \
+ LICENSE
+
+LATEX = latex
+PDFLATEX = pdflatex
+MAKEINDEX = makeindex
+RM = rm -f
+INSTALL = install
+MKDIR = mkdir
+
+#*=============================================================================
+
+all: cwpuzzle.pdf
+
+cwpuzzle.sty sty: cwpuzzle.dtx cwpuzzle.ins
+ $(RM) cwpuzzle.cls cwpuzzle.sty
+ $(PDFLATEX) cwpuzzle.ins
+
+cwpuzzle.dvi dvi: cwpuzzle.dtx cwpuzzle.sty
+ $(LATEX) cwpuzzle.dtx
+ $(LATEX) cwpuzzle.dtx
+ $(MAKEINDEX) -s gind.ist cwpuzzle
+ $(MAKEINDEX) -s gglo.ist -o cwpuzzle.gls cwpuzzle.glo
+ $(LATEX) cwpuzzle.dtx
+
+cwpuzzle.pdf pdf: cwpuzzle.sty cwpuzzle.gls
+ $(PDFLATEX) cwpuzzle.dtx
+ $(PDFLATEX) cwpuzzle.dtx
+ $(MAKEINDEX) -s gind.ist cwpuzzle
+ $(MAKEINDEX) -s gglo.ist -o cwpuzzle.gls cwpuzzle.glo
+ $(PDFLATEX) cwpuzzle.dtx
+
+cwpuzzle.gls:
+
+zip dist: ${FILES} cwpuzzle.pdf
+ rm -rf crossword
+ mkdir crossword
+ cp ${FILES} cwpuzzle.pdf crossword
+ zip crossword-` perl -n -e 'print $$1 if m/\\\\def\\\\fileversion[{](.*)[}]/' cwpuzzle.dtx`.zip \
+ crossword/*
+ rm -rf crossword
+
+clean:
+ $(RM) cwpuzzle.log cwpuzzle.aux cwpuzzle.glo cwpuzzle.gls \
+ cwpuzzle.idx cwpuzzle.ilg cwpuzzle.ind cwpuzzle.toc
+
+veryclean: clean
+ $(RM) cwpuzzle.cls cwpuzzle.sty cwpuzzle.dvi cwpuzzle.pdf
+
+#
Property changes on: trunk/Master/texmf-dist/doc/latex/crossword/makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/crossword/cwpuzzle.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/crossword/cwpuzzle.dtx 2020-05-25 15:11:03 UTC (rev 55270)
+++ trunk/Master/texmf-dist/source/latex/crossword/cwpuzzle.dtx 2020-05-25 21:11:36 UTC (rev 55271)
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\filename{cwpuzzle.dtx}
-\def\fileversion{1.9}
-\def\filedate{2014/01/12}
+\def\fileversion{1.10}
+\def\filedate{2020/05/23}
\let\docversion=\fileversion
\let\docdate=\filedate
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19,11 +19,11 @@
%%
%%
%% Author: Gerd Neugebauer
-%% Im Lerchels\xF6hl 5
-%% 64521 Gro\xDF-Gerau
+%% Im Lerchels\"ohl 5
+%% 64521 Gro\ss-Gerau
%% Mail: gene at gerd-neugebauer.de
%%
-%% Copyright (c) 1995-2014 Gerd Neugebauer
+%% Copyright (c) 1995-2020 Gerd Neugebauer
%%
%% cwpuzzle.dtx is distributed in the hope that it will be useful,
%% but WITHOUT ANY WARRANTY. No author or distributor accepts
@@ -35,10 +35,6 @@
%% cwpuzzle.dtx, provided this copyright notice is preserved and
%% any modifications are indicated.
%%
-%%
-%% This style is still under development and may be replaced with a
-%% new version which provides an enhanced functionality.
-%%
%<*driver>
\documentclass{ltxdoc}
\usepackage{xcolor}
@@ -77,8 +73,8 @@
% \DoNotIndex{\hfill,\if,\ifx,\large,\let,\makebox,\mbox,\newcommand}
% \DoNotIndex{\newcount,\newdimen,\newenvironment,\newif,\noindent}
% \DoNotIndex{\normalsize,\null,\par,\put,\raggedright,\raggedleft}
-% \DoNotIndex{\relax,\renewcommand,\RequirePackage,\rm,\rule}
-% \DoNotIndex{\scriptsize,\sf,\small,\textsf,\textwidth}
+% \DoNotIndex{\relax,\renewcommand,\RequirePackage,\rm,\rmfamily,\rule}
+% \DoNotIndex{\scriptsize,\sf,\sffamily,\small,\textsf,\textwidth}
% \DoNotIndex{\the,\tiny,\unitlength,\uppercase,\xdef,\ProvidesPackage}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -568,7 +564,7 @@
% \begin{minipage}{.65\textwidth}\small
% \begin{verbatim}
% \definecolor{gray}{gray}{.9}
-% \PuzzleDefineColorCell{g}{gray}
+% \PuzzleDefineColorCell{c}{gray}
% \begin{Puzzle}{2}{2}
% |{} |[1][cf]X |.
% |[2][c]X |{} |.
@@ -577,7 +573,7 @@
% \end{minipage}\hfill
% \begin{minipage}{.30\textwidth}
% \definecolor{gray}{gray}{.9}
-% \PuzzleDefineColorCell{g}{gray}
+% \PuzzleDefineColorCell{c}{gray}
% \begin{Puzzle}{2}{2}
% |{} |[1][cf]X |.
% |[2][c]X |{} |.
@@ -598,9 +594,10 @@
% default it is typeset in a mini-page of the appropriate width
% centered horizontally and vertically.
%
+% \changes{1.10}{2020/05/23}{Font changing macros modernized}
% \begin{verbatim}
% \begin{Puzzle}{8}{6}
-% \Frame{2}{2}{4}{2}{\sf Crossword\\Puzzle}
+% \Frame{2}{2}{4}{2}{\sffamily Crossword\\Puzzle}
% |[1]E|* |[2]N |U |L |[3]L |* |[4]V|.
% |[5]T|[6]R|I |A |N |G |[7]L|E |.
% |A |U |{} |{} |{} |{} |[8]C|C |.
@@ -613,7 +610,7 @@
% \PuzzleUnsolved\noindent
% \begin{minipage}{.5\textwidth}\PuzzleUnitlength=18pt
% \begin{Puzzle}{8}{6}%
-% \Frame{2}{2}{4}{2}{\sf Crossword\\Puzzle}%
+% \Frame{2}{2}{4}{2}{\sffamily Crossword\\Puzzle}%
% |[1]E|* |[2]N|U|L|[3]L|* |[4]V|.
% |[5]T|[6]R|I|A|N|G|[7]L|E|.
% |A|U|{}|{}|{}|{}|[8]C|C|.
@@ -769,7 +766,7 @@
% to switch to solution mode. Then all numbers are shown. The
% parameters to modify the appearance of a puzzle work here as well. \medskip
%
-% {\PuzzleSolution\PuzzleUnitlength=14pt\footnotesize\sf
+% {\PuzzleSolution\PuzzleUnitlength=14pt\sffamily\footnotesize
% \begin{Sudoku}
% | 7|*2| 4| 1| 3| 5| 6|*9| 8|.
% |*3| 8|*1|*9| 7|*6|*5| 4|*2|.
@@ -811,7 +808,7 @@
% \def\myColor{}\ifcase#1
% \def\myColor{white}\or\def\myColor{red}\or\def\myColor{green}\or\def\myColor{yellow}\or\def\myColor{orange}\or\def\myColor{lime}\or\def\myColor{purple}\or\def\myColor{violet}\or\def\myColor{teal}\or\def\myColor{brown}\else\def\myColor{white}\fi
% \colorbox{\myColor}{\makebox(1,1){#1}}}
-% \PuzzleSolution\PuzzleUnitlength=14pt\footnotesize\sf
+% \PuzzleSolution\PuzzleUnitlength=14pt\sffamily\footnotesize
% \begin{Sudoku}
% | 7|*2| 4| 1| 3| 5| 6|*9| 8|.
% |*3| 8|*1|*9| 7|*6|*5| 4|*2|.
@@ -882,7 +879,7 @@
% \begin{minipage}{.25\textwidth}
% {\PuzzleSolution
% \PuzzleUnitlength=14pt
-% \footnotesize\sf
+% \sffamily\footnotesize
% \begin{Kakuro}{6}{9}
% | - |<:13> |<:37> | - |<:41> |<:7> | - |.
% |<4:> |* 3 | 1 |<14:> | 8 | 6 | - |.
@@ -899,7 +896,7 @@
% \begin{verbatim}
% \PuzzleSolution
% \PuzzleUnitlength=14pt
-% \footnotesize\sf
+% \sffamily\footnotesize
% \begin{Kakuro}{6}{9}
% | - |<:13> |<:37>| - |<:41>|<:7> | - |.
% |<4:> |* 3 | 1 |<14:> | 8 | 6 | - |.
@@ -1191,8 +1188,9 @@
%
% The macro |\PuzzleFont| contains font changing
% commands issued before the puzzle is typeset.
+% \changes{1.10}{2020/05/23}{Font changing macros modernized}
% \begin{macrocode}
-\newcommand\PuzzleFont{\rm\normalsize}
+\newcommand\PuzzleFont{\rmfamily\normalsize}
% \end{macrocode}
% \end{macro}
%
@@ -1199,8 +1197,9 @@
% \begin{macro}{\PuzzleNumberFont}
% The macro |\PuzzleNumberFont| contains font changing
% commands issued before the numbers in a puzzle are typeset.
+% \changes{1.10}{2020/05/23}{Font changing macros modernized}
% \begin{macrocode}
-\newcommand\PuzzleNumberFont{\sf\scriptsize}
+\newcommand\PuzzleNumberFont{\sffamily\scriptsize}
% \end{macrocode}
% \end{macro}
%
@@ -1970,7 +1969,8 @@
\gdef\Sudoku{\begin{Puzzle}{9}{9}%
\let\Puzzle at pipe=|%
\def\PPa{\Puzzle at pipe[][fS]}%
- \def|##1{\ifx##1*\let\next\PPa\else\Puzzle at pipe{##1}\let\next\relax\fi\next}
+ \def|##1{\ifx##1*\let\next\PPa\else
+ \Puzzle at pipe{##1}\let\next\relax\fi\next}
}
\endgroup
% \end{macrocode}
@@ -2014,8 +2014,9 @@
% The macro |\KakuroNumberFont| is used to typeset the hints, i.e.
% the horizontal and vertical sums.
% \changes{1.8}{2009/09/13}{New}
+% \changes{1.10}{2020/05/23}{Font changing macros modernized}
% \begin{macrocode}
-\newcommand\KakuroNumberFont{\sf\tiny}
+\newcommand\KakuroNumberFont{\sffamily\tiny}
% \end{macrocode}
% \end{macro}
%
@@ -2023,6 +2024,7 @@
% The macro |\Kakuro at cell| is used to typeset the cells. It
% analyzes the argument and acts accordingly.
% \changes{1.8}{2009/09/13}{New}
+% \changes{1.10}{2020/05/23}{Font changing macros modernized}
% \begin{macrocode}
\def\Kakuro at cell#1{%
\ifx#1. \def\next{\Puzzle at pipe.}%
@@ -2059,12 +2061,16 @@
\def\Kakuro at hint#1:#2>{%
\def\x{#2}%
\ifx\x\empty\else
- \put(\Puzzle at X,\Puzzle at Y){\makebox(1,.8)[r]{\parbox{.95\unitlength}{\raggedright\KakuroNumberFont
+ \put(\Puzzle at X,\Puzzle at Y){%
+ \makebox(1,.8)[r]{\parbox{.95\unitlength}{%
+ \raggedright\KakuroNumberFont
$\blacktriangledown$\\#2}}}
\fi
\def\x{#1}%
\ifx\x\empty\else
- \put(\Puzzle at X,\Puzzle at Y){\makebox(1,1.2){\parbox{.95\unitlength}{\raggedleft\KakuroNumberFont
+ \put(\Puzzle at X,\Puzzle at Y){%
+ \makebox(1,1.2){\parbox{.95\unitlength}{%
+ \raggedleft\KakuroNumberFont
#1 $\blacktriangleright$\\\mbox{}}}}
\fi
\Puzzle at pipe[][\KakuroHintType]{ }}%
@@ -2138,6 +2144,7 @@
% Now, that everything is in place we can arrange some package
% options.
% \changes{1.6}{2006/08/12}{Several style options defined}
+% \changes{1.10}{2020/05/23}{Font changing macros modernized}
% \begin{macrocode}
\DeclareOption{numbered}{\Puzzle at SolutionNumberedtrue}
\DeclareOption{nocenter}{\let\PuzzlePre=\relax
@@ -2145,11 +2152,11 @@
\DeclareOption{unboxed}{\let\PuzzleCluePre=\relax
\let\PuzzleCluePost=\relax}
\DeclareOption{normalsize}{\PuzzleUnitlength=20pt
- \def\PuzzleFont{\rm\normalsize}}
+ \def\PuzzleFont{\rmfamily\normalsize}}
\DeclareOption{small}{\PuzzleUnitlength=16pt
- \def\PuzzleFont{\rm\small}}
+ \def\PuzzleFont{\rmfamily\small}}
\DeclareOption{large}{\PuzzleUnitlength=24pt
- \def\PuzzleFont{\rm\large}}
+ \def\PuzzleFont{\rmfamily\large}}
\DeclareOption{german}{%
\renewcommand\PuzzleWordsText[1]{Worte der L\"ange #1: }%
\renewcommand\PuzzleLettersText{Benutzte Buchstaben: }%
Modified: trunk/Master/texmf-dist/source/latex/crossword/cwpuzzle.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/crossword/cwpuzzle.ins 2020-05-25 15:11:03 UTC (rev 55270)
+++ trunk/Master/texmf-dist/source/latex/crossword/cwpuzzle.ins 2020-05-25 21:11:36 UTC (rev 55271)
@@ -1,11 +1,11 @@
%%------------------------------------------------------------------
%% Driver file to extract the dtx style and package file.
%%
-%% Copyright (C) 1995-2014 Gerd Neugebauer
+%% Copyright (C) 1995-2020 Gerd Neugebauer
%%
%% Author: Gerd Neugebauer
-%% Im Lerchels\xF6hl 5
-%% 64521 Gro\xDF-Gerau
+%% Im Lerchelsb\"ohl 5
+%% 64521 Gro\ss-Gerau
%% Mail: gene at gerd-neugebauer.de
%%
%% cwpuzzle.ins is distributed in the hope that it will be useful,
Modified: trunk/Master/texmf-dist/tex/latex/crossword/cwpuzzle.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/crossword/cwpuzzle.sty 2020-05-25 15:11:03 UTC (rev 55270)
+++ trunk/Master/texmf-dist/tex/latex/crossword/cwpuzzle.sty 2020-05-25 21:11:36 UTC (rev 55271)
@@ -21,8 +21,8 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\def\filename{cwpuzzle.dtx}
-\def\fileversion{1.9}
-\def\filedate{2014/01/12}
+\def\fileversion{1.10}
+\def\filedate{2020/05/23}
\let\docversion=\fileversion
\let\docdate=\filedate
\typeout{%
@@ -38,11 +38,11 @@
%%
%%
%% Author: Gerd Neugebauer
-%% Im Lerchels\xF6hl 5
-%% 64521 Gro\xDF-Gerau
+%% Im Lerchels\"ohl 5
+%% 64521 Gro\ss-Gerau
%% Mail: gene at gerd-neugebauer.de
%%
-%% Copyright (c) 1995-2014 Gerd Neugebauer
+%% Copyright (c) 1995-2020 Gerd Neugebauer
%%
%% cwpuzzle.dtx is distributed in the hope that it will be useful,
%% but WITHOUT ANY WARRANTY. No author or distributor accepts
@@ -54,10 +54,6 @@
%% cwpuzzle.dtx, provided this copyright notice is preserved and
%% any modifications are indicated.
%%
-%%
-%% This style is still under development and may be replaced with a
-%% new version which provides an enhanced functionality.
-%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% \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
@@ -80,8 +76,8 @@
\newdimen\PuzzleUnitlength
\PuzzleUnitlength=20pt
\newcommand\PuzzleClueFont{\footnotesize}
-\newcommand\PuzzleFont{\rm\normalsize}
-\newcommand\PuzzleNumberFont{\sf\scriptsize}
+\newcommand\PuzzleFont{\rmfamily\normalsize}
+\newcommand\PuzzleNumberFont{\sffamily\scriptsize}
\let\PuzzleHook=\relax
\newcount\Puzzle at X
\newcount\Puzzle at Y
@@ -339,7 +335,8 @@
\gdef\Sudoku{\begin{Puzzle}{9}{9}%
\let\Puzzle at pipe=|%
\def\PPa{\Puzzle at pipe[][fS]}%
- \def|##1{\ifx##1*\let\next\PPa\else\Puzzle at pipe{##1}\let\next\relax\fi\next}
+ \def|##1{\ifx##1*\let\next\PPa\else
+ \Puzzle at pipe{##1}\let\next\relax\fi\next}
}
\endgroup
\gdef\endSudoku{%
@@ -358,7 +355,7 @@
\put(0,3){\framebox(9,3){}}
\end{Puzzle}}
\newcommand\SudokuLinethickness{2pt}
-\newcommand\KakuroNumberFont{\sf\tiny}
+\newcommand\KakuroNumberFont{\sffamily\tiny}
\def\Kakuro at cell#1{%
\ifx#1. \def\next{\Puzzle at pipe.}%
\else\ifx#1< \let\next\Kakuro at HINT
@@ -373,12 +370,16 @@
\def\Kakuro at hint#1:#2>{%
\def\x{#2}%
\ifx\x\empty\else
- \put(\Puzzle at X,\Puzzle at Y){\makebox(1,.8)[r]{\parbox{.95\unitlength}{\raggedright\KakuroNumberFont
+ \put(\Puzzle at X,\Puzzle at Y){%
+ \makebox(1,.8)[r]{\parbox{.95\unitlength}{%
+ \raggedright\KakuroNumberFont
$\blacktriangledown$\\#2}}}
\fi
\def\x{#1}%
\ifx\x\empty\else
- \put(\Puzzle at X,\Puzzle at Y){\makebox(1,1.2){\parbox{.95\unitlength}{\raggedleft\KakuroNumberFont
+ \put(\Puzzle at X,\Puzzle at Y){%
+ \makebox(1,1.2){\parbox{.95\unitlength}{%
+ \raggedleft\KakuroNumberFont
#1 $\blacktriangleright$\\\mbox{}}}}
\fi
\Puzzle at pipe[][\KakuroHintType]{ }}%
@@ -402,11 +403,11 @@
\DeclareOption{unboxed}{\let\PuzzleCluePre=\relax
\let\PuzzleCluePost=\relax}
\DeclareOption{normalsize}{\PuzzleUnitlength=20pt
- \def\PuzzleFont{\rm\normalsize}}
+ \def\PuzzleFont{\rmfamily\normalsize}}
\DeclareOption{small}{\PuzzleUnitlength=16pt
- \def\PuzzleFont{\rm\small}}
+ \def\PuzzleFont{\rmfamily\small}}
\DeclareOption{large}{\PuzzleUnitlength=24pt
- \def\PuzzleFont{\rm\large}}
+ \def\PuzzleFont{\rmfamily\large}}
\DeclareOption{german}{%
\renewcommand\PuzzleWordsText[1]{Worte der L\"ange #1: }%
\renewcommand\PuzzleLettersText{Benutzte Buchstaben: }%
More information about the tex-live-commits
mailing list.