teubner (18dec13)

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

9 files changed, 499 insertions, 1099 deletions

diff --git a/Master/texmf-dist/doc/latex/teubner/README b/Master/texmf-dist/doc/latex/teubner/README
index 30a15089958..6d93c355b1a 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.4a dated September 2013.
+This accompanies the teubner bundle version 4.x dated December 2013.
 
 Copyright 2010-2013 Claudio Beccari
 
@@ -19,25 +19,25 @@ The main purpose of this bundle is to provide classical philologists with some
 means for typesetting their documents that usually contain very specific notation.
 
 This new version allows the typesetter to use both "italic" shapes: the Olga-like
-and the Lipsian-like ones; it contains extended accent macros that avoid the kerning
-problems that arise with the ligature mechanism embedded in the LGR encoded default
-CBfonts; it is compatible with the use of different scalable Latin Type~1 fonts; 
+and the Lipsian-like ones; it complies with the LICR (LaTeX Internal Character
+Representation) of the Greekk gluphs that avoid the kerning problems that arise 
+with the ligature mechanism embedded in the LGR encoded default CBfonts; it is 
+compatible with the use of different scalable Latin Type~1 fonts; 
 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-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.
+Running pdflatex on the dtx file produces both the documentation and the 
+extraction of the byproduct files teubner.sty, teubnertx.sty, teubner.pdf.  
+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 
-description files necessary to use the LGR encoded Greek fonts with non TeX standard 
-PostScript fonts; for example it automatically generates the necessary files if using 
+Moreover this teubner package generates on the fly the font description files 
+necessary to use the LGR encoded Greek fonts with some non standard TeX 
+PostScript fonts; for example, it automatically generates the necessary files if using 
 the TX or the PX fonts; with other Type 1 fonts the necessary .fd files require 
 manual intervention, which simply means giving a suitable command from within another 
 open file that loads teubner.
 
-Please, be sure to work with a 2010 updated collection of the CBgreek fonts.
+Please, be sure to work with a 2010 updated collection of the CBfonts, and with a 2013 uptdated version of the TeX system.
 
 Claudio Beccari
 claudio dot beccari at gmail dot com
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf b/Master/texmf-dist/doc/latex/teubner/teubner-doc.pdf
index 4b8739c4244..5ca479111cd 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 12579b6c78f..46e1cf79e1d 100644
--- a/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex
+++ b/Master/texmf-dist/doc/latex/teubner/teubner-doc.tex
@@ -9,7 +9,7 @@
 %\usepackage{pxfonts}
 \usepackage{mflogo}
 \usepackage[greek,english]{babel}
-\def\workingdate{2012/09/16}% see two lines ahead
+\def\workingdate{2013/12/10}% see two lines ahead
 \usepackage[boldLipsian,10pt,GlyphNames]% <--------  teubner options
            {teubner}[\workingdate]% <--- older versions don't work well
 \usepackage[scaled=0.90]{helvet}
@@ -45,27 +45,30 @@
 \thanks{This paper documents \texttt{teubner.sty} version \fileversion\ of \filedate.}\\
 An extension to the \textsf{greek} option\\ of the \babel\ package}
 \author{Claudio Beccari\thanks{\texttt{claudio dot beccari at gmail dot com}}}
-\date{Turin, April 2013}% <---- this is the date of the teubenr-doc document!
+\date{Turin, December 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$}
-\let\marg\ARG\let\meta\Arg
+\def\ARG#1{\texttt{\char123}\meta{#1}\texttt{\char125}}
+\def\meta#1{$\langle${\normalfont\itshape#1}$\rangle$}
+\let\marg\ARG\let\Arg\meta
 \def\brArg#1{\texttt{\char123#1\char125}}
-\def\opt#1{\texttt{[}$\langle$\textit{#1}$\rangle$\texttt{]}}
+\def\opt#1{\texttt{[}\meta{#1}\texttt{]}}
 \def\g#1 {\textDidot{#1}}
 \def\l#1 {\textLipsias{#1}}
 \renewcommand*{\textfraction}{0}
 \renewcommand*{\topfraction}{1.}
 \renewcommand*{\bottomfraction}{.5}
 \def\acro#1{\expandafter\textsc\expandafter{\MakeLowercase{#1}}}
-\def\babel{\textsf{\slshape babel}}
 
 \def\thrule{\par\hrule\medskip}
 \def\bhrule{\par\medskip\hrule}
 
+\newcommand*\class[1]{\textsf{\slshape#1}}
+\newcommand*\pack[1]{\textsf{\slshape#1}}
+\def\babel{\pack{babel}}
 
 \advance\textheight80pt \advance\topmargin-40pt
-\begin{document}
+
+\begin{document}\errorcontextlines=20
 
 \maketitle
 {\columnseprule=0.4pt
@@ -77,9 +80,9 @@ An extension to the \textsf{greek} option\\ of the \babel\ package}
 %\begin{sloppypar}
 This package \texttt{teubner.sty} is an extension of the \textsf{greek} option
 of the \babel\ package intended to typeset classical Greek with
-a philological approach. This version 3.x cannot yet typeset the critical
+a philological approach. This version 4.x cannot yet typeset the critical
 apparatus as the philologists are used to, but may be this work will continue
-and include also that facility. Apparently it is not incompatible with \textsf{ledmac}, but it may be considered a complement.
+and include also that facility. Apparently it is not incompatible with \textsf{eledmac}, but it may be considered a complement.
 %\end{sloppypar}
 
 {\tolerance=9999
@@ -89,35 +92,37 @@ This package is supposed to work with my CB fonts available on the
 Comprehensive \TeX\ Archive Network (\textsc{ctan}); one of the actions of this
 package consists in adding to the default ``italic'' Greek shape another one
 called ``Lispiakos'' in Greece; this name derives from the high quality of the
-fonts used in the printers' shops in the city of Lipsia in the past 100 years
+fonts used in the printers' shops in the city of Lipsia in the past 100~years
 or so; one of the printer shops that continues printing books for philologists
 (since 1849) is the B.G.~Teubner Verlags\-gesell\-schaft, that publishes the
 collection called ``Bibliotheca Scriptorum Graecorum et Latinorum
 Teubneriana''. The name given to this extension package is in homage to that
 printing company and to its high quality tradition in printing Greek texts.
 
-This package is generally loaded by default with any major distribution of the \TeX\ system; in basic distributions it might not be there, but in general it is sufficient to use the distribution facilities for loading it; with MiKTeX, for example one uses the MiKTeX settings and the Package tab. With \TeX\-live it is sufficient to operate with the program \textsf{tlmgr}; and so on.
+This package is generally loaded by default with any complete distribution of the \TeX\ system; in basic distributions it might not be there, but in general it is sufficient to use the distribution facilities for loading it; with MiKTeX, for example one uses the MiKTeX settings and the Package tab. With \TeX\-live it is sufficient to operate with the program \textsf{tlmgr}; and so on.
 
-The problem, if there is one, is to have the full collection of the CBgreek fonts; by default the scalable PostScript versions are in one size, 10\,pt, and it is necessary to use the \emph{10pt} option in order to have the various enlarged or reduced sizes. Otherwise it is necessary to load the \texttt{cbgreek-full} font collection and be sure that the map files are duly upgraded. In case, read your ditribution instructions to see how to control and, possibly, how to provide for this upgrade. Please, notice that this very file has been typeset with the \emph{10pt} option in force, so that if you want to typeset it again from source, you need the minimum amount of vector fonts needed by \textsf{pdflatex} to do its job.
+The problem, if there is one, is to have the full collection of the CB fonts; in partial distributions the scalable PostScript CB fonts are in one size, 10\,pt, and it is necessary to use the \emph{10pt} option in order to have the various enlarged or reduced sizes. For professional work, if the user has a partial \TeX\ system installation, it is necessary to load the \texttt{cbgreek-full} font collection and be sure that the map files are duly upgraded. In case, read your distribution instructions to see how to control and, possibly, how to provide for this upgrade. Please, notice that this very file has been typeset with the \emph{10pt} option in force, so that if you want to typeset it again from source, you need the minimum amount of vector fonts needed by \textsf{pdflatex} to do its job.
 
-In any case this \texttt{teubner} extension package makes the \texttt{cbgreek} font collection (full or reduced) directly compatible by construction with both the CM fonts (OT1 and T1 encoded; the latter are often referred to as the EC fonts) and with the LM fonts; it also contains adequate hooks in order to make them compatible and usable with other font collections; this very file has been successfully typeset using the CM and LM fonts, and also resorting to the Times and Palatino eXtended collections requested with the packages \texttt{txfonts}\footnote{Antonis Tsolomitis wrote package \textsf{txfontsb} for using a different Greek font collection together with the TX fonts so that the Latin and Greek glyph styles directly match each other; see the \textsf{txfontsb} package documentation for more information.} and \texttt{pxfonts} respectively.
+In any case this \texttt{teubner} extension package makes the CB font collection (full or reduced) directly compatible by construction with both the CM fonts (OT1 and T1 encoded; the latter ones are often referred to as the EC fonts) and with the LM fonts; it also contains adequate hooks in order to make them compatible and usable with other font collections; this very file has been successfully typeset using the CM and LM fonts, and also resorting to the Times and Palatino eXtended collections requested with the packages \texttt{txfonts}\footnote{Antonis Tsolomitis wrote package \textsf{txfontsb} for using a different Greek font collection together with the TX fonts so that the Latin and Greek glyph styles directly match each other; see the \textsf{txfontsb} package documentation for more information.} and \texttt{pxfonts} respectively.
 
-This short documentation will start by briefly recalling some peculiarities
+This additional documentation will start by briefly recalling some peculiarities
 of the CB fonts and their mapping to the Latin keyboard; afterwards it will
 list the new commands and their syntax.
 
 \section{Usage}
-The \texttt{teubner} extension is loaded in the usual way, but there are some simple rules to follow:
+The \pack{teubner} extension is loaded in the usual way, but there are some simple rules to follow:
 \begin{quote}
 \texttt{\string\usepackage}\opt{options}\brArg{teubner}
 \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 \pack{teubner} is an extension of the \pack{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. 
+
+\noindent\textbf{Warning}: 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 \pack{teubner}, which is useful only to typeset Greek text. For using other alphabets 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\slash doc\slash latex\slash base/}.
 
 \section{Package options}
 
-The  options available to \texttt{teubner} are collected in table~\ref{t:opzioni} with their meaning and usefulness.
+The  options available to \pack{teubner} are collected in table~\ref{t:opzioni} with their meaning and usefulness.
 
 \begin{table}
 \thrule
@@ -131,20 +136,20 @@ Option	& Meaning\R	\\\hline
 \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}
+\caption{Options for the \pack{teubner} extension package}\label{t:opzioni}
 \bhrule
 \end{table}
 
 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. This full collection is generally already available with any complete distribution of the \TeX\ system.
+\noindent\textbf{Warning}: You might need 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 seek 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, the Palatino, and the Fourier 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 , EC, 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 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).
+With the inclusion of the extended accent macros in the \pack{teubner} package (see below), the named accented glyphs should not be needed anymore; these accented glyph name macros are not defined by default, but for backwards compatibility they are available if the \emph{GlyphNames} option is specified; with the 2013 new Greek support for the \babel\ package, the extended accent macros are defined in a more efficient way and you should not need them any more; therefore, unless you specify this option, you avoid overloading the internal \TeX\ memory areas, thus leaving extra space for more useful extensions. 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). Moreover, if your keyboard has facilities for entering polytonic Greek, or if you installa a keyboard driver that allows you to do so, you can directly input Greek text with the Greek alphabet, without using the transliteration provided by the Greek support for \babel.
 
 \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
+The CB Greek fonts (full collection) come in  all shapes, sizes and series as the European Modern 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.
@@ -152,8 +157,8 @@ yet, at least.
 The regular shape has capital letters with serifs that are in the
 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
+This shape comes also in boldface, together with the corresponding
+oblique (or slanted) versions. The CB fonts contain
 also the upright and slanted, medium and boldface small caps
 alphabets.
 
@@ -166,14 +171,14 @@ oblique and upright shapes.
 The CB fonts are completed with the sans serif fonts, the
 monospaced typewriter fonts and the fonts for slides, besides an
 outline family that shows the regular shapes and series just with
-their contours; there is also a family with serifed lower case letters.
+their contours; there is also a shape with serifed lower case letters.
 
 The CB Lipsian fonts imitate the beautiful shapes used in
 Lipsia; they come in medium, bold, and extra-bold series, without
 an upright version, and they are meant to replace the
 corresponding Olga shapes. Their `simple bold' series is good for mixing
 with PostScript fonts, whose medium series is slightly blacker
-than the corresponding CM and LM fonts usually used with \LaTeX; this is easily achieved by passing the \emph{boldLipsian} option when invoking this \texttt{teubner} extension file. Notice that the Lipsian font produces an alternative to the ordinary `italic' Olga shape, it is not any more the default `italic' shape as it used to be with the previous versions of this package; now, in the same document, you can use both shapes and produce both versions: 
+than the corresponding EC and LM fonts nurmally used with \LaTeX; this is easily achieved by passing the \emph{boldLipsian} option when invoking this \pack{teubner} extension file. Notice that the Lipsian font produces an alternative to the ordinary `italic' Olga shape, it is not any more the default `italic' shape as it used to be with previous versions of this package; now, in the same document, you can use both shapes and produce both versions: 
 \foreignlanguage{greek}{\textit{Baq'ulides} 
 \textlatin{and} 
 \textli{Baq'ulides}}. 
@@ -184,33 +189,34 @@ But if you really want to permanently change the ``italic'' Greek font shape to
 \addto\extrasgreek{\def\itdefault{li}}%
 \addto\noextrasgreek{\def\itdefault{it}}%
 \end{verbatim}
-With these settings, \verb|\textit| and \verb|\textli| become equivalent and both use the Lipsian shape while typesetting   Greek text. Reverting to Latin script the \verb|\textli| text command uses the italic shape by default and there is no need to add anything else to the \verb|\noextrasgreek| macro.
+With these settings, \verb|\textit| and \verb|\textli| become equivalent and both use the Lipsian shape while typesetting Greek text. Reverting to Latin script the \verb|\textli| text command uses the italic shape by default and there is no need to add anything else to the \verb|\noextrasgreek| macro.
 
 
 \subsection*{Technical information}
 Typesetting documents with different scripts sets forth some problems. The \emph{greek} option to the \babel\ package, besides setting up the typographical rules for Greek, as it does for any other language, provides the script change; it defines also the \verb|\textlatin| macro in order to typeset something with the Latin script while the default script is Greek, as well as the \verb|\textgreek| macro to typeset something with the Greek script when typesetting with a Latin one. Of course the usual \verb|\selectlanguage| and \verb|\foreinglanguage| commands, as well as the \texttt{otherlanguage} environment, provide for a global change of the typesetting characteristics or an environment where the settings are reset to Greek.
 
-With standard \babel\ the CB fonts used to work only in conjunction with the CM fonts with either the OT1 (real CM fonts) or T1 (EC fonts) encoding. Since the 2008 distribution of standard \babel, the CB fonts work fine also with the Latin Modern fonts. This \texttt{teubner} extension tries to work seamlessly also with other font families, but it is not that simple. Some technical explanations are necessary.
+With standard \babel\ the CB fonts used to work only in conjunction with the CM fonts with either the OT1 (real CM fonts) or T1 (EC fonts) encoding. Since the 2008 distribution of standard \babel, the CB fonts work fine also with the Latin Modern fonts. This \pack{teubner} extension tries to work seamlessly also with other font families, but it is not that simple. Some technical explanations are necessary.
 
-When \LaTeX\ needs to use a specific font in a certain encoding and belonging to a  particular family, series and shape, available in such and such sizes, it gets this information by reading a \emph{font description file}; this file's name is composed with the encoding and the family names glued together and has the extension \texttt{.fd}; for OT1 encoded Computer Modern CM regular (serifed) fonts this file would be \texttt{ot1cmr.fd}. Any other package that is requested for using different fonts defines possibly a different encoding and certainly different family names. For using the Times eXtended TX fonts with T1 encoding, the \texttt{txfonts.sty} package defines the family name \texttt{txr} (for serifed fonts) so that \LaTeX\ reads the font description file \texttt{t1txr.fd} that contains the relevant information for all the series and shapes available.
+When \LaTeX\ needs to use a specific font in a certain encoding and belonging to a  particular family, series and shape, available in such and such sizes, it gets this information by reading a \emph{font description file}; this file's name is composed with the encoding and the family names glued together and has the extension \texttt{.fd}; for OT1 encoded Computer Modern CM regular (serifed) fonts this file would be \texttt{ot1cmr.fd}. Any other package that is requested for using different fonts defines possibly a different encoding and certainly different family names. For using the Times eXtended TX fonts with T1 encoding, the \texttt{txfonts.sty} package defines the family name \texttt{txr} (for serifed fonts) so that \LaTeX\ reads the font description file \texttt{t1txr.fd} that contains the relevant information for all the series, shapes, and sizes available.
 
-The CB Greek fonts are encoded according to the LGR encoding but have the same family names as the CM ones; since 2008, also the family names of the Latin Modern LM collection are recognized; therefore the relevant font description files for the regular\footnote{The regular lower case Greek alphabet does not have serifs; serifs are present in the font shape called `serifed' that corresponds to the\texttt{\string\textrs} font command.}  family are \texttt{lgrcmr.fd} and \texttt{lgrlmr.fd} respectively. The two collections of description files are not equivalent with one another, and they are not equivalent to the OT1 or T1 encoded CM or LM fonts, in the sense that the series and shapes available for these sets of fonts are not identical, even if most of them are.
+The CB fonts are encoded according to the LGR encoding but have the same family names as the CM ones; since 2008, also the family names of the Latin Modern LM collection are recognised; therefore the relevant font description files for the regular\footnote{The regular lower case Greek alphabet does not have serifs; serifs are present in the font shape called `serifed' that corresponds to the\texttt{\string\textrs} font command.}  family are \texttt{lgrcmr.fd} and \texttt{lgrlmr.fd} respectively. The two collections of description files are not equivalent with one another, and they are not equivalent to the OT1 or T1 encoded CM or LM fonts, in the sense that the series and shapes available for these sets of fonts are not identical, even if most of them are.
 
-In this way with CM and LM fonts the script switching for the same (existing) series and shapes amounts to switching the encoding name. At the same time there might exist some font switching commands that refer to a series or shape that does not exist in the other script families; one important example in our case is the Lipsian shape that is available only with the CB Greek fonts. There is no problem in declaring the Lipsian shape switching commands that behave in a proper way together with the CM and LM fonts, but even if I did my best for working with other font families, I am not 100\% confident that my macros restore correctly the other font characteristics when declaring a different series or shape.
+In this way with CM and LM fonts the script switching for the same (existing) series and shapes amounts to switching the encoding name. At the same time there might exist some font switching commands that refer to a series or shape that does not exist in the other script families; one important example in our case is the Lipsian shape that is available only with the CB fonts. There is no problem in declaring the Lipsian shape switching commands that behave in a proper way together with the CM and LM fonts, but even if I did my best for working with other font families, I am not 100\% confident that my macros restore correctly the other font characteristics when declaring a different series or shape.
 
 Going more technical, the default family settings are stored into the three macros 
-\verb|\rmdefault|, \verb|\sfdefault|, \verb|\ttdefault|; the series and the shape symbols are stored in similar macros; these default macros are accessed every time a font characteristic switching declaration or command is used. In the background the \verb|\selectfont| macro is executed and during the whole process the \emph{current} font characteristic macros are updated. Such macros are \verb|\f@encoding|, \verb|\f@family|, \verb|\f@series|, and \verb|\f@shape|; therefore when just one characteristic is modified, the current value is stored in the relevant current value macro and used in order to create the association with the actual font to be used.
+\verb|\rmdefault|, \verb|\sfdefault|, \verb|\ttdefault|; the series and the shape symbols are stored in similar macros; these default macros are accessed every time a font characteristic switching declaration or command is used. In the background the \verb|\selectfont| macro is executed and during the whole process the \emph{current} font characteristic macros are updated. Such macros are \verb|\f@encoding|, \verb|\f@family|, \verb|\f@series|, and \verb|\f@shape|; therefore when just one characteristic is modified, the new value is stored in the relevant current value macro and used in order to create the association with the actual font to be used.
 
-If the font switching macros are used within a group, upon exiting that group the previous values are restored; but if declarations are used without a delimiting scope, there is no simple (universal) way to use another ready made declaration that resets valid font characteristics. 
+If the font switching macros are used within a group, upon exiting that group the previous values are restored; but if declarations are used without a delimiting scope, there is no simple (universal) way to use another ready-made declaration that resets valid font characteristics. 
 
 An example where the necessity of delimiting scopes is shown: suppose we are typesetting with T1 encoded LM roman medium normal (upright) fonts; then the current font characteristics codes are stored in the relevant macros as \texttt{T1}, \texttt{lmr}, \texttt{m}, \texttt{n}. We switch to Greek with a language setting declaration, and the current encoding is changed to \texttt{LGR}, but the other characteristics remain the same, therefore we would be typesetting with LGR encoded, CB Didot (upright) medium normal font. While typesetting in Greek we switch to Lipsian shape with a declaration such as \verb|\lishape|\footnote{Notice that the \texttt{\string\lishape} declaration and the corresponding text command \texttt{\string\textli} are defined in such a way that they switch to the Lipsian shape only when the Greek encoding LGR is in force; with other encodings they behave as the corresponding italic font commands. In spite of this the example being carried on is valid, because the \texttt{\string\lishape} \emph{declaration} is supposed to be issued while the Greek encoding was in force.}, and this declaration changes only the current shape characteristic, so that the four ones would be \texttt{LGR}, \texttt{lmr}, \texttt{m}, \texttt{li}. Up to this point everything runs smoothly because every characteristic that was set is present in the specific font family in use. At this point we revert to typesetting with the Latin script by means of a language switching declaration; the only change that takes place is on the encoding and the four characteristics would become \texttt{T1}, \texttt{lmr}, \texttt{m}, \texttt{li}, but\dots\ The Latin Modern fonts do not contain a Lipsian shape, therefore there is no actual font that meets the requirements and \LaTeX\ selects the \emph{error font}, the T1 encoded LM roman medium normal one, that in this case is the correct one, and apparently the font switching process achieved the correct result. This is only apparent: remember that the \emph{error font} was selected, not the right font. If the Latin family and the Greek family hadn't been the same, there would have been other difficulties and the error font would have been selected; this is why, if the user does not pay attention, when the default font should be, say, the TX font, after a switch to Greek, upon reverting to the Latin script the wrong font series or shape might be used. In the next paragraphs some indications are given in order to overcome this feature.
 
 All these technicalities are really too technical, but it's necessary to have some clues in order to find out why sometimes the font switching commands don't work as expected. In some cases the font description file might provide a smart substitution for missing fonts, but it is not always the case.
 
-In this package I tried to forecast most situations, but I am not sure I coped with every font characteristics combination.
+In this package I tried to forecast most situations, but I am not sure I coped with every font characteristic 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.}. 
 
-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:
+If you use different scalable fonts you can specify yourself the font associations you want to use; simply, after loading a package that sets other default font family or families, open the the package file and take notice of the new family names; for each \meta{latin} family (serifed, sans serif, 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}
@@ -224,9 +230,12 @@ Example: suppose you want to use the regular Fourier fonts to replace the defaul
 \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}.
 
-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|.
+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.
+\noindent\textbf{Warning}: According to several maintainers of the language support packages, the procedure used with \verb|\ifFamily|, that produces in the local working directory a real, permanent \texttt{.fd} file, is not the best approach to create such pairing of fonts. G\"unter Milde, for example, produce a \pack{substitutefontfamily} package that defines the command \comando\subtitutefontfamily\ which creates a similar association, but does not write anything to the disk; simply the created association declarations are stored in the job memory, so that when the typesetting job is over, no traces remain on disk; this certainly avoids clogging the disk with the same files scattered all over in different directories that were the working one for different typesetting jobs.
+
+A small caveat: when you issue for the first time the command \verb|\ifFamily| you might not see the expected result (while with Milde's package you immediately obtain 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 only in subsequent typesetting runs.
 
 Nevertheless this does not imply that the correct fonts are used if the font switching macros are used without scoping groups or environments. Sometimes, when you use declarations instead of commands, it might be necessary to issue an apparently redundant \verb|\rmfamily| or \verb|\selectfont| command in order to re-establish the correct defaults.
 
@@ -234,24 +243,22 @@ In order to insert \emph{short texts} in Greek, either in Didot upright or in Li
 
 The \emph{text commands}, contrary to the corresponding \emph{text declarations}, typeset their argument within a group, so that the font characteristics are also correctly restored after the command execution is completed. 
 
-Therefore I suggest you to either use the text commands or to use the declarations as environment names (without the initial backslash), so that they provide the necessary group delimiters; it's correct and useful to input something such as:
+Therefore I suggest you to either use the text commands or to use the declarations as environment names (without the initial backslash), so that they provide the necessary group delimiters; it's syntactically correct and useful to input something such as:
 \begin{quote}
 \verb|\begin{Lipsiakostext}|\\
-$\langle$\textit{Greek text to be typeset with the Lipsian font}$\rangle$\\
+\meta{Greek text to be typeset with the Lipsian font}\\
 \verb|\end{Lipsiakostext}|
 \end{quote}
 
 
 \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 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.
- 
+package, you need to install them, if they are not already installed by default when you install your preferred \TeX\ system \emph{complete} distribution. You can freely download those fonts from \acro{ctan}, where you can find both the PostScript scalable ones and the driver files for generating their bitmaped 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: there are certainly the multi\-platform shell editors \textsf{TeXworks}, \textsf{TeXstudio}, and \textsf{Texmaker} that incorporate 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 in the same way. For Mac platforms, besides the default shell editor and previewer \textsf{TeXShop}, and the multi-platform program \textsf{TeXworks}, the Mac specific \textsf{TeXnicle} and \textsf{Texpad}, one can proceed with \textsf{Aquamacs} as a shell editor and \textsf{Skim} as PDF previewer that work together so as to allow direct and inverse search. 
  
 \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 (may be you should update your whole \TeX\ system installation).
+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 CB font 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.
+The updated \texttt{.tfm} files add some ligature and kerning information that is missing from the ``old'' ones. The Type~1 \texttt{pfb} font files have not been modified at all.
  
  
 \section{Greek text and Latin keys}
@@ -285,12 +292,14 @@ boundary after a sigma; therefore if you type \texttt{sv}, you get
 
 The invisible character \texttt{v} may be used also as a support
 for (apparently) isolated accents, especially when macros have to
-be used; if you type \verb"\={v}" you get
-\enspace\textDidot{\=v}\enspace, while if you omit the invisible
-\texttt{v} you get \enspace\textDidot{\={}}\enspace.
+be used; if you type \verb"\M{v}" you get
+\enspace\textDidot{\M{v}}\enspace, while if you omit the invisible
+\texttt{v} you get \enspace\textDidot{\M{}}\enspace.
+
+In LICR (\LaTeX\ Internal Character Representation), that is being used by the modern (2013) Greek support for \babel, the \texttt{v} character is represented by the macro \comando\textcompwordmark\ whose name recalls a compound word separator; actually it may perform also in this way; but it is a special character, not simply an invisible strut; It has the same category code as the other alphabetic characters, it has a very small width but its height is equal to the other lower case letters without ascenders; it's a real character even if in practice it is invisible; in particular it does not impeach hyphenation as an equally sized normal strut would do. But its usefulness is $(a)$ to hide the word boundary; $(b)$ to support an accent that would drop to the base line if  this character was absent; $(c)$ to break ligatures in those rare cases where it's necessary to do so.
 
 Accents, spirits and dieresis may be input \emph{before} each letter
-(prefix notation) without using any particular control sequence;
+(prefix notation) without using any particular control sequence, that is resorting to the ligature mechanism  that is part of the font characteristics, but since with certain fonts this mechanism may break kernings, it's better to use the proper accent macros;
 the correspondence between the Latin symbols and the Greek
 diacritical marks is shown in table~\ref{t:accenti}; all ``upper''
 diacritical marks must be prefixed (in any order), while the iota
@@ -307,16 +316,16 @@ extended accent macros
         &\t\string\>&\t\string\<&\t\string\"&\t\string\'&\t\string\`&\t\string\~& 
 \end{tabular}
 \caption{Correspondence between the Latin keyboard symbols and
-Greek diacritical marks; extended accent macros are also shown; notice that a couple of ``high'' diacritical marks may be joined in one macro (in any order) to produce the same result as with two separate macros; in other words, \texttt{\string\>\string\'}, \texttt{\string\'\string\>}, \texttt{\string\>'} and \texttt{\string\'>} are all almost equivalent with one another. For what concerns \texttt{\string\~}, see remarks below table~\ref{t:accentmacros}}\label{t:accenti}
+Greek diacritical marks; extended accent macros are also shown; notice that a couple of ``high'' diacritical marks may be joined in one macro (in any order) to produce the same result as with two separate macros; in other words, \texttt{\string\>\string\'}, \texttt{\string\'\string\>}, \texttt{\string\>'} and \texttt{\string\'>} are equivalent with one another. For what concerns \texttt{\string\~}, see remarks below table~\ref{t:accentmacros}}\label{t:accenti}
 \bhrule
 \end{table}
 
 Macrons and breves are just single glyphs and do not appear in combination with
 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. 
+by means of commands \verb|\M| and \verb|\B| respectively when typesetting in Greek
+in order to use them as single diacritics; for more than one diacritic superimposed to one another, when macrons and breves are involved, some other commands are available as shown in table~\ref{t:accentmacros}. 
 
-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.
+The new (2013) Greek support for \babel\ contains now the LICR encoded accent macros that allow to use any encoding input method, including direct input of Greek characters. The internal representation of accent macros resort to the same symbols shown in table~\ref{t:accenti}; simply they 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}. 
@@ -333,9 +342,9 @@ Example     & \multicolumn1c{Syntax}            & Example    & \multicolumn1c{Sy
 \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 \B{a}    & \comando\B\ARG{letter}\ap{4}     & \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} \\
+\g \M{a}      & \comando\M\ARG{letter}\ap{4}   & \g\Gsb{a}   & \comando\Gsb\ARG{letter} \\
 \g \>a      & \comando\>\ARG{letter}\ap{3}     & \g\Am{a}    & \comando\Am\ARG{letter}  \\
 \g \<a      & \comando\<\ARG{letter}\ap{3}     & \g\Gm{a}    & \comando\Gm\ARG{letter}  \\
 \g \r{a}    & \comando\r\ARG{letter}           & \g\Cm{a}    & \comando\Cm\ARG{letter}  \\
@@ -356,13 +365,14 @@ Example     & \multicolumn1c{Syntax}            & Example    & \multicolumn1c{Sy
 \caption{Accent macros}\label{t:accentmacros}
 \vskip\baselineskip
 REMARKS\\[3pt]\footnotesize
-\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,
+\mbox{\quad}\ap{1}These four commands superimpose the corresponding accent over the \meta{letter} belonging to the Greek alphabet; the corresponding commands \comando\`, \comando\', \comando\~, and \comando\" play the same rôle also with non Greek letters; this allows the stacking of several accents on the same base \meta{letter}. \\
+\mbox{\quad}\ap{2}Most commands may be used also with latin letters.\\
+\mbox{\quad}\ap{3}While typesetting in Greek within a \texttt{tabbing} environment,
 both commands \comando\> and \comando\< play a different r\^ole as tab shifters;
 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. Suggestion; never use the \texttt{tabbing} environment; there are more effective ways to align chunks of text, for example the \texttt{tabular} environment.
+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.\\
+\mbox{\quad}\ap{4}In \pack{teubner} versions preceding 4.0 macros for typesetting macrons and breves in Greek had the same name as the corresponding macros used when typesetting with Latin script, that is \comando\=\ and \comando\u. With the new Greek support for the \pack{babel} package that was implemented during year 2013, the Latin macros were not functional any more in the proper way, and were updated in \pack{teubner} version 4.0 with new names.
 \bhrule
 \end{table}
 
@@ -370,19 +380,19 @@ 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.
 
-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.}. 
+For example compare \textLipsias{a>ut'os} with \textLipsias{a\>ut\'os}. The small spacing difference, if any, between tau and the accented omicron is not 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 created by Günter Milde are now the default setting in the Greek support for \babel, and
 \item the character names have been defined with macros that access directly their own glyphs.
 \end{enumerate}
-The first solution has been described in the previous section and the extended accent  macros are shown in table~\ref{t:accenti}. At the expense of one slash, these macros create a chain of commands that deeply exploit the \LaTeXe\ kernel commands and allow to fetch directly each accented character; notice that there is no need to treat the \verb+|+ sign this way, because its postfixed position does not break the kerning 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 
+The first solution has been described in the previous section and the extended accent  macros are shown in table~\ref{t:accenti}. At the expense of one slash, these macros create a chain of commands that deeply exploit the \LaTeXe\ kernel commands and allow to fetch directly each accented character; notice that there is no need to treat the \verb+|+ sign this way, because its postfixed position does not break the kerning/ligature mechanism. The spirit macros \verb+\>+ and \verb+\<+ work also with the consonant `r' to produce \textLipsias{\>r, \<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 capitalising the upper diacritics must be written at the left of the initial letter); for example\footnote{In the capitalised 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 polytonic 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 example of how accents should \emph{not} be used in all caps words, you can type \textDidot{A\>UT\A{O}S} but you have to use the macros of 
 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
+Another solution is available if the \emph{GlyphNames} option is specified to the \texttt{teubner} 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
@@ -390,8 +400,8 @@ complex glyph in a certain order, precisely every macro is made
 up as such:
 \begin{enumerate}\itemsep=0pt\parsep=0pt
 \item the first character, obviously, is the backslash character \texttt{\char92};
-\item the next character is the name of the base character, one of the vowels a, e, h, i, o, u, w, or the consonant r, or one of the capitalized vowels I~or~U;
-\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 name of the base character, one of the vowels a, e, h, i, o, u, w, or the consonant r, or one of the capitalised vowels I~or~U;
+\item the next optional character is the code for dieresis, or 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} and for these glyphs adequate names are provided.
@@ -446,31 +456,32 @@ 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; 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 any kerning.
+\mbox{\quad}\ap{1}Some users remarked that with previous \pack{teubner} versions  \verb|\og| macro conflicted with the homonymous command available when typesetting French texts with the \texttt{french} option to \babel\ in force; for this reason it's necessary to use  \verb|\`o| in its place.\par
+\mbox{\quad}\ap{2}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  \verb|\<o| in its place.\par
+\mbox{\quad}\ap{3}In both cases  macros are unnecessary, specifically for \verb|\<o|, since an initial accented letter has no preceding letter whith whom some kerning might be necessary; therefore at the start of a word use \verb|'o| or \verb|<o|, and use \verb|\'o| in a word internal position, should some kerning be necessary; actually the shape of the omicron seldom requires any 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 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.
+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. The glyph names will be kept in future releases of this package just for backwards compatibility. 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}
+\section{Upper case initials and capitalised 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 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.
+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 diaeresis.
 
 
 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: \emph{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 polytonic spelling, since this package \texttt{teubner} sets this spelling as the default one; nobody forbids to spell in monotonic even when the polytonic 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 capitalising or uppercasing, and if you follow the suggestions given in this section you should not meet any particular inconvenience.
 
-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. 
+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 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 
+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 
 \verb|\MakeUppercase| command into an all-caps letter string. On the opposite the ligature sequences completely loose any reference to diacritics.
 
 
@@ -488,12 +499,12 @@ 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 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. 
+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 correct because \verb|\MakeUppercase| does not act on macros, but \verb|\>'| \emph{is} a macro, precisely an accent macro, that acts on the following letter before uppercasing, and the uppercase of an alpha with diacritics si simply the capital alpha; 5) is corret, but relies in the same kludge as case 2, so the same warnings apply; case 6) displays the result of using the accented glyph names which are not subject to capitalisation 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.
+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, but between the capital omega end th capital iota; 8) by simply inverting the sequence of the dieresis and the acute accent 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; 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:
+\verb|\scshape| declaration or the \verb|\textsc| command you should 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}\\
@@ -503,9 +514,9 @@ 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 `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.
+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, and  the extended accent macros produce the expected result. But accents are apparently used in French also when proper names are typeset in caps and small caps, contrary to Greek, so that 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 uppercased to itself and is suitable for supporting any diacritic mark at the proper height. Julien Browaeys pointed out this specific typesetting French tradition; I thank him very much for his feedback on this point.
 
-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.
+Conclusion: when writing the input code for a sectioning command, the argument of which has to be transformed to upper case, use \verb|\"| (in the proper sequence with other accents) for the internal diereses, as in cases 3), 4), 8), and 9) above. With the extended accent macros there are really few problems; the remaining ones take place in complete uppercasing remain with French traditions in caps and small caps that can be easily handled through the use of the \texttt{v} special invisible glyph. 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.
 
 \section{Other Greek symbols}
 Other Greek symbols may be obtained with ligatures or explicit
@@ -559,7 +570,7 @@ if you type \verb+\greeknumeral{123456}+ you get \textLipsias{\greeknumeral{1234
 
 The \textsf{teubner} package offers also the possibility of typesetting the Attic numerals, without the need of loading Apostolos Syropoulos' \textsf{athnum} package; the functionality is the same, although the code is different; in order to avoid clashes, the \textsf{teubner} command for transforming Arabic numerals into Attic ones is \comando\AtticNumeral. As for the original macro, the maximum value that can be transformed is 99\,999, while, of course, no vanishing or negative numbers can be transformed:
 \begin{quote}\obeylines
-if you type \verb|\AtticNumeral{2012}| you get \textLipsias{\AtticNumeral{2012}}
+if you type \verb|\AtticNumeral{2013}| you get \textLipsias{\AtticNumeral{2013}}
 if you type \verb|\AtticNumeral{1999}| you get \textLipsias{\AtticNumeral{1999}}
 \end{quote}
 
@@ -580,7 +591,7 @@ the \comando\ap's argument can contain any language or alphabet specific
 declaration. You can typeset something such as \textLipsias{Baq\'ulides\,\ap{\textlatin{a}}} by switching language and alphabet as required; the specific declarations and the commands contained in table~\ref{t:extcomandi} come handy also in these cases.
 
 
-\begin{table}[!p]\thrule\centering
+\begin{table}[!p]\thrule%\centering
 \let\c\comando
 \resizebox*{\textwidth}{!}{\footnotesize
 \begin{tabular}{cl|cl}
@@ -588,7 +599,7 @@ Example                 & Syntax                        &Example
 \l{Baq\'ulides}         & (declaration)                 &abcde                  & (declaration)                 \\
 \l{Baq\'ulides}         & \c\textLipsias\ARG{text}      &\l{\lesp{abg}}         &\c\lesp\ARG{text}              \\
 \g{Baq\'ulides}         &\c\textDidot\ARG{text}         &\LitNil                &\c\LitNil                      \\
-text                    & \c\textlatin\ARG{text}        &\cap{g}                &\c\cap\ARG{letter}             \\
+text                    & \c\textlatin\ARG{text}        &\cap{g}                &\c{\cap}\ARG{letter}\ap{($a$)} \\
 \l\frapar{Baq\'ulides}  & \c\frapar\ARG{text}           &\Coronis               &\c\Coronis                     \\
 (                       & \c\lpar                       &\lmqi                  &\c\lmqi                        \\
 )                       &\c\rpar                        &\rmqi                  &\c\rmqi                        \\
@@ -628,8 +639,11 @@ text                    & \c\textlatin\ARG{text}        &\cap{g}
 \splus                  &\c\splus                       &\stimes                &\c\stimes                  
 \end{tabular}%
 }
+\bhrule\smallskip
+
+{\footnotesize\mbox{\ap{($a$)}\enspace}Ansten M\o rch Klev spottes a conflict 
+with the Homonymous math command; this is now resolved. Thank you Ansten.\par}
 \caption{Extended commands}\label{t:extcomandi}
-\bhrule
 \end{table}
 
 
diff --git a/Master/texmf-dist/doc/latex/teubner/teubner.pdf b/Master/texmf-dist/doc/latex/teubner/teubner.pdf
index 405559dcb19..e6d98803ac4 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 d3732df0c1e..0939d0cb493 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.4a OF SEPTEMBER 2013
+             THE TEUBNER PACKAGE VERSION 4.x OF DECEMBER 2013
                  EXTENSION FOR PHILOLOGICAL TYPESETTING
 
 
@@ -16,25 +16,31 @@ README               short information abut installing this bundle
 teubner.txt          this file
 teubner.dtx          documented TeX file
 teubner-doc.tex      documentation file
+teubner.pdf          technical documentation
+teubner-doc.pdf      usage documentation
 
-By running pdflatex on teubner.dtx in addition to the documentation file 
-teubner.pdf,  the byproduct files teubner.sty, teubnertx.sty, LGRaccents-
-glyphs.def are generated; teubner-doc.pdf  must be generated  by running 
-pdflatex on the source file teubner-doc.tex file. The two mentioned .pdf
- files are already contained in the bundle
+By running  pdflatex  on teubner.dtx  in addition  to the  documentation 
+file teubner.pdf,  the byproduct files  teubner.sty,  teubnertx.sty, are 
+generated; teubner-doc.pdf  must be generated by running pdflatex on the 
+source file teubner-doc.tex file. 
+These two .pdf files are already contained in the bundle
+
+The previous versions 3.x of this packages used a  LGRaccents-glyphs.def 
+file, that now is not necessary, and is not contained in this bundle any 
+more.
 
 File teubner-doc.pdf  is the documentation file  that  shows what can be 
 done with this extension package and displays several examples.
 
-Version 3.x of the teubner package contains many new enhancements, among 
-which  it's worth  noting  the new  extended  accent macros  (that avoid 
-kerning  problems  that might show up using the ligature  mechanism) and 
-the  new  macros  that allow  to use  the LGR  encoded  CBgreek fonts in 
-conjunction  with other  PostScript  scalable  fonts;  the compatibility 
-with the Times eXtended  and  the  Palatino  eXtended  fonts, accessible  
-through  the packages  txfonts and pxfonts,  are already  built in;  the 
-compatibility with  the Latin  Modern  fonts  was already available with 
-version 2.x of the teubner package.
+Version 4.x of the teubner package contains many new enhancements, among 
+which  it's worth  noting  the compliance  with  the new  Greek language 
+support to babel, that makes use of the encoding independent LICR (LaTeX
+Internal Character Representation) of the Greek characters & diacritics; 
+it contains  also the macros that allow  using  the  LGR encoded CBfonts 
+together with other  PostScript scalable  fonts;  the compatibility with 
+the Times and the Palatino eXtended fonts,  through the packages txfonts 
+and pxfonts,  are already  built in;  the compatibility  with  the Latin 
+Modern fonts was already available with version 2.x of this package.
 
 While this package was upgraded and uploaded to CTAN, Antonis Tsolomitis 
 uploaded  the package txfontsb  which adds the possibility of using nice 
@@ -47,7 +53,7 @@ bold series and match the TX latin fonts pretty well.
 Although  Tsolomitis' fonts  satisfy very well  the everyday typesetting 
 necessities  of the Greek  users  and blend  well also  with the TX math 
 fonts, they do not satisfy the requirements of the teubner package. This 
-is why the processing of the teubner.dtx file  generates  also  file the
+is why the processing of the teubner.dtx file  generates  also  the file
 teubnertx.sty  that is being  input at begin  document time  if the user 
 specified the TX fonts by calling the txfonts package. 
 
@@ -57,44 +63,44 @@ distribution  already  provided  for  it;  may  be  your  TeX  system is
 configured  to load  missing  packages  on the fly.  In any case you can 
 check and possibly run your Package Manager (with MiKTeX follow the path 
 Programs|MiKTeX Settings|Packages;   with TeXlive and MacTeX   (if their 
-installation configuration was not the default complete one) run tlmgr).
+installation configuration was not the default complete one) run tlmgr.
   
 If you feel more comfortable to do everything by yourself and/or want to 
 make  a personal  installation,  run teubner.dtx  through  pdflatex; the 
-generated  files are teubner.sty and LGRaccents-glyphs.def,  besides the 
-aforementioned  teubnertx.sty  file;  they must be moved  where TeX-the-
-program  can  find  them.  This  depends  very  much  on your particular  
-implementation of the TeX system, but if your system  copes with the TDS 
-(standard TeX Directory Structure)  and has a multiplicity  of different 
-root directory structures,  you probably  have a  \localtexmf rooted TDS, 
-or a /texmmf one in your Home directory containing a tex directory which 
-on turn contains  a latex directory.  Under the latter one  create a new 
-directory named, say, teubner, and move there teubner.sty, teubnertx.sty, 
-and LGRaccents-glyphs.def.
+generated  files are  teubner.sty  and the aforementioned  teubnertx.sty  
+file;  they must be moved  where TeX-the-program  can  find  them.  This  
+depends very much  on your particular implementation  of the TeX system, 
+but if your system copes with the TDS (standard TeX Directory Structure)  
+and has a multiplicity  of different TeX  directory trees,  you probably  
+have a \localtexmf  rooted TDS,  or a /texmmf one in your Home directory 
+containing  a tex directory  which  on turn contains  a latex directory.  
+Under  the latter one  create a new directory  named, say,  teubner, and 
+move there teubner.sty, and teubnertx.sty.
 
 I suggest you to create  a  directory  teubner  in  the doc directory of
-the locally rooted structure  and move there  both teubner-doc.pdf   and
-teubner.pdf  that you  get  by running pdflatex directly on teubner.dtx.
+the  locally  rooted structure  and move there  both teubner-doc.pdf and 
+the  teubner.pdf  file  that you get  by running  pdflatex  directly  on 
+teubner.dtx.
 
 For what concerns fonts,  they should already be installed with a recent 
-TeX system distribution; this means that there are already all the files 
-TeX-the-program n eeds  in order  to do  its  work;  there is one point, 
-though, that  requires  full  attention;  the default  basic TeX system 
-installation  loads  only  the PostScript  fonts in size 10pt; all other 
-sizes are are obtained by reducing or enlarging that single size. 
-A complete TeX system installation does not exhibit  this limitation. 
+TeX system  distribution;  this means  that  there are  already  all the 
+files  TeX-the-program  needs  in order  to do  its  work;  there is one 
+point, though, that  requires  full  attention;  the default  basic  TeX 
+system installation  loads only  the PostScript  fonts in size 10pt; all 
+other sizes are are obtained  by reducing or enlarging that single size. 
+A complete  TeX system  installation  does not  exhibit this limitation. 
 There are also non standard scalable Type 1 fonts, such for example, the 
-Fourier ones, that come only in one size,  the 10pt one; for these fonts 
-it is not strictly necessary todo the same with the sizes of the CBfonts,  
-but if you prefer you can.
-
-In any case the teubner package copes  with this situation if you specify 
-the "10pt" option   when calling  this package,  but if you want  to have  
-perfect  optical sizes,  then  you should  download  from  CTAN  the full  
-collection  and  install it  in  your  computer.   The details  for  this 
-installation require  you read with due attention  the instructions  that 
-come  with  your  TeX system  distribution;  it's not  difficult,  but it 
-requires  to be very careful  at every step.  Remember, though, that your 
+Fourier  ones,  that  come  only  in one size,  the 10pt one;  for these 
+fonts it is not strictly necessary  to do the same with the sizes of the 
+CBfonts, but if you prefer you can.
+
+In any case the teubner package copes with this situation if you specify 
+the "10pt" option   when calling  this package, but if you want  to have  
+perfect  optical sizes,  then  you should  download from  CTAN  the full  
+collection  and  install it  in  your  computer.  The details  for  this 
+installation require  you read with due attention  the instructions that 
+come  with  your  TeX system  distribution;  it's not  difficult, but it 
+requires  to be very careful  at every step. Remember, though, that your 
 Package Manager can do all the work for you.
 
 It's important to control that you have the latest CBfonts;  even if you 
@@ -108,7 +114,7 @@ verify if your fonts are up to date.
 Another question you might ask yourself:  is my TeX system complete  and
 up to date? The fact you installed a TeX system and you did not have the
 CBfonts may be an index that  you still have the babel package locked at
-a  version  number  earlier than 3.7. I suggest you to upgrade  your TeX
+a  version  number  earlier than 3.9g. I suggest you to upgrade your TeX
 system to the most up to date one you can find on CTAN.
 
 Connected  to this point  there is  the question  of the updated  metric 
@@ -124,14 +130,14 @@ documentation file teubner-doc.pdf and that you have the hard copy close
 to you. 
 
 Remember,  though,  that most commands  are Latin names or abbreviations 
-that  should  be familiar  to any philologist  specialized in classical/
-ancient European languages, such as classical Greek, Latin, et cetera.
+that  should  be familiar  to any philologist  specialised in classical/
+ancient European languages, such as classical Greek, Latin, and so on.
 
 This set of extension  commands  has been tested  in several  documents;
-nevertheless I prepared them as a hobby, trying to help a friend philolo-
-gist. I hope this package may be useful also to you, but I must disclaim 
-any liability for any unwanted results you might get, including the worst  
-possible things that may happen to anybody using a computer.  
+nevertheless  I prepared them as a hobby,  trying to help  a philologist 
+friend.  I hope  this  package  may be useful  also to you,  but  I must 
+disclaim any liability for any unwanted results you might get, including 
+the worst possible things that may happen to anybody using a computer.  
 
 I will not write down any strong disclaimer sentence in capital letters,  
 because it should be absolutely evident that I did something  I consider
@@ -140,7 +146,7 @@ useful,  but is up to you  to decide to use it and face the consequences
 
 If you find this package of some utility but you find some errors and/or    
 some glitches,  please write me by e-mail (see below).  If you'd like me 
-to realize some other commands,  please send me  by e-mail  your request  
+to realise some other commands,  please send me  by e-mail  your request  
 together with a scanned image containing the visual result you'd like to 
 obtain. I don't guarantee I'll be able to satisfy your request, but I'll 
 give it a try.  In any case  don't ask for things LaTeX can't do; and if 
@@ -148,11 +154,11 @@ you use LaTeX, you know what are its pros and cons.
 
 Happy philological LaTeXing!
 
-Claudio Beccari                             Turin, 29 of September 2013
+Claudio Beccari                                    Turin, December 2013
 Former Professor of Electronics
 Politecnico di Torino, Italy
 claudio dot beccari at gmail dot com
 
 PS: I underline  my former  professorship  in electronics,  in order to 
 stress  the point  that I am not  a philologist, therefore beware: this 
-work might be simply "trash" to the eyes of a real philologist!
\ No newline at end of file
+work might be simply "trash" to the eyes of a real philologist!
diff --git a/Master/texmf-dist/source/latex/teubner/teubner.dtx b/Master/texmf-dist/source/latex/teubner/teubner.dtx
index 8152c726573..265b663cefe 100644
--- a/Master/texmf-dist/source/latex/teubner/teubner.dtx
+++ b/Master/texmf-dist/source/latex/teubner/teubner.dtx
@@ -4,7 +4,7 @@
 \input docstrip.tex
 \keepsilent
 \preamble
-Copyright 2001--2012 Claudio Beccari All rights reserved.
+Copyright 2001--2013 Claudio Beccari All rights reserved.
 
  This system is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@ IMPORTANT NOTICE:
 
 You are not allowed to change this file.
 
-You are allowed to distribute this file under the condition that it is
+You are allowed to distribute this file under the conditions that are 
 specified in the source file teubner.dtx.
 
 If you receive only some of these files from someone, complain!
@@ -36,11 +36,10 @@ etc.
  The latest version of this license is in
     http://www.latex-project.org/lppl.txt
 \endpostamble
-\askforoverwritetrue
+\askforoverwritefalse
 
-\generateFile{teubner.sty}{t}{\from{teubner.dtx}{package}}
-\generateFile{LGRaccents-glyphs.def}{t}{\from{teubner.dtx}{defs}}
-\generateFile{teubnertx.sty}{t}{\from{teubner.dtx}{tbtx}}
+\generateFile{teubner.sty}{f}{\from{teubner.dtx}{package}}
+\generateFile{teubnertx.sty}{f}{\from{teubner.dtx}{tbtx}}
 
 \def\tmpa{plain}
 \ifx\tmpa\fmtname\endgroup\expandafter\bye\fi
@@ -73,7 +72,7 @@ etc.
 %<tbtx>\ProvidesPackage{teubnertx}[%
 %<defs>\ProvidesFile{LGRaccents-glyphs}[%
 %<*driver,package,defs,tbtx>
-2012/09/17 v.3.4 
+2013/12/13 v.4.1 
 %<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]
@@ -98,10 +97,12 @@ etc.
       }{%
       \end{quote}\ignorespaces
       }
+ \renewcommand*\meta[1]{{\normalfont\textlangle\textit{#1}\textrangle}}
+ \newcommand*\pack[1]{\textsf{#1}}
  \newcommand*\acro[1]{\expandafter\textsc\expandafter{\MakeLowercase{#1}}}
  \usepackage{multicol}
 \usepackage[T1]{fontenc}
-\usepackage{lmodern}
+\usepackage{lmodern,textcomp}
 \begin{document}
  \maketitle
  \DocInput{teubner.dtx}
@@ -109,7 +110,7 @@ etc.
 %</driver>
 % \fi
 %
-% \CheckSum{5062}
+% \CheckSum{4293}
 % \begin{multicols}{2}\tableofcontents\end{multicols}
 %
 %
@@ -123,19 +124,20 @@ etc.
 % in the written text, as well as to typeset verses with special
 % layout. Metric sequences may be defined and typeset by means of a
 % companion font \texttt{gmtr????} that follows the same conventions
-% as the CB fonts that are normally used when the \babel\ greek
+% as the CB fonts that are normally used when the \babel\ |greek|   
 % option is in force.
 %
 % Examples and lists of commands are available in the file
 % \texttt{teubner-doc.pdf} which, as a regular pdf file, embeds all
 % the necessary fonts and may be read on screen as well as printed on paper;
 % beware, though, that the PostScript fonts that are being used
-% in \texttt{teubner-doc.pdf} are not distributed with the package.
-% While this documentation is being written the \TeX{}-Live Team is trying
-% to reduce the size of the distribution and one of the proposals is to reduce
-% the number of Greek fonts distributed on \TeX-Live; therefore it might
-% be necessary that the users of this \textsf{teubner} package download the
-% missing fonts directly from one of the \acro{CTAN} archives.
+% in \texttt{teubner-doc.pdf} are not installed by default if a basic
+% installation is sought.
+%
+% This version 4.0 tries to adapt to the new handling of the Greek language
+% by \babel, since it now this language script is based on the
+% LICR (\LaTeX\ Internal Character Representation), and source files, now can 
+% include Greek glyphs, besides the usual transliteration with Latin letters.
 % \end{abstract}
 %
 % \section{Introduction}
@@ -143,7 +145,7 @@ etc.
 % alphabets and several special symbols in order to mark up their
 % texts and to typeset them in a special way. Greek philology makes
 % no exception, therefore I prepared this file and some extra fonts
-% in order to complement what is already available with the greek
+% in order to complement what is already available with the |greek|   
 % option of the \babel\ package.
 %
 % I must warmly thank Paolo Ciacchi of the University of Trieste who
@@ -154,7 +156,7 @@ etc.
 %
 % Paolo Ciacchi's ``invitation'' arrived when I was almost finished
 % with the design of the Lipsian font family; I was working on this new
-% typeface after a kind request of Dimitri Filippou, with whom I
+% typeface after a kind request by Dimitri Filippou, with whom I
 % already collaborated for other questions related to Greek
 % typesetting. I warmly thank also Dimitri Filippou for the
 % patience with which he revised every single glyph of the new
@@ -163,31 +165,31 @@ etc.
 % end I think that the new typeface turned out pretty well thanks to
 % both my friends.
 %
-% The Lipsian font, also called Leipzig or Lipsiakos in Greece, is one of the
+% The Lipsian font, also called Leipzig, or Lipsiakos in Greece, is one of the
 % oblique fonts that used to be employed by the typesetters working in the
 % German city of Leipzig, among which the Teubner Printing Company.
 % This Company's classical works of ancient Greek poetry are considered among
 % the best ever published. The name of this file and this extension
-% package is in honor of that printing company.
+% package is in honour of that printing company.
 %
 % This package documentation does not contain any example written in
 % Greek, because when you process this file it is very likely that
 % you don't have the suitable Greek fonts and you must still download
-% all or some of them. Therefore a companion
-% file \texttt{teubner-doc.pdf} is included in this bundle where most,
-% if not all, the new commands are documented and suitably shown.
+% all or some of them. Therefore a companion file \texttt{teubner-doc.pdf}
+% is included in this bundle where most, if not all, new commands
+% are documented and suitably shown.
 %
 % This package contains new environments and new commands; it presumes
-% the user invokes it after declaring the \texttt{greek} option to the \babel\
+% the user invokes it after declaring the |greek|    option to the \babel\
 % package; should he forget, this package will complain. But once the
-% \texttt{greek} option is properly declared, this package verifies that the
-% |polutonikogreek| dialect is selected, or that the |polutoniko| attribute
-% is set. This choice depends on the particular version of the \babel\
-% package, but should not concern the user; switching back and forth
-% between classical Greek and some modern western language is performed
-% in a transparent way; possibly there might be some problem switching
-% from classical to modern spelling in Greek itself, but since in modern
-% spelling the multiplicity of Greek diacritical marks is not forbidden,
+% |greek| option is properly declared, this package verifies that the
+% |polutonikogreek| dialect (deprecated) is selected, or that the
+% |polutoniko| attribute is set. This choice depends on the particular
+% version of the \babel\ package, but should not concern the user; switching
+% back and forth between classical Greek and some modern western language
+% is performed in a transparent way; possibly there might be some problem
+% switching from classical to modern spelling in Greek itself, but since in
+% modern spelling the multiplicity of Greek diacritical marks is not forbidden,
 % it's the author choice to select classical or modern words, Lipsian or
 % Didot fonts, polytonic or monotonic accentuation. The worst it can happen
 % is that \babel\ might use just one hyphenation pattern set, so that in
@@ -197,28 +199,40 @@ etc.
 % The CB Greek fonts, which have been available for some years now on
 % \acro{ctan} in the directory \texttt{/tex-archive/fonts/greek/cb} have
 % been completed with the new files for the Lipsian fonts, and the metric
-% symbols font \texttt{gmtr????.*}; 
-% the latter does not need a formal font definition file, because
-% the necessary definitions are included in this package.
+% symbols font \texttt{gmtr????.*}; the latter does not need a formal font
+% definition file, because the necessary definitions are included in this package.
 % All fonts are available also as Type~1 scalable fonts. In general, recent
 % distributions of the \TeX\ system already contain the necessary
-% configuration to use the Type~1 font in one size, 10\,pt, but, thanks
+% configuration to use the Type~1 font in one size, 10\,pt, but, thanks to
 % scaling, these can be used at any size; this version of \textsf{teubner}
 % is compatible with this reduced set. If optical sizes are desired for
 % a more professional typesetting, the \acro{ctan} archives contain also
 % the \textsf{cbgreek-full} package, which includes also all the Type~1
 % fonts at the various standard (EC) sizes, plus other facilities that allow
-% to use the CB fonts also in conjunction with the Latin Modern ones.
+% to use the CB fonts also in conjunction with the Latin Modern ones. Complete 
+% installations of the \TeX\ system include the full CB fonts installation.
 %
 % The CB Greek fonts allow to input Greek text with a Latin keyboard and
 % by employing the prefix notation; with a Greek keyboard and file
 % \texttt{iso-8859-7.def} it is possible to directly input Greek text with the
 % monotonic spelling; if polytonic spelling is required I fear that the above
 % file is of little help and that a Latin keyboard does the job without
-% an excessive burden.
+% an excessive burden. The recent modifications to the \babel\ package and of the 
+% Greek language description file allow to enter also polytonic Greek text,
+% keyboard permitting, with no effort; it is necessary to use the |utf8|
+% input encoding. It's important to notice the Apple computers have available
+% a virtual keyboard (called keyboard viewer) that is operable with the mouse
+% and, just by selecting the \emph{Greek Polytonic} keyboard driver, the
+% author can enter Greek text directly in the source file. Computer with a
+% touch screen virtual keyboard allow to switch from on's the national to
+% the Greek keyboard just by a single sweep of the finger. Some platforms
+% have the possibility of switching keyboard but they don't show the new
+% keyboard layout on the screen, but the user can generally build a personal
+% table that describes the correspondence betwwen the key board and the
+% physical keyboard layout.
 %
 % Nevertheless there is a little point to observe; Lipsian fonts are very
-% nice but show most kerning errors with more evidence than the traditional
+% nice but show some kerning errors with more evidence than the traditional
 % Didot Greek fonts. With the prefix notation in force, kerning programs may
 % result disabled and some diphthongs and some consonant-vowel combinations
 % appear poorly matched when the second letter caries any diacritical mark. In
@@ -230,11 +244,11 @@ etc.
 % used to it, and agree that the effort is worth the result.
 %
 % \section{Environments}
-% I apologize if I chose Italian names for verse environments; I wanted to
+% I apologise if I chose Italian names for verse environments; I wanted to
 % use names very different from the corresponding English ones, but at the
-% same time easily recognizable; after all \emph{versi} is the plural of
+% same time easily recognisable; after all \emph{versi} is the plural of
 % \emph{verso} and therefore is the exact Italian translation of \emph{verses}.
-% If you feel more comfortable with Latin the alias environment names
+% If you feel more comfortable with Latin, the alias environment names
 % in Latin, |versus|, |Versus|, and |VERSUS|, are also available.
 %
 % \DescribeEnv{versi}
@@ -360,15 +374,23 @@ etc.
 % I am pleased to thank G\"unter Milde who wrote a definition file for accessing
 % the LGR encoded fonts in order to fetch the accented glyphs; I kindly gave me
 % permission to use his macros, that I adapted to the conventions used within this
-% file. These macros are saved into the definition file |LGRaccent-glyph.def|, so
-% that it can be used also without the |teubner| package, fore example for
-% typesetting without setting the \emph{polytoniko} language attribute.
+% file. These macros were saved into the definition file |LGRaccent-glyph.def|, so
+% that it could be used also without the |teubner| package, for example for
+% typesetting without setting the \emph{polytoniko} language attribute. But
+% since he became the maintainer of the Greek language support for the \babel\
+% package, he extended this support to the point that the extended macros are
+% already part of the new Greek support files.
 %
 % I got some ideas also from a paper that Werner Lemberg published on Eutypon, the
 % magazine of the Hellenic Friends of \TeX, where he discussed in a constructive
 % critical way the problems connected with the LGR encoded fonts and the Unicode
 % encoding.
 %
+% Now the new Greek support for the \babel\ package, thanks to G\"unter Milde,
+% includes also the support for Unicode input in the source file, in spite of
+% using LGR encoded output fonts. The actual support is partially useful also
+% with XeLaTeX and LuaLaTeX.
+%
 % \StopEventually{}
 %
 % \section{Code}
@@ -381,14 +403,14 @@ etc.
 % in facts, the black leader that joins the curved extremities appeared a little too
 % fat and did not join exactly the left mark. Recently, apparently, the fonts have
 % 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
+% a new boolean that copes with the fact that since 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}
+\@ifundefined{pdfoutput}{}{\ifnum\pdfoutput>\z@\PDFtrue\fi}
 %    \end{macrocode}
 % When \texttt{teubner.sty} is input the language Greek must have been already
 % defined; otherwise an error message is issued and processing is terminated.
@@ -397,12 +419,12 @@ etc.
 \PackageError{teubner}{Greek language unknown!\MessageBreak
 I am not going to use Lipsian fonts and Scholars' signs\MessageBreak
 if Greek is unknown.\MessageBreak
-Use the babel package with the \texttt{greek} option.\MessageBreak
+Use the babel package greek option.\MessageBreak
 Type X <return> to exit.}%
 {Type X <return> to exit.}
 \fi
 %    \end{macrocode}
-% If this test is passed, this means that not only the greek option to the \babel\ 
+% If this test is passed, this means that not only the greek option to the \babel\                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           
 % package is set, but also that all the \babel\ machinery is available.
 %
 % Since \texttt{teubner.sty} accepts some options it is necessary to provide
@@ -414,13 +436,10 @@ Type X <return> to exit.}%
 % accent-vowel macros contain only lowercase letters. The point is that accent vowel
 % sequences that directly access the accented glyph are made up as such:
 % \begin{sintassi}
-% \bslash \meta{base character}\meta{first diacritic}\meta{second diacritic}%
-% \meta{third diacritic}
+% \bslash \meta{base character}\meta{first diacritic}\meta{second diacritic}\meta{third diacritic}
 % \textrm{where}
-% \meta{first diacritic} \textrm{is \texttt{d} or \texttt{r}  or \texttt{s} for
-% diaeresis, rough or smooth breadth}
-% \meta{second diacritic} \textrm{is \texttt{c} or \texttt{a} or \texttt{g} for
-% circumflex or acute or grave}
+% \meta{first diacritic} \textrm{is \texttt{d} or \texttt{r}  or \texttt{s} for diaeresis, rough or smooth breadth}
+% \meta{second diacritic} \textrm{is \texttt{c} or \texttt{a} or \texttt{g} for circumflex or acute or grave}
 % \meta{third diacritic} \textrm{is \texttt{i} for iota subscript or adscript}
 % \end{sintassi}
 % Evidently none of the diacritical marks is compulsory, but at least one must
@@ -428,19 +447,26 @@ Type X <return> to exit.}%
 % |\oR| means omicron with rough breath, it is not very important that it is
 % declared with the standard sequence |<o| or with |\oR| or with |\<o|, because it never
 % falls after another letter, so that it never breaks any ligature or kerning
-% command. The command is there just for completeness. More or less the same is try with the |\og| sequence; it fails to work correctly when the main language is French and the |french| option to the |babel| package is in force; matter of facts, |\og| conflicts with the homonymous command defined by that option with the meaning of ``ouvrir guillemets''; therefore it's necessary to use either the plain sequence |`o| or the extended accent macro |\`o|.
+% command. The command is there just for completeness. More or less the same is
+% true with the |\og| sequence; it fails to work correctly when the main language
+% is French and the |french| option to the |babel| package is in force; matter
+% of facts, |\og| conflicts with the homonymous command defined by that option
+% to mean ``ouvrir guillemets''; therefore it's necessary to use
+% either the plain sequence |`o| or the extended accent macro |\`o|.
 %
 % At the same time since all accent combinations are defined as ``text commands'',
 % in \LaTeX\ jargon, when their commands are followed by a vowel (or `r') they
 % define a ``text symbol'' i.e.\ they fetch directly the glyph of the accented
 % character; therefore |<o|, |\oR| and |\r{o}| are all equivalent (at the beginning
-% of a word where omicron with rough breath is the only place where you can find
-% it). See more on this point in the sequel.
+% of a word where omicron with rough breath is the only place where you might find
+% it). See more on this point in the following sections.
 %
-% Nevertheless, while these glyph name macros are defined by default, it is possible
-% to do without by specifying the option \emph{NoGlyphNames} (default; you can specify the option \emph{GlyphNames} for turning on these macro names. In this case the same
-% result is more comfortably obtained by using the extended accent macros whose
-% behaviour is specified in the definition file |LGRaccent-glyph.def|.
+% These glyph name macros are not defined by default, because the |GlyphNames|
+% boolean variable is false by default; you can specify the option
+% \emph{GlyphNames} for activating these macro names.
+% In any case the same result is more comfortably obtained by using the
+% extended accent macros whose behaviour is specified by the new
+% \babel\-greek settings.
 %
 % Another unusual option is set up for being used with non standard \TeX\ system
 % fonts; we have noticed that the Lipsian fonts appear a little too light when used
@@ -449,17 +475,22 @@ Type X <return> to exit.}%
 % |boldLipsian| and the Lipsian fonts used in medium series will be substituted
 % with those of the semi\-bold one. 
 %
-% At the same time, from July 2005 and for a few years, the full collection of the complete size set of
-% the CB fonts has not been available any more \emph{as the default \TeX\ system set up};
-% only the 10pt size were available unless the \texttt{cbgreek-full} font package is
-% loaded; for this reason a new option is needed in order to instruct
-% \texttt{teubner.sty} to use the specific file \texttt{type1ec.sty} dated at least
-% 2002/09/07, so as to scale up or down all the EC and CB fonts from an original
-%  10\,pt size. In order that the \texttt{10pt} plays its role correctly, it is
-% convenient, if not compulsory, to require first the \texttt{babel} package, then
-% the \texttt{teubner} one with the option \texttt{10pt}, then all other packages
-% required for a specific document, in particular the \texttt{fontenc} one if the
-% \texttt{T1} encoding is requested.
+% At the same time, from July 2005 and for a few years, the full collection
+% of the complete size set of the CB fonts has not been available any more
+% \emph{as the default \TeX\ system set up}; only the 10pt size were available
+% unless the \texttt{cbgreek-full} font package was loaded; for this reason
+% a new option was needed in order to instruct \texttt{teubner.sty} to use
+% the specific file \texttt{type1ec.sty} dated at least 2002/09/07, so as to
+% scale up or down all the EC and CB fonts from an original 10\,pt size.
+% In order that the \texttt{10pt} plays its role correctly, it was convenient,
+% if not compulsory, to require first the \texttt{babel} package, then the
+% \texttt{teubner} one with the option \texttt{10pt}, then all other packages
+% required for a specific document, in particular the \texttt{fontenc}
+% one if the \texttt{T1} encoding is requested. All this is maintained for
+% backward compatibility, and should not be necessary any more; now the
+% complete set of the CB fonts gets installed with every full installation
+% of the \TeX\ system, but with partial or basic installations, such option
+% might turn out to be useful even now.
 %
 % This kludge is necessary for all fonts that have description files that use the
 % |\EC@family| command for describing the available shapes and sizes; in practice
@@ -468,7 +499,7 @@ Type X <return> to exit.}%
 % description files for the CB fonts are part of the \babel\ package, so this
 % problem does not exist; when using other fonts, such as the TX, PX, ZE,~\dots,
 % other kludges are necessary, because their font family names are different from
-% those normally used with \TeX: |cmr| for serifed fonts, |cmss| for sanserif ones,
+% those normally used with \TeX: |cmr| for serifed fonts, |cmss| for sans serif ones,
 % and |cmtt| for monospaced ones.\footnote{Even the Latin Modern fonts have
 % different family names, but, due to their importance, specific font description
 % files have been added to the \babel\ package. The LM fonts are more comfortable
@@ -476,7 +507,7 @@ Type X <return> to exit.}%
 % continuously scalable and download into the produced files less font files than
 % the EC o cm-super ones. Unless specifically requested, the LM fonts should always
 % be preferred to the EC and cm-super ones. When using the LM fonts, its better to
-% use the full collection of the CB fonts, although the CB font description files
+% use the full collection of the CB fonts, even if the CB font description files
 % are compatible with the single 10\,pt size.}
 %
 % Notice that when using, for example, the TX fonts and no kludge is available, the
@@ -485,7 +516,7 @@ Type X <return> to exit.}%
 % real Greek text in different shapes and series has to be typeset, the unaware
 % typesetter might get crazy trying to force shape and series changes in the Greek
 % text; it would not be impossible, but it would be very, very boring. In any case
-% see in the sequel for the implemented kludges in order to run successful
+% see in the next sections the implemented kludges in order to run successful
 % compilations also with non standard \TeX\ system fonts. 
 %    \begin{macrocode}
 \newif\ifor\orfalse % Compatibility with older versions
@@ -500,14 +531,15 @@ Type X <return> to exit.}%
 \ProcessOptions*
 %    \end{macrocode}
 %
-% In the sequel we frequently use the acronym for the Greek font encoding; we hope
-% it will eventually become \texttt{GR} or, following the actual 256 glyph font
-% encodings, \texttt{T7} or \texttt{X7}\footnote{Apparently \texttt{T7} has been
-% chosen to define an encoding where the first 128 glyphs are the standard
-% \texttt{OT1} encoded Latin fonts, and the second group again of 128 glyphs
+% In the next sections we frequently use the acronym for the Greek font encoding;
+% we hope it will eventually become \texttt{GR} or, following the actual 256 glyph
+% font encodings, \texttt{T7} or \texttt{X7}\footnote{Apparently \texttt{T7} has been
+% reserved to define an encoding where the first 128 glyphs are the standard
+% \texttt{OT1} encoded Latin fonts, and the second group, again of 128 glyphs,
 % contains the Greek characters; therefore, since polytonic spelling requires more
 % than 128 glyphs, the extended encoding \texttt{X7} will probably become the one
-% applicable to the whole set of the CB fonts.}.
+% applicable to the whole set of the CB fonts. Time passing by, the \texttt{X7}
+% encoding name apparently has been used for some nordic language.}.
 % Meanwhile the acronym is \texttt{LGR}, so we'd better define a symbolic name, so
 % that we can change the definitive name in just one place.
 %    \begin{macrocode}
@@ -515,7 +547,9 @@ Type X <return> to exit.}%
 %    \end{macrocode}
 %
 % Now the default Olga Greek fonts, used for rendering the ``Greek italic shape''
-% are an alternative with the Lipsian ones. If the \texttt{10pt} option was
+% are an alternative with the Lipsian ones.
+%
+% If the \texttt{10pt} option was
 % specified it is necessary to load also the package texttt{type1ec.sty}.
 % In any case we load also packages |graphicx| and |ifthen| that shall be useful
 % for some commands.
@@ -548,7 +582,7 @@ Type X <return> to exit.}%
 %    \end{macrocode}
 % \end{macro}
 % Next we require the package for extensible math fonts; it might be strange to use
-% extensible math fonts in Greek philology, but a certain command must be picked up
+% extensible math fonts in Greek philology, but a certain glyph must be picked up
 % from such fonts, with the assurance that it changes size together with the
 % current font size.
 % \begin{macrocode}
@@ -558,14 +592,17 @@ Type X <return> to exit.}%
 % Some macros are necessary to switch languages; such macros must be independent
 % (at least for now) from the particular \babel\ version, whether it be version
 % 3.6, 3.7, or~3.8; in the former the concept of ``language attribute'' is unknown,
-% while the latter recognizes varieties of the same language by the attribute
-% setting. Such macros, besides being as robust as possible, must provide the
+% while the latter recognises varieties of the same language by the attribute
+% setting. With \babel\ version 3.9g things have further changed; the attribute
+% to a language may be appended to the language name with an interposed dot;
+% for example for Greek it might be |greek.polutoniko|.
+% Such macros, besides being as robust as possible, must provide the
 % alphabet changes as required.
 %
 %\begin{macro}{\GreekName} 
 % During the language switching operations  |\GreekName|
 % distinguishes the dialect or the main language whose attribute
-% gets set and, evidently, becomes effective when the main language \texttt{greek}
+% gets set and, evidently, becomes effective when the main language |greek|   
 % is in force.
 %    \begin{macrocode}
 \ifx\languageattribute\undefined
@@ -592,7 +629,8 @@ Type X <return> to exit.}%
 %
 %\begin{macro}{\substitutefontfamily}
 %\begin{macro}{\ifLipsian}
-% The font macro |\substitutefontfamily| is already present in the \babel\ kernel;
+% The font macro |\substitutefontfamily| is already present in the \babel\ kernel, but
+% with version 3.9g it is deprecated, although maintained for backwards compatibility;
 % it copes only with the standard families, series and shapes, therefore it does not
 % consider the Lipsian shape and its series. I had to redefine it together with a
 % new conditional macro in order to do the same job as the original one but taking
@@ -601,7 +639,13 @@ Type X <return> to exit.}%
 % Greek encoding, but have the names of the Latin font families; such font
 % description files, simply substitute these non existent encoding-family series and
 % shapes with the existing series and shapes of any other LGR encoded Greek font, in
-% particular the CB ones. By issuing a command such as:
+% particular the CB ones.
+% Things might change in the future, so as to use the package by G\"unter Milde
+% \texttt{substitutefont} package (already present in the \acro{ctan} archive) or
+% other solutions by the core of \babel. Meanwhile we cope with what is available
+% right now.
+%
+% By issuing a command such as:
 % \begin{sintassi}\ttfamily
 % \texttt{\string\ifFamily}\{pxr\}\{cmr\}
 % \end{sintassi}
@@ -669,7 +713,7 @@ Type X <return> to exit.}%
 % |\n@xt| to be an alias to |\iftrue| or |iffalse| depending on the fact that the
 % CM (or EC) fonts or the LM fonts are the default Latin ones, in this case it sets
 % the |\n@xt| macro equivalent to |\iftrue|, otherwise it sets it to |\iffalse|. In
-% order to succeed, it requires to analyze the first two letters of the default
+% order to succeed, it requires to analyse the first two letters of the default
 % family name; if these letters form one of the sequences |cm| or |lm|, the CM or
 % LM fonts have been loaded, otherwise some other fonts are in force. We need
 % therefore a macro with delimited arguments in order to extract the first two
@@ -697,7 +741,7 @@ Type X <return> to exit.}%
 % map the missing family to the ordinary Computer Modern ones; the actual fonts are
 % the same, but the latter font definition files cope with the \emph{10pt} option,
 % while the former don't.}; by specifying |\Lipsiantrue| you state that you want to
-% create entries also for the Lipsian series and shape; The macro provides to reset 
+% create entries also for the Lipsian series and shape; the macro provides to reset 
 % |\Lipsianfalse| in order to avoid that other calls of that macro on non serifed
 % or monospaced fonts try to create entries that in any case do not exist: the
 % Lipsian font comes only as a serifed font! In this way, if you are using
@@ -722,7 +766,7 @@ Type X <return> to exit.}%
 % the |\substitutefontfamily| macro right after calling that font package and by
 % using the correct family names; similarly you might substitute the new Latin font
 % family names to other Greek font family names, if you have other fonts available.
-% At the same time at begin document we memorize the name and encoding of the Latin
+% At the same time at begin document we memorise the name and encoding of the Latin
 % font used for the default language, so that when returning to Latin font
 % typesetting after Greek font typesetting, the proper language typesetting rules
 % and encoding are restored.
@@ -740,14 +784,15 @@ Type X <return> to exit.}%
     \edef\previouslanguage{\languagename}%
     \edef\previousencoding{\f@encoding}}
 %    \end{macrocode}
+%
 % Nevertheless all this requires a minimum of attention in specifying the options
-% for the \babel\ package and in the order extensions packages are read in. The
+% for the \babel\ package and in the order extensions packages are input. The
 % |teubner.sty| package should be read \emph{after} any other package that sets or
 % resets the Latin font encoding; for example if the T1 encoding is selected as the
-% default one, in place of the OT1 encoding, then
-% this choice must be made before this package is read in. Similarly when the
-% \babel\ options are specified, remember that the last language name becomes the
-% default language at begin document; never specify \texttt{greek} as the last
+% default one, in place of the OT1 encoding, then this choice must be made before
+% this package is read in. Similarly when the \babel\ options are specified,
+% remember that the last language name becomes the default language at begin
+% document; never specify |greek| as the last
 % language option!
 %\end{macro}
 %\end{macro}
@@ -757,7 +802,7 @@ Type X <return> to exit.}%
 %\begin{macro}{\Lipsiakostext}
 %\begin{macro}{\lishape}
 %\begin{macro}{\textli}
-% |\lishape| is the normal declaration, modeled on the other similar macros in the
+% |\lishape| is the normal declaration, modelled on the other similar macros in the
 % \LaTeX\ kernel, made up to chose the Lipsian shape. Nevertheless since it is a
 % light character, if it must blend well with the other PostScript fonts, not only
 % the CM and LM, but also the other ones available for typesetting with the \TeX\ 
@@ -771,9 +816,9 @@ 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\~\Perispomeni| is required because swithching
-% on and off may reset the active tilde and connected macros definitions.
+% language name in force before this declaration are memorised, then the current
+% Greek version is selected; the |\let\~\accperispomeni| is required because
+% switching 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.
 %    \begin{macrocode}
@@ -790,7 +835,7 @@ Type X <return> to exit.}%
 \DeclareTextFontCommand{\textli}{\lishape}%
 \DeclareRobustCommand\Lipsiakostext{%
     \expandafter\select@language\expandafter{\GreekName}%
-    \let\~\Perispomeni\let~\greek@tilde\lishape}
+    \let\~\accperispomeni\let~\accperispomeni\lishape}
     
 %    \end{macrocode}
 %\end{macro}
@@ -799,10 +844,10 @@ Type X <return> to exit.}%
 %\begin{macro}{\textLipsias}
 % |\textLipsias| is a command that typesets its argument with the |\Lipsiakostext|
 % declaration in force. The \LaTeX\ command declaration used here makes sure that
-% possible italic corrections are taken into account; hte actual font switching is
+% possible italic corrections are taken into account; the actual font switching is
 % made through the same |\Lipsiakostext| declaration, but the inner working
-% maintain local this declaration, so non grouping is explicitly required; for this
-% reason we suggest to use this text command rather than the font declaration.
+% maintain local this declaration; for this reason we suggest to use this text
+% command rather than the font declaration.
 %    \begin{macrocode}
 \DeclareTextFontCommand{\textLipsias}{\Lipsiakostext}
 
@@ -838,13 +883,13 @@ Type X <return> to exit.}%
 %\end{macro}
 %\begin{macro}{\textDidot}
 % |\textDidot| is a similar macro where the common upright Greek characters are
-% selected; it goes by itself that if |\textit| is specified within the
+% selected; it goes by itself that if |\textli| is specified within the
 % |\textDidot| argument, the typesetting is or becomes identical with what
 % one can obtain with the |\textLipsias| command.
 %    \begin{macrocode}
 \DeclareRobustCommand\textDidot[1]{{%
     \expandafter\select@language\expandafter{\GreekName}%
-    \let\~\Perispomeni\let~\greek@tilde
+    \let\~\accperispomeni\let~\accperispomeni
     \fontencoding{LGR}\rmfamily#1}}
 
 %    \end{macrocode}
@@ -859,7 +904,7 @@ Type X <return> to exit.}%
 % maintaining the current series and shape; of course, if the shape is that related
 % to the Lipsian font, then the italic shape is temporarily restored (local
 % definition). Moreover, with the (default) Latin fonts the tilde is restored to a
-% non breaking space by simly making it an active character.
+% non breaking space by simply making it an active character.
 %    \begin{macrocode}
 \DeclareRobustCommand\textlatin[1]{\edef\externalencoding{\f@encoding}{%
     \def\itdefault{it}\def\@tempA{li}\ifx\@tempA\f@shape\def\f@shape{it}\fi%
@@ -901,7 +946,7 @@ Type X <return> to exit.}%
 %
 % \begin{macro}{\strip@pt}
 % The \LaTeX\ kernel has the macro |\strip@pt| that strips off the pt part from the
-% expanded value of a dimension register name and makes available the measure in pt
+% expanded value of a dimension register and makes available the measure in pt
 % of the contained length (the register contains the length measure in scaled
 % points; the expansion performed by \TeX\ with the command |\the| converts the
 % scaled points to printer points and shows the result with a string of decimal
@@ -909,6 +954,7 @@ Type X <return> to exit.}%
 % to be a dimension register name, not its expanded contents. The |\strip@pt|
 % command eliminates the decimal point and the fractional part if the latter is
 % nought.
+%
 % With the help of such service macro we are going to define a certain number of
 % ``lift accent'' macros or ``put cedilla'' macros that work with both upright and
 % slanted fonts, although they contain different parameters for Latin compared to
@@ -1012,12 +1058,18 @@ Type X <return> to exit.}%
 % \begin{macro}{\cap}
 % By means of the above |\cap@| macro we can define three equivalent commands to be
 % used either when the Greek encoding is in force, or when one of the Latin
-% encodings is in force:
-%    \begin{macrocode}
-\DeclareTextCommand{\cap}{\GRencoding@name}{\cap@}
-\DeclareTextCommand{\cap}{OT1}{\cap@}
-\DeclareTextCommand{\cap}{T1}{\cap@}
-
+% encodings is in force; but we must pay attention, because there exist already
+% the command |\cap| to be used in mathematics; therefore we better exclude this
+% possibility through a clever use of the |\textormath| macro. Therefore we
+% first save the math command into an alia |\mcap|; then we define three
+% textual commands for the various encodings |\tcap|; finnally we use
+% |\textormath|:
+%    \begin{macrocode}
+\let\mcap\cap
+\DeclareTextCommand{\tcap}{\GRencoding@name}{\cap@}
+\DeclareTextCommand{\tcap}{OT1}{\cap@}
+\DeclareTextCommand{\tcap}{T1}{\cap@}
+\DeclareRobustCommand*\cap{\textormath{\tcap}{\mcap}}
 %    \end{macrocode}
 % Probably one definition would be sufficient, but on one side the presence of three
 % encoding dependent macros are the remains of initial works, while on the other
@@ -1035,9 +1087,9 @@ Type X <return> to exit.}%
 \dimen@-.5\wd4
 \setbox\z@\hbox{#1}%
 \ifx\cf@encoding\GRencoding@name
-\ifx#1i\advance\dimen@ .65\wd\z@\else\advance\dimen@ .5\wd\z@\fi
+   \ifx#1i\advance\dimen@ .65\wd\z@\else\advance\dimen@ .5\wd\z@\fi
 \else
-\ifx#1i\advance\dimen@ .55\wd\z@\else\advance\dimen@ .5\wd\z@\fi
+   \ifx#1i\advance\dimen@ .55\wd\z@\else\advance\dimen@ .5\wd\z@\fi
 \fi
 \hbox to\z@{\kern\dimen@\box4\hss}\unhbox\z@}}
 
@@ -1047,7 +1099,7 @@ Type X <return> to exit.}%
 % \begin{macro}{\ring@cedilla}
 % Another cedilla like diacritical mark is the Scandinavian ring put under a letter;
 % the ring is taken from the metrics font, so its slot position does not depend 
-% on the various  Latin encodings; the correct positioning requires careful
+% on the various Latin encodings; the correct positioning requires careful
 % examination of the letter under which it is to be placed, distinguishing the Greek
 % from the Latin encodings:
 % \begin{macrocode}
@@ -1121,33 +1173,44 @@ Type X <return> to exit.}%
 %
 % \subsection{Extended accent definitions}
 % We will use those service macros in the definition of several accent like macros
-% that keep all the intricacies away from the user. Meanwhile we input from
-% a separate file |LGRaccent-glyph.def| a whole set of extended accent macros
-% slightly adapted from those contained in G\"unter  Milde's definition file.
+% that keep all the intricacies away from the user. 
+%
 % In particular the \LaTeX\ kernel macros are used in order to declare accents,
 % composite glyphs, composite commands, and the like; these are used as the default
 % definitions; afterwards other definitions will be given that work when these
 % composite macros don't work.
+%
 % In other words, while |\~| and |u| in Greek form the composite glyph ``upsilon
 % with circumflex'' that exists in the Greek font table, the same macro |\~| and the
 % 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 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.
+%^^A
+%^^A NON SEMBRA CHE FUNZIONI CON TUTTI I COMANDI;CHIEDERE A GÃœNTER
+%^^A
+% Notice that all these declarations are restricted to the Greek font encoding
+% so 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. In any case, with version
+% 3.9g of \babel\ and the modifications introduced by G\"unter Milde, the
+% actual \babel\-greek maintainer, during the year 2013, such extended accent
+% macros are LICR encoded and may always be used when typesetting in Greek;
+% see file \texttt{greek-fontenc.def} and \texttt{lgrenc.def} for further
+% details, remembering that such files are always loaded when typesetting
+% Greek texts, irrespective of the input encoding; if the encoding is
+% \texttt{utf8} direct Greek glyph input is possible (if your keyboard
+% allows you to do such input).
 % 
 % \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.
+% defined above, and that will be extensively used in the following definitions.
 % Note that for what the circumflex is concerned, when |teubner| is in effect it is
 % not defined as an active character and does not work as a non breaking space. The
-% command |\~| and its equivalent |\GRcirc| is just an accent macro; how do you put
+% command |\~| is just an accent macro; how do you put
 % a non breaking space in a Greek context? By simply using the \LaTeX\ kernel macro
 % |\nobreakspace|; when typesetting with non-Greek fonts the |~| is certainly handy
 % to insert a non breaking space (a tie), but for polytonic Greek spelling in the
 % 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
+% sign 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 of ``dirty tricks'' have been used, but
 % nothing has been done to replace the ``tie'' function of this character when
@@ -1155,66 +1218,69 @@ Type X <return> to exit.}%
 % this point has been to redefine the kernel macros for typesetting figure and table
 % captions so as to substitute the |~| character with its explicit definition
 % |\nobreakspace|. It is necessary to do the same when this package is used,
-% although a shorter command |\nbs| is provided in order to simplify the input
+% although a shorter alias command |\nbs| is provided in order to simplify the input
 % keying.
 %    \begin{macrocode}
 \let\nbs\nobreakspace
-%    \end{macrocode
+%    \end{macrocode}
 %
 % 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
+% LICR accent macros, we have to define the accent superpositioning 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
+% might be meaningless. At the same time we redefine the standard macros so as to 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|.
+% necessary, not only for backward compatibility, but also for avoiding that the
+% normal redefined macros highjack the LICR facility.
+%
+% We firs define aliases for the standard \LaTeX\ accents, so that when
+% entering Greek typesetting modo we can save the \LaTeX\ macros, and restore
+% them upon exiting:
+%    \begin{macrocode}
+\let\accacuto\' 
+\let\accgrave\` 
+\let\acccircon\~ 
+\let\accdieresi\"
+\let\accbreve\u
+\let\accmacron\=
+%    \end{macrocode}
+% 
+%Then we define alternate macros fors these accents, as ``lifting'' accent macros, so that they can put their respective accent over any letter.
 % 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.
+% fonts, that with LICR becomes |\textcompwordmark|) 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}
+\DeclareTextCommand{\D}{\GRencoding@name}[1]{\lift@accent{34\textcompwordmark}{#1}}
+\DeclareTextCommand{\B}{\GRencoding@name}[1]{\lift@accent{30}{#1}}
+\DeclareTextCommand{\M}{\GRencoding@name}[1]{\lift@accent{31}{#1}}
+%
+%    \end{macrocode}
 % 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
+% reset every time the Greek language is selected again in a multi language document
 % where language shifts take place quite often; we must also counteract the
 % resetting of the |\~| definition performed by the |greek.ld| file in every
-% language shift; it is not important to add the accent re-definition to the 
-% |\extrasgreek| macro, because when this macro is executed the last definition
-% given is the one that lasts until the next language shift.
+% language shift; we add the accent definition to the |\extrasgreek| macro,
+% and we reset them at |\noextrasgreek| execution.
 %    \begin{macrocode}
-\addto\extrasgreek{\shorthandoff{~}\let\~\Perispomeni}
-\addto\noextrasgreek{\shorthandon{~}}
+\addto\extrasgreek{\shorthandoff{~}\let\~\accperispomeni
+\let\"\accdialytika\let\'\acctonos\let\`\accvaria}
+\addto\noextrasgreek{\shorthandon{~}\let\~\acccircon
+\let\"\accdieresi\let\'\accacuto\let\`\accgrave}
 
 %    \end{macrocode}
-% 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.
 %
-% Besides the normal |\u| command for setting a breve command, another ``large
+% Besides the normal |\B| 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
 % responsibility to input the macro argument as made of two letters (possibly with
 % their own accents):
 % \begin{macrocode}
 \DeclareTextCommand{\U}{\GRencoding@name}[1]{\lift@accent{151}{#1}}
-% macron
-\DeclareTextCommand{\=}{\GRencoding@name}[1]{\lift@accent{31}{#1}}
 % rough
 \DeclareTextCommand{\r}{\GRencoding@name}[1]{\lift@accent{60}{#1}}
 % smooth
@@ -1242,19 +1308,19 @@ Type X <return> to exit.}%
 % meaning to certain combinations, that is when they receive as argument a vowel
 % whose accented glyph is present in the font; in this way in order to type
 % ``alpha with rough breath, acute accent and iota subscript'' you can type
-% \verb"<'a|", or \verb"\Ar{a}|" or |\arai| or \verb+\<'a|+, if you use Milde's
+% \verb"<'a|", or \verb"\Ar{a}|" or |\arai| or \verb+\<'a|+, if you use the new standard 
 % accent macros; the advantage of using the first notation is its short string; the
 % advantage of the second is that it does not break kerning commands with a
-% preceeding letter; the advantage of the third is that it does not break any
+% preceding letter; the advantage of the third is that it does not break any
 % kerning either before or after; the fourth solution produces the same result as
-% the third, but it's easier to make up and you don't have to memorize any specific
+% the third, but it's easier to make up and you don't have to memorise any specific
 % naming rule for accented glyphs. With the Lipsian font this trick is particularly
 % useful for any sequence of alpha and upsilon each one with its own accents and/or
-% diaresis.
+% diaeresis.
 %
 % In Greek the regular cedilla is meaningless, so that |\c| may be redefined
 % as a semivowel command; at the same time the typesetter might be more
-% comfortable if he could use always the same, although longer, macro for
+% comfortable if he could always use the same, although longer, macro for
 % marking a vowel as a semivowel one; therefore |\c| plays the same role
 % in Greek as |\semiv|.
 % \begin{macrocode}
@@ -1406,7 +1472,7 @@ Type X <return> to exit.}%
 %    \end{macrocode}
 %\end{macro}
 %
-% With the help of some of the previous macros some new commands get defined so as
+% With the help of the previous macros some new commands get defined so as
 % to use a simple more or less mnemonic macro instead of having the typesetter type
 % in nested macros; these macros are valid only in the Greek and Latin encodings.
 %    \begin{macrocode}
@@ -1441,30 +1507,7 @@ Type X <return> to exit.}%
 % \begin{macro}{\textemdash}
 % \begin{macro}{emdash}
 % \begin{macro}{\textendash}
-% Several macros are traditionally defined for every encoding; we do not make
-% exceptions. Actually all the symbols defined here can be obtained with the regular
-% CB font ligatures so the macros are sort of superfluous. Nevertheless, in case any
-% of the component symbols is made active and defined to perform something
-% different, these macros can overcome the difficulty of producing the ligated
-% glyphs. Even the |\textcompwordmark| macro, although the compound word mark is
-% sort of unusual, could have been omitted, because with a Latin keyboard this
-% symbol gets input by pressing the ``v'' key (``v'' stands for ``void''); all the
-% hyphenation pattern files for the Greek language recognize ``v'' as a letter, an
-% invisible one, that breaks any ligature, that hides the end of the word, that
-% allows hyphenation (if the rest of the word is taken as a \emph{word} by \TeX\ 
-% itself, which does not always happens!\dots).
-% \begin{macrocode}
-\DeclareTextSymbol{\greekquoteleft}{\GRencoding@name}{123}
-\let\textguillemotleft\greekquoteleft
-\DeclareTextSymbol{\greekquoteright}{\GRencoding@name}{125}
-\let\textguillemotright\greekquoteright
-\DeclareTextSymbol{\textcompwordmark}{\GRencoding@name}{118}
-\DeclareTextSymbol{\textemdash}{\GRencoding@name}{127}
-\let\emdash\textemdash
-\DeclareTextSymbol{\textendash}{\GRencoding@name}{0}
-
-%    \end{macrocode}
-% \end{macro}
+% All these macros are defined by the new \texttt{lgrenc.def} file, so it is not necessary to redefine them.% \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
@@ -1483,30 +1526,26 @@ Type X <return> to exit.}%
 %\begin{macro}{\Stigma}
 %\begin{macro}{\Sampi}
 %\begin{macro}{\Euro}
-%\begin{macro}{\permill} Some other Greek symbols are defined; some deal with the
-% lowercase and upper case Milesian numerals, that are not accessible in the
-% font matrix with a normal keyboard stroke, and some deal with the Euro symbol and
-% the permill symbol, that are unlikely to be used in a philological text,
-% but, who knows\dots
-%
-% May be the standard names starting with |text| should be used; It would not be too
-% difficult a task, but these names should be defined in the |greek.fd| language
-% description file; I know tha Werner Lemberg ha written a paper on Eutypon on this
-% subject, also in order to make use of the CB fonts with Unicode support. But this
-% is just an extension to that package, so I am not going to redefine things that
-% are already there or that will be there in a next version of that file.
+%\begin{macro}{\permill} S
+% These macros, too, are defined by the \texttt{lgrenc.def} file and subsidiaries,
+% but with different names; therefore we make some aliases: 
 %    \begin{macrocode}
-\DeclareTextSymbol{\stigma}{\GRencoding@name}{006}
-\DeclareTextSymbol{\varstigma}{\GRencoding@name}{007}
-\DeclareTextSymbol{\koppa}{\GRencoding@name}{18}
-\DeclareTextSymbol{\varkoppa}{\GRencoding@name}{19}\let\coppa\varkoppa
-\DeclareTextSymbol{\sampi}{\GRencoding@name}{27}
-\DeclareTextSymbol{\Coppa}{\GRencoding@name}{21}\let\Koppa\Coppa
-\DeclareTextSymbol{\Stigma}{\GRencoding@name}{22}
-\DeclareTextSymbol{\Sampi}{\GRencoding@name}{23}
-\DeclareTextSymbol{\Euro}{\GRencoding@name}{24}
-\DeclareTextSymbol{\permill}{\GRencoding@name}{25}
-
+\let\stigma\textstigma
+\let\varstigma\textvarstigma
+\let\koppa\textkoppa
+\let\qoppa\textqoppa
+\let\coppa\textqoppa
+\let\Koppa\textQoppa
+\let\Coppa\textQoppa
+\let\varkoppa\textqoppa
+\let\sampi\textsampi
+\let\Stigma\textStigma
+\let\Sampi\textsampi
+\let\f\textdigamma
+\let\Digamma\textDigamma
+\let\Euro\texteuro
+\let\permill\textperthousand
+\let\schwa\textschwa
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
@@ -1562,15 +1601,19 @@ Type X <return> to exit.}%
 % postfixed accent notation, instead of a prefixed one, none of these macros would
 % be necessary (probably\dots!), but there would be other inconveniences.
 %
-% Notice that the following code is subject to the boolean variabale |GlyphNames|
-% which is set to true by default, just fort compatibility with the past; I suggest
-% to use the \emph{NoGlyphNames} when typesetting new documents, since the glyphs
-% are more asily specified by means of the extended accent macros that are also less
-% restricted in their names; for a letter marked with a smooth breath and an acute
-% accent you can indifferently type before the letter one of the following |\>\'|,
-% |\>'|, |\'\>|, |\'>| at your choice. Moreover you can always postfix the mark for
-% the iota subscribed at the right of the letter, without any need o memorising
-% complicated names.
+% Notice that the following code is subject to the boolean variable |GlyphNames|
+% which is set to \emph{false} by default, just for compatibility with the past;
+% I suggest to use the \emph{GlyphNames} option when when you really want to use
+% such macros; remember though that all these glyphs are more easily specified by
+% means of the extended accent macros that are also less restricted in their names;
+% for a letter marked with a smooth breath and an acute accent you can indifferently
+% type before the letter one of the following |\>\'|, |\>'|, |\'\>|, |\'>| at your
+% choice. Moreover you can always postfix the mark for the iota subscribed at the
+% right of the letter, without any need o memorising complicated names.
+% Notice the macros |\oR| and |\oG| that have the second letter capitalised in
+% order to avoid conflicts with otherwise homonymous macros defined in the \LaTeX\
+% kernel or in other packages; by maintaining the false value to the boolean
+% variable |GlyphNames| you are sure to avoid conflicts.
 %    \begin{macrocode}
 \ifGlyphNames
 \DeclareTextSymbol{\ag}{\GRencoding@name}{128}
@@ -1734,7 +1777,7 @@ Type X <return> to exit.}%
 \DeclareTextComposite{\Gs}{\GRencoding@name}{e}{235}
 \DeclareTextSymbol{\oR}{\GRencoding@name}{229}
 \DeclareTextComposite{\r}{\GRencoding@name}{o}{229}
-\DeclareTextSymbol{\og}{\GRencoding@name}{228}
+\DeclareTextSymbol{\oG}{\GRencoding@name}{228}
 \DeclareTextSymbol{\os}{\GRencoding@name}{230}
 \DeclareTextComposite{\s}{\GRencoding@name}{o}{230}
 \DeclareTextSymbol{\org}{\GRencoding@name}{231}
@@ -1793,7 +1836,7 @@ Type X <return> to exit.}%
 % At the same time it was believed that for inserting lower and upper case
 % ``digamma'' it was preferable to use short macros and to avoid the dilemma between
 % the |\ddigamma| and the |\digamma| macros, the former being the
-% one defined in the \texttt{greek} extension to \babel, the latter being
+% one defined in the |greek| option to \babel, the latter being
 % a standard mathematical symbol; initially I believed that philologists do
 % not use mathematical symbols so we made |\digamma| an alias for |\f|; afterwards I
 % found out that mathematicians, physicists, engineers,~\dots\ use the
@@ -3193,7 +3236,7 @@ $\displaystyle\left.%
 %
 % \subsection{Classical Greek numerals}
 % When typesetting Greek it may occur to specify numbers written out as Milesian
-% numerals; the \texttt{greek} option to the \babel\ package defines a couple of
+% numerals; the |greek|    option to the \babel\ package defines a couple of
 % macros for transforming explicit arabic numerals or counter contents as Milesian
 % numerals. Since this package offers more possibilities in the choice of those
 % ``non alphabetic'' characters used in the Milesian notation, such macros have to
@@ -3436,352 +3479,6 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
 %\fi
 %
 %\iffalse
-%<*defs>
-%\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
-% and released under the LPPL LaTeX Project Public License
-% version 1.3 or ay later version.
-% 
-% These macros were slightly modified by Claudio Beccari
-% in this file, version 1.0 of 2010-04-13, in order to adapt them
-% to the teubner.sty package, but they can be used independently of 
-% this package.
-%
-% This modified version is released again under the LPPL license
-% version 1.3c or any later version.
-%
-% These definitions are a modest variation of the standard LGR
-% encoded ligature set, in the sense that they don't rely on
-% ligatures but on accent  and composite text macros that address
-% directly the accented glyphs.
-%
-% For example, if alpha with smooth spirit, acute accent and iota
-% subscribed has to be inserted in the Greek text, the user
-% can use either one of the following solutions:
-% \begin{quote}
-%    1) \verb+>'a|+ \\
-%    2) \verb+\>'a|+
-% \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. 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 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}
-\DeclareTextAccent{\u}{\GRencoding@name}{"1E} % breve
-\DeclareTextAccent{\=}{\GRencoding@name}{"1F} % macron
-
-\DeclareTextAccent{\Dialytika}{\GRencoding@name}{"22} % dialytika
-\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 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.
-
-\DeclareTextAccent{\DasiaOxia}{\GRencoding@name}{"56}	      % oxia+rough
-\DeclareTextAccent{\DasiaVaria}{\GRencoding@name}{"43}      % varia+rough
-\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
-% composite commands
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{'}{\DialytikaOxia}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{\'}{\DialytikaOxia}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{`}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{\`}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{~}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{\~}{\DialytikaPerispomeni}
-
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{"}{\DialytikaOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{\"}{\DialytikaOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{<}{\DasiaOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{\<}{\DasiaOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{>}{\PsiliOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{\>}{\PsiliOxia}
-
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{"}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{\"}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{<}{\DasiaVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{\<}{\DasiaVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{>}{\PsiliVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{\>}{\PsiliVaria}
-
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{"}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{\"}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{<}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{\<}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{>}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{\>}{\PsiliPerispomeni}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{'}{\PsiliOxia}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{\'}{\PsiliOxia}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{`}{\PsiliVaria}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{\`}{\PsiliVaria}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{~}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{\~}{\PsiliPerispomeni}
-
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{'}{\DasiaOxia}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{\'}{\DasiaOxia}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{`}{\DasiaVaria}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{\`}{\DasiaVaria}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{~}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{\~}{\DasiaPerispomeni}
-
-%    \end{macrocode}
-
-
-% \subsection{Second set of extended accent definitions}
-% Now come another bunch of Milde's macros for composite glyphs; none of them
-% involves glyphs containing the subscript or adscript iota; this symbol, in facts
-% is postfixed to the previous glyph macro description, so its ligature takes place
-% after the previous glyph macro has been expanded; remember also that with the
-% ``high accents'' you can use both input strings, for example: |>'| and |\>'|;
-% therefore you can use the simple ligature input and, if kerning is not working
-% well with certain glyphs, you can just add a backslash in front of the ligature
-% sequence and everything gets fixed with proper ligatures. So, if |a>'u| with
-% certain fonts results in broken kerning, you just change it to |a\>'u| and the
-% kerning gets fixed.
-%    \begin{macrocode}
-\DeclareTextComposite{\`}{\GRencoding@name}{a}{128}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{a}{129}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{a}{130}
-\DeclareTextComposite{\'}{\GRencoding@name}{a}{136}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{a}{144}
-\DeclareTextComposite{\~}{\GRencoding@name}{a}{144}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{a}{137}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{a}{145}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{a}{131}
-\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}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{h}{163}
-\DeclareTextComposite{\'}{\GRencoding@name}{h}{160}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{h}{161}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{h}{162}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{h}{171}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{h}{168}
-\DeclareTextComposite{\~}{\GRencoding@name}{h}{168}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{h}{169}
-\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{h}{170}
-
-\DeclareTextComposite{\`}{\GRencoding@name}{w}{176}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{w}{177}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{w}{178}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{w}{179}
-\DeclareTextComposite{\'}{\GRencoding@name}{w}{184}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{w}{185}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{w}{186}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{w}{187}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{w}{192}
-\DeclareTextComposite{\~}{\GRencoding@name}{w}{192}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{w}{193}
-\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{w}{194}
-
-\DeclareTextComposite{\`}{\GRencoding@name}{i}{200}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{i}{201}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{i}{202}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{i}{203}
-\DeclareTextComposite{\'}{\GRencoding@name}{i}{208}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{i}{209}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{i}{210}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{i}{211}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{i}{216}
-\DeclareTextComposite{\~}{\GRencoding@name}{i}{216}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{i}{217}
-\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{i}{218}
-\DeclareTextComposite{\"}{\GRencoding@name}{i}{240}
-\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}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{u}{207}
-\DeclareTextComposite{\'}{\GRencoding@name}{u}{212}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{u}{213}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{u}{214}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{u}{215}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{u}{220}
-\DeclareTextComposite{\~}{\GRencoding@name}{u}{220}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{u}{221}
-\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{u}{222}
-\DeclareTextComposite{\"}{\GRencoding@name}{u}{244}
-\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}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{e}{227}
-\DeclareTextComposite{\'}{\GRencoding@name}{e}{232}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{e}{233}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{e}{234}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{e}{235}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{o}{229}
-\DeclareTextComposite{\`}{\GRencoding@name}{o}{228}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{o}{230}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{o}{231}
-\DeclareTextComposite{\'}{\GRencoding@name}{o}{236}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{o}{237}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{o}{238}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{o}{239}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{r}{251}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{r}{252}
-
-%    \end{macrocode}
-% With capital letters the dialytika (diaeresis) is maintained on top of the letters
-% `I' and `U', while for the other capital letters the diacritics are typeset in
-% front of them, not on top of them, as it is customary with Greek typesetting best
-% practice; the Unicode capital accented glyphs do exist, but they should never be
-% used; the CB fonts don't even contain them. There is no concern with kerning
-% because the diacritics preceding the capital letters are not preceded by something
-% else; what follows is kerned the usual way. With \"I and \"U specific kernings are
-% provided, if the dialytika macro |\"| is used;  kerning with the dialytika
-% ligature temporarily works with kludges that should not be present in any font, but
-% the CB fonts have them because the |AU| and |A'U| kerning was terrible without them;
-% now, with Milde's macros and or the pre-existing |\Id| and |\Ud| macros, should
-% not be of any concern.
-%    \begin{macrocode}
-\DeclareTextComposite{\"}{\GRencoding@name}{I}{219}
-\DeclareTextComposite{\"}{\GRencoding@name}{U}{223}
-
-% Greek Extended
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{A}{>A}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{A}{<A}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{A}{A}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{A}{A}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{A}{A}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{A}{>`A}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{A}{<`A}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{A}{>'A}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{A}{<'A}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{\GRencoding@name}{A}{>\char126A}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{A}{<\char126A}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{A}{>A}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{A}{<A}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{E}{>E}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{E}{<E}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{E}{E}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{E}{E}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{E}{>`E}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{E}{<`E}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{E}{>'E}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{E}{<'E}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{E}{>E}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{E}{<E}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{H}{>H}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{H}{<H}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{H}{H}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{H}{H}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{H}{H}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{H}{>`H}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{H}{<`H}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{H}{>'H}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{H}{<'H}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{\GRencoding@name}{H}{>\char126H}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{H}{<\char126H}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{H}{>H}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{H}{<H}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{I}{>I}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{I}{<I}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{I}{I}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{I}{I}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{I}{I}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{I}{>`I}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{I}{<`I}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{I}{>'I}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{I}{<'I}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{\GRencoding@name}{I}{>\char126I}
-\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}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{O}{O}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{O}{O}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{O}{>`O}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{O}{<`O}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{O}{>'O}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{O}{<'O}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{O}{>O}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{O}{<O}
-
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{U}{<U}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{U}{<`U}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{U}{U}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{U}{U}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{U}{U}
-\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}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{W}{W}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{W}{W}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{W}{W}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{W}{>`W}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{W}{<`W}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{W}{>'W}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{W}{<'W}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{\GRencoding@name}{W}{>\char126W}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{W}{<\char126W}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{W}{>W}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{W}{<W}
-%    \end{macrocode}
-%\iffalse
-%</defs>
-%\fi
-%\iffalse
 %<*tbtx>
 %\fi
 %\section{Accessing the CBgreek fonts when the TX fonts are selected}
@@ -3789,14 +3486,15 @@ Illegal value (\number#1) for \string\ActicNumeral\space}}
 % using the CBgreek fonts even when other Latin fonts, different from the ``standard'' CM
 % and LM ones are selected for typesetting text with the Latin script.
 
-% At the same time Antonis Tsolomitis uploaded a new package in order to let Greek users
-% use some Greek fonts that match the Times eXtended ones. In order to use the de facto
-% default encoding LGR for Greek fonts, he produced the necessary |lgrtxr.fd|, |lgrtxss.fd|,
-% |lgrtxtt.fd|, font definition files that allow the font switching implied by the |greek|
-% option to the \textsf{babel} package. These files take precedence over the mechanism
-% outlined in section~\ref{ssec:LatinFontComp}, because command |\substitutefontfamily|
-% first tests the existence of |lgrtxr.fd|, and, if this is not available, it may generate
-% a specific one suitable for working smoothly with \textsf{teubner.sty}.
+% At the same time Antonis Tsolomitis uploaded a new package in order to let
+% Greek users use some Greek fonts that match the Times eXtended ones. In order
+% to use the de facto default encoding LGR for Greek fonts, he produced the
+% necessary |lgrtxr.fd|, |lgrtxss.fd|, |lgrtxtt.fd|, font definition files that
+% allow the font switching implied by the |greek| option to the \textsf{babel}
+% package. These files take precedence over the mechanism outlined in
+% section~\ref{ssec:LatinFontComp}, because command |\substitutefontfamily| first
+% tests the existence of |lgrtxr.fd|, and, if this is not available, it may
+% generate a specific one suitable for working smoothly with \textsf{teubner.sty}.
 %
 % Now if Tsolomitis' files are available on the main system tree, these take precedence
 % and the \textsf{teubner} compatible files are not generated. Unfortunately Tsolomitis'
diff --git a/Master/texmf-dist/tex/latex/teubner/LGRaccents-glyphs.def b/Master/texmf-dist/tex/latex/teubner/LGRaccents-glyphs.def
deleted file mode 100644
index 24e743d84ad..00000000000
--- a/Master/texmf-dist/tex/latex/teubner/LGRaccents-glyphs.def
+++ /dev/null
@@ -1,315 +0,0 @@
-%%
-%% This is file `LGRaccents-glyphs.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% teubner.dtx  (with options: `defs')
-%% Copyright 2001--2012 Claudio Beccari All rights reserved.
-%% 
-%%  This system is distributed in the hope that it will be useful,
-%%  but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-%% 
-%% 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:
-%% 
-%% You are not allowed to change this file.
-%% 
-%% You are allowed to distribute this file under the condition that it is
-%% specified in the source file teubner.dtx.
-%% 
-%% If you receive only some of these files from someone, complain!
-%% 
-%% You are NOT ALLOWED to distribute this file alone.  You are NOT
-%% ALLOWED to take money for the distribution or use of either this
-%% file or a changed version, except for a nominal charge for copying
-%% etc.
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-\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
-
-\DeclareTextAccent{\Dialytika}{\GRencoding@name}{"22} % dialytika
-\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 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.
-
-\DeclareTextAccent{\DasiaOxia}{\GRencoding@name}{"56}       % oxia+rough
-\DeclareTextAccent{\DasiaVaria}{\GRencoding@name}{"43}      % varia+rough
-\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
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{'}{\DialytikaOxia}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{\'}{\DialytikaOxia}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{`}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{\`}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{~}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\"}{\GRencoding@name}{\~}{\DialytikaPerispomeni}
-
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{"}{\DialytikaOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{\"}{\DialytikaOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{<}{\DasiaOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{\<}{\DasiaOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{>}{\PsiliOxia}
-\DeclareTextCompositeCommand{\'}{\GRencoding@name}{\>}{\PsiliOxia}
-
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{"}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{\"}{\DialytikaVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{<}{\DasiaVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{\<}{\DasiaVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{>}{\PsiliVaria}
-\DeclareTextCompositeCommand{\`}{\GRencoding@name}{\>}{\PsiliVaria}
-
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{"}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{\"}{\DialytikaPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{<}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{\<}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{>}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\~}{\GRencoding@name}{\>}{\PsiliPerispomeni}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{'}{\PsiliOxia}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{\'}{\PsiliOxia}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{`}{\PsiliVaria}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{\`}{\PsiliVaria}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{~}{\PsiliPerispomeni}
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{\~}{\PsiliPerispomeni}
-
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{'}{\DasiaOxia}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{\'}{\DasiaOxia}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{`}{\DasiaVaria}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{\`}{\DasiaVaria}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{~}{\DasiaPerispomeni}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{\~}{\DasiaPerispomeni}
-
-
-\DeclareTextComposite{\`}{\GRencoding@name}{a}{128}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{a}{129}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{a}{130}
-\DeclareTextComposite{\'}{\GRencoding@name}{a}{136}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{a}{144}
-\DeclareTextComposite{\~}{\GRencoding@name}{a}{144}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{a}{137}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{a}{145}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{a}{131}
-\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}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{h}{163}
-\DeclareTextComposite{\'}{\GRencoding@name}{h}{160}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{h}{161}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{h}{162}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{h}{171}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{h}{168}
-\DeclareTextComposite{\~}{\GRencoding@name}{h}{168}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{h}{169}
-\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{h}{170}
-
-\DeclareTextComposite{\`}{\GRencoding@name}{w}{176}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{w}{177}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{w}{178}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{w}{179}
-\DeclareTextComposite{\'}{\GRencoding@name}{w}{184}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{w}{185}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{w}{186}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{w}{187}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{w}{192}
-\DeclareTextComposite{\~}{\GRencoding@name}{w}{192}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{w}{193}
-\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{w}{194}
-
-\DeclareTextComposite{\`}{\GRencoding@name}{i}{200}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{i}{201}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{i}{202}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{i}{203}
-\DeclareTextComposite{\'}{\GRencoding@name}{i}{208}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{i}{209}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{i}{210}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{i}{211}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{i}{216}
-\DeclareTextComposite{\~}{\GRencoding@name}{i}{216}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{i}{217}
-\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{i}{218}
-\DeclareTextComposite{\"}{\GRencoding@name}{i}{240}
-\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}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{u}{207}
-\DeclareTextComposite{\'}{\GRencoding@name}{u}{212}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{u}{213}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{u}{214}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{u}{215}
-\DeclareTextComposite{\Perispomeni}{\GRencoding@name}{u}{220}
-\DeclareTextComposite{\~}{\GRencoding@name}{u}{220}
-\DeclareTextComposite{\DasiaPerispomeni}{\GRencoding@name}{u}{221}
-\DeclareTextComposite{\PsiliPerispomeni}{\GRencoding@name}{u}{222}
-\DeclareTextComposite{\"}{\GRencoding@name}{u}{244}
-\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}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{e}{227}
-\DeclareTextComposite{\'}{\GRencoding@name}{e}{232}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{e}{233}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{e}{234}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{e}{235}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{o}{229}
-\DeclareTextComposite{\`}{\GRencoding@name}{o}{228}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{o}{230}
-\DeclareTextComposite{\DasiaVaria}{\GRencoding@name}{o}{231}
-\DeclareTextComposite{\'}{\GRencoding@name}{o}{236}
-\DeclareTextComposite{\DasiaOxia}{\GRencoding@name}{o}{237}
-\DeclareTextComposite{\PsiliOxia}{\GRencoding@name}{o}{238}
-\DeclareTextComposite{\PsiliVaria}{\GRencoding@name}{o}{239}
-\DeclareTextComposite{\Dasia}{\GRencoding@name}{r}{251}
-\DeclareTextComposite{\Psili}{\GRencoding@name}{r}{252}
-
-\DeclareTextComposite{\"}{\GRencoding@name}{I}{219}
-\DeclareTextComposite{\"}{\GRencoding@name}{U}{223}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{A}{>A}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{A}{<A}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{A}{A}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{A}{A}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{A}{A}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{A}{>`A}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{A}{<`A}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{A}{>'A}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{A}{<'A}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{\GRencoding@name}{A}{>\char126A}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{A}{<\char126A}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{A}{>A}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{A}{<A}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{E}{>E}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{E}{<E}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{E}{E}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{E}{E}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{E}{>`E}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{E}{<`E}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{E}{>'E}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{E}{<'E}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{E}{>E}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{E}{<E}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{H}{>H}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{H}{<H}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{H}{H}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{H}{H}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{H}{H}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{H}{>`H}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{H}{<`H}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{H}{>'H}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{H}{<'H}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{\GRencoding@name}{H}{>\char126H}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{H}{<\char126H}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{H}{>H}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{H}{<H}
-
-\DeclareTextCompositeCommand{\Psili}{\GRencoding@name}{I}{>I}
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{I}{<I}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{I}{I}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{I}{I}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{I}{I}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{I}{>`I}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{I}{<`I}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{I}{>'I}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{I}{<'I}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{\GRencoding@name}{I}{>\char126I}
-\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}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{O}{O}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{O}{O}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{O}{>`O}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{O}{<`O}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{O}{>'O}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{O}{<'O}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{O}{>O}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{O}{<O}
-
-\DeclareTextCompositeCommand{\Dasia}{\GRencoding@name}{U}{<U}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{U}{<`U}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{U}{U}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{U}{U}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{U}{U}
-\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}
-\DeclareTextCompositeCommand{\Perispomeni}{\GRencoding@name}{W}{W}
-\DeclareTextCompositeCommand{\Varia}{\GRencoding@name}{W}{W}
-\DeclareTextCompositeCommand{\Oxia}{\GRencoding@name}{W}{W}
-\DeclareTextCompositeCommand{\PsiliVaria}{\GRencoding@name}{W}{>`W}
-\DeclareTextCompositeCommand{\DasiaVaria}{\GRencoding@name}{W}{<`W}
-\DeclareTextCompositeCommand{\PsiliOxia}{\GRencoding@name}{W}{>'W}
-\DeclareTextCompositeCommand{\DasiaOxia}{\GRencoding@name}{W}{<'W}
-\DeclareTextCompositeCommand{\PsiliPerispomeni}{\GRencoding@name}{W}{>\char126W}
-\DeclareTextCompositeCommand{\DasiaPerispomeni}{\GRencoding@name}{W}{<\char126W}
-\DeclareTextCompositeCommand{\>}{\GRencoding@name}{W}{>W}
-\DeclareTextCompositeCommand{\<}{\GRencoding@name}{W}{<W}
-%%  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 51e1a668ce1..4ed50bf7064 100644
--- a/Master/texmf-dist/tex/latex/teubner/teubner.sty
+++ b/Master/texmf-dist/tex/latex/teubner/teubner.sty
@@ -5,7 +5,7 @@
 %% The original source files were:
 %%
 %% teubner.dtx  (with options: `package')
-%% Copyright 2001--2012 Claudio Beccari All rights reserved.
+%% Copyright 2001--2013 Claudio Beccari All rights reserved.
 %% 
 %%  This system is distributed in the hope that it will be useful,
 %%  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,7 @@
 %% 
 %% You are not allowed to change this file.
 %% 
-%% You are allowed to distribute this file under the condition that it is
+%% You are allowed to distribute this file under the conditions that are
 %% specified in the source file teubner.dtx.
 %% 
 %% If you receive only some of these files from someone, complain!
@@ -46,15 +46,15 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{teubner}[%
-2012/09/17 v.3.4
+2013/12/13 v.4.1
 Extensions for Greek philology]
 \newif\ifPDF \PDFfalse
-\@ifundefined{pdfoutput}{\PDFfalse}{\ifnum\pdfoutput>\z@\PDFtrue\fi}
+\@ifundefined{pdfoutput}{}{\ifnum\pdfoutput>\z@\PDFtrue\fi}
 \ifx\captionsgreek\undefined
 \PackageError{teubner}{Greek language unknown!\MessageBreak
 I am not going to use Lipsian fonts and Scholars' signs\MessageBreak
 if Greek is unknown.\MessageBreak
-Use the babel package with the \texttt{greek} option.\MessageBreak
+Use the babel package greek option.\MessageBreak
 Type X <return> to exit.}%
 {Type X <return> to exit.}
 \fi
@@ -169,7 +169,7 @@ Type X <return> to exit.}%
 \DeclareTextFontCommand{\textli}{\lishape}%
 \DeclareRobustCommand\Lipsiakostext{%
     \expandafter\select@language\expandafter{\GreekName}%
-    \let\~\Perispomeni\let~\greek@tilde\lishape}
+    \let\~\accperispomeni\let~\accperispomeni\lishape}
 
 \DeclareTextFontCommand{\textLipsias}{\Lipsiakostext}
 
@@ -181,7 +181,7 @@ Type X <return> to exit.}%
 
 \DeclareRobustCommand\textDidot[1]{{%
     \expandafter\select@language\expandafter{\GreekName}%
-    \let\~\Perispomeni\let~\greek@tilde
+    \let\~\accperispomeni\let~\accperispomeni
     \fontencoding{LGR}\rmfamily#1}}
 
 \DeclareRobustCommand\textlatin[1]{\edef\externalencoding{\f@encoding}{%
@@ -251,18 +251,19 @@ Type X <return> to exit.}%
 \ifx#1k\advance\dimen@-.3\wd\tw@\fi\fi
 \raise\@tempdima\hbox to\z@{\kern\dimen@\box\tw@\relax\hss}\box\z@}}
 
-\DeclareTextCommand{\cap}{\GRencoding@name}{\cap@}
-\DeclareTextCommand{\cap}{OT1}{\cap@}
-\DeclareTextCommand{\cap}{T1}{\cap@}
-
+\let\mcap\cap
+\DeclareTextCommand{\tcap}{\GRencoding@name}{\cap@}
+\DeclareTextCommand{\tcap}{OT1}{\cap@}
+\DeclareTextCommand{\tcap}{T1}{\cap@}
+\DeclareRobustCommand*\cap{\textormath{\tcap}{\mcap}}
 \newcommand*\cap@cedilla[1]{\leavevmode
 {\setbox4\hbox{\fontencoding{\GRencoding@name}\selectfont\char1}%
 \dimen@-.5\wd4
 \setbox\z@\hbox{#1}%
 \ifx\cf@encoding\GRencoding@name
-\ifx#1i\advance\dimen@ .65\wd\z@\else\advance\dimen@ .5\wd\z@\fi
+   \ifx#1i\advance\dimen@ .65\wd\z@\else\advance\dimen@ .5\wd\z@\fi
 \else
-\ifx#1i\advance\dimen@ .55\wd\z@\else\advance\dimen@ .5\wd\z@\fi
+   \ifx#1i\advance\dimen@ .55\wd\z@\else\advance\dimen@ .5\wd\z@\fi
 \fi
 \hbox to\z@{\kern\dimen@\box4\hss}\unhbox\z@}}
 
@@ -317,24 +318,24 @@ Type X <return> to exit.}%
 \hbox to\z@{\kern\dimen@\box4\hss}\unhbox\z@}}
 
 \let\nbs\nobreakspace
+\let\accacuto\'
+\let\accgrave\`
+\let\acccircon\~
+\let\accdieresi\"
+\let\accbreve\u
+\let\accmacron\=
 \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{\D}{\GRencoding@name}[1]{\lift@accent{34\textcompwordmark}{#1}}
+\DeclareTextCommand{\B}{\GRencoding@name}[1]{\lift@accent{30}{#1}}
+\DeclareTextCommand{\M}{\GRencoding@name}[1]{\lift@accent{31}{#1}}
+\addto\extrasgreek{\shorthandoff{~}\let\~\accperispomeni
+\let\"\accdialytika\let\'\acctonos\let\`\accvaria}
+\addto\noextrasgreek{\shorthandon{~}\let\~\acccircon
+\let\"\accdieresi\let\'\accacuto\let\`\accgrave}
 
 \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}}
 \DeclareTextCommand{\s}{\GRencoding@name}[1]{\lift@accent{62}{#1}}
 \DeclareTextCommand{\Ad}{\GRencoding@name}[1]{\lift@accent{35}{#1}}
@@ -450,26 +451,22 @@ Type X <return> to exit.}%
 \DeclareTextCommand{\UO}{OT1}[1]{\Open{\u{#1}}}
 \DeclareTextCommand{\mO}{OT1}[1]{\Open{\={#1}}}
 
-\DeclareTextSymbol{\greekquoteleft}{\GRencoding@name}{123}
-\let\textguillemotleft\greekquoteleft
-\DeclareTextSymbol{\greekquoteright}{\GRencoding@name}{125}
-\let\textguillemotright\greekquoteright
-\DeclareTextSymbol{\textcompwordmark}{\GRencoding@name}{118}
-\DeclareTextSymbol{\textemdash}{\GRencoding@name}{127}
-\let\emdash\textemdash
-\DeclareTextSymbol{\textendash}{\GRencoding@name}{0}
-
-\DeclareTextSymbol{\stigma}{\GRencoding@name}{006}
-\DeclareTextSymbol{\varstigma}{\GRencoding@name}{007}
-\DeclareTextSymbol{\koppa}{\GRencoding@name}{18}
-\DeclareTextSymbol{\varkoppa}{\GRencoding@name}{19}\let\coppa\varkoppa
-\DeclareTextSymbol{\sampi}{\GRencoding@name}{27}
-\DeclareTextSymbol{\Coppa}{\GRencoding@name}{21}\let\Koppa\Coppa
-\DeclareTextSymbol{\Stigma}{\GRencoding@name}{22}
-\DeclareTextSymbol{\Sampi}{\GRencoding@name}{23}
-\DeclareTextSymbol{\Euro}{\GRencoding@name}{24}
-\DeclareTextSymbol{\permill}{\GRencoding@name}{25}
-
+\let\stigma\textstigma
+\let\varstigma\textvarstigma
+\let\koppa\textkoppa
+\let\qoppa\textqoppa
+\let\coppa\textqoppa
+\let\Koppa\textQoppa
+\let\Coppa\textQoppa
+\let\varkoppa\textqoppa
+\let\sampi\textsampi
+\let\Stigma\textStigma
+\let\Sampi\textsampi
+\let\f\textdigamma
+\let\Digamma\textDigamma
+\let\Euro\texteuro
+\let\permill\textperthousand
+\let\schwa\textschwa
 \DeclareTextCommand{\textdollar}{\GRencoding@name}%
     {{\fontencoding{T1}\selectfont\char36}}
 \DeclareTextCommand{\textsection}{\GRencoding@name}%
@@ -643,7 +640,7 @@ Type X <return> to exit.}%
 \DeclareTextComposite{\Gs}{\GRencoding@name}{e}{235}
 \DeclareTextSymbol{\oR}{\GRencoding@name}{229}
 \DeclareTextComposite{\r}{\GRencoding@name}{o}{229}
-\DeclareTextSymbol{\og}{\GRencoding@name}{228}
+\DeclareTextSymbol{\oG}{\GRencoding@name}{228}
 \DeclareTextSymbol{\os}{\GRencoding@name}{230}
 \DeclareTextComposite{\s}{\GRencoding@name}{o}{230}
 \DeclareTextSymbol{\org}{\GRencoding@name}{231}
diff --git a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty
index 331925ef021..b4a79e9751a 100644
--- a/Master/texmf-dist/tex/latex/teubner/teubnertx.sty
+++ b/Master/texmf-dist/tex/latex/teubner/teubnertx.sty
@@ -5,7 +5,7 @@
 %% The original source files were:
 %%
 %% teubner.dtx  (with options: `tbtx')
-%% Copyright 2001--2012 Claudio Beccari All rights reserved.
+%% Copyright 2001--2013 Claudio Beccari All rights reserved.
 %% 
 %%  This system is distributed in the hope that it will be useful,
 %%  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,7 @@
 %% 
 %% You are not allowed to change this file.
 %% 
-%% You are allowed to distribute this file under the condition that it is
+%% You are allowed to distribute this file under the conditions that are
 %% specified in the source file teubner.dtx.
 %% 
 %% If you receive only some of these files from someone, complain!
@@ -45,7 +45,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \ProvidesPackage{teubnertx}[%
-2012/09/17 v.3.4
+2013/12/13 v.4.1
 Access to the LGR encoded Greek fonts when TX fonts are used]
 
  \DeclareFontFamily{LGR}{txr}{}