teubner 3.3 (7sep11)

git-svn-id: svn://tug.org/texlive/trunk@23854 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 57 insertions, 43 deletions

diff --git a/Master/texmf-dist/doc/latex/teubner/README b/Master/texmf-dist/doc/latex/teubner/README
index fb5a626880b..c00eba87984 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.1 dated September 2011.
+This accompanies the teubner bundle version 3.3 dated September 2011.
 
 Copyright 2010-2011 Claudio Beccari
 
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf b/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf
index 07250484b00..cda258a0b8e 100644
--- a/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf
+++ b/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex b/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex
index 3020576dacf..f8a541a5ee8 100644
--- a/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex
+++ b/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex
@@ -1,12 +1,15 @@
+% !TEX encoding = IsoLatin
+% !TEX TS-program = pdflatex
 \documentclass[12pt,a4paper]{article}
-%\usepackage[latin1]{inputenc}
+\usepackage[latin1]{inputenc}
+\usepackage[T1]{fontenc}
 %\usepackage{lmodern}
 \usepackage{txfonts}
 %\usepackage{pxfonts}
 \usepackage{mflogo}
 \usepackage[greek,english]{babel}
-\def\workingdate{2010/05/08}
-\usepackage[boldLipsian,10pt]% <--------  teubner options
+\def\workingdate{2011/09/01}% see two lines ahead
+\usepackage[boldLipsian,10pt,GlyphNames]% <--------  teubner options
            {teubner}[\workingdate]% <--- older versions don't work well
 \usepackage[scaled=0.90]{helvet}
 \ifFamily{phv}{cmss}
@@ -41,8 +44,8 @@
 \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, August 2011}% <---- this is the date of the teubenr-doc document!
-\def\comando#1{\texttt{\expandafter\string\noexpand#1}}
+\date{Turin, September 2011}% <---- 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$}
 \let\marg\ARG\let\meta\Arg
@@ -109,7 +112,7 @@ The \texttt{teubner} extension is loaded in the usual way, but there are some si
 \end{quote}
 
 
-Since \texttt{teubner} is an extension of the \texttt{babel} package, it must be loaded after the latter. If you load it before and/or if you load it after, but you invoked the \texttt{babel} package without specifying the \meta{greek} language and the \texttt{polutoniko} Greek language attribute, \texttt{teubner} refuses to be completely loaded and emits a message very clear on this subject, so that you know what you should do in order to use the facilities offered by its extensions. Some people like the Lipsian font shape and want to load it also for writing mathematics with it. No problem, but they shouldn't do this with \texttt{teubner}, unless they want also to typeset Greek text. For using an alphabet in mathematics there are more suitable ways that rely on the commands described in the \texttt{fntguide.pdf} distributed with every \TeX\ system in \texttt{\$TEXMFDIST"/doc"/latex"/base/}.
+Since \texttt{teubner} is an extension of the \texttt{babel} package, it must be loaded after the latter. If you load it before and/or if you load it after, but you invoked the \texttt{babel} package without specifying the \meta{greek} language and the \texttt{polutoniko} Greek language attribute, \texttt{teubner} refuses to be completely loaded and emits a message very clear on this subject, so that you know what you should do in order to use the facilities offered by its extensions. Some people like the Lipsian font shape and want to load it also for writing mathematics with it. No problem, but they shouldn't do this with \texttt{teubner}, unless they want also to typeset Greek text. For using an alphabet in mathematics there are more suitable ways that rely on the commands described in the \texttt{fntguide.pdf} distributed with every \TeX\ system in \texttt{\$TEXMFDIST/doc/latex/base/}.
 
 \section{Package options}
 
@@ -123,7 +126,8 @@ Option	& Meaning\R	\\\hline
 \i or\R		& obsolete option kept for backwards compatibility\\
 \i 10pt		& for using only one  real font size and geometrically enlarging or reducing the other sizes from the original single 10\,pt one\\
 \i boldLipsian& to be selected in order to use a moderately blacker Lipsian font\\
-\i NoGlyphNames& to be selected in order to avoid the definition of accented glyphs\\[1ex]
+\i NoGlyphNames& to be selected in order to avoid the definition of accented glyphs (default)\\
+\i GlyphNames & to be selected in order to have available also the set of macros that directly address the accented glyphs\\[1ex]
 \hline
 \end{tabular}
 \caption{Options for the \texttt{teubner} extension package}\label{t:opzioni}
@@ -132,20 +136,20 @@ Option	& Meaning\R	\\\hline
 
 You should never need (and therefore never use) the \textit{or} option for two reasons: $(a)$ glyph name macros are not needed for the first letter of any word since there are no kerning problems with a preceding letter; $(b)$ glyph name macros are insensitive to uppercasing.
 
-You might be forced to use the \textit{10pt} option because your Greek font collection is the minimal one. But if you are using \texttt{teubner}, you are likely to aim to the best possible typeset text; therefore you should download and install the full collection of the Greek CB fonts.
+You might be forced to use the \textit{10pt} option because your Greek font collection is the minimal one. But if you are using \texttt{teubner}, you are likely to aim to the best possible typeset text; therefore you should download and install the full collection of the Greek CB fonts. This full collection is generally already available with any complete distribution of the \TeX\ system.
 
-If you are using Latin fonts different from the CM or LM collections, you have to control what you get with or without the option \textit{boldLipsian}; generally speaking, this option is best used with darker normal fonts; I have tried the Times and the Palatino ones and actually this option is desirable. This might not be true with other vector fonts.
+If you are using Latin fonts different from the CM or LM collections, you have to control what you get with or without the option \textit{boldLipsian}; generally speaking, this option is best used with darker normal fonts; I have tried the Times, the Palatino, and the Fourier ones, and actually this option is desirable. This might not be true with other vector fonts.
 
-With the inclusion of the extended accent macros in the \texttt{teubner} package (see below), the named accented glyphs should not be needed anymore; for backwards compatibility these accented glyph name macros remain defined by default, but if you are using the extended accent macros, you should not need them any more and by specifying this option you avoid overloading the internal \TeX\ memory areas, thus leaving extra space for more useful extensions. Therefore I suggest you to use the \textit{NoGlyphNames} option and make use of the extended accent macros, should the need arise (see below).
+With the inclusion of the extended accent macros in the \texttt{teubner} package (see below), the named accented glyphs should not be needed anymore; for backwards compatibility these accented glyph name macros are not defined by default, but are available if the \emph{GlyphNames} option is specified; if you are using the extended accent macros, you should not need them any more and, unless you specify this option, you avoid overloading the internal \TeX\ memory areas, thus leaving extra space for more useful extensions. Therefore I suggest you to let the \emph{default} option \textit{NoGlyphNames} act as its name implies, and make use of the extended accent macros, should the need arise (see below).
 
-\section{The Greek CB fonts}
-The CB fonts (full collection) come in  all shapes, sizes and series as the extended European fonts that conform with the T1 encoding introduced after the Cork Conference of the \TeX\ Users Group Society in 1991\footnote{If you want to or you have to use the single 10pt zize fonts, you certainly produce smaller PDF files, at the expense of a slightly poorer typographical quality.}. The CB fonts conform
+\section{The CB Greek fonts}
+The CB Greek fonts (full collection) come in  all shapes, sizes and series as the extended European fonts that conform with the T1 encoding introduced after the Cork Conference of the \TeX\ Users Group Society in 1991\footnote{If you want to or you have to use the single 10pt size fonts, you certainly produce smaller PDF files, at the expense of a slightly poorer typographical quality.}. The CB fonts conform
 to the encoding that is still being called LGR, since up to now there is no
 established encoding name for the Greek alphabet among the \TeX\ users, not
 yet, at least.
 
 The regular shape has capital letters with serifs that are in the
-same style as the roman capital ones, while the lower case letters
+same style as the Latin capital ones, while the lower case letters
 derive from the design by Didot and are very common in all texts.
 This shape comes also in boldface, together with the two
 corresponding oblique (or slanted) versions. The CB fonts contain
@@ -174,7 +178,7 @@ than the corresponding CM and LM fonts usually used with \LaTeX; this is easily
 \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}}.
 
-But if you 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:
+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}
 \addto\extrasgreek{\def\itdefault{li}}%
 \addto\noextrasgreek{\def\itdefault{it}}%
@@ -205,7 +209,7 @@ All these technicalities are really too technical, but it's necessary to have so
 In this package I tried to forecast most situations, but I am not sure I coped with every font characteristics combination.
 
 In particular I hooked the language changing declarations with suitable default family names; for example, when using the Times or the Palatino eXtended TX or PX  fonts,  three new family description files are created so as to connect the LGR encoding and the names of the above scalable fonts to the corresponding CB 
-fonts\footnote{I chose the CM Greek families, instead of the LM ones, because only the former are described by means of macros that cope with the \emph{10pt} option to the \texttt{teubner} package; just in case\dots\ The actual used fonts are the same in any case, except possibly for the visual sizes; the CM fonts come in fixed sizes, while the LM fonts are continuously scalable by enlarging or reducing a smaller number of base visual sizes.}. If you use different scalable fonts you can specify yourself the font associations you want to use; simply, after loading a package that sets as the default other  font family or families, open the the package file and take notice of the new family names; for each \meta{latin} family (serifed, sanserif, monospace) create a connection with the corresponding  \meta{greek} family by means of the following command:
+fonts\footnote{I chose the CM Greek families, instead of the LM ones, because only the former are described by means of macros that cope with the \emph{10pt} option to the \texttt{teubner} package; just in case\dots\ The actual used fonts are the same in any case, except possibly for the visual sizes; the CM fonts come in fixed sizes, while the LM fonts are continuously scalable by enlarging or reducing a smaller number of base visual sizes.}. If you use different scalable fonts you can specify yourself the font associations you want to use; simply, after loading a package that sets as the default other font family or families, open the the package file and take notice of the new family names; for each \meta{latin} family (serifed, sanserif, monospace) create a connection with the corresponding  \meta{greek} family by means of the following command:
 \begin{quote}
 \texttt{\string\ifFamily}\marg{latin}\marg{greek}
 \end{quote}
@@ -214,12 +218,12 @@ 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}
-\Lipiandtrue
+\Lipsiandtrue
 \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{cuts} 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{cuts}. 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 font name and the font family name.
+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}.
 
-Notice the \verb|\Lipsiantrue| command before issuing the matching command \verb|\ifFamily}|. This command is optional and is used only if the composer wishes to use the Lipsian fonts; in this case the \texttt{li} shape is also defined, so that the \verb|\textli| and \verb|\lishape| commands do not issue any error message.
+Notice the \verb|\Lipsiantrue| command before issuing the matching command \verb|\ifFamily}|. This command is optional and is used only if the composer wishes to use the Lipsian fonts; in this case the \texttt{li} shape is also defined, so that the \verb|\textli| and \verb|\lishape| commands do not issue any error message. At the end of the execution if the \verb|\ifFamily| command, the boolean switch is automatically reset to \verb|\Lipsianfalse|.
 
 A small caveat: when you issue for the first time the command \verb|\ifFamily| you might not see the expected result, and your Greek text might be typeset with the default ``Greek error font''. But the second time you typeset your document the expected result is obtained with the correct fonts. This is because with the very first run a new font description file is generated, and this file will be available in any subsequent typesetting run.
 
@@ -239,14 +243,12 @@ $\langle$\textit{Greek text to be typeset with the Lipsian font}$\rangle$\\
 
 \section{Font installation}
 In order to use the Greek CB fonts and the extensions provided with this
-package, you need to install them, if they are not already installed by default when you install your preferred \TeX\ system distribution. You can freely download those fonts from
-\textsc{ctan}, where you can find both the PostScript scalable ones and the
- driver files for generating their bit- (pixel-) maps with \MF; since nowadays it's very unlikely that \LaTeX\ users limit themselves to a final DVI file, but typeset their documents in PDF or PS formats, the pixel files are very unlikely needed to produce their final documents; the \MF\ pixel files just allow the DVI previewer (should one be used) to run \MF\ in the background in order to produce the necessary pixel files so as to display on the screen the typeset documents\footnote{I mean documents that have been typeset with \textsf{latex}, not with \textsf{pdflatex}.}. These days there are other solutions to preview directly the typeset output file in PDF format and to use the previewer for direct and inverse search, so that the DVI format becomes really necessary only in very special and rare occasions. In the future it's very likely that the choice among such PDF previewers is much greater than today: at the beginning of 2010, there is the multi\-platform shell editor \textsf{TeXworks}, that incorporates a PDF previewer capable of direct and inverse search; for modern Windows platforms there is the \textsf{SumatraPDF} previewer that may be configured to work with various shell editors in order to perform approximately in the same way. For Mac platforms, besides the default shell editor and previewer TeXShop, and the multi-platform program TeXworks, one can proceed with Aquamacs as a shell editor and Skim as PDF previewer that work together so as to allow direct and inverse search. 
-There are also \textsf{TeXmaker} and \textsf{TeXstudio}, multi platform shell editors, that perform very well with their internal editors; they exhibit other useful features that may appeal to many users. Probably there are other such programs, but I know and have direct experience only with the above mentioned ones.
+package, you need to install them, if they are not already installed by default when you install your preferred \TeX\ system complete distribution. You can freely download those fonts from \textsc{ctan}, where you can find both the PostScript scalable ones and the driver files for generating their bit- (pixel-) maps with \MF; since nowadays it's very unlikely that \LaTeX\ users limit themselves to a final DVI file, but typeset their documents in PDF or PS formats, the pixel files are very unlikely needed to produce their final documents; the \MF\ pixel files just allow the DVI previewer (should one be used) to run \MF\ in the background in order to produce the necessary pixel files so as to display on the screen the typeset documents\footnote{I mean documents that have been typeset with \textsf{latex}, not with \textsf{pdflatex}.}. These days there are other solutions to preview directly the typeset output file in PDF format and to use the previewer for direct and inverse search, so that the DVI format becomes really necessary only in very special and rare occasions. In the future it's very likely that the choice among such PDF previewers is much greater than today: at the beginning of 2010, there is the multi\-platform shell editor \textsf{TeXworks}, that incorporates a PDF previewer capable of direct and inverse search; for modern Windows platforms there is the \textsf{SumatraPDF} previewer that may be configured to work with various shell editors in order to perform approximately in the same way. For Mac platforms, besides the default shell editor and previewer TeXShop, and the multi-platform program TeXworks, one can proceed with Aquamacs as a shell editor and Skim as PDF previewer that work together so as to allow direct and inverse search. 
+There are also \textsf{TeXmaker} and \textsf{TeXstudio}, multi platform shell editors, that perform very well with their internal PDF readers; they exhibit other useful features that may appeal to many users. Probably there are other such programs, but I know and have direct experience only with the above mentioned ones.
  
  
 \section{\TeX\ font metric files}
-The package \texttt{teubner} requires the updated \TeX\ font metric files \texttt{.tfm} for all sizes and series of the Lipsian fonts.  With your file system explorer go to the folder \texttt{\$TEXMFDIST"/fonts"/tfm"/public"/cbfonts/} and read the date of, say, \texttt{grml1000.tfm}; if this date precedes the year 2010, then this \texttt{.tfm} file is ``old'' and must be replaced, and you should update your Greek CBfont collection.
+The package \texttt{teubner} requires the updated \TeX\ font metric files \texttt{.tfm} for all sizes and series of the Lipsian fonts.  With your file system explorer go to the folder \texttt{\$TEXMFDIST/fonts/tfm/public/cbfonts/} and read the date of, say, \texttt{grml1000.tfm}; if this date precedes the year 2010, then this \texttt{.tfm} file is ``old'' and must be replaced, and you should update your Greek CBfont collection (may be you should update your whole \TeX\ system installation).
 
 The updated \texttt{.tfm} files add some ligature and kerning information that is missing from the ``old'' ones. The Type~1 \texttt{pbf} font files have not been modified at all.
  
@@ -313,7 +315,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�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|} 
+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.
 
 
@@ -356,13 +358,13 @@ Example     & \multicolumn1c{Syntax}            & Example    & \multicolumn1c{Sy
 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. 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.\\
+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{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�le as tab shifters;
+both commands \comando\> and \comando\< play a different r\^ole as tab shifters;
 in this case either \comando\s\ and \comando\r\ are used for the spirit macros, or 
 the standard ligature mechanism is used, especially if the spirit diacritics 
-fall on the very first vowel of a word.
+fall on the very first vowel of a word. Suggestion; never use the \texttt{tabbing} environment; there are more effective ways to align chunks of text, for example the \texttt{tabular} environment.
 \bhrule
 \end{table}
 
@@ -370,7 +372,7 @@ fall on the very first vowel of a word.
 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 \l 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.}. 
+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.}. 
 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.
 
@@ -382,7 +384,7 @@ For this reason two mechanisms are implemented in this package:
 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+. 
 
-For the second solution a set of macros has been defined such that it is
+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
 resorting to the ligature mechanism. Such macros have a common
 structure; they are formed with the letters that make up the
@@ -394,7 +396,7 @@ up as such:
 \item the next optional character is the code for dieresis, smooth or rough spirit, with one of the letters d, s, r;
 \item the next character is the code for the circumflex, acute, or grave accent with one of the letters c, a, or g;
 \item the last optional character indicates iota subscript with the presence of an i;
-\item there are no glyph names for upper case letters, since they should never be marked with diacritics, except for the diaeresis over \textDidot{I} and~\textDidot{U} for which glyph names are provided.
+\item there are no glyph names for upper case letters, since they should never be marked with diacritics, except for the diaeresis over \textDidot{I} and~\textDidot{U} and for these glyphs adequate names are provided.
 \end{enumerate}
 
 This means that, for instance, \comando\asai\ stands for \textDidot{\asai}. For
@@ -436,7 +438,7 @@ subscript may still be used also when the accent--vowel combinations are used.}
 \c\ea   &\l\ea  &\c\eg  &\l\eg  &\c\er  &\l\er  &\c\es  &\l\es  \\
 \c\esa  &\l\esa &\c\esg &\l\esg &\c\era &\l\era &\c\erg &\l\erg \\
 \hline
-\c\oa   &\l\oa  &\c\og\ap{1}  &\l\og  &\c\oR\ap{2}&\l\oR  &\c\os  &\l\os  \\
+\c\oa   &\l\oa  &\c{\`o}\ap{1,3}  &\l{\`o}  &\c{\<o}\ap{2,3}&\l{\<o}  &\c\os  &\l\os  & \V\\
 \c\osa  &\l\osa &\c\osg &\l\osg &\c\ora &\l\ora &\c\org &\l\org \\
 \hline
 \c\rs   &\l\rs  &\c\rr  &\l\rr  &\D       \\
@@ -446,31 +448,31 @@ subscript may still be used also when the accent--vowel combinations are used.}
 \caption{Glyph name macros}\label{t:compoundvowels}
 \bigskip
 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; I have not experienced any inconvenience,at least with this version of of the \texttt{teubner} package.\par
+\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
-\texttt{\char92or} is incompatible with the
-primitive \TeX\ command with the same name.
+\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.
 \bhrule
 \end{table}
 
 What I suggest is to typeset your paper with the regular accent
 vowel ligatures and to substitute them in the final revision with
-the extended accent macros or the glyph name macros only in those instances where the lack of kerning is disturbing. The extended accent  macros should set forth less conflicts with other packages and should be the first choice when cleaning up the final revision. May be the glyph names will be eliminated in future releases of this package. Up to now these glyph name macros can be disabled if the option \emph{NoGlyphNames} is specified in the call statement to the \texttt{teubner.sty} package.
+the extended accent macros or the glyph name macros only in those instances where the lack of kerning is disturbing. The extended accent  macros should set forth less conflicts with other packages and should be the first choice when cleaning up the final revision. May be the glyph names will be eliminated in future releases of this package. Up to now these glyph name macros are disabled by default but, if the option \emph{GlyphNames} is specified in the call statement to the \texttt{teubner.sty} package, they are turned on and become available.
 
 
 \section{Upper case initials and capitalized text}
 As we have seen in the previous sections the ligature and kerning mechanisms are strictly connected and the extended accent macros may be useful in solving certain situations. The suggestion at the end of the previous section holds true, but some remarks must be underlined in order to use at its best the coexistence of both methods for using the accented glyphs.
 
-The remarks concern the use of capital letters. As mentioned before in Greek typography words with capital initials starting with a vowel require their diacritics in front and at the left of the initial capital vowel (for example:\textLipsias{>Aristot'elhs}) provided the vowel is not the first element of a Greek diphthong; in the latter case the diacritics go on top of the diphthong lower case  second element (for example: \textLipsias{A>isq'ulos}). On the opposite, all-caps words, such as in book titles or, with certain \LaTeX\ classes, in the headings, are typeset without any diacritic, except the dieresis.
+The remarks concern the use of capital letters and, to a certain extent also the caps and small caps font shape. As mentioned before in Greek typography words with capital initials starting with a vowel require their diacritics in front and at the left of the initial capital vowel (for example:\textLipsias{>Aristot'elhs}) provided the vowel is not the first element of a Greek diphthong; in the latter case the diacritics go on top of the diphthong lower case  second element (for example: \textLipsias{A>isq'ulos}). On the opposite, all-caps words, such as in book titles or, with certain \LaTeX\ classes, in the headings, are typeset without any diacritic, except the dieresis.
 
 
 I have already shown the unusual example of the word \textLipsias{>'aulos} where the first two vowels do not form a diphthong, but a hiatus; and this is why the diacritics fall on top of the alpha, not on the second element of the diphthong, for the very reason that there is no diphthong. In order to stress this unusual situation the word is most often spelled as \textLipsias{>'a\"ulos}, where the dieresis is sort of redundant, because the diacritics over the alpha already denote the hiatus. Similarly \textLipsias{>a\"upn'ia} is spelled with the redundant dieresis, although the soft spirit on the alpha already marks the hiatus. When these words require a capital initial, they become \textLipsias{>'A\"ulos} and \textLipsias{>A\"upn'ia}. 
 
-Notice that an initial single vowel may receive only a spirit marker with or without an accompanying accent, never a dieresis or a single accent\footnote{Of course we are talking of the polutoniko spelling, since this package \texttt{teubner} sets this spelling as the default one; nobody forbids to spell in monotoniko even when the polutoniko spelling is assumed, but in some rare instances there might be some inconsistencies.}. I tried hard to set up all the ligature and extended accent macros so as to do the right things when capitalizing or uppercasing, and if you follow the suggestions given in this section you should not meet any particular inconvenience; in particular, I stress this point here again, never use the extended accent macros for marking the initial vowel but use only the accent vowel ligatures.
+Notice that an initial single vowel may receive only a spirit marker with or without an accompanying accent, never a dieresis or a single accent\footnote{Of course we are talking of the polutoniko spelling, since this package \texttt{teubner} sets this spelling as the default one; nobody forbids to spell in monotoniko even when the polutoniko spelling is assumed, but in some rare instances there might be some inconsistencies.}. I tried hard to set up all the ligature and extended accent macros so as to do the right things when capitalizing or uppercasing, and if you follow the suggestions given in this section you should not meet any particular inconvenience; in particular, I stress this point here again: \emph{never use the extended accent macros for marking the initial vowel but use only the accent vowel ligatures}.
 
 Assume these words have to go in an all-caps header that is made up (behind the scenes) by making use of the \verb|\MakeUppercase| command; they have to be spelled \textLipsias{A\"ULOS} and \textLipsias{A\"UPNIA}, even if in the sectioning command argument they were spelled in lowercase with all the necessary diacritics. 
 
-This is where the ligature and/or the extended accent macros may show their different behaviour. With the \texttt{teubner} generated secondary \texttt{LGRaccents-glyphs\discretionary{}{.}{.}def} file, that contains all the extended accent macros, such macros do not disappear in uppercasing, i.e.\ in transforming the mixed case argument of the 
+This is where the ligature and/or the extended accent macros may show their different behavior. With the \texttt{teubner} generated secondary \texttt{LGRaccents-glyphs\discretionary{}{.}{.}def} file, that contains all the extended accent macros, such macros do not disappear in uppercasing, i.e.\ in transforming the mixed case argument of the 
 \verb|\MakeUppercase| command into an all-caps letter string. On the opposite the ligature sequences completely loose any reference to diacritics.
 
 
@@ -492,8 +494,20 @@ and it's easily seen that: 1) corresponds to a non redundant lowercase correct s
 
 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.
 
+When using small caps or caps and small caps, in other words, when using the 
+\verb|\scshape| declaration or the \verb|\textsc| command you use pay attention to other details; for example:
+\begin{flushleft}
+11)  \verb|\textDidot{\scshape >Arqim'hdhs}| yields \textDidot{\scshape>Arqim'hdhs}\\
+12)  \verb|\textDidot{\scshape \>Arqim'hdhs}| yields \textDidot{\scshape\>Arqim'hdhs}\\
+13)  \verb|\textDidot{\scshape \>Arqim\'hdhs}| yields \textDidot{\scshape\>Arqim\'hdhs}\\
+14)  \verb|\textDidot{\scshape >Arqim\'hdhs}| yields \textDidot{\scshape>Arqim\'hdhs}\\
+15)  \verb|\textDidot{\scshape \>Arqim\ha dhs}| yields \textDidot{\scshape\>Arqim\ha dhs}\\
+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.
+
 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.
-\enlargethispage*{1\baselineskip}
 
 \section{Other Greek symbols}
 Other Greek symbols may be obtained with ligatures or explicit
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner.pdf b/Master/texmf-dist/doc/latex/teubner/teubner.pdf
index f0db6c32be6..c6aaf431105 100644
--- a/Master/texmf-dist/doc/latex/teubner/teubner.pdf
+++ b/Master/texmf-dist/doc/latex/teubner/teubner.pdf
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner.txt b/Master/texmf-dist/doc/latex/teubner/teubner.txt
index 305e789995a..bdbd62eb193 100644
--- a/Master/texmf-dist/doc/latex/teubner/teubner.txt
+++ b/Master/texmf-dist/doc/latex/teubner/teubner.txt
@@ -1,8 +1,8 @@
-             THE TEUBNER PACKAGE VERSION 3.1 OF NOVEMBER 2010
+             THE TEUBNER PACKAGE VERSION 3.3 OF SEPTEMBER 2011
                  EXTENSION FOR PHILOLOGICAL TYPESETTING
 
 
-Copyright  2001-2004-2010 Claudio Beccari
+Copyright  2001-2004-2011 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 
@@ -145,7 +145,7 @@ you use LaTeX, you know what are its pros and cons.
 
 Happy philological LaTeXing!
 
-Claudio Beccari                               Turin, 3 of September 2011
+Claudio Beccari                               Turin, 7 of September 2011
 Former Professor of Electronics
 Politecnico di Torino, Italy
 claudio dot beccari at gmail dot com