From 0b6226d2b5c6201c2873e16cfb871a32bafb961b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Sep 2015 20:46:43 +0000 Subject: teubner (19sep15) git-svn-id: svn://tug.org/texlive/trunk@38410 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/teubner/README | 2 +- .../texmf-dist/doc/latex/teubner/teubner-doc.pdf | Bin 377552 -> 378361 bytes .../texmf-dist/doc/latex/teubner/teubner-doc.tex | 5 +- Master/texmf-dist/doc/latex/teubner/teubner.pdf | Bin 598838 -> 619621 bytes Master/texmf-dist/doc/latex/teubner/teubner.txt | 24 +++--- Master/texmf-dist/source/latex/teubner/teubner.dtx | 85 +++++++++------------ Master/texmf-dist/tex/latex/teubner/teubner.sty | 29 ++----- Master/texmf-dist/tex/latex/teubner/teubnertx.sty | 19 +---- 8 files changed, 65 insertions(+), 99 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/teubner/README b/Master/texmf-dist/doc/latex/teubner/README index 7ee3767b7ca..0e8d044cb00 100644 --- a/Master/texmf-dist/doc/latex/teubner/README +++ b/Master/texmf-dist/doc/latex/teubner/README @@ -1,4 +1,4 @@ -This accompanies the teubner bundle version 4.x dated January 2015. +This accompanies the teubner bundle version 4.x dated September 2015. Copyright 2010-2015 Claudio Beccari diff --git a/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf b/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf index 8655d55cfb2..49c2d5742ae 100644 Binary files a/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf and b/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex b/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex index 810a8f3675b..8ff53dbe69f 100644 --- a/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex +++ b/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex @@ -45,7 +45,7 @@ \thanks{This paper documents \texttt{teubner.sty} version \fileversion\ of \filedate.}\\ An extension to the \textsf{greek} option\\ of the \babel\ package} \author{Claudio Beccari\thanks{\texttt{claudio dot beccari at gmail dot com}}} -\date{Turin, January 2015}% <---- this is the date of the teubenr-doc document! +\date{Turin, September 2015}% <---- this is the date of the teubenr-doc document! \def\comando#1{\expandafter\texttt\expandafter{\string#1}} \def\cs#1{\texttt{\char92#1}} \def\ARG#1{\texttt{\char123}\meta{#1}\texttt{\char125}} @@ -584,8 +584,9 @@ if you type \verb+\greeknumeral{123456}+ you get \textLipsias{\greeknumeral{1234 The \textsf{teubner} package offers also the possibility of typesetting the Attic numerals, without the need of loading Apostolos Syropoulos' \textsf{athnum} package; the functionality is the same, although the code is different; in order to avoid clashes, the \textsf{teubner} command for transforming Arabic numerals into Attic ones is \comando\AtticNumeral. As for the original macro, the maximum value that can be transformed is 99\,999, while, of course, no vanishing or negative numbers can be transformed: \begin{quote}\obeylines -if you type \verb|\AtticNumeral{2013}| you get \textLipsias{\AtticNumeral{2013}} +if you type \verb|\AtticNumeral{2015}| you get \textLipsias{\AtticNumeral{2015}} if you type \verb|\AtticNumeral{1999}| you get \textLipsias{\AtticNumeral{1999}} +if you type \verb|\AtticNumeral{55555}| you get \textLipsias{\AtticNumeral{55555}} \end{quote} \section{New commands} diff --git a/Master/texmf-dist/doc/latex/teubner/teubner.pdf b/Master/texmf-dist/doc/latex/teubner/teubner.pdf index b7af4b9bea4..edf589563e1 100644 Binary files a/Master/texmf-dist/doc/latex/teubner/teubner.pdf and b/Master/texmf-dist/doc/latex/teubner/teubner.pdf differ diff --git a/Master/texmf-dist/doc/latex/teubner/teubner.txt b/Master/texmf-dist/doc/latex/teubner/teubner.txt index 9b6dfdd9845..dd886a68bb7 100644 --- a/Master/texmf-dist/doc/latex/teubner/teubner.txt +++ b/Master/texmf-dist/doc/latex/teubner/teubner.txt @@ -1,4 +1,4 @@ - THE TEUBNER PACKAGE VERSION 4.x OF JANUARY 2015 + THE TEUBNER PACKAGE VERSION 4.x OF SEPTEMBER 2015 EXTENSION FOR PHILOLOGICAL TYPESETTING @@ -44,11 +44,16 @@ Modern fonts was already available with version 2.x of this package. While this package was upgraded and uploaded to CTAN, Antonis Tsolomitis uploaded the package txfontsb which adds the possibility of using nice -TX compatible greek fonts when using the TX latin fonts so as to let the +TX compatible Greek fonts when using the TX latin fonts so as to let the users typeset their documents in mixed script. The upright shape resembles the traditional Didot one, and the italic shape resembles the Lipsian one; they come in both the medium and the -bold series and match the TX latin fonts pretty well. +bold series and match the TX latin fonts pretty well. They probably match +also the newer newtxtext fonts by Michael Sharpe, but since the latter +have different font family names, the automatically produced .fd files +for adapting the LGR encoded fonts to the TX fonts are not suited any +more; in order to have matching .fd files it is necessary to proceed as +with any other font collection different from the TX one Although Tsolomitis' fonts satisfy very well the everyday typesetting necessities of the Greek users and blend well also with the TX math @@ -59,7 +64,7 @@ specified the TX fonts by calling the txfonts package. In order to use this extension package with LaTeX you have to install it. May be the very installation of your (recent) TeX system -distribution already provided for it; may be your TeX system is +distribution already provided for this task; may be your TeX system is configured to load missing packages on the fly. In any case you can check and possibly run your Package Manager (with MiKTeX follow the path Programs|MiKTeX Settings|Packages; with TeXlive and MacTeX (if their @@ -73,14 +78,13 @@ depends very much on your particular implementation of the TeX system, but if your system copes with the TDS (standard TeX Directory Structure) and has a multiplicity of different TeX directory trees, you probably have a \localtexmf rooted TDS, or a /texmmf one in your Home directory -containing a tex directory which on turn contains a latex directory. +containing a tex directory tree which on turn contains a latex directory. Under the latter one create a new directory named, say, teubner, and move there teubner.sty, and teubnertx.sty. -I suggest you to create a directory teubner in the doc directory of -the locally rooted structure and move there both teubner-doc.pdf and -the teubner.pdf file that you get by running pdflatex directly on -teubner.dtx. +I suggest you to create a directory teubner in the doc directory of the +locally rooted structure and move there both teubner-doc.pdf and the +teubner.pdf file that you get by running pdflatex directly on teubner.dtx. For what concerns fonts, they should already be installed with a recent TeX system distribution; this means that there are already all the @@ -155,7 +159,7 @@ you use LaTeX, you know what are its pros and cons. Happy philological LaTeXing! -Claudio Beccari Turin, January 2015 +Claudio Beccari Turin, September 2015 Former Professor of Electronics Politecnico di Torino, Italy claudio dot beccari at gmail dot com diff --git a/Master/texmf-dist/source/latex/teubner/teubner.dtx b/Master/texmf-dist/source/latex/teubner/teubner.dtx index 11ba39e81bd..1667ee7d1bd 100644 --- a/Master/texmf-dist/source/latex/teubner/teubner.dtx +++ b/Master/texmf-dist/source/latex/teubner/teubner.dtx @@ -4,7 +4,7 @@ \input docstrip.tex \keepsilent \preamble -Copyright 2001--2013 Claudio Beccari All rights reserved. +Copyright 2001--2015 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 @@ -45,21 +45,6 @@ charge for copying, etc. % % \fi % -%% \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 -%% Lower-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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} % \iffalse %^^A The following trick uses the same date for every file header. %\NeedsTeXFormat{LaTeX2e} @@ -69,7 +54,7 @@ charge for copying, etc. %\ProvidesPackage{teubner}[% %\ProvidesPackage{teubnertx}[% %<*driver,package,tbtx> -2015/01/18 v.4.5a +2015/09/19 v.4.6 %Extensions for Greek philology] %Access to the LGR encoded Greek fonts that match the TX fonts] % @@ -80,12 +65,9 @@ charge for copying, etc. \documentclass{ltxdoc} \GetFileInfo{teubner.dtx} \title{The \textsf{teubner} package\\ - Extensions for Greek philology% - \thanks{This file - has version number \fileversion, last - revised on \filedate.}} - \author{Claudio Beccari\thanks{claudio dot beccari at gmail dot com}} - \date{} + Extensions for Greek philology} + \author{Claudio Beccari --- \texttt{claudio dot beccari at gmail dot com}} + \date{Version \fileversion\ last revised \filedate} \providecommand\babel{\pack{babel}} \newcommand\lbr{\char123\relax}\newcommand\rbr{\char125\relax} \newenvironment{sintassi}{% @@ -106,7 +88,7 @@ charge for copying, etc. % % \fi % -% \CheckSum{4330} +% \CheckSum{4334} % \begin{multicols}{2}\tableofcontents\end{multicols} % % @@ -3483,7 +3465,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}} \DeclareRobustCommand*\AtticNumeral[1]{% \ifnum#1<\@ne \attic@ill@value{#1}\else \ifnum#1>99999\relax \attic@ill@value{#1}\else - \AtticCycl@{#1} + \AtticCycl@{#1}% \fi \fi} @@ -3504,19 +3486,19 @@ Illegal value (\number#1) for \string\ActicNumeral\space}} \valore=#1\relax \cifra=\valore\divide\cifra10000\relax \valore=\numexpr\valore-\cifra*10000\relax - \ifnum\cifra>4\relax\Vmiria \advance\cifra-5\fi + \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\fi + \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\fi + \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\fi + \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 @@ -3539,24 +3521,33 @@ Illegal value (\number#1) for \string\ActicNumeral\space}} % and LM ones are selected for typesetting text with the Latin script. % At the same time Antonis Tsolomitis uploaded a new package in order to let -% Greek users use some Greek fonts that match the Times eXtended ones. In order -% to use the de facto default encoding LGR for Greek fonts, he produced the -% necessary |lgrtxr.fd|, |lgrtxss.fd|, |lgrtxtt.fd|, font definition files that -% allow the font switching implied by the |greek| option to the \textsf{babel} -% package. These files take precedence over the mechanism outlined in -% section~\ref{ssec:LatinFontComp}, because command |\substitutefontfamily| first -% tests the existence of |lgrtxr.fd|, and, if this is not available, it may -% generate a specific one suitable for working smoothly with \textsf{teubner.sty}. -% -% Now if Tsolomitis' files are available on the main system tree, these take precedence -% and the \textsf{teubner} compatible files are not generated. Unfortunately Tsolomitis' -% fonts, although better suited to match the TX fonts, are well adapted to typeset common -% Greek text, but they are not adapted to typeset philological texts. -% -% We therefore avoid this clash by creating a \textsf{teubnertx.sty} file. This extension -% defines the families and shapes available with the familiar fond definition files, but -% the information gets input by \textsf{teubner.sty} at the ``begin document'' time, -% without resorting to any |.fd| file. May be more information is loaded than is strictly +% Greek users use some Greek fonts that match the Times eXtended +% ones\footnote{Probably Antonis Tsolomitis' Greek fonts match also the +% newer Times eXtended fonts produced by Michael Sharpe. The newer fonts +% have different font family names than the previous TX fonts; in order +% to produce similar \texttt{.fd} files to be used with the newer Times +% fonts, it is necessary to procede as for any other font collection +% different from the TX ones.}. In order to use the de facto default +% encoding LGR for Greek fonts, he produced the necessary |lgrtxr.fd|, +% |lgrtxss.fd|, |lgrtxtt.fd|, font definition files that allow the font +% switching implied by the |greek| option to the \textsf{babel} package. +% These files take precedence over the mechanism outlined in +% section~\ref{ssec:LatinFontComp}, because command |\substitutefontfamily| +% first tests the existence of |lgrtxr.fd|, and, if this is not available, +% it may generate a specific one suitable for working smoothly with +% \textsf{teubner.sty}. +% +% Now if Tsolomitis' files are available on the main system tree, these +% take precedence and the \textsf{teubner} compatible files are not +% generated. Unfortunately Tsolomitis' fonts, although better suited to +% match the TX fonts, are well matched to modern Greek typesettin, +% but they are incomplete for philological typesetting. +% +% We therefore avoid this clash by creating a \textsf{teubnertx.sty} file. +% This extension defines the families and shapes available with the +% familiar fond definition files, but the information gets input by +% \textsf{teubner.sty} at the ``begin document'' time, without resorting +% to any |.fd| file. May be more information is loaded than is strictly % necessary, but it better to do this way than to clash with other packages. % \begin{macrocode} \DeclareFontFamily{LGR}{txr}{} diff --git a/Master/texmf-dist/tex/latex/teubner/teubner.sty b/Master/texmf-dist/tex/latex/teubner/teubner.sty index 02411d62cbc..5d60988e4ef 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--2013 Claudio Beccari All rights reserved. +%% Copyright 2001--2015 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 @@ -27,24 +27,9 @@ %% 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. -%% \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 -%% Lower-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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{teubner}[% -2015/01/18 v.4.5a +2015/09/19 v.4.6 Extensions for Greek philology] \RequirePackage{iftex} \let\ifPDF\ifPDFTeX @@ -1274,7 +1259,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}} \DeclareRobustCommand*\AtticNumeral[1]{% \ifnum#1<\@ne \attic@ill@value{#1}\else \ifnum#1>99999\relax \attic@ill@value{#1}\else - \AtticCycl@{#1} + \AtticCycl@{#1}% \fi \fi} @@ -1284,19 +1269,19 @@ Illegal value (\number#1) for \string\ActicNumeral\space}} \valore=#1\relax \cifra=\valore\divide\cifra10000\relax \valore=\numexpr\valore-\cifra*10000\relax - \ifnum\cifra>4\relax\Vmiria \advance\cifra-5\fi + \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\fi + \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\fi + \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\fi + \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 diff --git a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty index 819d6142f14..e18108a365c 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--2013 Claudio Beccari All rights reserved. +%% Copyright 2001--2015 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 @@ -27,23 +27,8 @@ %% 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. -%% \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 -%% Lower-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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} \ProvidesPackage{teubnertx}[% -2015/01/18 v.4.5a +2015/09/19 v.4.6 Access to the LGR encoded Greek fonts that match the TX fonts] \DeclareFontFamily{LGR}{txr}{} -- cgit v1.2.3