1 files changed, 14 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx b/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx
index edd7be84b2c..da1283e11d7 100644
--- a/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx
+++ b/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file. 
 % 
@@ -8,12 +8,12 @@
 % ----------------------------------------------------------
 % 
 % It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3b
 % 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
-% and version 1.3 or later is part of all distributions of LaTeX 
-% version 2003/12/01 or later.
+% and version 1.3b or later is part of all distributions of LaTeX 
+% version 2005/12/01 or later.
 % 
 % The list of all files belonging to the `Cyrillic Bundle' is
 % given in the file `manifest.txt'.
@@ -65,7 +65,7 @@
 %<T2A>\ProvidesFile{t2aenc.def}
 %<T2B>\ProvidesFile{t2benc.def}
 %<T2C>\ProvidesFile{t2cenc.def}
-  [2004/01/26 v1.0g Cyrillic encoding definition file]
+  [2005/09/27 v1.0i Cyrillic encoding definition file]
 %    \end{macrocode}
 %
 % To assure that |\MakeUppercase| and |\MakeLowercase| will work
@@ -103,8 +103,13 @@
 \DeclareTextAccent{\C}{\LastDeclaredEncoding}{19}
 % Cyrillic breve accent:
 \DeclareTextAccent{\U}{\LastDeclaredEncoding}{20}
+%    \end{macrocode}
+%  In these definitions we no longer use the helper function |\sh@ft|
+%  from plain.tex since that now has two incompatible definitions.
+% \changes{v1.0i}{2005/09/27}{Replace \cs{sh@ft} by \cs{ltx@sh@ft}}
+%    \begin{macrocode}
 \DeclareTextCommand{\b}{\LastDeclaredEncoding}[1]
-   {\hmode@bgroup\o@lign{\relax#1\crcr\hidewidth\sh@ft{29}%
+   {\hmode@bgroup\o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-3ex}%
      \vbox to.2ex{\hbox{\char9}\vss}\hidewidth}\egroup}
 \DeclareTextCommand{\c}{\LastDeclaredEncoding}[1]
    {\leavevmode\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
@@ -112,18 +117,18 @@
         \crcr\unhbox\z@}}\fi}
 \DeclareTextCommand{\d}{\LastDeclaredEncoding}[1]
    {\hmode@bgroup
-    \o@lign{\relax#1\crcr\hidewidth\sh@ft{10}.\hidewidth}\egroup}
+    \o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-1ex}.\hidewidth}\egroup}
 \DeclareTextCommand{\k}{\LastDeclaredEncoding}[1]
    {\oalign{\null#1\crcr\hidewidth\char12}}
 \DeclareTextCommand{\textperthousand}{\LastDeclaredEncoding}
    {\%\char 24 }
 \DeclareTextCommand{\textpertenthousand}{\LastDeclaredEncoding}
    {\%\char 24\char 24 }
-%<*!X2>
+%<*!X2&AAhack>
 \DeclareTextCompositeCommand{\r}{\LastDeclaredEncoding}{A}
    {\leavevmode\setbox\z@\hbox{!}\dimen@\ht\z@\advance\dimen@-1ex%
     \rlap{\raise.67\dimen@\hbox{\char6}}A}
-%</!X2>
+%</!X2&AAhack>
 %    \end{macrocode}
 %
 % Common symbolic glyphs.