summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/teubner
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-07 23:25:52 +0000
committerKarl Berry <karl@freefriends.org>2011-09-07 23:25:52 +0000
commitfacd5da6746c2e6834b9020905bc08b4dc708a67 (patch)
tree5c8caac9d3c57718af54dd12fc955e53c945c4e6 /Master/texmf-dist/source/latex/teubner
parent6f5b6c9a9a35731810a5390082a3e193456afce1 (diff)
teubner 3.3 (7sep11)
git-svn-id: svn://tug.org/texlive/trunk@23854 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/teubner')
-rw-r--r--Master/texmf-dist/source/latex/teubner/teubner.dtx136
1 files changed, 73 insertions, 63 deletions
diff --git a/Master/texmf-dist/source/latex/teubner/teubner.dtx b/Master/texmf-dist/source/latex/teubner/teubner.dtx
index f5e5130829b..55c895ef486 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--2010 Claudio Beccari All rights reserved.
+Copyright 2001--2011 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
@@ -38,7 +38,7 @@ etc.
\ifx\tmpa\fmtname\endgroup\expandafter\bye\fi
\endgroup
%</internal>
-% File: teubner.dtx Copyright (C) 2001-2010 Claudio Beccari
+% File: teubner.dtx Copyright (C) 2001-2011 Claudio Beccari
%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -65,10 +65,10 @@ etc.
%% Right brace \} Tilde \~}
% \iffalse
%<*dtx>
-\ProvidesFile{teubner.dtx}[2010/11/02 v.3.1 extensions for Greek philology]
+\ProvidesFile{teubner.dtx}[2011/09/07 v.3.3 extensions for Greek philology]
%</dtx>
%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{teubner}[2010/05/08 v.3.0k extensions for Greek philology]
+%<package>\ProvidesPackage{teubner}[2011/09/07 v.3.3 extensions for Greek philology]
%
%<*driver>
\documentclass{ltxdoc}
@@ -89,6 +89,8 @@ etc.
}
\newcommand*\acro[1]{\expandafter\textsc\expandafter{\MakeLowercase{#1}}}
\usepackage{multicol}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
\begin{document}
\maketitle
\DocInput{teubner.dtx}
@@ -96,7 +98,7 @@ etc.
%</driver>
% \fi
%
-% \CheckSum{5003}
+% \CheckSum{5021}
% \begin{multicols}{2}\tableofcontents\end{multicols}
%
%
@@ -206,12 +208,12 @@ etc.
%
% Nevertheless there is a little point to observe; Lipsian fonts are very
% nice but show most kerning errors with more evidence than the traditional
-% Didot Greek fonts. With the prefix notation in force, kerning programs may result disabled
-% and some diphthongs and some consonant-vowel combinations appear poorly matched when
-% the second letter caries any diacritical mark. In order to avoid this
-% ``feature'', the accented vowels may be input by means of macros, that
-% directly translate to the accented glyph, rather than invoking the ligature
-% programs that are implied by the prefix notation; reading a Greek text
+% Didot Greek fonts. With the prefix notation in force, kerning programs may
+% result disabled and some diphthongs and some consonant-vowel combinations
+% appear poorly matched when the second letter caries any diacritical mark. In
+% order to avoid this ``feature'', the accented vowels may be input by means of
+% macros, that directly translate to the accented glyph, rather than invoking the
+% ligature programs that are implied by the prefix notation; reading a Greek text
% on the screen while editing the input \texttt{.tex} file when a Latin
% keyboard and such macros are used may be very strange, but authors get
% used to it, and agree that the effort is worth the result.
@@ -344,10 +346,12 @@ etc.
% file in order to help him typeset his master thesis of philological type in
% classical Greek.
%
-% I am pleased to thank G\"unter Milde who wrote a definition file for accessing the
-% LGR encoded fonts in order to fetch the accented glyphs; I kindly gave me
+% I am pleased to thank G\"unter Milde who wrote a definition file for accessing
+% the LGR encoded fonts in order to fetch the accented glyphs; I kindly gave me
% permission to use his macros, that I adapted to the conventions used within this
-% file. These macros are saved into the definition file |LGRaccent-glyph.def|, so that it can be used also without the |teubner| package, fore example for typesetting without setting the \emph{polytoniko} language attribute.
+% file. These macros are saved into the definition file |LGRaccent-glyph.def|, so
+% that it can be used also without the |teubner| package, fore example for
+% typesetting without setting the \emph{polytoniko} language attribute.
%
% I got some ideas also from a paper that Werner Lemberg published on Eutypon, the
% magazine of the Hellenic Friends of \TeX, where he discussed in a constructive
@@ -416,9 +420,9 @@ Type X <return> to exit.}%
% Evidently none of the diacritical marks is compulsory, but at least one must
% be present; if more than one is present it must be given in that sequence. Since
% |\oR| means omicron with rough breath, it is not very important that it is
-% declared with the standard sequence |<o| or with |\oR|, because it never
+% declared with the standard sequence |<o| or with |\oR| or with |\<o|, because it never
% falls after another letter, so that it never breaks any ligature or kerning
-% command. The command is there just for completeness.
+% command. The command is there just for completeness. More or less the same is try with the |\og| sequence; it fails to work correctly when the main language is French and the |french| option to the |babel| package is in force; matter of facts, |\og| conflicts with the homonymous command defined by that option with the meaning of ``ouvrir guillemets''; therefore it's necessary to use either the plain sequence |`o| or the extended accent macro |\`o|.
%
% At the same time since all accent combinations are defined as ``text commands'',
% in \LaTeX\ jargon, when their commands are followed by a vowel (or `r') they
@@ -428,7 +432,7 @@ Type X <return> to exit.}%
% it). See more on this point in the sequel.
%
% Nevertheless, while these glyph name macros are defined by default, it is possible
-% to do without by specifying the option \emph{NoGlyphNames}, In this case the same
+% to do without by specifying the option \emph{NoGlyphNames} (default; you can specify the option \emph{GlyphNames} for turning on these macro names. In this case the same
% result is more comfortably obtained by using the extended accent macros whose
% behaviour is specified in the definition file |LGRaccent-glyph.def|.
%
@@ -439,12 +443,12 @@ Type X <return> to exit.}%
% |boldLipsian| and the Lipsian fonts used in medium series will be substituted
% with those of the semi\-bold one.
%
-% At the same time, from July 2005, The full collection of the complete size set of
-% the CB fonts is not available any more \emph{as the default \TeX\ system set up};
-% only the 10pt size are available unless the \texttt{cbgreek-full} font package is
+% At the same time, from July 2005 and for a few years, the full collection of the complete size set of
+% the CB fonts has not been available any more \emph{as the default \TeX\ system set up};
+% only the 10pt size were available unless the \texttt{cbgreek-full} font package is
% loaded; for this reason a new option is needed in order to instruct
% \texttt{teubner.sty} to use the specific file \texttt{type1ec.sty} dated at least
-% 2002/09/07, so as to scale up or ddown all the EC and CB fonts from an original
+% 2002/09/07, so as to scale up or down all the EC and CB fonts from an original
% 10\,pt size. In order that the \texttt{10pt} plays its role correctly, it is
% convenient, if not compulsory, to require first the \texttt{babel} package, then
% the \texttt{teubner} one with the option \texttt{10pt}, then all other packages
@@ -461,7 +465,7 @@ Type X <return> to exit.}%
% those normally used with \TeX: |cmr| for serifed fonts, |cmss| for sanserif ones,
% and |cmtt| for monospaced ones.\footnote{Even the Latin Modern fonts have
% different family names, but, due to their importance, specific font description
-% files have been added to the \babel\ package. The Lm fonts are more comfortable
+% files have been added to the \babel\ package. The LM fonts are more comfortable
% than the EC ones, when scalable fonts are to be used, because they are
% continuously scalable and download into the produced files less font files than
% the EC o cm-super ones. Unless specifically requested, the LM fonts should always
@@ -476,7 +480,7 @@ Type X <return> to exit.}%
% typesetter might get crazy trying to force shape and series changes in the Greek
% text; it would not be impossible, but it would be very, very boring. In any case
% see in the sequel for the implemented kludges in order to run successful
-% compilations also with non standard \TeX\ system fonts.
+% compilations also with non standard \TeX\ system fonts.
% \begin{macrocode}
\newif\ifor\orfalse % Compatibility with older versions
\DeclareOption{or}{\relax}
@@ -484,8 +488,9 @@ Type X <return> to exit.}%
\DeclareOption{boldLipsian}{\boldLipsiantrue}
\newif\ifonesizetypeone
\DeclareOption{10pt}{\onesizetypeonetrue}
-\newif\ifGlyphNames \GlyphNamestrue
+\newif\ifGlyphNames \GlyphNamesfalse
\DeclareOption{NoGlyphNames}{\GlyphNamesfalse}
+\DeclareOption{GlyphNames}{\GlyphNamestrue}
\ProcessOptions*
% \end{macrocode}
%
@@ -504,8 +509,8 @@ Type X <return> to exit.}%
% \end{macrocode}
%
% Now the default Olga Greek fonts, used for rendering the ``Greek italic shape''
-% are an alternative with the Lipsian ones. If the \texttt{10pt}
-% option was specified it is necessary to load also the package texttt{type1ec.sty}.
+% are an alternative with the Lipsian ones. If the \texttt{10pt} option was
+% specified it is necessary to load also the package texttt{type1ec.sty}.
% In any case we load also packages |graphicx| and |ifthen| that shall be useful
% for some commands.
% \begin{macrocode}
@@ -538,18 +543,18 @@ Type X <return> to exit.}%
% \end{macro}
% Next we require the package for extensible math fonts; it might be strange to use
% extensible math fonts in Greek philology, but a certain command must be picked up
-% from such fonts, with the assurance that it changes size together with the current
-% font size.
+% from such fonts, with the assurance that it changes size together with the
+% current font size.
% \begin{macrocode}
\RequirePackage{exscale}
% \end{macrocode}
%
% Some macros are necessary to switch languages; such macros must be independent
-% (at least for now) from the particular \babel\ version, whether it be version 3.6
-% or~3.7; in the former the concept of ``language attribute'' is unknown, while the
-% latter recognizes varieties of the same language by the attribute setting.
-% Such macros, besides being as robust as possible, must provide the alphabet
-% changes as required.
+% (at least for now) from the particular \babel\ version, whether it be version
+% 3.6, 3.7, or~3.8; in the former the concept of ``language attribute'' is unknown,
+% while the latter recognizes varieties of the same language by the attribute
+% setting. Such macros, besides being as robust as possible, must provide the
+% alphabet changes as required.
%
%\begin{macro}{\GreekName}
% During the language switching operations |\GreekName|
@@ -641,7 +646,7 @@ Type X <return> to exit.}%
\string\DeclareFontShape{#1}{#2}{b}{rs}{<->ssub * #3/m/rs}{}^^J %<-serifed lc
\string\DeclareFontShape{#1}{#2}{bx}{rs}{<->ssub * #3/bx/rs}{}^^J%<-serifed lc
}%
- \fi
+ \Lipsianfalse\fi
\closeout15}%
}}
@@ -658,10 +663,10 @@ Type X <return> to exit.}%
% |\n@xt| to be an alias to |\iftrue| or |iffalse| depending on the fact that the
% CM (or EC) fonts or the LM fonts are the default Latin ones, in this case it sets
% the |\n@xt| macro equivalent to |\iftrue|, otherwise it sets it to |\iffalse|. In
-% order to succeed, it requires to analize the first two letters of the default
+% order to succeed, it requires to analyze the first two letters of the default
% family name; if these letters form one of the sequences |cm| or |lm|, the CM or
% LM fonts have been loaded, otherwise some other fonts are in force. We need
-% therefore a macro with delimited arguments in order to extract the ffirst two
+% therefore a macro with delimited arguments in order to extract the first two
% letters of the family name.
%
% \begin{macrocode}
@@ -677,7 +682,7 @@ Type X <return> to exit.}%
% encoding. Therefore, after these font definition files exist, \LaTeX\ can fetch
% the Greek fonts by way of substitution. Let's explain again: if you specify
% \begin{verbatim}
-% \Lispsiantrue\ifFamuly{pxr}{lmr}\Lipsianfalse
+% \Lipsiantrue\ifFamily{pxr}{lmr}
% \end{verbatim}
% you state that you want to run the macro on the serifed Palatino font family, by
% associating the |pxr| family to the |lmr| one\footnote{If you have the full CB
@@ -686,17 +691,17 @@ Type X <return> to exit.}%
% map the missing family to the ordinary Computer Modern ones; the actual fonts are
% the same, but the latter font definition files cope with the \emph{10pt} option,
% while the former don't.}; by specifying |\Lipsiantrue| you state that you want to
-% create entries also for the Lipsian series and shape; afterwards you reset
-% |\Lipsianfalse| in order to avoid that other call of that macro on non serifed or
-% monospaced fonts try to create entries that in any case do not exist: the Lipsian
-% font comes only as a serifed font!. In this way, if you are using Palatino fonts
-% through the \textsf{pxpackage}, the |teubner| macros provide to create the
-% necessary font description files so that while you are typesetting in medium
-% normal Latin Palatino and you switch to Greek, the built in macros change the
-% encoding to LGR; The LGR Palatino serifed medium normal Greek font does not exist,
-% but that family, series and shape are mapped by the font description file to the
-% corresponding LGR encoded Latin Modern CB fonts in medium series and normal shape,
-% and typesetting goes on with the rigth Greek fonts.
+% create entries also for the Lipsian series and shape; The macro provides to reset
+% |\Lipsianfalse| in order to avoid that other calls of that macro on non serifed
+% or monospaced fonts try to create entries that in any case do not exist: the
+% Lipsian font comes only as a serifed font! In this way, if you are using
+% Palatino fonts through the \textsf{pxfonts} package, the |teubner| macros provide
+% to create the necessary font description files so that while you are typesetting
+% in medium normal Latin Palatino and you switch to Greek, the built in macros
+% change the encoding to LGR; the LGR Palatino serifed medium normal Greek font
+% does not exist, but that family, series and shape are mapped by the font
+% description file to the corresponding LGR encoded Latin Modern CB fonts in medium
+% series and normal shape, and typesetting goes on with the right Greek fonts.
% \begin{macrocode}
\newcommand*\ifFamily[2]{%
\expandafter\ifCMLM#1!\else\substitutefontfamily{LGR}{#1}{#2}\fi}
@@ -706,7 +711,7 @@ Type X <return> to exit.}%
% fonts loaded by means of the corresponding packages \textsf{txfonts} or
% \textsf{pxfonts}, because a hook is set up so that ``at begin document'' the
% loading of those packages is tested, and if the test is true, the necessary font
-% description files are possibly created. If you load the Tymes or the Palatino or
+% description files are possibly created. If you load the Times or the Palatino or
% any other non standard font by means of other packages, it's up to you to issue
% the |\substitutefontfamily| macro right after calling that font package and by
% using the correct family names; similarly you might substitute the new Latin font
@@ -732,8 +737,8 @@ Type X <return> to exit.}%
% Nevertheless all this requires a minimum of attention in specifying the options
% for the \babel\ package and in the order extensions packages are read in. The
% |teubner.sty| package should be read \emph{after} any other package that sets or
-% resets the Latin font encoding; for example if
-% the T1 encoding is selected as the default one, in place of the OT1 encoding, then
+% resets the Latin font encoding; for example if the T1 encoding is selected as the
+% default one, in place of the OT1 encoding, then
% this choice must be made before this package is read in. Similarly when the
% \babel\ options are specified, remember that the last language name becomes the
% default language at begin document; never specify \texttt{greek} as the last
@@ -789,8 +794,8 @@ Type X <return> to exit.}%
% |\textLipsias| is a command that typesets its argument with the |\Lipsiakostext|
% declaration in force. The \LaTeX\ command declaration used here makes sure that
% possible italic corrections are taken into account; hte actual font switching is
-% made through the same |\Lipsiakostext| declaration, but the innner working
-% maintain local this declaration, so non grouping is explicitly required; for this
+% made through the same |\Lipsiakostext| declaration, but the inner working
+% maintain local this declaration, so non grouping is explicitly required; for this
% reason we suggest to use this text command rather than the font declaration.
% \begin{macrocode}
\DeclareTextFontCommand{\textLipsias}{\Lipsiakostext}
@@ -865,9 +870,9 @@ Type X <return> to exit.}%
%\begin{macro}{\textui}
%\begin{macro}{\rsshape}
%\begin{macro}{\textrs}
-% The other switching foont macros for using the other shaps that are available with
-% the CB fonts are working only when tyesetting in Greek and the default encoding is
-% therefore LGR.
+% The other switching font macros for using the other shapes that are available
+% with the CB fonts are working only when typesetting in Greek and the default
+% encoding is therefore LGR.
% \begin{macrocode}
\DeclareRobustCommand\uishape{%
\ifthenelse{\equal{\f@encoding}{\GRencoding@name}}%
@@ -3420,7 +3425,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
%<*defs>
% \begin{macrocode}
\ProvidesFile{LGRaccents-glyphs.def}%
- [2010/05/08 v.2.0a Definitions of accents and glyphs for LGR encoded Greek fonts]
+ [2011/09/07 v.3.3 Definitions of accents and glyphs for LGR encoded Greek fonts]
% \end{macrocode}
% \subsection{First set of extended accent definitions}
% These macros were originally defined by Guenter Milde
@@ -3550,6 +3555,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{a}{129}
\DeclareTextComposite{\Psili}{\GRencoding@name}{a}{130}
\DeclareTextComposite{\'}{\GRencoding@name}{a}{136}
+\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{a}{144}
\DeclareTextComposite{\~}{\GRencoding@name}{a}{144}
\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{a}{137}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{a}{145}
@@ -3565,6 +3571,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{h}{161}
\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{h}{162}
\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{h}{171}
+\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{h}{168}
\DeclareTextComposite{\~}{\GRencoding@name}{h}{168}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{h}{169}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{h}{170}
@@ -3576,6 +3583,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{w}{185}
\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{w}{186}
\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{w}{187}
+\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{w}{192}
\DeclareTextComposite{\~}{\GRencoding@name}{w}{192}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{w}{193}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{w}{194}
@@ -3590,6 +3598,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\~}{\GRencoding@name}{i}{216}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{i}{217}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{i}{218}
+\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{i}{240}
\DeclareTextComposite{\"}{\GRencoding@name}{i}{240}
\DeclareTextComposite{\DialytikaVaria}{\GRencoding@name}{i}{241}
\DeclareTextComposite{\DialytikaTonos}{\GRencoding@name}{i}{242}
@@ -3602,6 +3611,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{u}{213}
\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{u}{214}
\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{u}{215}
+\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{u}{220}
\DeclareTextComposite{\~}{\GRencoding@name}{u}{220}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{u}{221}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{u}{222}
@@ -3636,9 +3646,9 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
% used; the CB fonts don't even contain them. There is no concern with kerning
% because the diacritics preceding the capital letters are not preceded by something
% else; what follows is kerned the usual way. With \"I and \"U specific kernings are
-% provided, if the dialytika macro |\"| is used, while kerning dith the dialytika
-% ligature temporarily work with kludges that should not be present in any font, but
-% the CB fonts have because the |AU| and |A'U| kerning was terrible without them;
+% provided, if the dialytika macro |\"| is used; kerning with the dialytika
+% ligature temporarily works with kludges that should not be present in any font, but
+% the CB fonts have them because the |AU| and |A'U| kerning was terrible without them;
% now, with Milde's macros and or the pre-existing |\Id| and |\Ud| macros, should
% not be of any concern.
% \begin{macrocode}
@@ -3737,7 +3747,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
%<*tbtx>
%\section{Accessing the CBgreek fonts when the TX fonts are selected}
% During the year 2010 this package \textsf{teubner.sty} was upgraded in order to allow
-% using the CBgreek fonts eve when other Latin font, different from the ``standard'' CM
+% using the CBgreek fonts even when other Latin fonts, different from the ``standard'' CM
% 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
@@ -3749,7 +3759,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
% 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 it Tsolomitis' files are available on the main system tree, these take precedence
+% 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.
@@ -3761,7 +3771,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
% necessary, but it better to do this way than to clash with other packages.
% \begin{macrocode}
\ProvidesPackage{teubnertx}%
- [2010/11/02 v.1.0 Access to the LGR encoded Greek fonts when TX fonts are used]
+ [2011/09/07 v.3.3 Access to the LGR encoded Greek fonts when TX fonts are used]
\DeclareFontFamily{LGR}{txr}{}
\DeclareFontShape{LGR}{txr}{m}{n}{<->ssub * cmr/m/n}{}
\DeclareFontShape{LGR}{txr}{m}{it}{<->ssub * cmr/m/it}{}