summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/babel-contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-10-15 03:00:58 +0000
committerNorbert Preining <norbert@preining.info>2020-10-15 03:00:58 +0000
commitff1e02dbf9c33ee832d7f0cb39a42648b376c9c5 (patch)
treea42fe5db4e9016144fdea322aff808927deeccd6 /macros/latex/contrib/babel-contrib
parent3a5a864b265cf29d47d0821fb7f03745f99b97d9 (diff)
CTAN sync 202010150300
Diffstat (limited to 'macros/latex/contrib/babel-contrib')
-rw-r--r--macros/latex/contrib/babel-contrib/russian/README7
-rw-r--r--macros/latex/contrib/babel-contrib/russian/russianb.dtx43
-rw-r--r--macros/latex/contrib/babel-contrib/russian/russianb.pdfbin550621 -> 127486 bytes
-rw-r--r--macros/latex/contrib/babel-contrib/ukrainian/README.md7
-rw-r--r--macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx79
-rw-r--r--macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdfbin134371 -> 134237 bytes
6 files changed, 72 insertions, 64 deletions
diff --git a/macros/latex/contrib/babel-contrib/russian/README b/macros/latex/contrib/babel-contrib/russian/README
index 46fe0449e7..fb47e71ebd 100644
--- a/macros/latex/contrib/babel-contrib/russian/README
+++ b/macros/latex/contrib/babel-contrib/russian/README
@@ -1,6 +1,6 @@
----------------------------------------------------------------
-Russian language module for Babel, v1.3k
+Russian language module for Babel, v1.3l
Released under the LaTeX Project Public License v1.3c or later.
See http://www.latex-project.org/lppl.txt
@@ -108,6 +108,11 @@ might be absent.
5. CHANGES
+2020-10-16 version 1.3l
+
+ * Patches for Russian language from hyperref package to babel-russian module
+ (thanks to Ulrike Fischer).
+
2020-09-06 version 1.3k
* Bug fixed in definition of \Russian command (thanks to Javier Bezos).
diff --git a/macros/latex/contrib/babel-contrib/russian/russianb.dtx b/macros/latex/contrib/babel-contrib/russian/russianb.dtx
index cf89bcd118..33c24a06f5 100644
--- a/macros/latex/contrib/babel-contrib/russian/russianb.dtx
+++ b/macros/latex/contrib/babel-contrib/russian/russianb.dtx
@@ -7,7 +7,7 @@
%<*readme>
----------------------------------------------------------------
-Russian language module for Babel, v1.3k
+Russian language module for Babel, v1.3l
Released under the LaTeX Project Public License v1.3c or later.
See http://www.latex-project.org/lppl.txt
@@ -119,6 +119,11 @@ might be absent.
5. CHANGES
+2020-10-16 version 1.3l
+
+ * Patches for Russian language from hyperref package to babel-russian module
+ (thanks to Ulrike Fischer).
+
2020-09-06 version 1.3k
* Bug fixed in definition of \Russian command (thanks to Javier Bezos).
@@ -267,7 +272,7 @@ and the derived files russianb.ins,
%</internal>
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{russianb.ldf}[2020/09/09 1.3k Russian support for the Babel system]
+\ProvidesFile{russianb.ldf}[2020/10/16 1.3l Russian support for the Babel system]
%</code>
%<*driver>
\documentclass[a4paper]{ltxdoc}
@@ -281,16 +286,10 @@ and the derived files russianb.ins,
\ifnum 0\ifxetex 1\fi\ifluatex 1\fi>0
\usepackage{fontspec}
\defaultfontfeatures{Ligatures={TeX}}
- \setmainfont{CMU Serif}
- %\setmainfont{STIX Two}[
- % UprightFont={* Math},
- % %UprightFont={* Text},
- % ItalicFont={* Text Italic},
- % BoldFont={* Text Bold},
- % BoldItalicFont={* Text Bold Italic},
- %]
- %\setsansfont{CMU Sans Serif}
- %\setmonofont{CMU Typewriter Text}
+ \setmainfont{cmunrm.otf}%{CMU Serif}
+ %\setmainfont{STIX Two Text}
+ \setsansfont{cmunss.otf}%{CMU Sans Serif}
+ \setmonofont{cmuntt.otf}%{CMU Typewriter Text}
%%\setmonofont[Scale=MatchLowercase]{Courier New}
%%\setmonofont[Scale=MatchUppercase]{Courier New}
%%\setmonofont{Courier New}
@@ -909,7 +908,8 @@ and the derived files russianb.ins,
%
% \section{Implementation}
%
-% \changes{1.3k}{2020/09/06}{bug in definition of \cs{Russian} fixed}
+% \changes{1.3l}{2020/10/16}{Added support to hyperref package}
+% \changes{1.3k}{2020/09/06}{Bug in definition of \cs{Russian} fixed}
% \changes{1.3h}{2016/02/18}{\cs{cyrdash} is redefined}
% \changes{1.3h}{2016/02/18}{Bugs fixed in captions for revtex4 and revtex4-1}
% \changes{1.3g}{2015/05/01}{Added support for revtex4 and revtex4-1 classes}
@@ -1363,12 +1363,16 @@ and the derived files russianb.ins,
% which indicates explicitly breakpoint for hyphenation in a word. Meaning
% of these shorthands is explained in table~\ref{tab:russian-quote}.
%
+% Some of this definitions need a alternative definitions for the booksmarks.
+% \changes{1.3l}{2020/10/16}{Modified shorthands}
% \begin{macrocode}
+\providecommand\texorpdfstring[2]{#1}
\declare@shorthand{russian}{""}{\hskip\z@skip}
-\declare@shorthand{russian}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
+\declare@shorthand{russian}{"~}{\texorpdfstring{\textormath{\leavevmode\hbox{-}}{-}}{-}}
\declare@shorthand{russian}{"=}{\nobreak-\hskip\z@skip}
\declare@shorthand{russian}{"|}{%
- \textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}}
+ \texorpdfstring{%
+ \textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}}{}}
% \end{macrocode}
%
% \subsubsection{Emdash, endash and hyphenation sign}
@@ -1378,12 +1382,13 @@ and the derived files russianb.ins,
% If it is, we output an emdash, otherwise a hyphen sign. Therefor
% \TeX\ looks for the next token after the first `|-|', writes
% its meaning to |\russian@sh@next| and finally call for |\russian@sh@tmp|.
+% \changes{1.3l}{2020/10/16}{Modified shorthands}
% \begin{macrocode}
\declare@shorthand{russian}{"-}{%
- \def\russian@sh@tmp{%
+ \texorpdfstring{\def\russian@sh@tmp{%
\if\russian@sh@next-\expandafter\russian@sh@emdash
\else\expandafter\russian@sh@hyphen\fi}%
- \futurelet\russian@sh@next\russian@sh@tmp}
+ \futurelet\russian@sh@next\russian@sh@tmp}{-}}
% \end{macrocode}
% Two macros |\russian@sh@hyphen| and |\russian@sh@emdash| called by
% |\russian@sh@tmp| are defined below. The second of
@@ -1406,7 +1411,7 @@ and the derived files russianb.ins,
\errmessage{Wrong usage of cdash}\fi\fi\fi}
% \end{macrocode}
%
-% All these 3 internal macros call for |\cyrdash|, which type Cyrillic
+% All these 3 internal macros call for |\cyrdash|, which types Cyrillic
% emdash, but put different spaces around the dash.
%
% |\@Acdash| is invoked by |"---|. It types Cyrillic emdash to be used
@@ -2179,7 +2184,7 @@ and the derived files russianb.ins,
%\iffalse
%</code>
%\fi
-%\CheckSum{2353}
+%\CheckSum{2358}
%\Finale
%
%%
diff --git a/macros/latex/contrib/babel-contrib/russian/russianb.pdf b/macros/latex/contrib/babel-contrib/russian/russianb.pdf
index ac043c91cf..791989648b 100644
--- a/macros/latex/contrib/babel-contrib/russian/russianb.pdf
+++ b/macros/latex/contrib/babel-contrib/russian/russianb.pdf
Binary files differ
diff --git a/macros/latex/contrib/babel-contrib/ukrainian/README.md b/macros/latex/contrib/babel-contrib/ukrainian/README.md
index bdeb5018d7..ed2832dc1d 100644
--- a/macros/latex/contrib/babel-contrib/ukrainian/README.md
+++ b/macros/latex/contrib/babel-contrib/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/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx b/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx
index f99ce29dbb..8d1ef19714 100644
--- a/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx
+++ b/macros/latex/contrib/babel-contrib/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/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf b/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf
index a9714b7d06..8278fe7607 100644
--- a/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf
+++ b/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf
Binary files differ