diff options
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf')
-rw-r--r-- | Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf | 91 |
1 files changed, 43 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf index 0ad8bc9a461..4e7684f3d50 100644 --- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf +++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf @@ -7,25 +7,27 @@ \fi \def\russian@font{% -\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt -\@ifundefined{russianfont}{% - \@ifundefined{cyrillicfont}{% - \zf@check@ot@script{cyrl}% - \if@tempswa% - \addfontfeature{Script=Cyrillic}% - \else% - \PackageError{polyglossia}{^^J - The current font does not contain the Cyrillic script!^^J - Please define \string\cyrillicfont\space or \string\russianfont\space with \string\newfontfamily}% - \fi% - \zf@check@ot@lang{RUS}% - \if@tempswa\addfontfeature{Language=Russian}\fi% - }% - {\cyrillicfont% - \zf@check@ot@lang{RUS}% - \if@tempswa\addfontfeature{Language=Russian}\fi}% - }% - {\russianfont}% + \@ifundefined{russianfont}{% + \@ifundefined{cyrillicfont}{% + \normalfontlatin% + \font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt + \zf@check@ot@script{cyrl}% + \if@tempswa + \addfontfeature{Script=Cyrillic}% + \else + \PackageError{polyglossia}{^^J + The current font does not contain the Cyrillic script!^^J + Please define \string\cyrillicfont\space or \string\russianfont\space with \string\newfontfamily}% + \fi + \zf@check@ot@lang{RUS}% + \if@tempswa\addfontfeature{Language=Russian}\fi + }% + {\cyrillicfont% + \font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt + \zf@check@ot@lang{RUS}% + \if@tempswa\addfontfeature{Language=Russian}\fi}% + }% + {\russianfont}% } \def\tmp@old{old} @@ -39,7 +41,19 @@ \def\daterussian{\daterussian@modern}% \fi} -\setkeys{russian}{spelling} +%TODO: enable key to switch between latin and cyrillic \alph +\def\tmp@latin{latin} +\newif\iflatin@numerals +\define@key{russian}{numerals}[russian]{% + \def\@tmpa{#1}% + \ifx\@tmpa\tmp@latin + \latin@numeralstrue + \else + \latin@numeralsfalse + \fi +} + +\setkeys{russian}{spelling,numerals} \def\captionsrussian@modern{% \def\prefacename{Предисловие}% @@ -49,8 +63,8 @@ \def\chaptername{Глава}% \def\appendixname{Приложение}% \ifcsundef{thechapter}% - {\def\contentsname{Содержание}}% - {\def\contentsname{Оглавление}}% + {\def\contentsname{Содержание}}% + {\def\contentsname{Оглавление}}% \def\listfigurename{Список иллюстраций}% \def\listtablename{Список таблиц}% \def\indexname{Предметный указатель}% @@ -91,8 +105,8 @@ \def\chaptername{Глава}% \def\appendixname{Приложеніе}% \ifcsundef{thechapter}% - {\def\contentsname{Содержаніе}}% - {\def\contentsname{Оглавленіе}}% + {\def\contentsname{Содержаніе}}% + {\def\contentsname{Оглавленіе}}% \def\listfigurename{Списокъ иллюстрацій}% \def\listtablename{Списокъ таблицъ}% \def\indexname{Предмѣтный указатель}% @@ -145,12 +159,12 @@ \def\presubparagraph{}} \def\russian@Alph#1{\ifcase#1\or - А\or Б\or В\or г\or д\or Е\or Ж\or + А\or Б\or В\or Г\or Д\or Е\or Ж\or З\or И\or К\or Л\or М\or Н\or О\or П\or Р\or С\or Т\or У\or Ф\or Х\or Ц\or Ч\or Ш\or Щ\or Э\or Ю\or Я\else\xpg@ill@value{#1}{russian@Alph}\fi} \def\russian@alph#1{\ifcase#1\or - а\or б\or в\or Г\or Д\or е\or ж\or + а\or б\or в\or г\or д\or е\or ж\or з\or и\or к\or л\or м\or н\or о\or п\or р\or с\or т\or у\or ф\or х\or ц\or ч\or ш\or щ\or э\or ю\or я\else\xpg@ill@value{#1}{russian@alph}\fi} @@ -174,11 +188,13 @@ \def\noextras@russian{% \nonfrenchspacing% \def\@seccntformat##1{\csname the##1\endcsname\quad}% = LaTeX kernel + \iflatin@numerals\else\norussian@numbers\fi } - + \def\blockextras@russian{% \frenchspacing% \russian@capsformat% + \iflatin@numerals\else\russian@numbers\fi } \def\inlineextras@russian{% @@ -186,24 +202,3 @@ } \endinput - -%\def\russian@punctuation{% -% \frenchspacing% -% \def\No{№\kern.1667em}% -% \def\cyrdash{—}% -% \def\PlainTextEmDash{\ifdim\lastskip>\z@\unskip\nobreak\hskip.2em\fi% -% \cyrdash\hskip.2em\ignorespaces}% -% \def\CompoundNamesEmDash{\leavevmode\ifdim\lastskip>\z@\unskip\fi% -% \nobreak\cyrdash\penalty\exhyphenpenalty\hskip\z@skip\ignorespaces}% -% \def\DirectSpeechEmDash{\leavevmode% -% \nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}} -% -%\def\norussian@punctuation{% -% \nonfrenchspacing% -% \let\No\@undefined% -% \let\cyrdash\@undefined% -% \let\PlainTextEmDash\@undefined% -% \let\CompoundNamesEmDash\@undefined% -% \let\DirectSpeechEmDash\@undefined% -%} - |