babel-ukrainian (15oct20)

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

4 files changed, 70 insertions, 79 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-ukrainian/README.md b/Master/texmf-dist/doc/generic/babel-ukrainian/README.md
index bdeb5018d77..ed2832dc1d9 100644
--- a/Master/texmf-dist/doc/generic/babel-ukrainian/README.md
+++ b/Master/texmf-dist/doc/generic/babel-ukrainian/README.md
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------
 
-Ukrainian language module for Babel, v1.4c
+Ukrainian language module for Babel, v1.4e
 
 Released under the LaTeX Project Public License v1.3c or later.
 See http://www.latex-project.org/lppl.txt
@@ -15,7 +15,7 @@ The current maintainer is Sergiy Ponomarenko <sergiy.ponomarenko@gmail.com>.
 1. INSTALLATION
 
 - unpack babel-ukrainian.zip
-- run "xelatex.exe ukraineb.dtx" (recommended)
+- run "lualatex.exe ukraineb.dtx" (recommended)
   or "pdflatex.exe ukraineb.dtx";
   run "tex.exe ukraineb.dtx"
   or "tex.exe ukraineb.ins", if you don't need documentation
@@ -81,6 +81,9 @@ files as they might have stored incompatible internal encodings.
 
 5. CHANGES
 
+2020-10-13 version 1.4e
+   * Preventing a problem with duplicate math operators in russian.ldf.
+
 2020-10-13 version 1.4d
    * Added support for pdfstings.
 
diff --git a/Master/texmf-dist/doc/generic/babel-ukrainian/ukraineb.pdf b/Master/texmf-dist/doc/generic/babel-ukrainian/ukraineb.pdf
index a9714b7d061..8278fe7607d 100644
--- a/Master/texmf-dist/doc/generic/babel-ukrainian/ukraineb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-ukrainian/ukraineb.pdf
diff --git a/Master/texmf-dist/source/generic/babel-ukrainian/ukraineb.dtx b/Master/texmf-dist/source/generic/babel-ukrainian/ukraineb.dtx
index f99ce29dbb2..8d1ef197147 100644
--- a/Master/texmf-dist/source/generic/babel-ukrainian/ukraineb.dtx
+++ b/Master/texmf-dist/source/generic/babel-ukrainian/ukraineb.dtx
@@ -6,7 +6,7 @@
 %<*readme>
 ----------------------------------------------------------------
 
-Ukrainian language module for Babel, v1.4c
+Ukrainian language module for Babel, v1.4e
 
 Released under the LaTeX Project Public License v1.3c or later.
 See http://www.latex-project.org/lppl.txt
@@ -22,7 +22,7 @@ The current maintainer is Sergiy Ponomarenko <sergiy.ponomarenko@gmail.com>.
 1. INSTALLATION
 
 - unpack babel-ukrainian.zip
-- run "xelatex.exe ukraineb.dtx" (recommended)
+- run "lualatex.exe ukraineb.dtx" (recommended)
   or "pdflatex.exe ukraineb.dtx";
   run "tex.exe ukraineb.dtx"
   or "tex.exe ukraineb.ins", if you don't need documentation
@@ -90,6 +90,9 @@ files as they might have stored incompatible internal encodings.
 
 5. CHANGES
 
+2020-10-13 version 1.4e
+   * Preventing a problem with duplicate math operators in russian.ldf.
+
 2020-10-13 version 1.4d
    * Added support for pdfstings.
 
@@ -200,8 +203,8 @@ and the derived files             ukraineb.ins,
 %</internal>
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-%\ProvidesLanguage{\jobname}[2020/10/13 1.4d Ukrainian support for the Babel system]
-\ProvidesFile{ukraineb.ldf}[2020/10/13 1.4d Ukrainian support for the Babel system]
+%\ProvidesLanguage{\jobname}[2020/10/14 1.4e Ukrainian support for the Babel system]
+\ProvidesFile{ukraineb.ldf}[2020/10/14 1.4e Ukrainian support for the Babel system]
 %</code>
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
@@ -1009,29 +1012,7 @@ and the derived files             ukraineb.ins,
 % well enough to Ukrainian version of Windows ANSI encoding which is almost
 % equivalent to \texttt{cp1251}.
 %
-%    \begin{macrocode}
-\@ifpackageloaded{inputenc}{%
-    \if@ukr@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 Ukrainian language}
-                \fi
-            \fi
-        \fi
-    %\fi
-}
-%    \end{macrocode}
+% \changes{1.4e}{2020/10/14}{Removed check if inputenc is loaded}
 %
 %
 %    \subsection{Shorthands}
@@ -1534,7 +1515,7 @@ and the derived files             ukraineb.ins,
 % 
 % \subsection{Ukrainian mathetematical typography traditions}
 %
-% \Describe\sh{}
+% \Describe\sh{}%
 % \DescribeOther\ch{}%
 % \DescribeOther\tg{}%
 % \DescribeOther\ctg{}%
@@ -1551,20 +1532,34 @@ and the derived files             ukraineb.ins,
 % defined in Latin~1 encoding:
 %
 %    \begin{macrocode}
-\def\sh{\mathop{\operator@font sh}\nolimits}
-\def\ch{\mathop{\operator@font ch}\nolimits}
-\def\tg{\mathop{\operator@font tg}\nolimits}
-\def\ctg{\mathop{\operator@font ctg}\nolimits}
-\def\arctg{\mathop{\operator@font arctg}\nolimits}
-\def\arcctg{\mathop{\operator@font arcctg}\nolimits}
-\addto\extrasukrainian{%
-    \babel@save{\th}%
-    \let\ltx@th\th
-    \def\th{\textormath{\ltx@th}%
-        {\mathop{\operator@font th}\nolimits}}%
+\AtBeginDocument{%
+  \@ifpackagewith{babel}{russian}{\relax}{%
+      \@ifpackageloaded{amsopn}
+      {%
+        \DeclareMathOperator{\sh}{sh}%
+        \DeclareMathOperator{\ch}{ch}%
+        \DeclareMathOperator{\tg}{tg}%
+        \DeclareMathOperator{\ctg}{ctg}%
+        \DeclareMathOperator{\arctg}{arctg}%
+        \DeclareMathOperator{\arcctg}{arcctg}%
+        \DeclareMathOperator{\cth}{cth}%\
+        \DeclareMathOperator{\cosec}{cosec}%
+        \DeclareMathOperator{\math@th}{th}%
+      }{%
+        \DeclareRobustCommand\sh{\mathop{\operator@font sh}\nolimits}%
+        \DeclareRobustCommand\ch{\mathop{\operator@font ch}\nolimits}%
+        \DeclareRobustCommand\tg{\mathop{\operator@font tg}\nolimits}%
+        \DeclareRobustCommand\ctg{\mathop{\operator@font ctg}\nolimits}%
+        \DeclareRobustCommand{\arctg}{\mathop{\operator@font arctg}\nolimits}%
+        \DeclareRobustCommand\arcctg{\mathop{\operator@font arcctg}\nolimits}%
+        \DeclareRobustCommand\cth{\mathop{\operator@font cth}\nolimits}%\MakeRobust\cth%
+        \DeclareRobustCommand\cosec{\mathop{\operator@font cosec}\nolimits}%
+        \DeclareRobustCommand{\math@th}{\mathop{\operator@font arctg}\nolimits}%
+      }%
+      \let\text@th\th%
+      \DeclareRobustCommand{\th}{\TextOrMath{\text@th}{\math@th}}%
+    }%
 }
-\def\cth{\mathop{\operator@font cth}\nolimits}
-\def\cosec{\mathop{\operator@font cosec}\nolimits}
 %    \end{macrocode}
 %
 % For compatibility with older Ukrainian packages we leave definition of the |\No|
@@ -1591,7 +1586,7 @@ and the derived files             ukraineb.ins,
 %\iffalse
 %</code>
 %\fi
-% \CheckSum{1092}
+% \CheckSum{1083}
 %\Finale
 %
 %%
diff --git a/Master/texmf-dist/tex/generic/babel-ukrainian/ukraineb.ldf b/Master/texmf-dist/tex/generic/babel-ukrainian/ukraineb.ldf
index ec02f00cd5d..f06adfe2901 100644
--- a/Master/texmf-dist/tex/generic/babel-ukrainian/ukraineb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-ukrainian/ukraineb.ldf
@@ -12,7 +12,7 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{ukraineb.ldf}[2020/10/13 1.4d Ukrainian support for the Babel system]
+\ProvidesFile{ukraineb.ldf}[2020/10/14 1.4e Ukrainian support for the Babel system]
 \LdfInit{ukrainian}{captionsukrainian}
 \ifdefined\if@ukr@uni@ode
     \PackageError{babel}{if@ukr@uni@ode already defined.\MessageBreak
@@ -94,27 +94,6 @@
     \DeclareTextCommand{\AA}{OT1}{\r A}
 \fi
 \DeclareTextFontCommand{\textcyrillic}{\cyrillictext}
-\@ifpackageloaded{inputenc}{%
-    \if@ukr@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 Ukrainian language}
-                \fi
-            \fi
-        \fi
-    %\fi
-}
 \initiate@active@char{"}
 \begingroup \catcode`\"12
 \def\reserved@a{\endgroup
@@ -340,20 +319,34 @@
             \fi}%
     \fi
 }
-\def\sh{\mathop{\operator@font sh}\nolimits}
-\def\ch{\mathop{\operator@font ch}\nolimits}
-\def\tg{\mathop{\operator@font tg}\nolimits}
-\def\ctg{\mathop{\operator@font ctg}\nolimits}
-\def\arctg{\mathop{\operator@font arctg}\nolimits}
-\def\arcctg{\mathop{\operator@font arcctg}\nolimits}
-\addto\extrasukrainian{%
-    \babel@save{\th}%
-    \let\ltx@th\th
-    \def\th{\textormath{\ltx@th}%
-        {\mathop{\operator@font th}\nolimits}}%
+\AtBeginDocument{%
+  \@ifpackagewith{babel}{russian}{\relax}{%
+      \@ifpackageloaded{amsopn}
+      {%
+        \DeclareMathOperator{\sh}{sh}%
+        \DeclareMathOperator{\ch}{ch}%
+        \DeclareMathOperator{\tg}{tg}%
+        \DeclareMathOperator{\ctg}{ctg}%
+        \DeclareMathOperator{\arctg}{arctg}%
+        \DeclareMathOperator{\arcctg}{arcctg}%
+        \DeclareMathOperator{\cth}{cth}%\
+        \DeclareMathOperator{\cosec}{cosec}%
+        \DeclareMathOperator{\math@th}{th}%
+      }{%
+        \DeclareRobustCommand\sh{\mathop{\operator@font sh}\nolimits}%
+        \DeclareRobustCommand\ch{\mathop{\operator@font ch}\nolimits}%
+        \DeclareRobustCommand\tg{\mathop{\operator@font tg}\nolimits}%
+        \DeclareRobustCommand\ctg{\mathop{\operator@font ctg}\nolimits}%
+        \DeclareRobustCommand{\arctg}{\mathop{\operator@font arctg}\nolimits}%
+        \DeclareRobustCommand\arcctg{\mathop{\operator@font arcctg}\nolimits}%
+        \DeclareRobustCommand\cth{\mathop{\operator@font cth}\nolimits}%\MakeRobust\cth%
+        \DeclareRobustCommand\cosec{\mathop{\operator@font cosec}\nolimits}%
+        \DeclareRobustCommand{\math@th}{\mathop{\operator@font arctg}\nolimits}%
+      }%
+      \let\text@th\th%
+      \DeclareRobustCommand{\th}{\TextOrMath{\text@th}{\math@th}}%
+    }%
 }
-\def\cth{\mathop{\operator@font cth}\nolimits}
-\def\cosec{\mathop{\operator@font cosec}\nolimits}
 \DeclareRobustCommand{\No}{%
     \ifmmode{\nfss@text{\textnumero}}\else\textnumero\fi}
 \ldf@finish{ukrainian}