diff options
Diffstat (limited to 'Master/texmf-dist/source/generic')
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-russian/russianb.dtx | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/generic/babel-russian/russianb.dtx b/Master/texmf-dist/source/generic/babel-russian/russianb.dtx index cf89bcd118a..33c24a06f52 100644 --- a/Master/texmf-dist/source/generic/babel-russian/russianb.dtx +++ b/Master/texmf-dist/source/generic/babel-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 % %% |