diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/teubner')
-rw-r--r-- | Master/texmf-dist/tex/latex/teubner/teubner.sty | 267 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/teubner/teubnertx.sty | 17 |
2 files changed, 106 insertions, 178 deletions
diff --git a/Master/texmf-dist/tex/latex/teubner/teubner.sty b/Master/texmf-dist/tex/latex/teubner/teubner.sty index 9b5c820a798..8f9360d4540 100644 --- a/Master/texmf-dist/tex/latex/teubner/teubner.sty +++ b/Master/texmf-dist/tex/latex/teubner/teubner.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% teubner.dtx (with options: `package') -%% Copyright 2001--2015 Claudio Beccari All rights reserved. +%% Copyright 2001--2020 Claudio Beccari All rights reserved. %% %% This system is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,20 +16,9 @@ %% CTAN/macros/latex/base/lppl.tex. %% See the end of the file. %% -%% IMPORTANT NOTICE: -%% -%% You are allowed to distribute this file under the conditions that are -%% specified in the source file teubner.dtx. -%% -%% If you receive only some of these files from someone, complain! -%% -%% You are NOT ALLOWED to distribute this file alone. -%% You are NOT ALLOWED to take money for the distribution or use -%% of either this file or a changed version, except for a nominal -%% charge for copying, etc. -\NeedsTeXFormat{LaTeX2e} +\NeedsTeXFormat{LaTeX2e}[2020-01-01] \ProvidesPackage{teubner}[% -2016/03/31 v.4.8 +2020/11/17 v.5.0 Extensions for Greek philology] \RequirePackage{iftex} \let\ifPDF\ifPDFTeX @@ -41,6 +30,7 @@ Use the babel package greek option.\MessageBreak Type X <return> to exit.}% {Type X <return> to exit.} \fi + \newif\ifor\orfalse % Compatibility with older versions \DeclareOption{or}{\relax} \newif\ifboldLipsian \boldLipsianfalse @@ -62,10 +52,9 @@ Type X <return> to exit.}% \DeclareFontShape{U}{mtr}{m}{n}{<-> gmtr1000}{}% \else \DeclareFontShape{U}{mtr}{m}{n}{% - <-5.5> gmtr0500 <5.5-6.5> gmtr0600 - <6.5-7.5> gmtr0700 <7.5-8.5> gmtr0800 - <8.5-9.5> gmtr0900 <9.5-11> gmtr1000 - <11-15> gmtr1200 <15-> gmtr1728}{}% + <-5.5> gmtr0500 <5.5-6.5> gmtr0600 + <6.5-7.5> gmtr0700 <7.5-8.5> gmtr0800 <8.5-9.5> gmtr0900 + <9.5-11> gmtr1000 <11-15> gmtr1200 <15-> gmtr1728}{}% \fi \DeclareFontShape{U}{mtr}{m}{it}{<->ssub*mtr/m/n}{}% \DeclareFontShape{U}{mtr}{b}{it}{<->ssub*mtr/m/n}{}% @@ -179,11 +168,12 @@ Type X <return> to exit.}% \fontencoding{LGR}\rmfamily#1}} \DeclareRobustCommand\textlatin[1]{\edef\externalencoding{\f@encoding}{% - \def\itdefault{it}\def\@tempA{li}\ifx\@tempA\f@shape\def\f@shape{it}\fi% - \expandafter\select@language\expandafter{\previouslanguage}% - \fontencoding{\previousencoding}\selectfont - \bbl@activate{~}#1}% - \expandafter\fontencoding\expandafter{\externalencoding}} + \def\itdefault{it}\def\@tempA{li}\ifx\@tempA\f@shape\def\f@shape{it}\fi + \expandafter\select@language\expandafter{\previouslanguage}% + \fontencoding{\previousencoding}% + \fontfamily{\rmdefault}\selectfont + \bbl@activate{~}#1}% + \expandafter\fontencoding\expandafter{\externalencoding}\rmfamily} \DeclareRobustCommand\uishape{% \ifthenelse{\equal{\f@encoding}{\GRencoding@name}}% @@ -449,19 +439,14 @@ Type X <return> to exit.}% \DeclareTextCommand{\UO}{OT1}[1]{\Open{\u{#1}}} \DeclareTextCommand{\mO}{OT1}[1]{\Open{\={#1}}} -\let\stigma\textstigma +\let\stigma\textstigma \let\Stigma\textStigma \let\varstigma\textvarstigma -\let\koppa\textkoppa +\let\koppa\textkoppa \let\Koppa\textQoppa \let\qoppa\textqoppa -\let\coppa\textqoppa -\let\Koppa\textQoppa -\let\Coppa\textQoppa \let\varkoppa\textqoppa -\let\sampi\textsampi -\let\Stigma\textStigma -\let\Sampi\textsampi -\let\f\textdigamma -\let\F\textDigamma\let\Digamma\F +\let\coppa\textqoppa \let\Coppa\textQoppa +\let\sampi\textsampi \let\Sampi\textSampi +\let\f\textdigamma \let\F\textDigamma \let\Digamma\F \let\Euro\texteuro \let\permill\textperthousand \let\schwa\textschwa @@ -667,12 +652,11 @@ Type X <return> to exit.}% {{\fontencoding{OT1}\selectfont j}}% \let\iod\yod -\AtBeginDocument{\unless\ifcsname digamma\endcsname\let\digamma\textdigamma\fi} \DeclareRobustCommand{\fLow}% {{\setbox\z@\hbox{\f}\dimen@\ht\z@ - \advance\dimen@-1ex\raise-\dimen@\hbox{\box\z@}}} + \advance\dimen@-1ex\raisebox{-\dimen@}{\f}}} \DeclareRobustCommand{\fHigh}% - {{\setbox\z@\hbox{\f}\dimen@\dp\z@\raise\dimen@\hbox{\box\z@}}} + {{\setbox\z@\hbox{\f}\dimen@\dp\z@\raisebox{\dimen@}{\f}}} \DeclareRobustCommand\qmark{\hskip.16ex{\fontencoding{OT1}\upshape(?)}} \DeclareRobustCommand\lpar{{\metricsfont(}} @@ -980,7 +964,8 @@ Type X <return> to exit.}% \multiply\count255by5\relax \advance\count255-\value{verso}% \ifnum\count255=\z@ - {\fontseries{m}\small\expandafter\oldstylenums\expandafter{\the\c@verso}}% + {\fontseries{m}\small + \expandafter\oldstylenums\expandafter{\the\c@verso}}% \else \empty \fi}% @@ -1086,27 +1071,17 @@ Type X <return> to exit.}% }{% \\% \egroup\endlist} -\let\VERSUS\VERSI \let\endVERSUS\endVERSUS - -\DeclareRobustCommand\lunga{{\metricsfont l}} -\let\longa\lunga -\let\br@ve\breve -\DeclareRobustCommand\breve{\textormath{{{\metricsfont b}}}{\br@ve}} -\let\brevis\breve -\DeclareRobustCommand\bbreve{{\metricsfont c}} -\let\bbrevis\bbreve -\DeclareRobustCommand\barbreve{{\metricsfont i}} -\let\barbrevis\barbreve -\DeclareRobustCommand\barbbreve{{\metricsfont j}} -\let\barbbrevis\barbbreve -\DeclareRobustCommand\ubarbreve{{\metricsfont d}} -\let\ubarbrevis\ubarbreve -\DeclareRobustCommand\ubarbbreve{{\metricsfont e}} -\let\ubarbbrevis\ubarbbreve -\DeclareRobustCommand\ubarsbreve{{\metricsfont f}} -\let\ubarsbrevis\ubarsbreve -\DeclareRobustCommand{\ubrevelunga}{{\metricsfont\char107}} -\let\ubrevislonga\ubrevelunga +\let\VERSUS\VERSI \let\endVERSUS\endVERSI + +\DeclareRobustCommand\longa{{\metricsfont l}} +\DeclareRobustCommand\brevis{\textormath{{{\metricsfont b}}}{\br@ve}} +\DeclareRobustCommand\bbrevis{{\metricsfont c}} +\DeclareRobustCommand\barbrevis{{\metricsfont i}} +\DeclareRobustCommand\barbbrevis{{\metricsfont j}} +\DeclareRobustCommand\ubarbrevis{{\metricsfont d}} +\DeclareRobustCommand\ubarbbrevis{{\metricsfont e}} +\DeclareRobustCommand\ubarsbrevis{{\metricsfont f}} +\DeclareRobustCommand{\ubrevislonga}{{\metricsfont\char107}} \DeclareRobustCommand\corona{{\metricsfont\char20}} \let\ElemInd\corona @@ -1133,18 +1108,18 @@ Type X <return> to exit.}% \expandafter\@namedef\expandafter{\stripsl@sh#1}% {{\metricsfonttrue#2}}} -\newmetrics\iam{\barbreve\lunga\breve\lunga} -\newmetrics\chor{\lunga\breve\breve\lunga} -\newmetrics\enopl{\breve\lunga\breve\breve\lunga\breve\breve\lunga} -\newmetrics{\4MACRO}{\lunga\lunga\lunga\lunga} -\newmetrics{\aeolchorsor}{\lunga\zeugma{\breve\breve}\breve - \breve\zeugma{\breve\breve}} -\newmetrics{\hexam}{\lunga\breve\breve\lunga\breve\breve - \lunga\breve\breve\lunga\breve\breve\lunga\breve\breve - \lunga\lunga} -\newmetrics{\pentam}{\lunga\barbbreve\lunga\barbbreve\lunga\dBar - \lunga\breve\breve\lunga\breve\breve\lunga} -\newmetrics{\2tr}{\lunga\breve\lunga\X\ \lunga\breve\lunga\X\ } +\newmetrics\iam{\barbrevis\longa\brevis\longa} +\newmetrics\chor{\longa\brevis\brevis\longa} +\newmetrics\enopl{\brevis\longa\brevis\brevis\longa\brevis\brevis\longa} +\newmetrics{\4MACRO}{\longa\longa\longa\longa} +\newmetrics{\aeolchorsor}{\longa\zeugma{\brevis\brevis}\brevis + \brevis\zeugma{\brevis\brevis}} +\newmetrics{\hexam}{\longa\brevis\brevis\longa\brevis\brevis + \longa\brevis\brevis\longa\brevis\brevis\longa\brevis\brevis + \longa\longa} +\newmetrics{\pentam}{\longa\barbbrevis\longa\barbbrevis\longa\dBar + \longa\brevis\brevis\longa\brevis\brevis\longa} +\newmetrics{\2tr}{\longa\brevis\longa\X\ \longa\brevis\longa\X\ } \DeclareRobustCommand*{\metricstack}[2]% {$\mathord{\mathop{\hbox{#1\rule{\z@}{1ex}}}% @@ -1175,79 +1150,26 @@ $\displaystyle\left.% \def\TRON{\tracingcommands=\tw@ \tracingmacros=\tw@} \def\TROF{\tracingcommands=\z@ \tracingmacros=\z@} -\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\textQoppa\let\n@vecento\textSampi - \@ifStar{\Gr@@kn@meral}{\Gr@@knum@ral}} +\RenewDocumentCommand\Greeknumeral{s m}{\bgroup% + \let\textkoppa\textqoppa \let\textKoppa\textQoppa + \IfBooleanTF{#1}% + {\let\textstigmagreek\textstigma \let\textStigmagreek\textStigma}% + {\let\textstigmagreek\textdigamma \let\textStigmagreek\textDigamma}% + \bbl@greek@GreekNum\@secondoftwo{#2}\egroup} -\DeclareRobustCommand*{\greeknumeral}{% - \let\n@vanta\textqoppa\let\n@vecento\textsampi - \@ifStar{\let\s@i\textstigma\gr@@numeral}{\let\s@i\fLow\gr@@numeral}} +\RenewDocumentCommand\greeknumeral{s m}{\bgroup% + \let\textkoppa\textqoppa \let\textKoppa\textQoppa + \IfBooleanTF{#1}% + {\let\textstigmagreek\textstigma \let\textStigmagreek\textStigma}% + {\let\textstigmagreek\textdigamma \let\textStigmagreek\textDigamma}% + \bbl@greek@GreekNum\@firstoftwo{#2}\egroup} -\def\Gr@@kn@meral#1{\let\s@i\textStigma - \expandafter\MakeUppercase\expandafter{\gr@@numeral{#1}}} - -\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}}} - -\def\gr@@numeral#1{{% - \ifnum#1<\@ne\space\gr@ill@value{#1}% - \else - \ifnum#1<10\relax\expandafter\gr@num@i\number#1% - \else - \ifnum#1<100\relax\expandafter\gr@num@ii\number#1% - \else - \ifnum#1<\@m\relax\expandafter\gr@num@iii\number#1% - \else - \ifnum#1<\@M\relax\expandafter\gr@num@iv\number#1% - \else - \ifnum#1<100000\relax\expandafter\gr@num@v\number#1% - \else - \ifnum#1<1000000\relax\expandafter\gr@num@vi\number#1% - \else - \space\gr@ill@value{#1}% - \fi - \fi - \fi - \fi - \fi - \fi - \fi -}} -\def\gr@num@i#1{% - \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 \textiota\or \textkappa\or \textlambda\or \textmu\or \textnu% - \or \textxi\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 \textrho\or \textsigma\or \texttau\or \textupsilon - \or \textphi\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 \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 \textiota\or \textkappa\or \textlambda\or - \textmu\or \textnu\or \textxi\or \textomicron\or \textpi\or \n@vanta\fi - \gr@num@iv} -\def\gr@num@vi#1{% - \katwtonos - \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} +\NewDocumentCommand\grtoday{ s }% +{\bgroup\IfBooleanTF{#1}% +{\greeknumeral*{\the\day}\space\gr@c@month\space\greeknumeral*{\the\year}}% +{\greeknumeral{\the\day}\space\gr@c@month\space\greeknumeral{\the\year}}% +\egroup} \DeclareTextSymbol{\Vmiria}{\GRencoding@name}{5} \DeclareTextSymbol{\Vkilo}{\GRencoding@name}{4} @@ -1263,32 +1185,49 @@ Illegal value (\number#1) for \string\ActicNumeral\space}} \fi} \def\AtticCycl@#1{% - \bgroup - \countdef\valore=252\countdef\cifra=250\relax - \valore=#1\relax - \cifra=\valore\divide\cifra10000\relax - \valore=\numexpr\valore-\cifra*10000\relax - \ifnum\cifra>4\relax\Vmiria \advance\cifra-5\relax\fi - \@whilenum\cifra>\z@\do{M\advance\cifra\m@ne}% - \cifra=\valore\divide\cifra1000\relax - \valore=\numexpr\valore-\cifra*1000\relax - \ifnum\cifra>4\relax\Vkilo \advance\cifra-5\relax\fi - \@whilenum\cifra>\z@\do{Q\advance\cifra\m@ne}% - \cifra=\valore\divide\cifra100\relax - \valore=\numexpr\valore-\cifra*100\relax - \ifnum\cifra>4\relax\Vetto \advance\cifra-5\relax\fi - \@whilenum\cifra>\z@\do{H\advance\cifra\m@ne}% - \cifra=\valore\divide\cifra10\relax - \valore=\numexpr\valore-\cifra*10\relax - \ifnum\cifra>4\relax\Vdeka \advance\cifra-5\relax\fi - \@whilenum\cifra>\z@\do{D\advance\cifra\m@ne}% - \cifra=\valore - \ifnum\cifra>4\relax P\advance\cifra-5\relax\fi - \@whilenum\cifra>\z@\do{I\advance\cifra\m@ne}% - \egroup} + \bgroup + \countdef\valore=252\countdef\cifra=250\relax + \valore=#1\relax + \@whilenum\valore>0\do{% + \ifnum\valore>9999\relax + \cifra=\valore\divide\cifra10000\relax + \valore=\numexpr\valore-\cifra*10000\relax + \ifnum\cifra>4\relax\Vmiria \advance\cifra-5\relax\fi + \@whilenum\cifra>\z@\do{M\advance\cifra\m@ne}% + \else + \ifnum\valore>999\relax + \cifra=\valore\divide\cifra1000\relax + \valore=\numexpr\valore-\cifra*1000\relax + \ifnum\cifra>4\relax\Vkilo \advance\cifra-5\relax\fi + \@whilenum\cifra>\z@\do{Q\advance\cifra\m@ne}% + \else + \ifnum\valore>99\relax + \cifra=\valore\divide\cifra100\relax + \valore=\numexpr\valore-\cifra*100\relax + \ifnum\cifra>4\relax\Vetto \advance\cifra-5\relax\fi + \@whilenum\cifra>\z@\do{H\advance\cifra\m@ne}% + \else + \ifnum\valore>9\relax + \cifra=\valore\divide\cifra10\relax + \valore=\numexpr\valore-\cifra*10\relax + \ifnum\cifra>4\relax\Vdeka \advance\cifra-5\relax\fi + \@whilenum\cifra>\z@\do{D\advance\cifra\m@ne}% + \else + \ifnum\valore>0\relax + \cifra=\valore + \ifnum\cifra>4\relax P\advance\cifra-5\relax\fi + \@whilenum\cifra>\z@\do{I\advance\cifra\m@ne}% + \valore=\cifra + \fi + \fi + \fi + \fi + \fi + }% + \egroup} %% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt diff --git a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty index b37e8e8d9bc..4b22c27e5da 100644 --- a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty +++ b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% teubner.dtx (with options: `tbtx') -%% Copyright 2001--2015 Claudio Beccari All rights reserved. +%% Copyright 2001--2020 Claudio Beccari All rights reserved. %% %% This system is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,19 +16,8 @@ %% CTAN/macros/latex/base/lppl.tex. %% See the end of the file. %% -%% IMPORTANT NOTICE: -%% -%% You are allowed to distribute this file under the conditions that are -%% specified in the source file teubner.dtx. -%% -%% If you receive only some of these files from someone, complain! -%% -%% You are NOT ALLOWED to distribute this file alone. -%% You are NOT ALLOWED to take money for the distribution or use -%% of either this file or a changed version, except for a nominal -%% charge for copying, etc. \ProvidesPackage{teubnertx}[% -2016/03/31 v.4.8 +2020/11/17 v.5.0 Access to the LGR encoded Greek fonts that match the TX fonts] \DeclareFontFamily{LGR}{txr}{} @@ -83,7 +72,7 @@ Access to the LGR encoded Greek fonts that match the TX fonts] \DeclareFontShape{LGR}{txtt}{bx}{sl}{<->ssub * cmtt/bx/sl}{} \DeclareFontShape{LGR}{txtt}{bx}{sc}{<->ssub * cmtt/bx/sc}{} %% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt |