From e6a303a237982fbb9ad369052437d2a13bdb2eeb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 15 Oct 2015 21:19:47 +0000 Subject: teubner (15oct15) git-svn-id: svn://tug.org/texlive/trunk@38654 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/teubner/teubner.dtx | 98 +++++++++++----------- 1 file changed, 50 insertions(+), 48 deletions(-) (limited to 'Master/texmf-dist/source/latex/teubner') diff --git a/Master/texmf-dist/source/latex/teubner/teubner.dtx b/Master/texmf-dist/source/latex/teubner/teubner.dtx index 1667ee7d1bd..fb8234c6d54 100644 --- a/Master/texmf-dist/source/latex/teubner/teubner.dtx +++ b/Master/texmf-dist/source/latex/teubner/teubner.dtx @@ -54,7 +54,7 @@ charge for copying, etc. %\ProvidesPackage{teubner}[% %\ProvidesPackage{teubnertx}[% %<*driver,package,tbtx> -2015/09/19 v.4.6 +2015/10/15 v.4.7 %Extensions for Greek philology] %Access to the LGR encoded Greek fonts that match the TX fonts] % @@ -88,7 +88,7 @@ charge for copying, etc. % % \fi % -% \CheckSum{4334} +% \CheckSum{4363} % \begin{multicols}{2}\tableofcontents\end{multicols} % % @@ -1571,7 +1571,7 @@ Type X to exit.}% \let\Stigma\textStigma \let\Sampi\textsampi \let\f\textdigamma -\let\Digamma\textDigamma +\let\F\textDigamma\let\Digamma\F \let\Euro\texteuro \let\permill\textperthousand \let\schwa\textschwa @@ -1870,21 +1870,13 @@ Type X to exit.}% % the |\ddigamma| and the |\digamma| macros, the former being the % one defined in the |greek| option to \babel, the latter being % a standard mathematical symbol; initially I believed that philologists do -% not use mathematical symbols so we made |\digamma| an alias for |\f|; afterwards I +% not use mathematical symbols so we made |\digamma| an alias for |\f|; +% afterwards I % found out that mathematicians, physicists, engineers,~\dots\ use the % \textsf{teubner.sty} package and that the |\digamma| is a symbol already defined % in the package \textsf{amssymb.sty}; therefore I made a conditional creation of -% this alias; this trick is delayed to the beginning of the document, so as to make -% it independent on the order with which packages are loaded. -% \begin{macrocode} -\DeclareTextSymbol{\f}{\GRencoding@name}{147} -\AtBeginDocument{\@ifpackageloaded{amssymb}% -{\let\AMSdigamma\digamma\def\digamma{\textormath{\f}{\AMSdigamma}}}% amssymb loaded -{\let\digamma\f}% amssymb not loadedloaded -} -\DeclareTextSymbol{\F}{\GRencoding@name}{195}\let\Digamma\F - -% \end{macrocode} +% this alias; this trick is delayed to the beginning of the document, so as to +% make it independent on the order with which packages are loaded. Actually since the introduction of the LICR macros, this is irrelevant and I deleted it. %\end{macro} %\end{macro} %\end{macro} @@ -1892,12 +1884,13 @@ Type X to exit.}% % %\begin {macro}{\fLow} %\begin {macro}{\fHigh} -% The digamma glyphs set forth another question because, according to Paolo Ciacchi, -% a different glyph should be used for typesetting text compared with the one that -% is used as a variant in Milesian numerals in place of the standard stigma symbol. +% The digamma glyphs set forth another question because, according to Paolo +% Ciacchi, a different glyph should be used for typesetting text compared with +% the one that is used as a variant in Milesian numerals in place of the standard +% stigma symbol. % By means of macros |\fLow| or |\fHigh| it is possible to chose the raised or the -% lowered digamma glyphs; Greek numerals always use the lowered one, while when text -% is being typeset the typesetter can chose the version he likes best. +% lowered digamma glyphs; Greek numerals always use the lowered one, while when +% text is being typeset the typesetter can chose the version he likes best. % \begin{macrocode} \DeclareRobustCommand{\fLow}% {{\setbox\z@\hbox{\f}\dimen@\ht\z@ @@ -3300,16 +3293,21 @@ $\displaystyle\left.% \def\@ifStar#1#2{\def\@tempA{#1}\def\@tempB{#2}\futurelet\@tempC\@testStar} \def\@testStar{\ifx\@tempC*\bbl@afterelse\expandafter\@tempA\@gobble\else \bbl@afterfi\@tempB\fi} + \DeclareRobustCommand*{\Greeknumeral}{% - \let\n@vanta\Coppa\let\n@vecento\Sampi + \let\n@vanta\textQoppa\let\n@vecento\textSampi \@ifStar{\Gr@@kn@meral}{\Gr@@knum@ral}} + \DeclareRobustCommand*{\greeknumeral}{% - \let\n@vanta\varkoppa\let\n@vecento\sampi - \@ifStar{\let\s@i\stigma\gr@@numeral}{\let\s@i\fLow\gr@@numeral}} -\def\Gr@@kn@meral#1{\let\s@i\Stigma + \let\n@vanta\textqoppa\let\n@vecento\textsampi + \@ifStar{\let\s@i\textstigma\gr@@numeral}{\let\s@i\fLow\gr@@numeral}} + +\def\Gr@@kn@meral#1{\let\s@i\textStigma \expandafter\MakeUppercase\expandafter{\gr@@numeral{#1}}} -\def\Gr@@knum@ral#1{\let\s@i\Digamma + +\def\Gr@@knum@ral#1{\let\s@i\textDigamma \expandafter\MakeUppercase\expandafter{\gr@@numeral{#1}}} + \def\grtoday{{\expandafter\greeknumeral\expandafter{\the\day}}\space \gr@c@month\space{\expandafter\greeknumeral\expandafter{\the\year}}} @@ -3330,16 +3328,19 @@ $\displaystyle\left.% % used for ``acrobatic performances'' but possibly for writing the Greek date with % the AD year; six decimal places are more than enough for this purpose. % |\gr@ill@value| was not redefined from Apostolos Syropoulos' \babel\ definition; -% it simply issues a warning message about an argument out of range. The presence of -% the primitive command |number| in these macros is for two purposes: (a) transforms -% a counter contents into a sequence of digits tokens, and (b) if the argument is -% already a digit string, it removes any leading zeros. No braces are present -% because this string is examined sequentially one digit at a time from the leading -% position to the least significant position; of course this means that the decimal -% zero is treated correctly even if Milesian symbols do not have the equivalent of a -% zero. -% \begin{macrocode} -\def\gr@@numeral#1{% +% it simply issues a warning message about an argument out of range. The presence +% of the primitive command |number| in these macros is for two purposes: +% (a) transforms a counter contents into a sequence of digits tokens, and +% (b) if the argument is already a digit string, it removes any leading zeros. +% No braces are present because this string is examined sequentially one digit +% at a time from the leading position to the least significant position; of +% course this means that the decimal zero is treated correctly even if Milesian +% symbols do not have the equivalent of a zero. +% The double opening and closing braces are necessary to avoid a space vanishing +% after using the |\gr@@numeral| macro; the six levels of digit reprentation are +% corrected with the LICR macoros. +% \begin{macrocode} +\def\gr@@numeral#1{{% \ifnum#1<\@ne\space\gr@ill@value{#1}% \else \ifnum#1<10\relax\expandafter\gr@num@i\number#1% @@ -3362,7 +3363,7 @@ $\displaystyle\left.% \fi \fi \fi -} +}} % \end{macrocode} %\end{macro} %\begin{macro}{\gr@num@i} @@ -3386,31 +3387,32 @@ $\displaystyle\left.% % correct lower or upper case `qoppa' or sampi' respectively. % \begin{macrocode} \def\gr@num@i#1{% - \ifcase#1\or a\or b\or g\or d\or e% - \or \s@i\or z\or h\or j\fi + \ifcase#1\or \textalpha\or \textbeta\or \textgamma\or + \textdelta\or \textepsilon + \or \s@i\or \textzeta\or \texteta\or \texttheta\fi \ifnum#1=\z@\else\anw@true\fi\anw@print} \def\gr@num@ii#1{% - \ifcase#1\or i\or k\or l\or m\or n% - \or x\or o\or p\or \n@vanta\fi + \ifcase#1\or \textiota\or \textkappa\or \textlambda\or \textmu\or \textnu% + \or \textcsi\or \textomicron\or \textpi\or \n@vanta\fi \ifnum#1=\z@\else\anw@true\fi\gr@num@i} \def\gr@num@iii#1{% - \ifcase#1\or r\or s\or t\or u\or f% - \or q\or y\or w\or \n@vecento\fi + \ifcase#1\or \textrho\or \textsigma\or \texttau\or \textupsilon + \or \textalphaphi\or \textchi\or \textpsi\or \textomega\or \n@vecento\fi \ifnum#1=\z@\anw@false\else\anw@true\fi\gr@num@ii} \def\gr@num@iv#1{% \ifnum#1=\z@\else\katwtonos\fi - \ifcase#1\or a\or b\or g\or d\or e% - \or \s@i\or z\or h\or j\fi + \ifcase#1\or \textalpha\or \textbeta\or \textgamma\or \textdelta + \or \textepsilon\or \s@i\or \textzeta\or \texteta\or \texttheta\fi \gr@num@iii} \def\gr@num@v#1{% \ifnum#1=\z@\else\katwtonos\fi - \ifcase#1\or i\or k\or l\or m\or n% - \or x\or o\or p\or \n@vanta\fi + \ifcase#1\or \textiota\or \textkappa\or \textlambda\or + \textmu\or \textnu\or \textcsi\or \textomicron\or \textpi\or \n@vanta\fi \gr@num@iv} \def\gr@num@vi#1{% \katwtonos - \ifcase#1\or r\or s\or t\or u\or f% - \or q\or y\or w\or \n@vecento\fi + \ifcase#1\or \textrho\or \textsigma\or \texttau\or \textupsilon + \or \textphi\or \textchi\or \textpsi\or \textomega\or \n@vecento\fi \gr@num@v} % \end{macrocode} -- cgit v1.2.3