From d8dd2c6b804770d2b5c55edc1bfb2d5786e95386 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 Mar 2016 21:16:00 +0000 Subject: teubner (31mar16) git-svn-id: svn://tug.org/texlive/trunk@40197 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/teubner/README | 4 ++-- .../texmf-dist/doc/latex/teubner/teubner-doc.pdf | Bin 379953 -> 381111 bytes .../texmf-dist/doc/latex/teubner/teubner-doc.tex | 23 ++++++++++++--------- Master/texmf-dist/doc/latex/teubner/teubner.pdf | Bin 619806 -> 611666 bytes Master/texmf-dist/doc/latex/teubner/teubner.txt | 9 ++++---- Master/texmf-dist/source/latex/teubner/teubner.dtx | 23 ++++++++++----------- Master/texmf-dist/tex/latex/teubner/teubner.sty | 7 +++---- Master/texmf-dist/tex/latex/teubner/teubnertx.sty | 2 +- 8 files changed, 35 insertions(+), 33 deletions(-) diff --git a/Master/texmf-dist/doc/latex/teubner/README b/Master/texmf-dist/doc/latex/teubner/README index 593adb36b85..f1c8b924fc8 100644 --- a/Master/texmf-dist/doc/latex/teubner/README +++ b/Master/texmf-dist/doc/latex/teubner/README @@ -1,6 +1,6 @@ -This accompanies the teubner bundle version 4.x dated October 2015. +This accompanies the teubner bundle version 4.x dated November 2015 or later. -Copyright 2010-2015 Claudio Beccari +Copyright 2010-2016 Claudio Beccari The bundle contains the files diff --git a/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf b/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf index 381cac343d0..803ba492c40 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 9c5c6c7f9b3..a1ec488d22b 100644 --- a/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex +++ b/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex @@ -1,15 +1,15 @@ -% !TEX encoding = IsoLatin +% !TEX encoding = UTF-8 Unicode % !TEX TS-program = pdflatex \documentclass[12pt,a4paper]{article} %\usepackage{trace} -\usepackage[latin1]{inputenc} +\usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} %\usepackage{lmodern} \usepackage{txfonts} %\usepackage{pxfonts} \usepackage{mflogo} \usepackage[greek,english]{babel} -\def\workingdate{2015/01/18}% see two lines ahead +\def\workingdate{2016/03/31}% see two lines ahead \usepackage[boldLipsian,10pt,GlyphNames]% <-------- teubner options {teubner}[\workingdate]% <--- older versions don't work well \usepackage[scaled=0.90]{helvet} @@ -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, September 2015}% <---- this is the date of the teubenr-doc document! +\date{Turin, March 2016}% <---- 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}} @@ -188,9 +188,9 @@ corresponding Olga shapes. Their `simple bold' series is good for mixing with PostScript fonts, whose medium series is slightly blacker than the corresponding EC and LM fonts nurmally used with \LaTeX; this is easily achieved by passing the \emph{boldLipsian} option when invoking this \pack{teubner} extension file. Notice that the Lipsian font produces an alternative to the ordinary `italic' Olga shape, it is not any more the default `italic' shape as it used to be with previous versions of this package; now, in the same document, you can use both shapes and produce both versions: \foreignlanguage{greek}{\textit{Baq'ulides} -\textlatin{and} +\textlatin{\upshape and} \textli{Baq'ulides}}. -With the availability of the unslanted Olga font and the serifed lowercase alphabet, you can use also the \verb|\textui| and the \verb|\textrs| commands so as to obtain \foreignlanguage{greek}{\textui{Baq'ulides} \textlatin{and} \textrs{Baq'ulides}}; also in extended boldface: \foreignlanguage{greek}{\bfseries\textui{Baq'ulides} \textlatin{\mdseries and} \textrs{Baq'ulides}}. +With the availability of the unslanted Olga font and the serifed lowercase alphabet, you can use also the \verb|\textui| and the \verb|\textrs| commands so as to obtain \foreignlanguage{greek}{\textui{Baq'ulides} \textlatin{\upshape and} \textrs{Baq'ulides}}; also in extended boldface: \foreignlanguage{greek}{\bfseries\textui{Baq'ulides} \textlatin{\upshape \mdseries and} \textrs{Baq'ulides}}. But if you really want to permanently change the ``italic'' Greek font shape to the Lipsian one, without keeping the alternative, then in your preamble add the following statements \emph{after} you have loaded the \texttt{teubner} package: \begin{verbatim} @@ -203,6 +203,9 @@ With these settings, \verb|\textit| and \verb|\textli| become equivalent and bot \subsection*{Technical information} Typesetting documents with different scripts sets forth some problems. The \emph{greek} option to the \babel\ package, besides setting up the typographical rules for Greek, as it does for any other language, provides the script change; it defines also the \verb|\textlatin| macro in order to typeset something with the Latin script while the default script is Greek, as well as the \verb|\textgreek| macro to typeset something with the Greek script when typesetting with a Latin one. Of course the usual \verb|\selectlanguage| and \verb|\foreinglanguage| commands, as well as the \texttt{otherlanguage} environment, provide for a global change of the typesetting characteristics or an environment where the settings are reset to Greek. +\noindent\textbf{Beware}! Differently from before, \verb|\textlatin| changes only the encoding and sets some other small details, but it does not reset the local font family to "roman", as it used to do before \verb|teubner| version~4.8. This was remarked by Jens Börstinghaus, whom I thank very much for this bug notification. In facts \verb|\textlatin| is often used behind the scenes by \LaTeX\ internal commands and the user has little or no control over the font characteristics; before the font family was reset to the default, instead of continuing with the current family, series and shape. Now it does, and the users should explicitly declare some other family, series or shape if they do not want the current ones. + + With standard \babel\ the CB fonts used to work only in conjunction with the CM fonts with either the OT1 (real CM fonts) or T1 (EC fonts) encoding. Since the 2008 distribution of standard \babel, the CB fonts work fine also with the Latin Modern fonts. This \pack{teubner} extension tries to work seamlessly also with other font families, but it is not that simple. Some technical explanations are necessary. When \LaTeX\ needs to use a specific font in a certain encoding and belonging to a particular family, series and shape, available in such and such sizes, it gets this information by reading a \emph{font description file}; this file's name is composed with the encoding and the family names glued together and has the extension \texttt{.fd}; for OT1 encoded Computer Modern CM regular (serifed) fonts this file would be \texttt{ot1cmr.fd}. Any other package that is requested for using different fonts defines possibly a different encoding and certainly different family names. For using the Times eXtended TX fonts with T1 encoding, the \texttt{txfonts.sty} package defines the family name \texttt{txr} (for serifed fonts) so that \LaTeX\ reads the font description file \texttt{t1txr.fd} that contains the relevant information for all the series, shapes, and sizes available. @@ -247,7 +250,7 @@ A small caveat: when you issue for the first time the command \verb|\ifFamily| y Nevertheless this does not imply that the correct fonts are used if the font switching macros are used without scoping groups or environments. Sometimes, when you use declarations instead of commands, it might be necessary to issue an apparently redundant \verb|\rmfamily| or \verb|\selectfont| command in order to re-establish the correct defaults. -In order to insert \emph{short texts} in Greek, either in Didot upright or in Lipsian inclined shape, the \emph{text} commands \verb|\textDidot| and \verb|\textLipsias| may be used, as well as a redefined \verb|\textlatin| \emph{text} command for typesetting a short Latin script text while typesetting in Greek; these macros should already select the correct encoding, family, series and shape in most circumstances. +In order to insert \emph{short texts} in Greek, either in Didot upright or in Lipsian inclined shape, the \emph{text} commands \verb|\textDidot| and \verb|\textLipsias| may be used, as well as a redefined \verb|\textlatin| \emph{text} command for typesetting a short Latin script text while typesetting in Greek; these macros should already select the correct encoding, family, series and shape in most circumstances. If the users want to change some of these font characteristics, they have to do it explicitly. The \emph{text commands}, contrary to the corresponding \emph{text declarations}, typeset their argument within a group, so that the font characteristics are also correctly restored after the command execution is completed. @@ -343,7 +346,7 @@ The attentive reader might have noticed that some accent macros use the control On the opposite some conflicts may arise with \cs{<} and \cs{>}, as reported by David Kastrup. We have examined these conflict occurrences and we noticed that actually \cs{>} is defined as a `math wide space' command; an alias \cs{:} is defined immediately after the definition, and the \LaTeX\ handbook by Leslie Lamport does not even mention \cs{>}; therefore \cs{>} may be considered a leftover from the beginnings of \LaTeX, and it would be surprising if anybody used it; nevertheless\dots\ The control symbol \cs{<} has been reported as being used as a macro with a delimited argument \cs{<}\meta{arg}\texttt{>} in the documentation of package \pack{calc}. We immagine that it is very unlikely that this \pack{teubner} package might be used in another package documentation, but\dots -These conflicts are avoided if Günter Milde package \pack{textalpha} is loaded; we did not find out any conflict in any testing run we made, but such conflicts may arise; therefore we decided to have \pack{teubner} load the \pack{textalpha} package at \verb|\begin{document}| execution time, so as to avoid any possible conflicts. +These conflicts are avoided if Günter Milde package \pack{textalpha} is loaded; we did not find out any conflict in any testing run we made, but such conflicts may arise; therefore we decided to have \pack{teubner} load the \pack{textalpha} package at \verb|\begin{document}| execution time, so as to avoid any possible conflicts. \begin{table}[tb]\thrule @@ -379,7 +382,7 @@ Example & \multicolumn1c{Syntax} & Example & \multicolumn1c{Sy \caption{Accent macros}\label{t:accentmacros} \vskip\baselineskip REMARKS\\[3pt]\footnotesize -\mbox{\quad}\ap{1}These four commands superimpose the corresponding accent over the \meta{letter} belonging to the Greek alphabet; the corresponding commands \comando\`, \comando\', \comando\~, and \comando\" play the same rôle also with non Greek letters; this allows the stacking of several accents on the same base \meta{letter}. \\ +\mbox{\quad}\ap{1}These four commands superimpose the corresponding accent over the \meta{letter} belonging to the Greek alphabet; the corresponding commands \comando\`, \comando\', \comando\~, and \comando\" play the same rôle also with non Greek letters; this allows the stacking of several accents on the same base \meta{letter}. \\ \mbox{\quad}\ap{2}Most commands may be used also with latin letters.\\ \mbox{\quad}\ap{3}While typesetting in Greek within a \texttt{tabbing} environment, both commands \comando\> and \comando\< play a different r\^ole as tab shifters; @@ -400,7 +403,7 @@ section, the spirit marker and the acute accent inhibit the kerning mechanism wi For this reason two mechanisms are implemented in this package: \begin{enumerate}\itemsep=0pt\parsep=0pt -\item the extended accent macros created by Günter Milde are now the default setting in the Greek support for \babel, and +\item the extended accent macros created by Günter Milde are now the default setting in the Greek support for \babel, and \item the character names have been defined with macros that access directly their own glyphs. \end{enumerate} The first solution has been described in the previous section and the extended accent macros are shown in table~\ref{t:accenti}. At the expense of one slash, these macros create a chain of commands that deeply exploit the \LaTeXe\ kernel commands and allow to fetch directly each accented character; notice that there is no need to treat the \verb+|+ sign this way, because its postfixed position does not break the kerning/ligature mechanism. The spirit macros \verb+\>+ and \verb+\<+ work also with the consonant `r' to produce \textLipsias{\>r, \'Aulos, A\"ULOS} was typeset with \verb+\>'Aulos, A\"ULOS+. Notice also that the initial capital vowel has a spirit and possibly an accent, or is not preceded by anything, since the possible spirit with or without accent falls on the second element of a descending diphthong: \textDidot{a\>ut'os}, \textDidot{A\>ut'os}, and \textDidot{AUTOS}; \textDidot{e\>'inai}, \textDidot{E\>'inai}, \textDidot{EINAI}. If you really want to show an example of how accents should \emph{not} be used in all caps words, you can type \textDidot{A\>UT\A{O}S} but you have to use the macros of diff --git a/Master/texmf-dist/doc/latex/teubner/teubner.pdf b/Master/texmf-dist/doc/latex/teubner/teubner.pdf index a6d7b8b05b6..90735cb33b7 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 d232589487f..6594a1ecc5c 100644 --- a/Master/texmf-dist/doc/latex/teubner/teubner.txt +++ b/Master/texmf-dist/doc/latex/teubner/teubner.txt @@ -1,8 +1,9 @@ - THE TEUBNER PACKAGE VERSION 4.x OF OCTOBER 2015 + + THE TEUBNER PACKAGE VERSION 4.x OF MARCH 2016 EXTENSION FOR PHILOLOGICAL TYPESETTING -Copyright 2001-2004-2015 Claudio Beccari +Copyright 2001-2004-2016 Claudio Beccari The programs contained in this bundle can be distributed and/or modified under the terms of the LaTeX Project Public License (LPPL), version 1.3c @@ -159,8 +160,8 @@ you use LaTeX, you know what are its pros and cons. Happy philological LaTeXing! -Claudio Beccari Turin, October 2015 -Former Professor of Electronics +Claudio Beccari Turin, March 2016 +Professor Emeritus 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 bccc4bdfcdc..f7b457ada7d 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/10/25 v.4.7b +2016/03/31 v.4.8 %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{4371} +% \CheckSum{4368} % \begin{multicols}{2}\tableofcontents\end{multicols} % % @@ -910,21 +910,20 @@ Type X to exit.}% %\begin{macro}{\textlatin} % |\textlatin| is a redefinition of the standard \babel\ macro that is adapted to % the present situation, where it may be called behind the scenes in certain -% situations that are beyond the control of the typesetter. Therefore -% every precaution is taken in order to be sure that the composition of the command -% argument is really done with the default encoding and font families, but -% maintaining the current series and shape; of course, if the shape is that related -% to the Lipsian font, then the italic shape is temporarily restored (local -% definition). Moreover, with the (default) Latin fonts the tilde is restored to a -% non breaking space by simply making it an active character. +% situations that are beyond the control of the typesetter. Therefore every +% precaution is taken in order to be sure that the composition of the command +% argument is really done with the default encoding but maintaining the current +% font familY, series and shape; of course, if the shape is that +% related to the Lipsian font, then the italic shape is temporarily restored +% (local definition). Moreover, with the (default) Latin fonts the tilde is +% restored to a non breaking space by simply making it an active character. % \begin{macrocode} \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}% - \fontfamily{\rmdefault}\selectfont + \fontencoding{\previousencoding}\selectfont \bbl@activate{~}#1}% - \expandafter\fontencoding\expandafter{\externalencoding}\rmfamily} + \expandafter\fontencoding\expandafter{\externalencoding}} % \end{macrocode} %\end{macro} diff --git a/Master/texmf-dist/tex/latex/teubner/teubner.sty b/Master/texmf-dist/tex/latex/teubner/teubner.sty index d0fa7bb6d66..9b5c820a798 100644 --- a/Master/texmf-dist/tex/latex/teubner/teubner.sty +++ b/Master/texmf-dist/tex/latex/teubner/teubner.sty @@ -29,7 +29,7 @@ %% charge for copying, etc. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{teubner}[% -2015/10/25 v.4.7b +2016/03/31 v.4.8 Extensions for Greek philology] \RequirePackage{iftex} \let\ifPDF\ifPDFTeX @@ -181,10 +181,9 @@ Type X to exit.}% \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}% - \fontfamily{\rmdefault}\selectfont + \fontencoding{\previousencoding}\selectfont \bbl@activate{~}#1}% - \expandafter\fontencoding\expandafter{\externalencoding}\rmfamily} + \expandafter\fontencoding\expandafter{\externalencoding}} \DeclareRobustCommand\uishape{% \ifthenelse{\equal{\f@encoding}{\GRencoding@name}}% diff --git a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty index f25e3f2fc2e..b37e8e8d9bc 100644 --- a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty +++ b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty @@ -28,7 +28,7 @@ %% of either this file or a changed version, except for a nominal %% charge for copying, etc. \ProvidesPackage{teubnertx}[% -2015/10/25 v.4.7b +2016/03/31 v.4.8 Access to the LGR encoded Greek fonts that match the TX fonts] \DeclareFontFamily{LGR}{txr}{} -- cgit v1.2.3