summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-19 23:38:28 +0000
committerKarl Berry <karl@freefriends.org>2013-04-19 23:38:28 +0000
commit1d4c2a74644b4bbb8828b70adc492f5da0493236 (patch)
treeab8b88bea0aae246ed5b3dc4c7a99805ad42ee83 /Master/texmf-dist
parent69de3344104bfec286cbe7ea63f03fab58d3c1ec (diff)
teubner (19apr13)
git-svn-id: svn://tug.org/texlive/trunk@30045 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/teubner/README6
-rw-r--r--Master/texmf-dist/doc/latex/teubner/teubner-doc.pdfbin368871 -> 368870 bytes
-rw-r--r--Master/texmf-dist/doc/latex/teubner/teubner-doc.tex44
-rw-r--r--Master/texmf-dist/doc/latex/teubner/teubner.pdfbin640046 -> 632421 bytes
-rw-r--r--Master/texmf-dist/doc/latex/teubner/teubner.txt5
-rw-r--r--Master/texmf-dist/source/latex/teubner/teubner.dtx178
-rw-r--r--Master/texmf-dist/tex/latex/teubner/LGRaccents-glyphs.def35
-rw-r--r--Master/texmf-dist/tex/latex/teubner/teubner.sty38
-rw-r--r--Master/texmf-dist/tex/latex/teubner/teubnertx.sty13
9 files changed, 194 insertions, 125 deletions
diff --git a/Master/texmf-dist/doc/latex/teubner/README b/Master/texmf-dist/doc/latex/teubner/README
index e84a36924b3..84a6b90bcc3 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 3.3a dated September 2012.
+This accompanies the teubner bundle version 3.4 dated September 2012.
Copyright 2010-2012 Claudio Beccari
@@ -24,8 +24,8 @@ contains new designs for the horizontally stretchable markers, et cetera.
Running pdflatex on the dtx file produces both the documentation and the extraction
of the byproduct files teubner.sty, teubnertx.sty, teubner.pdf, and
-LGRaccents-gyphs.def. The latter might be separately input and used also without
-the teubner bundle. The readable extend documentation file teubner-doc.pdf is
+LGRaccents-glyphs.def. The latter might be separately input and used also without
+the teubner bundle. The readable extended documentation file teubner-doc.pdf is
obtained by running pdflatex on the teubner-doc.tex file.
Moreover this new version of the teubner package generates on the fly the font
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf b/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf
index caa524a1952..4b8739c4244 100644
--- a/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf
+++ b/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex b/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex
index 74963c24970..12579b6c78f 100644
--- a/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex
+++ b/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex
@@ -1,6 +1,7 @@
% !TEX encoding = IsoLatin
% !TEX TS-program = pdflatex
\documentclass[12pt,a4paper]{article}
+\usepackage{trace}
\usepackage[latin1]{inputenc}
\usepackage[T1]{fontenc}
%\usepackage{lmodern}
@@ -8,7 +9,7 @@
%\usepackage{pxfonts}
\usepackage{mflogo}
\usepackage[greek,english]{babel}
-\def\workingdate{2012/09/11}% see two lines ahead
+\def\workingdate{2012/09/16}% see two lines ahead
\usepackage[boldLipsian,10pt,GlyphNames]% <-------- teubner options
{teubner}[\workingdate]% <--- older versions don't work well
\usepackage[scaled=0.90]{helvet}
@@ -28,7 +29,7 @@
\def\@tbnhlp{Probably your typesetting will fail;
in any case\MessageBreak
expect a lot of errors and warnings!\@ehc}%
- \@latex@error{This file must be processed with %
+ \@latex@error{This file must be processed with\MessageBreak
a teubner package\MessageBreak
with a file date not older than \workingdate;\MessageBreak
your teubner package has a date mark of \filedate.
@@ -43,8 +44,8 @@
\title{\texttt{teubner.sty}%
\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}
-\date{Turin, September 2011}% <---- this is the date of the teubenr-doc document!
+\author{Claudio Beccari\thanks{\texttt{claudio dot beccari at gmail dot com}}}
+\date{Turin, April 2013}% <---- this is the date of the teubenr-doc document!
\def\comando#1{\expandafter\texttt\expandafter{\string#1}}
\def\ARG#1{\texttt{\char123}$\langle$\textit{#1}$\rangle$\texttt{\char125}}
\def\Arg#1{$\langle$\textit{#1}$\rangle$}
@@ -218,7 +219,7 @@ right after the \verb|\usepackage| command with which you call that package.
Example: suppose you want to use the regular Fourier fonts to replace the default roman normal serifed fonts; then you should load the package \texttt{fourier} \emph{after} the \texttt{teubner} extension and specify:
\begin{verbatim}
\usepackage{fourier}
-\Lipsiandtrue
+\Lipsiantrue
\ifFamily{futs}{cmr}
\end{verbatim}
You can see that the family name \texttt{futs}, corresponding to the regular Fourier font family, has been matched to the CB Greek \texttt{cmr} font family; the name \texttt{futs} has been deduced by reading the \texttt{fourier.sty} file from which one can see that the family declaration for the regular Fourier font family is \texttt{futs}. This sort of coding does not take place with all fonts: if the Iwona fonts had to be chosen, for example, then the font family name would coincide with the font name, making it difficult to distinguish between the \emph{font name} and the \emph{font family name}.
@@ -315,8 +316,7 @@ any letter, due to the limitation of 256 glyphs per font; but they may be input
by means of the standard \LaTeX\ commands \verb|\=| and \verb|\u| respectively
in order to use them as accents.
-Thanks to G\"unter Milde, whom I thank very much and acknowledge his work, this package uses an extended set of macros that involve only the ``upper'' diacritics; they can be used in place of the combining diacritics described in table~\ref{t:accenti}; simply the accents are prefixed by a backslash and/or the accent sequence is prefixed with one backslash; therefore \textDidot{>'a|}
-may be obtained with \verb+>'a|+, or \verb+\>\'a|+, or \verb+\>'a|+. The last form is to be preferred with some shapes as discussed in the following paragraphs.
+Thanks to Günter Milde, whom I thank very much and acknowledge his work, this package uses an extended set of macros that involve only the ``upper'' diacritics; they can be used in place of the combining diacritics described in table~\ref{t:accenti}; simply the accents are prefixed by a backslash and/or the accent sequence is prefixed with one backslash; therefore \textDidot{>'a|} may be obtained with \verb+>'a|+, or \verb+\>\'a|+, or \verb+\>'a|+. The last form is to be preferred with some shapes as discussed in the following paragraphs.
Together with the macros for inserting such symbols, a complete set is available for inserting any combination of diacritical marks over or under any letter, not only vowels: see table~\ref{t:accentmacros}.
@@ -329,10 +329,10 @@ Of course the results may not be comparable with the ones one can obtain with th
\begin{tabular}{cl|cl}
Example & \multicolumn1c{Syntax} & Example & \multicolumn1c{Syntax} \\
\hline
-\g \`a & \comando\`\Arg{letter} & \g\ut{aw} & \comando\ut\ARG{letters} \\
-\g \'a & \comando\'\Arg{letter} & \g\Ab{a} & \comando\Ab\ARG{letter} \\
-\g \~a & \comando\~\Arg{letter}\ap{1} & \g\Gb{a} & \comando\Gb\ARG{letter} \\
-\g \"i & \comando\"\Arg{letter} & \g\Arb{a} & \comando\Arb\ARG{letter} \\
+\g \`{a} & \comando\G\ARG{letter}\ap{1} & \g\ut{aw} & \comando\ut\ARG{letters} \\
+\g \'{a} & \comando\A\ARG{letter}\ap{1} & \g\Ab{a} & \comando\Ab\ARG{letter} \\
+\g \~{a} & \comando\C\ARG{letter}\ap{1} & \g\Gb{a} & \comando\Gb\ARG{letter} \\
+\g \"{i} & \comando\D\ARG{letter}\ap{1} & \g\Arb{a} & \comando\Arb\ARG{letter} \\
\g \u{a} & \comando\u\ARG{letter} & \g\Grb{a} & \comando\Grb\ARG{letter} \\
\g \U{ai} & \comando\U\ARG{diphthong} & \g\Asb{a} & \comando\Asb\ARG{letter} \\
\g \=a & \comando\=\ARG{letter} & \g\Gsb{a} & \comando\Gsb\ARG{letter} \\
@@ -356,9 +356,7 @@ Example & \multicolumn1c{Syntax} & Example & \multicolumn1c{Sy
\caption{Accent macros}\label{t:accentmacros}
\vskip\baselineskip
REMARKS\\[3pt]\footnotesize
-\ap{1}\quad The circumflex accent may be obtained with \comando\~\ only if
-attribute \textsf{polutoniko} was specified for the
-Greek language with \babel\ v.3.7 or v.3.8. At the same time it must be followed by its argument without using curly braces; if a Greek circumflex accent is desired over a vowel that ordinarily does not receive such an accent, or on any other symbol, then use \texttt{\string\GRcirc}\ARG{symbol} instead.\\
+\ap{1}\quad 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}. \\
\ap{2}\quad Most commands may be used also with latin letters.\\
\ap{3}\quad While typesetting in Greek within a \texttt{tabbing} environment,
both commands \comando\> and \comando\< play a different r\^ole as tab shifters;
@@ -372,17 +370,17 @@ fall on the very first vowel of a word. Suggestion; never use the \texttt{tabbin
It should be clear from the previous section that the ligature mechanism is the
one that offers good results with most accented vowels, while speeding up the keying-in of the text to be typeset; nevertheless there are situations where you might be unsatisfied.
-Fore example compare \textLipsias{a>ut'os} with \textLipsias{a\>ut\'os}. The small spacing difference between tau and the accented omicron is hardly noticeable, but the spacing difference between alpha and the marked upsilon is remarkable. Where does that difference come from? It comes from the fact that the smooth spirit marker inhibits kerning between the previous alpha and the resulting ligature from the spirit marker and the upsilon\footnote{The CB fonts may be used also with monotoniko spelling; in this case \textLipsias{A"ULOS} comes out well even with ligatures \texttt{A"ULOS}, because a special kludge has been devised; with the extended accent macros it would not be too boring to typeset \texttt{A\string\"ULOS} and do away with that kludge; without it and without such extended macros that word would be set as \textLipsias{Av"ULOS} with a much larger space between the capital alpha and the marked capital upsilon.}.
+For example compare \textLipsias{a>ut'os} with \textLipsias{a\>ut\'os}. The small spacing difference between tau and the accented omicron is hardly noticeable, but the spacing difference between alpha and the marked upsilon is remarkable. Where does that difference come from? It comes from the fact that the smooth spirit marker inhibits kerning between the previous alpha and the resulting ligature from the spirit marker and the upsilon\footnote{The CB fonts may be used also with monotoniko spelling; in this case \textLipsias{A"ULOS} comes out well even with ligatures \texttt{A"ULOS}, because a special kludge has been devised; with the extended accent macros it would not be too boring to typeset \texttt{A\string\"ULOS} and do away with that kludge; without it and without such extended macros that word would be set as \textLipsias{Av"ULOS} with a much larger space between the capital alpha and the marked capital upsilon.}.
In other words, by inputting \verb"a>ut'os", as it is suggested in the previous
section, the spirit marker and the acute accent inhibit the kerning mechanism with the previous letter. In most instances the lack of such kerning is hardly noticeable, but in others it strikes your attention.
For this reason two mechanisms are implemented in this package:
\begin{enumerate}\itemsep=0pt\parsep=0pt
-\item the extended accent macros suggested by G�nter Milde have been adapted to this package in order to have accent macros that help fetching the accented character in the font table, and
+\item the extended accent macros suggested by Günter Milde have been adapted to this package in order to have accent macros that help fetching the accented character in the font table, 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 mechanism. The spirit macros \verb+\>+ and \verb+\<+ work also with the consonant `r' to produce \textLipsias{\>r, \<r}. The extended accent macros work correctly also with capital letters (where, in all caps, accents should not be typeset, except the dieresis, while in normal initial capitalizing the upper diacritics must be written at the left of the initial letter); for example\footnote{In the capitalized word the spirit and accent at the left of A imply a hiatus between the A and the \textDidot{u}; in the all caps word this hiatus is marked with the ``dialytika'' (dieresis) over the \textDidot{U}. This is an unusual example, but it shows also why the \texttt{\string\uppercase} and the \texttt{\string\MakeUppercase} require some attention in polutoniko Greek.} \textDidot{\>'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 examle of how accents should \emph{not} be used in all caps words, you can type \textDidot{A\>UT\'OS} but you have to use the macros of
-table~\ref{t:accentmacros} as such: \verb+A\>UT\'OS+.
+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 mechanism. The spirit macros \verb+\>+ and \verb+\<+ work also with the consonant `r' to produce \textLipsias{\>r, \<r}. The extended accent macros work correctly also with capital letters (where, in all caps, accents should not be typeset, except the dieresis, while in normal initial capitalizing the upper diacritics must be written at the left of the initial letter); for example\footnote{In the capitalized word the spirit and accent at the left of A imply a hiatus between the A and the \textDidot{u}; in the all caps word this hiatus is marked with the ``dialytika'' (dieresis) over the \textDidot{U}. This is an unusual example, but it shows also why the \texttt{\string\uppercase} and the \texttt{\string\MakeUppercase} require some attention in polutoniko Greek.} \textDidot{\>'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 examle 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
+table~\ref{t:accentmacros} as such: \verb+A\>UT\A{O}S+.
Another solution is available if the \emph{GlyphNames} option is specified to the \texttt{tenbner} package: a set of macros has been defined such that it is
possible to input the accented characters directly, without
@@ -451,7 +449,7 @@ REMARKS\\[3pt]\footnotesize
\ap{1}\quad Some users remarked that this \verb|\og| command may conflict the homonymous command available when typesetting French texts with the \texttt{french} option to \texttt{babel} in force; For this reason it's necessary to use \verb|\`o| in its place, therefore using the extended accent macros.\par
\leavevmode\ap{2}\quad As mentioned in the body of this text the command
\comando{\or} is incompatible with the primitive \TeX\ command with the same name, therefore it is necessary to use the extend accent macro \verb|\<o|.\par
-\leavevmode\ap{3}\quad In both cases macros are unnecessary, specifically for \verb|\>o|, since an initial accented letter has no preceding letter which whom some kerning might be necessary; therefore at the start of a word always use \verb|'o| or \verb|<o|, and use \verb|\'o| only in a word internal position, should some kerning be necessary; actually the shape of the omicron seldom requires some kerning.
+\leavevmode\ap{3}\quad In both cases macros are unnecessary, specifically for \verb|\>o|, since an initial accented letter has no preceding letter which whom some kerning might be necessary; therefore at the start of a word always use \verb|'o| or \verb|<o|, and use \verb|\'o| only in a word internal position, should some kerning be necessary; actually the shape of the omicron seldom requires any kerning.
\bhrule
\end{table}
@@ -490,7 +488,7 @@ In other words we have:
10) \verb|\MakeUppercase{e>uzw\"ia}| yields \textLipsias{\MakeUppercase{e>uzw\"ia}}.%\\
\end{flushleft}
%
-and it's easily seen that: 1) corresponds to a non redundant lowercase correct spelling but misses the required dieresis in upper case; 2) is correct but it relies on a special kludge on which it's better not to rely on, because in future releases of the fonts it may be eliminated; meanwhile it is usable; 3) is correct; 4) is wrong because \verb|\MakeUppercase| does not act on macros, but \verb|\>| is a macro, while \verb|'| is just a character that, as all the other accents, has an uppercase code mapped to a zero space dummy invisible character, therefore when conversion to uppercase is performed, the smooth spirit goes over a zero height invisible character, and that's why it appears to be sitting on the baseline; 5) is wrong because in all-caps spelling accents should not be shown. Case 6) displays the result of using the accented glyph names which are not subject to capitalization since they are given by means of macros; therefore they can never be used for words that are possibly subject to all-caps transformation.
+and it's easily seen that: 1) corresponds to a non redundant lowercase correct spelling but misses the required dieresis in upper case; 2) is correct but it relies on a special kludge on which it's better not to rely on, because in future releases of the fonts it may be eliminated; meanwhile it is usable; 3) is correct; 4) is wrong because \verb|\MakeUppercase| does not act on macros, but \verb|\>| is a macro, while \verb|'| is just a character that, as all the other accents, has an uppercase code mapped to a zero height dummy invisible character, therefore when conversion to uppercase is performed, the smooth spirit goes over a zero height invisible character, and that's why it appears to be sitting on the baseline; 5) is wrong because in all-caps spelling accents should not be shown. Case 6) displays the result of using the accented glyph names which are not subject to capitalization since they are given by means of macros; therefore they can never be used for words that are possibly subject to all-caps transformation.
Let's examine another case where the lower case word has both the dieresis and an accent over the same vowel: \textLipsias{e>uzw"'ia}. Case 7) shows the effect of uppercasing when using ligatures, and the result is not correct because the dieresis does not fall over the capital iota; by simply inverting the sequence of the dieresis and the acute accent, case 8), a correct result is obtained, but kerning problems might take place because of the invisible presence of the lower cased acute accent; notice that the same result would be obtained if instead of the dieresis-vowel ligature the extended dieresis macro had been used; case 9) displays the situation when both extended accent macros are used so that the result does not suffer of any kerning problem but the capital iota has both the dieresis and the acute accent, while the latter should be absent; finally, case 10) displays a correct upper case result but the lower case counterpart would miss the acute accent.
@@ -505,7 +503,7 @@ When using small caps or caps and small caps, in other words, when using the
16) \verb|\textDidot{\scshape \>{v}Arqim\'hdhs}| yields \textDidot{\scshape\>{v}Arqim\'hdhs}\\
\end{flushleft}
-With caps and small caps a spirit, or a spirit accent combination prefixed to a capital letter does not produce any mark; this is the usual modern Greek habit of avoiding accents with capital letters and the \verb|\scshape| specification to Greek fonts excludes all the ligatures and kernings with such signs; the same holds true also with small caps. The extended accent macros explicitly avoid any mark over capital letters, but even in front they are ``silenced'' by the very characteristics of the specific font shape. With small caps there is a similar situation, except the the extended accent macros use a different definition for the accent macro so as to being able to put the accent on any glyph. But accents are apparently used in French also when proper names are typeset in caps and small caps, contrary to Greek, and in French the spelling of case 16 is correct; for the initial spirit, therefore it is necessary to resort to the invisible character obtained with the Latin letter `u', that is suitable for supporting any diacritic mark at the proper height. This remark comes from a mail exchange with Julien Browaeys who pointed out this specific typesetting French tradition. Julien Browaeys spotted also a sneaky glitch in the set of extended accent macros that was corrected thanks to his bug notification. I am pleased to acknowledge his contributions.
+With caps and small caps a spirit, or a spirit accent combination prefixed to a capital letter does not produce any mark; this is the usual modern Greek habit of avoiding accents with capital letters and the \verb|\scshape| specification to Greek fonts excludes all the ligatures and kernings with such signs; the same holds true also with small caps. The extended accent macros explicitly avoid any mark over capital letters, but even in front they are ``silenced'' by the very characteristics of the specific font shape. With small caps there is a similar situation, except the the extended accent macros use a different definition for the accent macro so as to being able to put the accent on any glyph. But accents are apparently used in French also when proper names are typeset in caps and small caps, contrary to Greek, and in French the spelling of case 16 is correct; for the initial spirit, therefore it is necessary to resort to the invisible character obtained with the Latin letter `v', that is suitable for supporting any diacritic mark at the proper height. This remark comes from a mail exchange with Julien Browaeys who pointed out this specific typesetting French tradition. Julien Browaeys spotted also a sneaky glitch in the set of extended accent macros that was corrected thanks to his bug notification. I am pleased to acknowledge his contributions.
Conclusion: when writing the input code for a sectioning command, the argument of which has to be transformed to upper case, use only ligatures before the first vowel and use \verb|\"| (in the proper sequence with other accents) for the internal diereses, as in cases 3) and 8) above; don't use extended accent macros for the other internal accents. If you need to correct internal kerning by using internal extended accent macros, play with the sectioning command optional argument in order to use the right strategy for the correct typesetting of both the sectioning title and the page heading. The worst it can happen is a wrong kerning in the table of contents entry. If you want to avoid also this possibility, then either avoid classes that typeset their headings in all-caps, or use any external package that defines sectioning commands with two optional arguments, one for the heading contents and the other for the table of contents; or use equivalent tricks: for example the \texttt{memoir} class has a specific command \verb|\nouppercaseheads| that eliminates any heading uppercasing.
@@ -559,9 +557,9 @@ if you type \verb"\Greeknumeral*{1996}" you get \textLipsias{\Greeknumeral*{1996
if you type \verb+\greeknumeral{123456}+ you get \textLipsias{\greeknumeral{123456}}
\end{quote}
-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 maximium value that can be transformed is 99\,999, while, of course, no vanishing or negative numbers can be transformed:
+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{2011}| you get \textLipsias{\AtticNumeral{2011}}
+if you type \verb|\AtticNumeral{2012}| you get \textLipsias{\AtticNumeral{2012}}
if you type \verb|\AtticNumeral{1999}| you get \textLipsias{\AtticNumeral{1999}}
\end{quote}
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner.pdf b/Master/texmf-dist/doc/latex/teubner/teubner.pdf
index d12820c535d..f6aa73d68d1 100644
--- a/Master/texmf-dist/doc/latex/teubner/teubner.pdf
+++ b/Master/texmf-dist/doc/latex/teubner/teubner.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner.txt b/Master/texmf-dist/doc/latex/teubner/teubner.txt
index 37455abb573..f99f4a084c6 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 3.3a OF SEPTEMBER 2012
+ THE TEUBNER PACKAGE VERSION 3.4 OF SEPTEMBER 2012
EXTENSION FOR PHILOLOGICAL TYPESETTING
@@ -12,6 +12,7 @@ dated 2008-05-04 or later as it appears in
This bundle contains the following files
+README short information abut installing this bundle
teubner.txt this file
teubner.dtx documented TeX file
teubner-doc.tex documentation file
@@ -145,7 +146,7 @@ you use LaTeX, you know what are its pros and cons.
Happy philological LaTeXing!
-Claudio Beccari Turin, 11 of September 2012
+Claudio Beccari Turin, 17 of September 2012
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 9ae4a362db7..e5ffc2a84a4 100644
--- a/Master/texmf-dist/source/latex/teubner/teubner.dtx
+++ b/Master/texmf-dist/source/latex/teubner/teubner.dtx
@@ -13,6 +13,7 @@ Copyright 2001--2012 Claudio Beccari All rights reserved.
This file is distributed under the LPPL licence, version 1.3c
dated 2008-05-04 or later as it appears in
CTAN/macros/latex/base/lppl.tex.
+See the end of the file.
IMPORTANT NOTICE:
@@ -28,6 +29,13 @@ 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.
\endpreamble
+\postamble
+ It may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either version 1.3
+ 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
+\endpostamble
\askforoverwritetrue
\generateFile{teubner.sty}{t}{\from{teubner.dtx}{package}}
@@ -38,14 +46,6 @@ etc.
\ifx\tmpa\fmtname\endgroup\expandafter\bye\fi
\endgroup
%</internal>
-% File: teubner.dtx Copyright (C) 2001-2012 Claudio Beccari
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% 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
-%
% \fi
%
%% \CharacterTable
@@ -64,12 +64,22 @@ etc.
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
% \iffalse
-%<*dtx>
-\ProvidesFile{teubner.dtx}[2012/09/11 v.3.3a extensions for Greek philology]
-%</dtx>
%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{teubner}[2012/09/11 v.3.3a extensions for Greek philology]
-%
+%<*driver>
+\ProvidesFile{teubner.dtx}[%
+%</driver>
+%<package>\ProvidesPackage{teubner}[%
+%<tbtx>\ProvidesPackage{teubnertx}[%
+%<defs>\ProvidesFile{LGRaccents-glyphs}[%
+%<*driver,package,defs,tbtx>
+2012/09/17 v.3.4
+%<package>Extensions for Greek philology]
+%<defs>Definitions of accents and glyphs for LGR encoded Greek fonts]
+%<tbtx>Access to the LGR encoded Greek fonts when TX fonts are used]
+%</driver,package,defs,tbtx>
+%<*driver>
+]
+%</driver>
%<*driver>
\documentclass{ltxdoc}
\GetFileInfo{teubner.dtx}
@@ -98,7 +108,7 @@ etc.
%</driver>
% \fi
%
-% \CheckSum{5022}
+% \CheckSum{5062}
% \begin{multicols}{2}\tableofcontents\end{multicols}
%
%
@@ -362,14 +372,6 @@ etc.
%
% \section{Code}
% \subsection{Preliminaries}
-% The beginning of the file starts with the traditional stuff;
-% as usual we provide also the means for avoiding reading this file again.
-% \begin{macrocode}
-%<*package>
-\ifx\teubner\undefined
- \def\teubner{teubner}\else\expandafter\endinput
-\fi
-% \end{macrocode}
% In order to use the PostScript pfb fonts (CM, EC, and CB) it is necessary to know
% if we are dealing with \LaTeX\ or pdf\LaTeX; this was necessary because apparently
% the pfb math scalable fonts derived from the \textsf{META\-FONT} counterparts do
@@ -380,6 +382,9 @@ etc.
% been corrected and this trick is not necessary any more. Nevertheless we define
% a new boolean that copes with the fact that sin 2007 the \TeX\ engine is
% \textsf{pdftex} even when DVI output is sought:
+%\iffalse
+%<*package>
+%\fi
% \begin{macrocode}
\newif\ifPDF \PDFfalse
\@ifundefined{pdfoutput}{\PDFfalse}{\ifnum\pdfoutput>\z@\PDFtrue\fi}
@@ -766,7 +771,7 @@ Type X <return> to exit.}%
% |\Lipsiakostext| is a \emph{declaration} stating that from now on
% typesetting will be done with the Lipsian fonts; notice that the encoding and the
% language name in force before this declaration are memorized, then the current
-% Greek version is selected; the |\let\~\GRcirc| is required because swithching
+% Greek version is selected; the |\let\~\Perispomeni| is required because swithching
% on and off may reset the active tilde and connected macros definitions.
% |\~| in Greek must set the circumflex accent, so we make sure that this really
% occurs.
@@ -784,7 +789,7 @@ Type X <return> to exit.}%
\DeclareTextFontCommand{\textli}{\lishape}%
\DeclareRobustCommand\Lipsiakostext{%
\expandafter\select@language\expandafter{\GreekName}%
- \let\~\GRcirc\let~\greek@tilde\lishape}
+ \let\~\Perispomeni\let~\greek@tilde\lishape}
% \end{macrocode}
%\end{macro}
@@ -838,7 +843,7 @@ Type X <return> to exit.}%
% \begin{macrocode}
\DeclareRobustCommand\textDidot[1]{{%
\expandafter\select@language\expandafter{\GreekName}%
- \let\~\GRcirc\let~\greek@tilde
+ \let\~\Perispomeni\let~\greek@tilde
\fontencoding{LGR}\rmfamily#1}}
% \end{macrocode}
@@ -921,7 +926,6 @@ Type X <return> to exit.}%
\setbox\tw@\hbox{i}\setbox\z@\hbox{#2}%
\ifdim\wd\z@>\wd\tw@\advance\dimen@ .5\wd\z@
\else\advance\dimen@ .3\wd\z@\fi
-\ifx#2a\advance\dimen@-.1\wd\z@\fi
\ifx#2h\advance\dimen@.05\wd\z@\fi
\@tempdima\ht\z@\advance\@tempdima-1ex\relax
\advance\dimen@\slant@\@tempdima
@@ -1128,14 +1132,10 @@ Type X <return> to exit.}%
% letter |k| produce the superposition of a circumflex on top of a ``kappa'' glyph,
% since this glyph does not exist in the Greek font table.
% Notice that all these declarations are restricted to the Greek font encoding so
-% they are usable only when such font is in force. See the |teubner-doc.pdf| file
+% they are usable only when such encoding is in force. See the |teubner-doc.pdf| file
% for more details concerning the usefulness of the extended accent macros vs.\ the
% ligature mechanism.
%
-% \begin{macrocode}
-\input{LGRaccents-glyphs.def}
-% \end{macrocode}
-%
% \subsection{Special accent macros}
% Now we come back to the ``accent like'' and ``cedilla like'' general macros we
% defined above, and that will be extensively used in the following definitions.
@@ -1148,7 +1148,7 @@ Type X <return> to exit.}%
% past 15 years or so the Greek language definition file has always used the |~|
% sign a a letter, not as an active character. If you look in the \babel\ package
% documentation related to the Greek language, you find that for what concerns the
-% |~| with polytonic spelling a number ot ``dirty tricks'' have been used, but
+% |~| with polytonic spelling a number of ``dirty tricks'' have been used, but
% nothing has been done to replace the ``tie'' function of this character when
% typesetting in languages that use the Latin script; the only action related to
% this point has been to redefine the kernel macros for typesetting figure and table
@@ -1160,19 +1160,34 @@ Type X <return> to exit.}%
\let\nbs\nobreakspace
% \end{macrocode
%
-% Having defined the Greek accents with the extended macroso input with the
-% |LGRaccents-glyphs.def| file, we can let some equivalences so that such accents
-% may be used with shorter control sequences that are coherent with the
-% corresponding ligatures.
-% \begin{macrocode}
-% grave
-\DeclareTextCommand{\`}{\GRencoding@name}[1]{\lift@accent{96}{#1}}
-% acute
-\DeclareTextCommand{\'}{\GRencoding@name}[1]{\lift@accent{39}{#1}}
-% circumflex
-\DeclareTextCommand{\~}{\GRencoding@name}[1]{\lift@accent{126}{#1}}
-\let\GRcirc\Perispomeni
+% Before defining the Greek accents with the extended macros input with the
+% |LGRaccents-glyphs.def| file, we have to define the accent supersitioning macros that
+% with \pack{teubner} allow to stack from one to more accent over the base letter,
+% taking into account the slant of the font from which the base letter is taken.
+% Notice that these macros allow to set an accent on any base latter, even if that
+% might be meaningless. At the same time we redefine the standard macros so as let
+% them do the same work when the LGR encoding is not in force. This duality is
+% necessary, not only for backward compatibility, but also for avoidng that the
+% normal redefined macros highjack the extended macro facility acquired by inputing
+% the external definition file |LGRaccents-glyphs.def|.
+% For the diaeresis we need to put an invisible character (|v| in the LGR encoded CB
+% fonts) in order to avoid any ligature with an implied end of word (boundarychar)
+% that turns the diaeresis into an apostrophe.
+% \begin{macrocode}
+\DeclareTextCommand{\G}{\GRencoding@name}[1]{\lift@accent{96}{#1}}
+\DeclareTextCommand{\A}{\GRencoding@name}[1]{\lift@accent{39}{#1}}
+\DeclareTextCommand{\C}{\GRencoding@name}[1]{\lift@accent{126}{#1}}
+\DeclareTextCommand{\D}{\GRencoding@name}[1]{\lift@accent{34v}{#1}}
+\DeclareTextCommand{\u}{\GRencoding@name}[1]{\lift@accent{30}{#1}}
+\DeclareTextCommand{\=}{\GRencoding@name}[1]{\lift@accent{31}{#1}}
+\renewcommand*\'[1]{\lift@accent{39}{#1}}
+\renewcommand*\`[1]{\lift@accent{96}{#1}}
+\renewcommand*\~[1]{\lift@accent{126}{#1}}
+\renewcommand*\"[1]{\lift@accent{34v}{#1}}
+\input{LGRaccents-glyphs.def}
+\let\GRcirc\Perispomeni
+%
% \end{mcrocode}
% But we have to provide also the means for disabling the |~| shorthand that is
% reset every time the Greek language is selected again in a multilanguage document
@@ -1189,12 +1204,7 @@ Type X <return> to exit.}%
% For the diaeresis we need to put an invisible character (|v| in the LGR encoded CB
% fonts) in order to avoid any ligature with an implied end of word (boundarychar)
% that turns the diaeresis into an apostrophe.
-% \begin{macrocode}
-% diaeresis
-\DeclareTextCommand{\"}{\GRencoding@name}[1]{\lift@accent{34v}{#1}}
-% breve
-\DeclareTextCommand{\u}{\GRencoding@name}[1]{\lift@accent{30}{#1}}
-% \end{macrocode}
+%
% Besides the normal |\u| command for setting a breve command, another ``large
% breve'' is required by philologists, who need to mark a diphthong, or in general
% two letters; the macro |\U| does the job, but it is the typesetter's
@@ -3420,13 +3430,13 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
% \end{macrocode}
%\end{macro}
%\end{macro}
+%\iffalse
%</package>
+%\fi
%
+%\iffalse
%<*defs>
-% \begin{macrocode}
-\ProvidesFile{LGRaccents-glyphs.def}%
- [2012/09/11 v.3.3a Definitions of accents and glyphs for LGR encoded Greek fonts]
-% \end{macrocode}
+%\fi
% \subsection{First set of extended accent definitions}
% These macros were originally defined by Guenter Milde
% in his file lgrenc-accents.def version 3.2 dated 2008-06-17
@@ -3455,21 +3465,26 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
% \end{quote}
% Solution 1) saves hitting one key but breaks the kerning mechanism;
% Solution 2) requires hitting one more key but preserves the kerning
-% mechanism.
-%
-% Only the diacritics that involve the breve (\u) and the macron (\=)
-% are regular TeX accent macros and behave as ordinary OT1-like
-% accents. There is no addressing of the marked glyphs, because the 256
-% font table can't accommodate so many glyphs.
-%
-% This file should be usable by inputting it even without requiring the
+% mechanism. As explained in |teubner-doc.pdf| there might be some problems when
+% typesetting in all capitals or in caps and small caps (just the initial is
+% capitalized); in these cases the choice between either solution is not without
+% consequences, especially if capitalization takes place behind the scenes, say,
+% in typesetting a header that is stylized with |\MakeUppercase|.
+%
+% Only the diacritics that involve the breve (\u) and the macron (\=) are ``regular''
+% \TeX\ accent macros and behave almost as ordinary OT1-like accents; actually they
+% allow to stack several accents over the same base letter. There is no addressing
+% of the marked glyphs, because the 256-font table can't accommodate so many glyphs.
+%
+% This file should be usable by inputting it directly even without requiring the
% polutoniko language attribute of the Greek language.
%
% For more details read the teubner.pdf and the teubner-doc.pdf files
% that are part of the teubner package documentation.
%
-% Thanks to Stanislav Kondratyev who spotted a bug in the definition of
-% one of the commands
+% Thanks to Stanislav Kondratyev who spotted sneaky bugs in the definition of some
+% commands; his testing and feedback resulted very precious. This upgraded version 3.4
+% of the |teubner| package derived from his feedback.
%
% \begin{macrocode}
\providecommand*\GRencoding@name{LGR}
@@ -3480,11 +3495,16 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextAccent{\Oxia}{\GRencoding@name}{"27} % oxia
\DeclareTextAccent{\Varia}{\GRencoding@name}{"60} % varia
\DeclareTextAccent{\Perispomeni}{\GRencoding@name}{"7E} % perispomeni
+\DeclareTextCommand{\'}{\GRencoding@name}{\Oxia}
+\DeclareTextCommand{\`}{\GRencoding@name}{\Varia}
+\DeclareTextCommand{\~}{\GRencoding@name}{\Perispomeni}
+\DeclareTextCommand{\"}{\GRencoding@name}{\Dialytika}
+
\DeclareTextAccent{\Dasia}{\GRencoding@name}{"3C} % rough breath/spirit
\DeclareTextAccent{\Psili}{\GRencoding@name}{"3E} % smooth breath/spirit
-\DeclareTextCommand{\<}{\GRencoding@name}{\Dasia} % alias coomand
+\DeclareTextCommand{\<}{\GRencoding@name}{\Dasia} % alias command
\DeclareTextCommand{\>}{\GRencoding@name}{\Psili} % alias command
-%
+
\DeclareTextAccent{\DialytikaOxia}{\GRencoding@name}{"23} % oxia+dialytika
\DeclareTextAccent{\DialytikaVaria}{\GRencoding@name}{"24} % varia+dialytika
\DeclareTextAccent{\DialytikaPerispomeni}{\GRencoding@name}{"20} % perisp.+dial.
@@ -3494,8 +3514,8 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextAccent{\DasiaPerispomeni}{\GRencoding@name}{"40}% perisp.+rough
\DeclareTextAccent{\PsiliOxia}{\GRencoding@name}{"5E} % oxia+smooth
-\DeclareTextAccent{\PsiliVaria}{\GRencoding@name}{"5F} % varia+smooth
-\DeclareTextAccent{\PsiliPerispomeni}{\GRencoding@name}{"5C}% perisp/+smooth
+\DeclareTextAccent{\PsiliVaria}{\GRencoding@name}{"5F} % varia+smooth
+\DeclareTextAccent{\PsiliPerispomeni}{\GRencoding@name}{"5C}% perisp.+smooth
% composite commands
\DeclareTextCompositeCommand{\"}{\GRencoding@name}{'}{\DialytikaOxia}
\DeclareTextCompositeCommand{\"}{\GRencoding@name}{\'}{\DialytikaOxia}
@@ -3566,6 +3586,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{a}{138}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{a}{146}
\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{a}{139}
+
\DeclareTextComposite{\`}{\GRencoding@name}{h}{152}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{h}{153}
\DeclareTextComposite{\Psili}{\GRencoding@name}{h}{154}
@@ -3578,6 +3599,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\~}{\GRencoding@name}{h}{168}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{h}{169}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{h}{170}
+
\DeclareTextComposite{\`}{\GRencoding@name}{w}{176}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{w}{177}
\DeclareTextComposite{\Psili}{\GRencoding@name}{w}{178}
@@ -3590,6 +3612,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\~}{\GRencoding@name}{w}{192}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{w}{193}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{w}{194}
+
\DeclareTextComposite{\`}{\GRencoding@name}{i}{200}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{i}{201}
\DeclareTextComposite{\Psili}{\GRencoding@name}{i}{202}
@@ -3606,6 +3629,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\DialytikaVaria}{\GRencoding@name}{i}{241}
\DeclareTextComposite{\DialytikaTonos}{\GRencoding@name}{i}{242}
\DeclareTextComposite{\DialytikaPerispomeni}{\GRencoding@name}{i}{243}
+
\DeclareTextComposite{\`}{\GRencoding@name}{u}{204}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{u}{205}
\DeclareTextComposite{\Psili}{\GRencoding@name}{u}{206}
@@ -3622,6 +3646,7 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextComposite{\DialytikaVaria}{\GRencoding@name}{u}{245}
\DeclareTextComposite{\DialytikaTonos}{\GRencoding@name}{u}{246}
\DeclareTextComposite{\DialytikaPerispomeni}{\GRencoding@name}{u}{247}
+
\DeclareTextComposite{\`}{\GRencoding@name}{e}{224}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{e}{225}
\DeclareTextComposite{\Psili}{\GRencoding@name}{e}{226}
@@ -3711,6 +3736,9 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{I}{<\char126I}
\DeclareTextCompositeCommand{\>}{\GRencoding@name}{I}{>I}
\DeclareTextCompositeCommand{\<}{\GRencoding@name}{I}{<I}
+\DeclareTextCompositeCommand{\Dialytica}{\GRencoding@name}{I}{\"I}
+\DeclareTextCompositeCommand{\DialytikaOxia}{\GRencoding@name}{I}{\"I}
+\DeclareTextCompositeCommand{\DialyticaDasia}{\GRencoding@name}{I}{\"I}
\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{O}{>O}
\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{O}{<O}
@@ -3731,6 +3759,9 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{U}{<'U}
\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{U}{<\char126U}
\DeclareTextCompositeCommand{\<}{\GRencoding@name}{U}{<U}
+\DeclareTextCompositeCommand{\Dialytica}{\GRencoding@name}{U}{\"U}
+\DeclareTextCompositeCommand{\DialytikaOxia}{\GRencoding@name}{U}{\"U}
+\DeclareTextCompositeCommand{\DialyticaDasia}{\GRencoding@name}{U}{\"U}
\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{W}{>W}
\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{W}{<W}
@@ -3745,9 +3776,13 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{W}{<\char126W}
\DeclareTextCompositeCommand{\>}{\GRencoding@name}{W}{>W}
\DeclareTextCompositeCommand{\<}{\GRencoding@name}{W}{<W}
-%</defs>
% \end{macrocode}
+%\iffalse
+%</defs>
+%\fi
+%\iffalse
%<*tbtx>
+%\fi
%\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 even when other Latin fonts, different from the ``standard'' CM
@@ -3773,8 +3808,6 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
% 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}
-\ProvidesPackage{teubnertx}%
- [2012/09/11 v.3.3a 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}{}
@@ -3826,8 +3859,9 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\DeclareFontShape{LGR}{txtt}{bx}{it}{<->ssub * cmtt/bx/it}{}
\DeclareFontShape{LGR}{txtt}{bx}{sl}{<->ssub * cmtt/bx/sl}{}
\DeclareFontShape{LGR}{txtt}{bx}{sc}{<->ssub * cmtt/bx/sc}{}
-
% \end{macrocode}
+%\iffalse
%</tbtx>
+%\fi
% \Finale
\endinput
diff --git a/Master/texmf-dist/tex/latex/teubner/LGRaccents-glyphs.def b/Master/texmf-dist/tex/latex/teubner/LGRaccents-glyphs.def
index 6e967996078..24e743d84ad 100644
--- a/Master/texmf-dist/tex/latex/teubner/LGRaccents-glyphs.def
+++ b/Master/texmf-dist/tex/latex/teubner/LGRaccents-glyphs.def
@@ -14,6 +14,7 @@
%% This file is distributed under the LPPL licence, version 1.3c
%% dated 2008-05-04 or later as it appears in
%% CTAN/macros/latex/base/lppl.tex.
+%% See the end of the file.
%%
%% IMPORTANT NOTICE:
%%
@@ -43,8 +44,9 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesFile{LGRaccents-glyphs.def}%
- [2012/09/11 v.3.3a Definitions of accents and glyphs for LGR encoded Greek fonts]
+\ProvidesFile{LGRaccents-glyphs}[%
+2012/09/17 v.3.4
+Definitions of accents and glyphs for LGR encoded Greek fonts]
\providecommand*\GRencoding@name{LGR}
\DeclareTextAccent{\u}{\GRencoding@name}{"1E} % breve
\DeclareTextAccent{\=}{\GRencoding@name}{"1F} % macron
@@ -53,10 +55,16 @@
\DeclareTextAccent{\Oxia}{\GRencoding@name}{"27} % oxia
\DeclareTextAccent{\Varia}{\GRencoding@name}{"60} % varia
\DeclareTextAccent{\Perispomeni}{\GRencoding@name}{"7E} % perispomeni
+\DeclareTextCommand{\'}{\GRencoding@name}{\Oxia}
+\DeclareTextCommand{\`}{\GRencoding@name}{\Varia}
+\DeclareTextCommand{\~}{\GRencoding@name}{\Perispomeni}
+\DeclareTextCommand{\"}{\GRencoding@name}{\Dialytika}
+
\DeclareTextAccent{\Dasia}{\GRencoding@name}{"3C} % rough breath/spirit
\DeclareTextAccent{\Psili}{\GRencoding@name}{"3E} % smooth breath/spirit
-\DeclareTextCommand{\<}{\GRencoding@name}{\Dasia} % alias coomand
+\DeclareTextCommand{\<}{\GRencoding@name}{\Dasia} % alias command
\DeclareTextCommand{\>}{\GRencoding@name}{\Psili} % alias command
+
\DeclareTextAccent{\DialytikaOxia}{\GRencoding@name}{"23} % oxia+dialytika
\DeclareTextAccent{\DialytikaVaria}{\GRencoding@name}{"24} % varia+dialytika
\DeclareTextAccent{\DialytikaPerispomeni}{\GRencoding@name}{"20} % perisp.+dial.
@@ -66,8 +74,8 @@
\DeclareTextAccent{\DasiaPerispomeni}{\GRencoding@name}{"40}% perisp.+rough
\DeclareTextAccent{\PsiliOxia}{\GRencoding@name}{"5E} % oxia+smooth
-\DeclareTextAccent{\PsiliVaria}{\GRencoding@name}{"5F} % varia+smooth
-\DeclareTextAccent{\PsiliPerispomeni}{\GRencoding@name}{"5C}% perisp/+smooth
+\DeclareTextAccent{\PsiliVaria}{\GRencoding@name}{"5F} % varia+smooth
+\DeclareTextAccent{\PsiliPerispomeni}{\GRencoding@name}{"5C}% perisp.+smooth
\DeclareTextCompositeCommand{\"}{\GRencoding@name}{'}{\DialytikaOxia}
\DeclareTextCompositeCommand{\"}{\GRencoding@name}{\'}{\DialytikaOxia}
\DeclareTextCompositeCommand{\"}{\GRencoding@name}{`}{\DialytikaVaria}
@@ -123,6 +131,7 @@
\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{a}{138}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{a}{146}
\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{a}{139}
+
\DeclareTextComposite{\`}{\GRencoding@name}{h}{152}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{h}{153}
\DeclareTextComposite{\Psili}{\GRencoding@name}{h}{154}
@@ -135,6 +144,7 @@
\DeclareTextComposite{\~}{\GRencoding@name}{h}{168}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{h}{169}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{h}{170}
+
\DeclareTextComposite{\`}{\GRencoding@name}{w}{176}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{w}{177}
\DeclareTextComposite{\Psili}{\GRencoding@name}{w}{178}
@@ -147,6 +157,7 @@
\DeclareTextComposite{\~}{\GRencoding@name}{w}{192}
\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{w}{193}
\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{w}{194}
+
\DeclareTextComposite{\`}{\GRencoding@name}{i}{200}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{i}{201}
\DeclareTextComposite{\Psili}{\GRencoding@name}{i}{202}
@@ -163,6 +174,7 @@
\DeclareTextComposite{\DialytikaVaria}{\GRencoding@name}{i}{241}
\DeclareTextComposite{\DialytikaTonos}{\GRencoding@name}{i}{242}
\DeclareTextComposite{\DialytikaPerispomeni}{\GRencoding@name}{i}{243}
+
\DeclareTextComposite{\`}{\GRencoding@name}{u}{204}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{u}{205}
\DeclareTextComposite{\Psili}{\GRencoding@name}{u}{206}
@@ -179,6 +191,7 @@
\DeclareTextComposite{\DialytikaVaria}{\GRencoding@name}{u}{245}
\DeclareTextComposite{\DialytikaTonos}{\GRencoding@name}{u}{246}
\DeclareTextComposite{\DialytikaPerispomeni}{\GRencoding@name}{u}{247}
+
\DeclareTextComposite{\`}{\GRencoding@name}{e}{224}
\DeclareTextComposite{\Dasia}{\GRencoding@name}{e}{225}
\DeclareTextComposite{\Psili}{\GRencoding@name}{e}{226}
@@ -253,6 +266,9 @@
\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{I}{<\char126I}
\DeclareTextCompositeCommand{\>}{\GRencoding@name}{I}{>I}
\DeclareTextCompositeCommand{\<}{\GRencoding@name}{I}{<I}
+\DeclareTextCompositeCommand{\Dialytica}{\GRencoding@name}{I}{\"I}
+\DeclareTextCompositeCommand{\DialytikaOxia}{\GRencoding@name}{I}{\"I}
+\DeclareTextCompositeCommand{\DialyticaDasia}{\GRencoding@name}{I}{\"I}
\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{O}{>O}
\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{O}{<O}
@@ -273,6 +289,9 @@
\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{U}{<'U}
\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{U}{<\char126U}
\DeclareTextCompositeCommand{\<}{\GRencoding@name}{U}{<U}
+\DeclareTextCompositeCommand{\Dialytica}{\GRencoding@name}{U}{\"U}
+\DeclareTextCompositeCommand{\DialytikaOxia}{\GRencoding@name}{U}{\"U}
+\DeclareTextCompositeCommand{\DialyticaDasia}{\GRencoding@name}{U}{\"U}
\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{W}{>W}
\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{W}{<W}
@@ -287,6 +306,10 @@
\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{W}{<\char126W}
\DeclareTextCompositeCommand{\>}{\GRencoding@name}{W}{>W}
\DeclareTextCompositeCommand{\<}{\GRencoding@name}{W}{<W}
-\endinput
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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
%%
%% End of file `LGRaccents-glyphs.def'.
diff --git a/Master/texmf-dist/tex/latex/teubner/teubner.sty b/Master/texmf-dist/tex/latex/teubner/teubner.sty
index e33f9d7052e..51e1a668ce1 100644
--- a/Master/texmf-dist/tex/latex/teubner/teubner.sty
+++ b/Master/texmf-dist/tex/latex/teubner/teubner.sty
@@ -14,6 +14,7 @@
%% This file is distributed under the LPPL licence, version 1.3c
%% dated 2008-05-04 or later as it appears in
%% CTAN/macros/latex/base/lppl.tex.
+%% See the end of the file.
%%
%% IMPORTANT NOTICE:
%%
@@ -44,10 +45,9 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{teubner}[2012/09/11 v.3.3a extensions for Greek philology]
-\ifx\teubner\undefined
- \def\teubner{teubner}\else\expandafter\endinput
-\fi
+\ProvidesPackage{teubner}[%
+2012/09/17 v.3.4
+Extensions for Greek philology]
\newif\ifPDF \PDFfalse
\@ifundefined{pdfoutput}{\PDFfalse}{\ifnum\pdfoutput>\z@\PDFtrue\fi}
\ifx\captionsgreek\undefined
@@ -169,7 +169,7 @@ Type X <return> to exit.}%
\DeclareTextFontCommand{\textli}{\lishape}%
\DeclareRobustCommand\Lipsiakostext{%
\expandafter\select@language\expandafter{\GreekName}%
- \let\~\GRcirc\let~\greek@tilde\lishape}
+ \let\~\Perispomeni\let~\greek@tilde\lishape}
\DeclareTextFontCommand{\textLipsias}{\Lipsiakostext}
@@ -181,7 +181,7 @@ Type X <return> to exit.}%
\DeclareRobustCommand\textDidot[1]{{%
\expandafter\select@language\expandafter{\GreekName}%
- \let\~\GRcirc\let~\greek@tilde
+ \let\~\Perispomeni\let~\greek@tilde
\fontencoding{LGR}\rmfamily#1}}
\DeclareRobustCommand\textlatin[1]{\edef\externalencoding{\f@encoding}{%
@@ -208,7 +208,6 @@ Type X <return> to exit.}%
\setbox\tw@\hbox{i}\setbox\z@\hbox{#2}%
\ifdim\wd\z@>\wd\tw@\advance\dimen@ .5\wd\z@
\else\advance\dimen@ .3\wd\z@\fi
-\ifx#2a\advance\dimen@-.1\wd\z@\fi
\ifx#2h\advance\dimen@.05\wd\z@\fi
\@tempdima\ht\z@\advance\@tempdima-1ex\relax
\advance\dimen@\slant@\@tempdima
@@ -317,18 +316,23 @@ Type X <return> to exit.}%
\setbox\tw@\hbox{o}\ifdim\wd\z@=\wd\tw@\advance\dimen@-.05\wd\z@\fi
\hbox to\z@{\kern\dimen@\box4\hss}\unhbox\z@}}
-\input{LGRaccents-glyphs.def}
\let\nbs\nobreakspace
-\DeclareTextCommand{\`}{\GRencoding@name}[1]{\lift@accent{96}{#1}}
-\DeclareTextCommand{\'}{\GRencoding@name}[1]{\lift@accent{39}{#1}}
-\DeclareTextCommand{\~}{\GRencoding@name}[1]{\lift@accent{126}{#1}}
-\let\GRcirc\Perispomeni
+\DeclareTextCommand{\G}{\GRencoding@name}[1]{\lift@accent{96}{#1}}
+\DeclareTextCommand{\A}{\GRencoding@name}[1]{\lift@accent{39}{#1}}
+\DeclareTextCommand{\C}{\GRencoding@name}[1]{\lift@accent{126}{#1}}
+\DeclareTextCommand{\D}{\GRencoding@name}[1]{\lift@accent{34v}{#1}}
+\DeclareTextCommand{\u}{\GRencoding@name}[1]{\lift@accent{30}{#1}}
+\DeclareTextCommand{\=}{\GRencoding@name}[1]{\lift@accent{31}{#1}}
+\renewcommand*\'[1]{\lift@accent{39}{#1}}
+\renewcommand*\`[1]{\lift@accent{96}{#1}}
+\renewcommand*\~[1]{\lift@accent{126}{#1}}
+\renewcommand*\"[1]{\lift@accent{34v}{#1}}
+\input{LGRaccents-glyphs.def}
+\let\GRcirc\Perispomeni
\addto\extrasgreek{\shorthandoff{~}\let\~\Perispomeni}
\addto\noextrasgreek{\shorthandon{~}}
-\DeclareTextCommand{\"}{\GRencoding@name}[1]{\lift@accent{34v}{#1}}
-\DeclareTextCommand{\u}{\GRencoding@name}[1]{\lift@accent{30}{#1}}
\DeclareTextCommand{\U}{\GRencoding@name}[1]{\lift@accent{151}{#1}}
\DeclareTextCommand{\=}{\GRencoding@name}[1]{\lift@accent{31}{#1}}
\DeclareTextCommand{\r}{\GRencoding@name}[1]{\lift@accent{60}{#1}}
@@ -1286,6 +1290,10 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
\@whilenum\cifra>\z@\do{I\advance\cifra\m@ne}%
\egroup}
-\endinput
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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
%%
%% End of file `teubner.sty'.
diff --git a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty
index 1d4832da035..331925ef021 100644
--- a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty
+++ b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty
@@ -14,6 +14,7 @@
%% This file is distributed under the LPPL licence, version 1.3c
%% dated 2008-05-04 or later as it appears in
%% CTAN/macros/latex/base/lppl.tex.
+%% See the end of the file.
%%
%% IMPORTANT NOTICE:
%%
@@ -43,9 +44,10 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+\ProvidesPackage{teubnertx}[%
+2012/09/17 v.3.4
+Access to the LGR encoded Greek fonts when TX fonts are used]
-\ProvidesPackage{teubnertx}%
- [2012/09/11 v.3.3a 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}{}
@@ -97,7 +99,10 @@
\DeclareFontShape{LGR}{txtt}{bx}{it}{<->ssub * cmtt/bx/it}{}
\DeclareFontShape{LGR}{txtt}{bx}{sl}{<->ssub * cmtt/bx/sl}{}
\DeclareFontShape{LGR}{txtt}{bx}{sc}{<->ssub * cmtt/bx/sc}{}
-
-\endinput
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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
%%
%% End of file `teubnertx.sty'.