babel-russian (10aug17)

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

1 files changed, 141 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-russian/russianb.ldf b/Master/texmf-dist/tex/generic/babel-russian/russianb.ldf
index 8a9665a5d8e..8c64872334a 100644
--- a/Master/texmf-dist/tex/generic/babel-russian/russianb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-russian/russianb.ldf
@@ -12,7 +12,9 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesLanguage{russianb}[2017/01/12 1.3i Russian support for the Babel system]
+
+\ProvidesLanguage{russian}
+    [2017/08/12 1.3j Russian support for the Babel system]
 \LdfInit{russian}{captionsrussian}
 \ifdefined\if@uni@ode
   \PackageError{babel}{if@uni@ode already defined.\MessageBreak
@@ -41,24 +43,27 @@
     \sce@a{##1}{T2B}%
     \sce@a{##1}{T2A}%
     \if@uni@ode
-      \sce@a{##1}{EU1}%
-      \sce@a{##1}{EU2}%
+      %\sce@a{##1}{EU1}%
+      %\sce@a{##1}{EU2}%
+      \sce@a{##1}{TU}%
     \fi}%
   \cdp@list
 }
-\@setcyrillicencoding
+\ifx\cyrillicencoding\undefined
+  \@setcyrillicencoding
+\fi
 \@onlypreamble\@setcyrillicencoding
 \@onlypreamble\sce@a
 \@onlypreamble\sce@b
 \@onlypreamble\sce@c
-\ifdefined\cyrillicencoding
-\else
+\ifx\cyrillicencoding\undefined
   \if@uni@ode
-    \ifdefined\XeTeXrevision
-      \edef\cyrillicencoding{EU1}
-    \else\ifdefined\luatexversion
-      \edef\cyrillicencoding{EU2}
-    \fi\fi
+    %\ifdefined\XeTeXrevision
+    %  \edef\cyrillicencoding{EU1}
+    %\else\ifdefined\luatexversion
+    %  \edef\cyrillicencoding{EU2}
+    %\fi\fi
+    \edef\cyrillicencoding{TU}
   \else
     \edef\cyrillicencoding{T2A}
   \fi
@@ -83,32 +88,38 @@
 %%  \expandafter\set@hyphenmins\englishhyphenmins
 %%  \language\l@english}%
 %%\let\Eng\English
-\expandafter\ifx\csname T@X2\endcsname\relax\else
-  \DeclareTextSymbolDefault{\AA}{OT1}
-  \DeclareTextSymbolDefault{\aa}{OT1}
-  \DeclareTextCommand{\aa}{OT1}{\r a}
-  \DeclareTextCommand{\AA}{OT1}{\r A}
-\fi
+%%\DeclareRobustCommand{\latintext}{%
+%%  \fontencoding{\latinencoding}\selectfont
+%%  \def\encodingdefault{\latinencoding}}
+%%\let\lat\latintext
 \DeclareTextFontCommand{\textcyrillic}{\cyrillictext}
-\@ifpackageloaded{inputenc}{%
- \if@uni@ode
-   \PackageWarning{babel}{inputenc should not be used with LuaTeX or XeTeX}
- \fi
-}{%
-  %\def\reserved@a{LWN}%
-  %\ifx\reserved@a\cyrillicencoding\else
-    \def\reserved@a{OT2}%
-    \ifx\reserved@a\cyrillicencoding\else
-       \def\reserved@a{EU1}%
-       \ifx\reserved@a\cyrillicencoding\else
-          \def\reserved@a{EU2}%
-          \ifx\reserved@a\cyrillicencoding\else
-             \PackageWarning{babel}%
-                {No input encoding specified for Russian language}
-    \fi\fi\fi
-  %\fi
-}
+%%\expandafter\ifx\csname T@X2\endcsname\relax\else
+%%  \DeclareTextSymbolDefault{\AA}{OT1}
+%%  \DeclareTextSymbolDefault{\aa}{OT1}
+%%  \DeclareTextCommand{\aa}{OT1}{\r a}
+%%  \DeclareTextCommand{\AA}{OT1}{\r A}
+%%\fi
+%%\@ifpackageloaded{inputenc}{%
+%%% \if@uni@ode
+%%%   \PackageWarning{babel}{inputenc should not be used with LuaTeX or XeTeX}
+%%% \fi
+%% \ifdefined\luatexversion
+%%   \PackageWarning{babel}{inputenc should not be used with LuaTeX}
+%% \fi}{%
+%%  %\def\reserved@a{LWN}%
+%%  %\ifx\reserved@a\cyrillicencoding\else
+%%    \def\reserved@a{OT2}%
+%%    \ifx\reserved@a\cyrillicencoding\else
+%%       \def\reserved@a{TU}%
+%%       \ifx\reserved@a\cyrillicencoding\else
+%%         \PackageWarning{babel}%
+%%           {No input encoding specified for Russian language}
+%%    \fi\fi
+%%  %\fi
+%%}
 \initiate@active@char{"}
+%%\def\mdqon{\bbl@activate{"}}
+%%\def\mdqoff{\bbl@deactivate{"}}
 \begingroup \catcode`\"12
 \def\reserved@a{\endgroup
   \def\@SS{\mathchar"7019 }
@@ -142,9 +153,11 @@
  \nobreak\cyrdash\penalty\exhyphenpenalty\hskip\z@skip\ignorespaces}%
 \def\@Ccdash{\leavevmode
  \nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
-\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}%
-    {\hbox to.8em{--\hss--}}{\textemdash}}
 \declare@shorthand{russian}{",}{\nobreak\hskip.2em\ignorespaces}
+\PackageInfo{babel}{Default for \string\cyrdash\space is provided}
+%%\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}%
+%%  {\hbox to.8em{--\hss--}}{\textemdash}}
+\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}
 \if@uni@ode
   %\captionsrussian@modern
   \addto\captionsrussian{%
@@ -551,13 +564,99 @@
   \def\NOK{\mathop{\mathrm{НОК}}\nolimits}
   \def\Proj{\mathop{\mathrm{Пр}}\nolimits}
 \else
-  \def\nod{\mathop{\textrm{\textup{\cyrn.\cyro.\cyrd.}}}\nolimits}
-  \def\nok{\mathop{\textrm{\textup{\cyrn.\cyro.\cyrk.}}}\nolimits}
-  \def\NOD{\mathop{\textrm{\textup{\CYRN\CYRO\CYRD}}}\nolimits}
-  \def\NOK{\mathop{\textrm{\textup{\CYRN\CYRO\CYRK}}}\nolimits}
-  \def\Proj{\mathop{\textrm{\textup{\CYRP\cyrr}}}\nolimits}
+  \def\nod{\mathop{\textnormal{\cyrn.\cyro.\cyrd.}}\nolimits}
+  \def\nok{\mathop{\textnormal{\cyrn.\cyro.\cyrk.}}\nolimits}
+  \def\NOD{\mathop{\textnormal{\CYRN\CYRO\CYRD}}\nolimits}
+  \def\NOK{\mathop{\textnormal{\CYRN\CYRO\CYRK}}\nolimits}
+  \def\Proj{\mathop{\textnormal{\CYRP\cyrr}}\nolimits}
 \fi
 \ldf@finish{russian}
+%%
+%% \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        \~}
+%%
+
+%% Nonunicode Cyrillic Letters
+%% \CYRA=А
+%% \CYRB=Б
+%% \CYRV=В
+%% \CYRG=Г
+%% \CYRGUP=Ґ
+%% \CYRD=Д
+%% \CYRE=Е
+%% \CYRIE=Є
+%% \CYRZH=Ж
+%% \CYRZ=З
+%% \CYRI=И
+%% \CYRII=I
+%% \CYRYI=Ї
+%% \CYRISHRT=Й
+%% \CYRK=К
+%% \CYRL=Л
+%% \CYRM=М
+%% \CYRN=Н
+%% \CYRO=О
+%% \CYRP=П
+%% \CYRR=Р
+%% \CYRS=С
+%% \CYRT=Т
+%% \CYRU=У
+%% \CYRF=Ф
+%% \CYRH=Х
+%% \CYRC=Ц
+%% \CYRCH=Ч
+%% \CYRSH=Ш
+%% \CYRSHCH=Щ
+%% \CYRYU=Ю
+%% \CYRYA=Я
+%% \CYRSFTSN=Ь
+%%
+%% \cyra=а
+%% \cyrb=б
+%% \cyrv=в
+%% \cyrg=г
+%% \cyrgup=ґ
+%% \cyrd=д
+%% \cyre=е
+%% \cyrie=є
+%% \cyrzh=ж
+%% \cyrz=з
+%% \cyri=и
+%% \cyrii=i
+%% \cyryi=ї
+%% \cyrishrt=й
+%% \cyrk=к
+%% \cyrl=л
+%% \cyrm=м
+%% \cyrn=н
+%% \cyro=о
+%% \cyrp=п
+%% \cyrr=р
+%% \cyrs=с
+%% \cyrt=т
+%% \cyru=у
+%% \cyrf=ф
+%% \cyrh=х
+%% \cyrc=ц
+%% \cyrch=ч
+%% \cyrsh=ш
+%% \cyrshch=щ
+%% \cyryu=ю
+%% \cyrya=я
+%% \cyrsftsn=ь
 %% ----------------------------------------------------------------
 %% Copyright 2011-2017 Igor A. Kotelnikov.
 %% Copyright 1995-2008 Olga Lapko.