babel-russian (3jun14)

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

1 files changed, 154 insertions, 60 deletions

diff --git a/Master/texmf-dist/source/generic/babel-russian/russianb.dtx b/Master/texmf-dist/source/generic/babel-russian/russianb.dtx
index 377ee366a6b..1ca27766beb 100644
--- a/Master/texmf-dist/source/generic/babel-russian/russianb.dtx
+++ b/Master/texmf-dist/source/generic/babel-russian/russianb.dtx
@@ -1,5 +1,5 @@
 % \iffalse meta-comment
-% !Mode:: "TEX:DTX:UNIX:UTF-8:US"
+% !Mode:: "TEX:DTX:UNIX:UTF-8:US:RU"
 %
 % Copyright 2011-2013 Igor A. Kotelnikov.
 % Copyright 1995-2008 Olga Lapko.
@@ -23,7 +23,7 @@
 % The Current Maintainer of this work is Igor A. Kotelnikov.
 %
 % \fi
-% \CheckSum{1730}
+% \CheckSum{1947}
 %
 % \iffalse
 %    Tell the \LaTeX\ system who we are and write an entry on the
@@ -34,7 +34,7 @@
 %<code>\ProvidesLanguage{russian}
 %\fi
 %\ProvidesFile{russianb.dtx}
-        [2013/04/13 1.3a Russian support from the babel system]
+        [2014/06/02 1.3c Russian support from the babel system]
 %\iffalse
 %%
 %% Babel package for LaTeX 2e
@@ -50,7 +50,7 @@
 %%           by Vladimir Volovich TeX at vvv.vsu.ru
 %%              Werner Lemberg wl at gnu.org
 %
-%% Copyright (C) 2011 - 2013
+%% Copyright (C) 2011 - 2014
 %%           by Igor A. Kotelnikov kia999 at mail dot ru
 %% Adapted to EU1 (LuaTeX) and EU2 (XeTeX) encodings
 %
@@ -560,6 +560,19 @@ text commands such as |\textbf|, |\textsf|, |\textit|, |\texttt|, e.t.c.
 
 \section{History}
 
+\subsection{Changes in version 1.3c}
+\begin{itemize}
+\item
+  Bug fix in \string\daterussian.
+\end{itemize}
+
+\subsection{Changes in version 1.3b}
+\begin{itemize}
+\item
+  Added support for the packages \pkg{listing}, \pkg{nomencl}, and
+  \pkg{nomentbl}.
+\end{itemize}
+
 \subsection{Changes in version 1.3a}
 \begin{itemize}
 \item
@@ -657,8 +670,9 @@ text commands such as |\textbf|, |\textsf|, |\textit|, |\texttt|, e.t.c.
 %
 %    \section{Implementation}
 %
-% \changes{russianu-1.3b}{2013/04/06}{Renamed to russianb to work with babel 3.9}
-% \changes{russianu-1.2b}{2013/01/08}{Renamed to russianu to work with babel-beta 3.9}
+% \changes{russianb-1.3c}{2014/06/02}{Fix bug in \string\daterussian}
+% \changes{russianb-1.3b}{2013/04/06}{Renamed to russianb to work with babel 3.9}
+% \changes{russianb-1.2b}{2013/01/08}{Renamed to russianu to work with babel-beta 3.9}
 % \changes{russianb-1.2a}{2012/06/06}{Indentation of 1st paragraph removed}
 % \changes{russianb-1.1c}{1996/07/11}{Replaced \cs{undefined} with
 %    \cs{@undefined} and \cs{empty} with \cs{@empty} for consistency
@@ -1253,11 +1267,11 @@ text commands such as |\textbf|, |\textsf|, |\textit|, |\texttt|, e.t.c.
 \if@uni@ode
   %\captionsrussian@modern
   \addto\captionsrussian{%
-    \def\prefacename{Предисловие}%
-    \def\refname{Список литературы}%
-    \def\abstractname{Аннотация}%
-    \def\bibname{Литература}%
-    \def\chaptername{Глава}%
+    \def\prefacename{Предисловие}%   [babel]
+    \def\refname{Список литературы}% [only article]
+    \def\abstractname{Аннотация}%    [only article, report]
+    \def\bibname{Литература}%        [only book, report]
+    \def\chaptername{Глава}%         [only book, report]
     \def\appendixname{Приложение}%
     \@ifundefined{thechapter}
       {\def\contentsname{Содержание}}%
@@ -1273,12 +1287,51 @@ text commands such as |\textbf|, |\textsf|, |\textit|, |\texttt|, e.t.c.
     \def\enclname{вкл.}%
     \def\ccname{исх.}%
     \def\headtoname{вх.}%
-    \def\pagename{с.}%
+    \def\pagename{с.}%               [letter]
     \def\seename{см.}%
     \def\alsoname{см.\ также}%
-    \def\proofname{Доказательство}%
+    \def\proofname{Доказательство}%  [amsthm]
     \def\glossaryname{Словарь терминов}%
+    \def\acronymname{Аббревиатуры}%  [glossaries] {Acronyms}
+    \def\lstlistingname{Листинг}%    [listings]  (the environment) {Listing}
+    \def\lstlistlistingname{Листинги}% [listings]  (the "List of") {Listings}
+    \def\notesname{Заметки}%         [endnotes] {Notes}
   }%
+  %% =========================================
+  %% nomencl
+  \ifdefined\nomname
+    \addto\captionsrussian{%
+        \def\nomname{Обозначения}%
+        \def\eqdeclaration#1{, см.\nobreakspace(#1)}%
+        \def\pagedeclaration#1{, стр.\nobreakspace#1}%
+    }%
+  \fi
+  %% =========================================
+  %% RevTeX4 & RevTeX4-1
+  %%\@ifclassloaded{revtex4-1}
+  %%{<true code>}
+  %%{<false coode>}%
+  %\ifdefined\@pacs@name
+  \@ifclassloaded{revtex4-1}
+  {%
+    \addto\captionsrussian{%
+    \def\lofname{\listfigurename}
+    \def\lotname{\listtablename}
+    \def\figuresname{Рисунки}%{Figures}%
+    \def\tablesname{Таблицы}%{Tables}%
+    \def\appendixesname{Приложения}%{Appendixes}%
+    \def\acknowledgmentsname{Благодарности}%{Acknowledgments}
+    \def\andname{и}%{and}
+    \def\@pacs@name{PACS коды: }%{PACS numbers: }%
+    \def\@keys@name{Ключевые слова: }%{Keywords: }%
+    \def\Dated@name{Дата: }%{Dated: }%
+    \def\Received@name{Получено }%{Received }%
+    \def\Revised@name{Исправленная версия }%{Revised }%
+    \def\Accepted@name{Принято }%{Accepted }%
+    \def\Published@name{Опубликовано }%{Published }%
+    }%
+  %\fi
+  }{}%
   \def\captionsrussian@ancient{%
     \def\prefacename{Предисловіе}%
     \def\refname{Примѣчанія}%
@@ -1305,53 +1358,89 @@ text commands such as |\textbf|, |\textsf|, |\textit|, |\texttt|, e.t.c.
     \def\alsoname{см.~также}%
     \def\proofname{Доказательство}%
     \def\glossaryname{Словарь терминов}%
+    \def\acronymname{Аббревиатуры}%
+    \def\lstlistingname{Листинг}%
+    \def\lstlistlistingname{Листинги}%
+    %\ifdefined\nomname
+      \def\nomname{Объавлениѥ}% {Обозначенія}%
+    %\fi
+    \def\notesname{Заметки}%
   }
+  % =========================================
+  % RevTeX4 & RevTeX4-1
+  %\ifdefined\@pacs@name
+  \@ifclassloaded{revtex4-1}
+  {%
+    \addto\captionsrussian@ancient{%
+    \def\lofname{\listfigurename}
+    \def\lotname{\listtablename}
+    \def\figuresname{Рисунки}%{Figures}%
+    \def\tablesname{Таблицы}%{Tables}%
+    \def\appendixesname{Приложения}%{Appendixes}%
+    \def\acknowledgmentsname{Благодарности}%{Acknowledgments}
+    \def\andname{}%{and}
+    \def\@pacs@name{PACS коды: }%{PACS numbers: }%
+    \def\@keys@name{Ключевые слова: }%{Keywords: }%
+    \def\Dated@name{Дата: }%{Dated: }%
+    \def\Received@name{Получено }%{Received }%
+    \def\Revised@name{Исправленная версия }%{Revised }%
+    \def\Accepted@name{Принято }%{Accepted }%
+    \def\Published@name{Опубликовано }%{Published }%
+    }%
+  %\fi
+  }{}%
+  % =========================================
 \else
   %\def\captionsrussian@modern{%
   \addto\captionsrussian{%
-  \def\prefacename{%
-    {\cyr\CYRP\cyrr\cyre\cyrd\cyri\cyrs\cyrl\cyro\cyrv\cyri\cyre}}%
-  \def\refname{%
-    {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\
-    \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}}%
-  \def\abstractname{%
-    {\cyr\CYRA\cyrn\cyrn\cyro\cyrt\cyra\cyrc\cyri\cyrya}}%
-    \def\bibname{%
-      {\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyra}}%
-  \def\chaptername{{\cyr\CYRG\cyrl\cyra\cyrv\cyra}}%
-  \def\appendixname{%
-    {\cyr\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}}%
-  \@ifundefined{thechapter}%
-    {\def\contentsname{%
-      {\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre}}}%
-    {\def\contentsname{%
-      {\cyr\CYRO\cyrg\cyrl\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre}}}%
-  \let\tocname=\contentsname
-  \def\listfigurename{%
-    {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk
-      \ \cyri\cyrl\cyrl\cyryu\cyrs\cyrt\cyrr\cyra\cyrc\cyri\cyrishrt}}%
-  \def\listtablename{%
-    {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk
-      \ \cyrt\cyra\cyrb\cyrl\cyri\cyrc}}%
-  \def\indexname{%
-    {\cyr\CYRP\cyrr\cyre\cyrd\cyrm\cyre\cyrt\cyrn\cyrery\cyrishrt
-      \ \cyru\cyrk\cyra\cyrz\cyra\cyrt\cyre\cyrl\cyrsftsn}}%
-  \def\authorname{%
-    {\cyr\CYRI\cyrm\cyre\cyrn\cyrn\cyro\cyrishrt
-      \ \cyru\cyrk\cyra\cyrz\cyra\cyrt\cyre\cyrl\cyrsftsn}}%
-  \def\figurename{{\cyr\CYRR\cyri\cyrs.}}%
-  \def\tablename{{\cyr\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}}%
-  \def\partname{{\cyr\CYRCH\cyra\cyrs\cyrt\cyrsftsn}}%
-  \def\enclname{{\cyr\cyrv\cyrk\cyrl.}}%
-  \def\ccname{{\cyr\cyri\cyrs\cyrh.}}%
-  \def\headtoname{{\cyr\cyrv\cyrh.}}%
-  \def\pagename{{\cyr\cyrs.}}%
-  \def\seename{{\cyr\cyrs\cyrm.}}%
-  \def\alsoname{{\cyr\cyrs\cyrm.\ \cyrt\cyra\cyrk\cyrzh\cyre}}%
-  \def\proofname{{\cyr\CYRD\cyro\cyrk\cyra\cyrz\cyra\cyrt
-      \cyre\cyrl\cyrsftsn\cyrs\cyrt\cyrv\cyro}}%
-  \def\glossaryname{{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\
-      \cyrt\cyre\cyrr\cyrm\cyri\cyrn\cyro\cyrv}}%
+    \def\prefacename{%
+      {\cyr\CYRP\cyrr\cyre\cyrd\cyri\cyrs\cyrl\cyro\cyrv\cyri\cyre}}%
+    \def\refname{%
+      {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\
+      \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}}%
+    \def\abstractname{%
+      {\cyr\CYRA\cyrn\cyrn\cyro\cyrt\cyra\cyrc\cyri\cyrya}}%
+      \def\bibname{%
+        {\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyra}}%
+    \def\chaptername{{\cyr\CYRG\cyrl\cyra\cyrv\cyra}}%
+    \def\appendixname{%
+      {\cyr\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}}%
+    \@ifundefined{thechapter}%
+      {\def\contentsname{%
+        {\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre}}}%
+      {\def\contentsname{%
+        {\cyr\CYRO\cyrg\cyrl\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre}}}%
+    \let\tocname=\contentsname
+    \def\listfigurename{%
+      {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk
+        \ \cyri\cyrl\cyrl\cyryu\cyrs\cyrt\cyrr\cyra\cyrc\cyri\cyrishrt}}%
+    \def\listtablename{%
+      {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk
+        \ \cyrt\cyra\cyrb\cyrl\cyri\cyrc}}%
+    \def\indexname{%
+      {\cyr\CYRP\cyrr\cyre\cyrd\cyrm\cyre\cyrt\cyrn\cyrery\cyrishrt
+        \ \cyru\cyrk\cyra\cyrz\cyra\cyrt\cyre\cyrl\cyrsftsn}}%
+    \def\authorname{%
+      {\cyr\CYRI\cyrm\cyre\cyrn\cyrn\cyro\cyrishrt
+        \ \cyru\cyrk\cyra\cyrz\cyra\cyrt\cyre\cyrl\cyrsftsn}}%
+    \def\figurename{{\cyr\CYRR\cyri\cyrs.}}%
+    \def\tablename{{\cyr\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}}%
+    \def\partname{{\cyr\CYRCH\cyra\cyrs\cyrt\cyrsftsn}}%
+    \def\enclname{{\cyr\cyrv\cyrk\cyrl.}}%
+    \def\ccname{{\cyr\cyri\cyrs\cyrh.}}%
+    \def\headtoname{{\cyr\cyrv\cyrh.}}%
+    \def\pagename{{\cyr\cyrs.}}%
+    \def\seename{{\cyr\cyrs\cyrm.}}%
+    \def\alsoname{{\cyr\cyrs\cyrm.\ \cyrt\cyra\cyrk\cyrzh\cyre}}%
+    \def\proofname{{\cyr\CYRD\cyro\cyrk\cyra\cyrz\cyra\cyrt
+       \cyre\cyrl\cyrsftsn\cyrs\cyrt\cyrv\cyro}}%
+    \def\glossaryname{{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\
+       \cyrt\cyre\cyrr\cyrm\cyri\cyrn\cyro\cyrv}}%
+    \def\acronymname{\CYRA\cyrb\cyrb\cyrr\cyre\cyrv\cyri\cyra\cyrt\cyru\cyrr\cyrery}%
+    \def\lstlistingname{\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg}%
+    \def\lstlistlistingname{\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
+    \def\nomname{\CYRO\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrya}%
+    \def\notesname{\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyri}%
   }%
   \def\captionsrussian@ancient{%
     \def\prefacename{%
@@ -1396,6 +1485,11 @@ text commands such as |\textbf|, |\textsf|, |\textit|, |\texttt|, e.t.c.
       \cyre\cyrl\cyrsftsn\cyrs\cyrt\cyrv\cyro}}%
     \def\glossaryname{{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\
       \cyrt\cyre\cyrr\cyrm\cyri\cyrn\cyro\cyrv}}% <-- Needs translation
+    \def\acronymname{\CYRA\cyrb\cyrb\cyrr\cyre\cyrv\cyri\cyra\cyrt\cyru\cyrr\cyrery}%
+    \def\lstlistingname{\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg}%
+    \def\lstlistlistingname{\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
+    \def\nomname{\CYRO\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrii\cyrya}%
+    \def\notesname{\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyri}%
   }%
 \fi
 %    \end{macrocode}
@@ -1446,8 +1540,8 @@ text commands such as |\textbf|, |\textsf|, |\textit|, |\texttt|, e.t.c.
     \cyrm\cyra\cyrr\cyrt\cyra\or
     \cyra\cyrp\cyrr\cyre\cyrl\cyrya\or
     \cyrm\cyra\cyrya\or
-    \cyrii\cyryu\cyrn\cyrya\or
-    \cyrii\cyryu\cyrl\cyrya\or
+    \cyri\cyryu\cyrn\cyrya\or
+    \cyri\cyryu\cyrl\cyrya\or
     \cyra\cyrv\cyrg\cyru\cyrs\cyrt\cyra\or
     \cyrs\cyre\cyrn\cyrt\cyrya\cyrb\cyrr\cyrya\or
     \cyro\cyrk\cyrt\cyrya\cyrb\cyrr\cyrya\or
@@ -1461,8 +1555,8 @@ text commands such as |\textbf|, |\textsf|, |\textit|, |\texttt|, e.t.c.
     \cyrm\cyra\cyrr\cyrt\cyra\or
     \cyra\cyrp\cyrr\cyre\cyrl\cyrya\or
     \cyrm\cyra\cyrya\or
-    \cyri\cyryu\cyrn\cyrya\or
-    \cyri\cyryu\cyrl\cyrya\or
+    \cyrii\cyryu\cyrn\cyrya\or
+    \cyrii\cyryu\cyrl\cyrya\or
     \cyra\cyrv\cyrg\cyru\cyrs\cyrt\cyra\or
     \cyrs\cyre\cyrn\cyrt\cyrya\cyrb\cyrr\cyrya\or
     \cyro\cyrk\cyrt\cyrya\cyrb\cyrr\cyrya\or