From 3bffd8b7dfcee8333bb2841ea194a0daa26af8cd Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 21 Dec 2021 03:00:53 +0000 Subject: CTAN sync 202112210300 --- graphics/pgf/contrib/xistercian/README.md | 2 +- graphics/pgf/contrib/xistercian/xistercian.dtx | 467 +++++++++++++++++++------ graphics/pgf/contrib/xistercian/xistercian.pdf | Bin 325294 -> 351990 bytes 3 files changed, 370 insertions(+), 99 deletions(-) (limited to 'graphics/pgf/contrib') diff --git a/graphics/pgf/contrib/xistercian/README.md b/graphics/pgf/contrib/xistercian/README.md index 42fea466d4..da604d7304 100644 --- a/graphics/pgf/contrib/xistercian/README.md +++ b/graphics/pgf/contrib/xistercian/README.md @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------- # xistercian -- Cistercian numerals in LaTeX -Version 2021-11-23 v1.1a +Version 2021-12-20 v1.2 Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt diff --git a/graphics/pgf/contrib/xistercian/xistercian.dtx b/graphics/pgf/contrib/xistercian/xistercian.dtx index 16382ad2ca..ff9b20b105 100644 --- a/graphics/pgf/contrib/xistercian/xistercian.dtx +++ b/graphics/pgf/contrib/xistercian/xistercian.dtx @@ -55,7 +55,7 @@ and the derived files xistercian.pdf \fi % \IfFileExists{xistercian.sty}{\RequirePackage[debug]{xistercian}}{} -\ProvidesFile{xistercian.dtx}[2021-11-23 v1.1a Cistercian numerals in LaTeX] +\ProvidesFile{xistercian.dtx}[2021-12-20 v1.2 Cistercian numerals in LaTeX] \PassOptionsToPackage{full}{textcomp} \documentclass{l3doc} \RequirePackage[fulloldstyle,nott]{kpfonts} @@ -80,32 +80,38 @@ and the derived files xistercian.pdf \cisterciannum{#1}^^A \endgroup } +\pagenumbering{cistercian} +\ExplSyntaxOn +\makeatletter +\AddToHook{env/syntax/begin}{\let\myhfill\hfill} +\let\myhfill\@empty \newcommand*\mydefault[1] - {^^A + { \begingroup - \color{darkgray}^^A + \color{darkgray} \myrestoredefaults - \hfill + \myhfill \texttt - {^^A - \detokenize\expandafter\expandafter\expandafter - {\csname xister@#1\endcsname}^^A - \unskip - }^^A + { + \expandafter\ifx\csname xister@#1\endcsname\@empty + \normalfont\emph{empty} + \else + \detokenize\expandafter\expandafter\expandafter + {\csname xister@#1\endcsname} + \unskip + \fi + } \endgroup } \newcommand*\mysdefault[1] - {^^A + { \begingroup - \color{darkgray}^^A + \color{darkgray} \myrestoredefaults - \hfill - \texttt{#1}^^A + \myhfill + \texttt { \str_if_eq:nnTF {#1} { empty } { \normalfont \emph{#1} } {#1} } \endgroup } -\pagenumbering{cistercian} -\ExplSyntaxOn -\makeatletter \def\myrestoredefaults#1{\def\unexpanded{#1}{\unexpanded\expandafter{#1}}} \edef\myrestoredefaults { @@ -117,6 +123,7 @@ and the derived files xistercian.pdf \myrestoredefaults\xister@th \myrestoredefaults\xister@tdu \myrestoredefaults\xister@tdd + \myrestoredefaults\xister@ts \myrestoredefaults\xister@font } \makeatother @@ -135,11 +142,33 @@ and the derived files xistercian.pdf {\cisterciansetup{sv=.27ex,sdd=.27ex,sh=.12ex,sdu=.12ex,wd=.625em}} \AddToHook{mdseries}{\myrestoredefaults} \cisterciansetup{redraw+=series} +\tl_new:N \l__xisterexample_digit_tl +\newcommand*\showbb[1] + { + \begingroup + \cisterciansetup{#1}\cistercianredraw + \fboxrule=.5pt + \fboxsep=-.5\fboxrule + \leavevmode + \rlap + { + \textcolor{red} + {\fbox{\phantom{\cisterciannumE{\l__xisterexample_digit_tl}}}} + } + \kern.5\fboxrule + \cisterciannumE{\l__xisterexample_digit_tl} + \kern.5\fboxrule + \endgroup + } +\newcommand*\exampledigits{\tl_set:Nn \l__xisterexample_digit_tl} +\cistercianstyle{.ex}{sv=3pt,sdd=3pt,sh=2pt,sdu=2pt} +\cistercianstyle{vex}{o=v,bx=,by=,wd=7mm,ht=14mm,.ex} +\cistercianstyle{hex}{o=h,bx=,by=,ht=7mm,wd=14mm,.ex} \ExplSyntaxOff \begin{document} \title{The \pkg{xistercian} package} \author{Jonathan P. Spratte\thanks{\protect\randomize{jspratte@yahoo.de}}} - \date{2021-11-23 v1.1a} + \date{2021-12-20 v1.2} \DocInput{xistercian.dtx} \end{document} %^^A=<< @@ -171,6 +200,13 @@ and the derived files xistercian.pdf % This package also supports that, in which case the numerals are rotated by % $90$ degrees counter-clockwise, see figure~\ref{fig:glyphs:h}. % +% Moreover some glyphs have a different shape in some manuscripts. The shapes in +% figures~\ref{fig:glyphs} and~\ref{fig:glyphs:h} are the most used ones +% nowadays (most likely because those are the ones Wikipedia shows vector +% graphics of). This package offers some (not all) alternative forms. Most +% notably some historic documents have swapped shapes of digits. To not further +% the confusion this package doesn't support swapping digit shapes. +% % All glyphs have the same bounding box, are drawn using the \pkg{pgf} % package, and cached inside \TeX\ box registers. Therefore the performance is % quite well, at least well enough to actually consider using these numerals @@ -219,7 +255,8 @@ and the derived files xistercian.pdf % The package tries to play nice on \pkg{hyperref} if it is loaded, but % bookmarks containing material that should've been a Cistercian numeral will % have a leading |CISTER| in front of the numeric value to give unique -% strings compared to |\arabic|. +% strings compared to |\arabic| (to my knowledge there are no Unicode points for +% Cistercian numerals). % % Negative numbers just keep a leading~|-|, and numbers with an absolute number % greater than $9999$ are displayed with multiple Cistercian digits. For @@ -227,6 +264,11 @@ and the derived files xistercian.pdf % that four consecutive digits are zeros they get displayed as that: % \cistexnum{10000} is $10000$. % +% Full disclaimer: I'm neither a historian nor have I any authority on the +% matter. I'm just a bloke who was fascinated by this numeral system and wanted +% to provide \LaTeX\ support for it. Most of my knowledge about this stems from +% Wikipedia and similar sources. +% % % \subsection{Macros} % @@ -282,15 +324,25 @@ and the derived files xistercian.pdf % % \begin{function}{\cistercianstyle} % \begin{syntax} -% \cs{cistercianstyle}\marg{name}\marg{key=value,\ldots} +% \cs{cistercianstyle}\meta{*}\marg{name}\marg{key=value,\ldots} % \end{syntax} % With this macro you can define a key called \meta{name} that'll set the % options in the \meta{key=value} list if used inside |\cisterciansetup|. -% Only new names are allowed. +% Only new names are allowed. If your style shouldn't take an argument (so is +% fixed) use the normal variant. If your style needs to take an argument use +% the variant with \meta{*}. % \end{function} -% For example, the key |horizontal| is equivalently defined to +% For example, the key |horizontal| is equivalently defined to and can be used +% as % \begin{verbatim} % \cistercianstyle{horizontal}{o=h,wd=0.775em,ht=1.13ex} +% \cisterciansetup{horizontal} +% \end{verbatim} +% And if you want to define a style that at the same time changes the stroke +% widths for vertical and horizontal strokes you could use +% \begin{verbatim} +% \cistercianstyle*{sh+v}{sh={#1},sv={#1}} +% \cisterciansetup{sh+v=.12ex} % \end{verbatim} % % @@ -303,10 +355,10 @@ and the derived files xistercian.pdf % % For the options |width| and |height|, and probably also the strokes, you % should use dimensions using |ex| or |em| to get sizes depending on the current -% font size. For all three of those options the \meta{dimension expression} is -% evaluated (using the setup specified in |font|) every time the font changed -% according to the |redraw| option's feature list (by default only when the size -% changed) since the last time they were drawn. +% font size. A \meta{dimension expression} is evaluated (using the setup +% specified in |font|) every time the font changed according to the |redraw| +% option's feature list (by default only when the size changed) since the last +% time they were drawn. % % Initial values if present are printed on the right. A small graphic explaining % most of the size related options is shown in figure~\ref{fig:size}. @@ -392,7 +444,7 @@ and the derived files xistercian.pdf % % \begin{function}{bound-y,by} % \begin{syntax} -% bound-y = \marg{float} \mysdefault{\normalfont\emph{empty}} +% bound-y = \marg{float} \mydefault{by} % \end{syntax} % Specifies the factor the bounding box in $y$-direction is bigger than the % |height|. An empty \meta{float} is considered the same as $1$. @@ -400,7 +452,7 @@ and the derived files xistercian.pdf % % \begin{function}{baseline,bs} % \begin{syntax} -% baseline = \marg{float} \mysdefault{\normalfont\emph{empty}} +% baseline = \marg{float} \mydefault{bs} % \end{syntax} % Sets the baseline of the symbols in multiples of the negative height. $1$ % (or empty) results in the symbol starting on the surrounding baseline, @@ -437,6 +489,15 @@ and the derived files xistercian.pdf % right. % \end{function} % +% \begin{function}{stroke-s,ss} +% \begin{syntax} +% stroke-s = \marg{dimension expression} \mydefault{ts} +% \end{syntax} +% Sets the stroke thickness of the zero stem. If this is set to an empty value +% the stroke thickness in vertical mode is that of |stroke-v| and in +% horizontal mode that of |stroke-h|. +% \end{function} +% % \begin{function}{strokes,s} % \begin{syntax} % stroke = \marg{dimension expression} @@ -454,8 +515,8 @@ and the derived files xistercian.pdf % right rectangle. The width of that rectangle is determined by |width|, and % the upper border by |height|, and with this option you can set the lower % border as a fraction of the |height|. You can either just give a factor as a -% \meta{float}, or just pass in a divisor as an \meta{integer}, or both. An -% empty \meta{float} equals $1$. +% \meta{float}, or just pass in a divisor as an \meta{integer} (with a leading +% slash), or both. An empty \meta{float} equals $1$. % \end{function} % Consider the following example (result on the right):\\[\bigskipamount] % \begin{minipage}[c]{.8\linewidth} @@ -498,7 +559,7 @@ and the derived files xistercian.pdf % \begin{syntax} % alternate-5 = \marg{choice} \mysdefault{triangle} % \end{syntax} -% There are alternative forms of the digit $5$, while the most often used one +% There are alternative forms of the digit $5$. While the most often used one % nowadays seems to be the |triangle| form, this package also supports two % other variants. Those are called |dot| and |dash|. While if you choose % |triangle| you can't give an additional value, if your choice is |dot| or @@ -507,12 +568,13 @@ and the derived files xistercian.pdf % value if you changed the value at some point in time). % % For |dot| you can also specify the radius as a dimension. The default is -% \mbox{\mydefault{five@dot}}. +% \mydefault{five@dot}. % % For |dash| you can specify the length of the dash in multiples of the used % stroke thickness (which might differ for the horizontal and vertical % symbols), an empty value is considered the same as $1$. The default is -% \mbox{\mysdefault{\normalfont\emph{empty}}}. +% \mydefault{five@dash}. Please ensure that your readers can't confuse the +% results with the shape of $6$. % % A comparison of the three alternate forms is shown in % figure~\ref{fig:fives}. @@ -529,32 +591,79 @@ and the derived files xistercian.pdf % % \begin{figure} % \centering -% \def\showbb#1{^^A -% \begingroup -% \cisterciansetup{#1}\cistercianredraw -% \fboxrule=.5pt -% \fboxsep=-.5\fboxrule -% \leavevmode -% \rlap{\textcolor{red}{\fbox{\phantom{\cisterciannum{5555}}}}}^^A -% \kern.5\fboxrule\cisterciannum{5555}\kern.5\fboxrule^^A -% \endgroup -% }^^A -% \cisterciansetup{bx=1,by=1,wd=1cm,ht=2cm,sv=3pt,sdd=3pt,sh=2pt,sdu=2pt} -% \cistercianstyle{hexample}{o=h,ht=1cm,wd=2cm} -% \begin{tabular}{*5c} -% \texttt{triangle} & -% \texttt{dot=2pt} & \texttt{dot=4pt} & -% \texttt{dash=1} & \texttt{dash=3} \\ -% \showbb{5=triangle} & -% \showbb{5=dot=2pt} & \showbb{5=dot=4pt} & -% \showbb{5=dash=1} & \showbb{5=dash=3} \\ -% \showbb{5=triangle,hexample} & -% \showbb{5=dot=2pt,hexample} & \showbb{5=dot=4pt,hexample} & -% \showbb{5=dash=1,hexample} & \showbb{5=dash=3,hexample} -% \end{tabular} +% \exampledigits{5555}% +% \begingroup +% \cisterciansetup{vex}% +% \begin{tabular}{*5c} +% \texttt{triangle} & +% \texttt{dot=2pt} & \texttt{dot=4pt} & +% \texttt{dash=1} & \texttt{dash=3} \\ +% \showbb{5=triangle} & +% \showbb{5=dot=2pt} & \showbb{5=dot=4pt} & +% \showbb{5=dash=1} & \showbb{5=dash=3} \\ +% \showbb{5=triangle,hex} & +% \showbb{5=dot=2pt,hex} & \showbb{5=dot=4pt,hex} & +% \showbb{5=dash=1, hex} & \showbb{5=dash=3, hex} \\ +% \end{tabular} +% \endgroup % \caption[Alternate forms of the digit $5$] -% {Alternate forms of the digit $5$. The tight bounding -% boxes using \texttt{bx=1,by=1} are drawn red.\label{fig:fives}} +% {Alternate forms of the digit $5$. The length of the \texttt{dash=3} +% variant is too long in the normal setup of this document, as the +% difference between {\cisterciansetup{5=dash=3,r!}\cisterciannum{5555}} +% and \cisterciannum{6666} is hard to notice. The tight bounding boxes +% using \texttt{bx=1,by=1} are drawn red.\label{fig:fives}} +% \end{figure} +% +% \begin{function}{alternate-6,6} +% \begin{syntax} +% \cs{alternate-6} = \marg{choice} \mysdefault{stroke} +% \end{syntax} +% There are alternative forms of the digit $6$. While today the usual form is +% |stroke|, there are also historic documents showing the $6$ as two dots, +% which you can achieve using the |dot| choice, and to support squares or +% short dashes instead of round dots you can use the |dash| choice. +% +% For |dot| you can also specify the radius as a dimension. The default is +% \mydefault{six@dot}. And for |dash| you can also specify the length in +% multiples of the used stroke thickness, an empty value is considered the +% same as $1$. The default is \mydefault{six@dash}. The |stroke| has always +% the full length and doesn't accept an additional specification. +% +% A comparison of the alternate forms is shown in figure~\ref{fig:69}. +% \end{function} +% +% \begin{function}{alternate-9,9} +% \begin{syntax} +% \cs{alternate-9} = \marg{choice} \mysdefault{rectangle} +% \end{syntax} +% Another digit having alternative forms is the $9$. For this two +% \meta{choice}s are available, |rectangle| and |triangle|. Neither of the two +% accept additional specifications. +% +% A comparison of the alternate forms is shown in figure~\ref{fig:69}. +% \end{function} +% +% \begin{figure} +% \centering +% \exampledigits{6666}% +% \cisterciansetup{vex}% +% \begin{tabular}{@{}*5c} +% \texttt{stroke} & \texttt{dot=2pt} & \texttt{dot=4pt} +% & \texttt{dash=1} & \texttt{dash=2} \\ +% \showbb{6=stroke} & \showbb{6=dot=2pt} & \showbb{6=dot=4pt} +% & \showbb{6=dash=1} & \showbb{6=dash=2} \\ +% \showbb{6=stroke,hex} & \showbb{6=dot=2pt,hex} & \showbb{6=dot=4pt,hex} +% & \showbb{6=dash=1, hex} & \showbb{6=dash=2, hex} \\ +% \end{tabular}\hfill +% \exampledigits{9999}% +% \begin{tabular}{*2c@{}} +% \texttt{rectangle} & \texttt{triangle} \\ +% \showbb{9=rectangle} & \showbb{9=triangle} \\ +% \showbb{9=rectangle,hex} & \showbb{9=triangle,hex} \\ +% \end{tabular} +% \caption[Alternate forms of the digits $6$ and $9$] +% {Alternate forms of the digits $6$ (left) and $9$ (right). The tight +% bounding boxes using \texttt{bx=1,by=1} are drawn red.\label{fig:69}} % \end{figure} % % \begin{function}{font,f} @@ -651,7 +760,7 @@ and the derived files xistercian.pdf % \gobbledocstriptag %<*pkg> % \begin{macrocode} -\ProvidesPackage{xistercian}[2021-11-23 v1.1a Cistercian numerals in LaTeX] +\ProvidesPackage{xistercian}[2021-12-20 v1.2 Cistercian numerals in LaTeX] \RequirePackage{pgf,expkv-opt} % \end{macrocode} % @@ -665,6 +774,7 @@ and the derived files xistercian.pdf \newcommand*\xister@tv{.18ex} \newcommand*\xister@tdu{.1ex} \newcommand*\xister@tdd{.18ex} +\newcommand*\xister@ts{} \newcommand*\xister@x{.5em} \newcommand*\xister@y{1.55ex} \newcommand*\xister@bx{1.2} @@ -673,11 +783,16 @@ and the derived files xistercian.pdf \newcommand*\xister@font{\normalfont} \newcommand*\xister@five@dot{.09ex} \newcommand*\xister@five@dash{} +\newcommand*\xister@six@dot{.09ex} +\newcommand*\xister@six@dash{} \newcommand*\xister@share@div{/6} \newcommand*\xister@share@mul{} \newif\ifxister@dbg@ \newif\ifxister@five@triangle@\xister@five@triangle@true \newif\ifxister@five@dot@ +\newif\ifxister@six@dot@ +\newif\ifxister@six@stroke@\xister@six@stroke@true +\newif\ifxister@nine@triangle@ \newdimen\xister@X \newdimen\xister@Y \newdimen\xister@XY@share @@ -685,8 +800,11 @@ and the derived files xistercian.pdf \newdimen\xister@Tv \newdimen\xister@Tdu \newdimen\xister@Tdd +\newdimen\xister@Ts \newdimen\xister@TMPA \newdimen\xister@TMPB +\newdimen\xister@Five@dot +\newdimen\xister@Six@dot % \end{macrocode} % % We also need a bunch of box registers ($37$ of them to be precise). For the @@ -888,21 +1006,27 @@ and the derived files xistercian.pdf } \xister@tmp{wd}{width}{\edef\xister@x{\unexpanded{#1}}\xister@dbg@dim{#1}} \xister@tmp{ht}{height}{\edef\xister@y{\unexpanded{#1}}\xister@dbg@dim{#1}} +\xister@tmp{bx}{bound-x}{\edef\xister@bx{\unexpanded{#1}}\xister@dbg@float{#1}} +\xister@tmp{by}{bound-y}{\edef\xister@by{\unexpanded{#1}}\xister@dbg@float{#1}} +\xister@tmp{bs}{baseline}{\edef\xister@bs{\unexpanded{#1}}\xister@dbg@float{#1}} \xister@tmp{sv}{stroke-v}{\edef\xister@tv{\unexpanded{#1}}\xister@dbg@dim{#1}} \xister@tmp{sh}{stroke-h}{\edef\xister@th{\unexpanded{#1}}\xister@dbg@dim{#1}} \xister@tmp{sdu}{stroke-du} {\edef\xister@tdu{\unexpanded{#1}}\xister@dbg@dim{#1}} \xister@tmp{sdd}{stroke-dd} {\edef\xister@tdd{\unexpanded{#1}}\xister@dbg@dim{#1}} -\xister@tmp{bx}{bound-x}{\edef\xister@bx{\unexpanded{#1}}\xister@dbg@float{#1}} -\xister@tmp{by}{bound-y}{\edef\xister@by{\unexpanded{#1}}\xister@dbg@float{#1}} -\xister@tmp{bs}{baseline}{\edef\xister@bs{\unexpanded{#1}}\xister@dbg@float{#1}} +\xister@tmp{ss}{stroke-s} + {% + \edef\xister@ts{\unexpanded{#1}}% + \unless\ifx\xister@ts\@empty\xister@dbg@dim{#1}\fi + } \xister@tmp{s}{strokes} {% \edef\xister@tv{\unexpanded{#1}}% \let\xister@th\xister@tv \let\xister@tdu\xister@tv \let\xister@tdd\xister@tv + \let\xister@ts\xister@tv \xister@dbg@dim{#1}% } \xister@tmp{f}{font}{\edef\xister@font{\unexpanded{#1}}} @@ -960,6 +1084,40 @@ and the derived files xistercian.pdf \ekvlet{xister}{5}\xister@five@set \ekvlet{xister}{alternate-5}\xister@five@set \let\xister@five@set\xister@undefined +\protected\long\ekvdef{xister/6}{dot} + {% + \xister@six@stroke@false + \xister@six@dot@true + \edef\xister@six@dot{\unexpanded{#1}}% + \xister@dbg@dim{#1}% + } +\protected\long\ekvdef{xister/6}{dash} + {% + \xister@six@stroke@false + \xister@six@dot@false + \edef\xister@six@dash{\unexpanded{#1}}% + \xister@dbg@float{#1}% + } +\protected\ekvdefNoVal{xister/6}{stroke}{\xister@six@stroke@true} +\protected\ekvdefNoVal{xister/6}{dot} + {% + \xister@six@stroke@false + \xister@six@dot@true + } +\protected\ekvdefNoVal{xister/6}{dash} + {% + \xister@six@stroke@false + \xister@six@dot@false + } +\protected\ekvsetdef\xister@six@set{xister/6} +\ekvlet{xister}{6}\xister@six@set +\ekvlet{xister}{alternate-6}\xister@six@set +\let\xister@six@set\xister@undefined +\protected\ekvdefNoVal{xister/9}{rectangle}{\xister@nine@triangle@false} +\protected\ekvdefNoVal{xister/9}{triangle}{\xister@nine@triangle@true} +\protected\ekvsetdef\xister@nine@set{xister/9} +\ekvlet{xister}{9}\xister@nine@set +\ekvlet{xister}{alternate-9}\xister@nine@set \protected\ekvdefNoVal{xister}{horizontal} {% \let\xister@build\xister@build@horizontal @@ -1036,18 +1194,27 @@ and the derived files xistercian.pdf % \end{macro} % % \begin{macro}{\cistercianstyle} +% \begin{macro}[internal]{\xister@style} % We allow users to define a style they can call with a single key name inside % |\cisterciansetup|. To achieve that we just define a |NoVal| key that'll -% call a nested |\cisterciansetup|. +% call a nested |\cisterciansetup|, or a normal key if their style needs to +% take a value. % \begin{macrocode} -\protected\long\def\cistercianstyle#1#2% +\protected\def\cistercianstyle + {% + \@ifstar + {\xister@style\ekvifdefined{\long\ekvdef}}% + {\xister@style\ekvifdefinedNoVal\ekvdefNoVal}% + } +\protected\long\def\xister@style#1#2#3#4% {% - \ekvifdefinedNoVal{xister}{#1}% - {\PackageError{xistercian}{Key `#1' already defined}{}}% - {\protected\ekvdefNoVal{xister}{#1}{\cisterciansetup{#2}}}% + #1{xister}{#3}% + {\PackageError{xistercian}{Key `#3' already defined}{}}% + {\protected#2{xister}{#3}{\cisterciansetup{#4}}}% } % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\cistercian} % \begin{macro}[internal]{\@cistercian} @@ -1222,14 +1389,14 @@ and the derived files xistercian.pdf \newcommand*\xister@clip@v[1] {% \pgfpathrectanglecorners - {\pgfpoint{\dimexpr\ifdim\xister@X<\z@-\fi\xister@Tv\relax}{#1}}% + {\pgfpoint{\dimexpr\ifdim\xister@X<\z@-\fi\xister@Ts\relax}{#1}}% {\pgfpoint\xister@X\xister@Y}% \pgfusepath{clip}% } \newcommand*\xister@clip@h[1] {% \pgfpathrectanglecorners - {\pgfpoint{#1}{-\dimexpr\ifdim\xister@Y<\z@-\fi\xister@Th\relax}}% + {\pgfpoint{#1}{-\dimexpr\ifdim\xister@Y<\z@-\fi\xister@Ts\relax}}% {\pgfpoint{-\xister@X}\xister@Y}% \pgfusepath{clip}% } @@ -1262,7 +1429,7 @@ and the derived files xistercian.pdf }% \xister@drawdigit{3#1}% {% - \xister@TMPB=#3\dimexpr\xister@Tv-\xister@Tdd\relax + \xister@TMPB=#3\dimexpr\xister@Ts-\xister@Tdd\relax \xister@clip@v\xister@XY@share \pgfsetlinewidth{2\xister@Tdd}% \pgfpathmoveto{\pgfpoint\xister@TMPB\xister@XY@share}% @@ -1272,7 +1439,7 @@ and the derived files xistercian.pdf \xister@drawdigit{4#1}% {% \xister@clip@v\z@ - \xister@TMPB=#3\dimexpr\xister@Tv-\xister@Tdu\relax + \xister@TMPB=#3\dimexpr\xister@Ts-\xister@Tdu\relax \pgfsetlinewidth{2\xister@Tdu}% \pgfpathmoveto{\pgfpoint\xister@TMPB\xister@Y}% \pgfpathlineto{\pgfpoint\xister@TMPB\xister@XY@share}% @@ -1283,7 +1450,7 @@ and the derived files xistercian.pdf \ifxister@five@triangle@ \xister@clip@v\z@ \xister@TMPB=% - #3\dimexpr\xister@Tv-\xister@Tdu\relax + #3\dimexpr\xister@Ts-\xister@Tdu\relax \pgfsetlinewidth{2\xister@Tdu}% \pgfpathmoveto{\pgfpoint\xister@TMPB\xister@Y}% \pgfpathlineto{\pgfpoint\xister@TMPB\xister@XY@share}% @@ -1295,9 +1462,9 @@ and the derived files xistercian.pdf \pgfpathlineto{\pgfpoint\xister@X\xister@TMPA}% \else\ifxister@five@dot@ \pgfpathcircle - {\pgfpoint{\dimexpr\xister@X-#3\xister@five@dot\relax}% - {\dimexpr\xister@Y-#2\xister@five@dot\relax}}% - {\xister@five@dot}% + {\pgfpoint{\dimexpr\xister@X-#3\xister@Five@dot\relax}% + {\dimexpr\xister@Y-#2\xister@Five@dot\relax}}% + {\xister@Five@dot}% \pgfusepath{fill}% \else \xister@TMPB=\dimexpr\xister@X-#3\xister@Tv\relax @@ -1328,12 +1495,60 @@ and the derived files xistercian.pdf \rlap{\copy\csname xister@digitbox@2#1\endcsname}% \copy\csname xister@digitbox@6#1\endcsname }% - \xister@superimpose{9#1}% - {% - \rlap{\copy\csname xister@digitbox@1#1\endcsname}% - \rlap{\copy\csname xister@digitbox@2#1\endcsname}% - \copy\csname xister@digitbox@6#1\endcsname - }% + \ifxister@nine@triangle@ + \xister@drawdigit{9#1}% + {% + \xister@TMPA=.5\dimexpr\xister@XY@share+\xister@Y\relax + \xister@TMPB=#3\dimexpr\xister@Ts-\xister@Tdd\relax + \xister@clip@v\z@ + \pgfsetlinewidth{2\xister@Tdd}% + \pgfpathmoveto{\pgfpoint\xister@TMPB\xister@XY@share}% + \pgfpathlineto{\pgfpoint\xister@TMPB\xister@Y}% + \pgfpathlineto{\pgfpoint\xister@X\xister@TMPA}% + \pgfusepath{stroke}% + \xister@TMPB=#3\dimexpr\xister@Ts-\xister@Tdu\relax + \pgfsetlinewidth{2\xister@Tdu}% + \pgfpathmoveto{\pgfpoint\xister@TMPB\xister@Y}% + \pgfpathlineto{\pgfpoint\xister@TMPB\xister@XY@share}% + \pgfpathlineto{\pgfpoint\xister@X\xister@TMPA}% + }% + \else + \xister@superimpose{9#1}% + {% + \rlap{\copy\csname xister@digitbox@1#1\endcsname}% + \rlap{\copy\csname xister@digitbox@2#1\endcsname}% + \copy\csname xister@digitbox@6#1\endcsname + }% + \fi + \unless\ifxister@six@stroke@ + \xister@drawdigit{6#1}% + {% + \ifxister@six@dot@ + \xister@TMPA=\dimexpr\xister@X-#3\xister@Six@dot\relax + \pgfpathcircle + {\pgfpoint\xister@TMPA + {\dimexpr\xister@Y-#2\xister@Six@dot\relax}}% + {\xister@Six@dot}% + \pgfpathcircle + {\pgfpoint\xister@TMPA + {\dimexpr\xister@XY@share+#2\xister@Six@dot\relax}}% + {\xister@Six@dot}% + \pgfusepath{fill}% + \else + \xister@TMPB=\dimexpr\xister@X-#3\xister@Tv\relax + \xister@TMPA=2\dimexpr#2\xister@six@dash\xister@Tv\relax + \pgfsetlinewidth{2\xister@Tv}% + \pgfpathmoveto{\pgfpoint\xister@TMPB\xister@Y}% + \pgfpathlineto + {\pgfpoint\xister@TMPB + {\dimexpr\xister@Y-\xister@TMPA\relax}}% + \pgfpathmoveto{\pgfpoint\xister@TMPB\xister@XY@share}% + \pgfpathlineto + {\pgfpoint\xister@TMPB + {\dimexpr\xister@XY@share+\xister@TMPA\relax}}% + \fi + }% + \fi } \newcommand\xister@drawdigits@horizontal[3] {% @@ -1341,20 +1556,20 @@ and the derived files xistercian.pdf \xister@drawdigit{1#1}% {% \pgfsetlinewidth{2\xister@Tv}% - \xister@TMPA=-\dimexpr\xister@X-#3\xister@Tv\relax + \xister@TMPA=\dimexpr#3\xister@Tv-\xister@X\relax \pgfpathmoveto{\pgfpoint\xister@TMPA\z@}% \pgfpathlineto{\pgfpoint\xister@TMPA\xister@Y}% }% \xister@drawdigit{2#1}% {% \pgfsetlinewidth{2\xister@Tv}% - \xister@TMPA=-\dimexpr#3\xister@Tv-\xister@XY@share\relax + \xister@TMPA=\dimexpr\xister@XY@share-#3\xister@Tv\relax \pgfpathmoveto{\pgfpoint\xister@TMPA\z@}% \pgfpathlineto{\pgfpoint\xister@TMPA\xister@Y}% }% \xister@drawdigit{3#1}% {% - \xister@TMPB=#2\dimexpr\xister@Th-\xister@Tdu\relax + \xister@TMPB=#2\dimexpr\xister@Ts-\xister@Tdu\relax \xister@clip@h\xister@XY@share \pgfsetlinewidth{2\xister@Tdu}% \pgfpathmoveto{\pgfpoint\xister@XY@share\xister@TMPB}% @@ -1364,7 +1579,7 @@ and the derived files xistercian.pdf \xister@drawdigit{4#1}% {% \xister@clip@h\z@ - \xister@TMPB=#2\dimexpr\xister@Th-\xister@Tdd\relax + \xister@TMPB=#2\dimexpr\xister@Ts-\xister@Tdd\relax \pgfsetlinewidth{2\xister@Tdd}% \pgfpathmoveto{\pgfpoint\xister@X\xister@TMPB}% \pgfpathlineto{\pgfpoint\xister@XY@share\xister@TMPB}% @@ -1374,21 +1589,21 @@ and the derived files xistercian.pdf {% \ifxister@five@triangle@ \xister@clip@h\z@ - \xister@TMPB=#2\dimexpr\xister@Th-\xister@Tdd\relax + \xister@TMPB=#2\dimexpr\xister@Ts-\xister@Tdd\relax \pgfsetlinewidth{2\xister@Tdd}% \pgfpathmoveto{\pgfpoint{-\xister@X}\xister@TMPB}% \pgfpathlineto{\pgfpoint\xister@XY@share\xister@TMPB}% \pgfpathlineto{\pgfpoint{-\xister@X}\xister@Y}% \pgfusepath{stroke,clip}% \pgfsetlinewidth{2\xister@Tv}% - \xister@TMPA=-\dimexpr\xister@X-#3\xister@Tv\relax + \xister@TMPA=\dimexpr#3\xister@Tv-\xister@X\relax \pgfpathmoveto{\pgfpoint\xister@TMPA\z@}% \pgfpathlineto{\pgfpoint\xister@TMPA\xister@Y}% \else\ifxister@five@dot@ \pgfpathcircle - {\pgfpoint{-\dimexpr\xister@X-#3\xister@five@dot\relax}% - {\dimexpr\xister@Y-#2\xister@five@dot\relax}}% - {\xister@five@dot}% + {\pgfpoint{\dimexpr#3\xister@Five@dot-\xister@X\relax}% + {\dimexpr\xister@Y-#2\xister@Five@dot\relax}}% + {\xister@Five@dot}% \pgfusepath{fill}% \else \pgfsetlinewidth{2\xister@Th}% @@ -1397,7 +1612,7 @@ and the derived files xistercian.pdf \pgfpathlineto {% \pgfpoint - {-\dimexpr\xister@X-#3\xister@five@dash\xister@Th*2\relax}% + {\dimexpr#3\xister@five@dash\xister@Th*2-\xister@X\relax}% \xister@TMPB }% \fi\fi @@ -1419,12 +1634,60 @@ and the derived files xistercian.pdf \rlap{\copy\csname xister@digitbox@2#1\endcsname}% \copy\csname xister@digitbox@6#1\endcsname }% - \xister@superimpose{9#1}% - {% - \rlap{\copy\csname xister@digitbox@1#1\endcsname}% - \rlap{\copy\csname xister@digitbox@2#1\endcsname}% - \copy\csname xister@digitbox@6#1\endcsname - }% + \ifxister@nine@triangle@ + \xister@drawdigit{9#1}% + {% + \xister@TMPA=.5\dimexpr\xister@XY@share-\xister@X\relax + \xister@TMPB=#2\dimexpr\xister@Ts-\xister@Tdu\relax + \xister@clip@h\z@ + \pgfsetlinewidth{2\xister@Tdu}% + \pgfpathmoveto{\pgfpoint\xister@XY@share\xister@TMPB}% + \pgfpathlineto{\pgfpoint{-\xister@X}\xister@TMPB}% + \pgfpathlineto{\pgfpoint\xister@TMPA\xister@Y}% + \pgfusepath{stroke}% + \xister@TMPB=#2\dimexpr\xister@Ts-\xister@Tdd\relax + \pgfsetlinewidth{2\xister@Tdd}% + \pgfpathmoveto{\pgfpoint\xister@X\xister@TMPB}% + \pgfpathlineto{\pgfpoint\xister@XY@share\xister@TMPB}% + \pgfpathlineto{\pgfpoint\xister@TMPA\xister@Y}% + }% + \else + \xister@superimpose{9#1}% + {% + \rlap{\copy\csname xister@digitbox@1#1\endcsname}% + \rlap{\copy\csname xister@digitbox@2#1\endcsname}% + \copy\csname xister@digitbox@6#1\endcsname + }% + \fi + \unless\ifxister@six@stroke@ + \xister@drawdigit{6#1}% + {% + \ifxister@six@dot@ + \xister@TMPA=\dimexpr\xister@Y-#2\xister@Six@dot\relax + \pgfpathcircle + {\pgfpoint{\dimexpr#3\xister@Six@dot-\xister@X\relax}% + \xister@TMPA}% + {\xister@Six@dot}% + \pgfpathcircle + {\pgfpoint{\dimexpr\xister@XY@share-#3\xister@Six@dot\relax}% + \xister@TMPA}% + {\xister@Six@dot}% + \pgfusepath{fill}% + \else + \pgfsetlinewidth{2\xister@Th}% + \xister@TMPB=\dimexpr\xister@Y-#2\xister@Th\relax + \xister@TMPA=2\dimexpr#3\xister@six@dash\xister@Th\relax + \pgfpathmoveto{\pgfpoint{-\xister@X}\xister@TMPB}% + \pgfpathlineto + {\pgfpoint{\dimexpr\xister@TMPA-\xister@X\relax}% + \xister@TMPB}% + \pgfpathmoveto{\pgfpoint\xister@XY@share\xister@TMPB}% + \pgfpathlineto + {\pgfpoint{\dimexpr\xister@XY@share-\xister@TMPA\relax}% + \xister@TMPB}% + \fi + }% + \fi } % \end{macrocode} % Each digit has the same bounding box and baseline which is specified here. @@ -1456,7 +1719,7 @@ and the derived files xistercian.pdf {% \xister@drawdigit{0}% {% - \pgfsetlinewidth{2\xister@Tv}% + \pgfsetlinewidth{2\xister@Ts}% \pgfpathmoveto{\pgfpoint\z@{-\xister@Y}}% \pgfpathlineto{\pgfpoint\z@\xister@Y}% }% @@ -1465,7 +1728,7 @@ and the derived files xistercian.pdf {% \xister@drawdigit{0}% {% - \pgfsetlinewidth{2\xister@Th}% + \pgfsetlinewidth{2\xister@Ts}% \pgfpathmoveto{\pgfpoint{-\xister@X}\z@}% \pgfpathlineto{\pgfpoint\xister@X\z@}% }% @@ -1504,6 +1767,14 @@ and the derived files xistercian.pdf \xister@Tv=\the\dimexpr.5\dimexpr\xister@tv\relax\relax \xister@Tdu=\the\dimexpr.5\dimexpr\xister@tdu\relax\relax \xister@Tdd=\the\dimexpr.5\dimexpr\xister@tdd\relax\relax + \xister@Five@dot=\the\dimexpr\xister@five@dot\relax + \xister@Six@dot=\the\dimexpr\xister@six@dot\relax + \ifx\xister@ts\@empty + \xister@Ts=% + \ifx\xister@build\xister@build@h\xister@Th\else\xister@Tv\fi + \else + \xister@Ts=\the\dimexpr.5\dimexpr\xister@ts\relax\relax + \fi }% \xister@tmp } diff --git a/graphics/pgf/contrib/xistercian/xistercian.pdf b/graphics/pgf/contrib/xistercian/xistercian.pdf index 5f291a44e6..c233b91a93 100644 Binary files a/graphics/pgf/contrib/xistercian/xistercian.pdf and b/graphics/pgf/contrib/xistercian/xistercian.pdf differ -- cgit v1.2.3