From b20f06b8fb854624dac510cb6055601940753432 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Oct 2019 21:05:00 +0000 Subject: xecyr (7oct19) git-svn-id: svn://tug.org/texlive/trunk@52315 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty | 35 +++++++++++++++++++-------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/xelatex/xecyr') diff --git a/Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty b/Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty index 43c082b7759..fde8e2a316a 100644 --- a/Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty +++ b/Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty @@ -1,7 +1,8 @@ -% Modified from Evgenie Medvedev by A. Shipunov (plantago@herba.msu.ru) - \ProvidesPackage{xecyr}% - [2008/03/08 v1.0 Definitions for Cyrillic Babel/XeLaTeX compatibility] + [2019/10/04 v1.2 Definitions for Cyrillic Babel and XeLaTeX/LuaTeX compatibility] + +\RequirePackage{ifluatex} +\RequirePackage{ifxetex} \newif\if@EXT \DeclareOption{ext}{\@EXTtrue} @@ -14,18 +15,32 @@ \ProcessOptions \if@MIS - \RequirePackage{misccorr} - \XeTeXinputencoding "KOI8-R" + \RequirePackage{misccorr} \fi -\if@EXT - \PassOptionsToPackage{cm-default}{fontspec} - \RequirePackage{xltxtra} +\ifluatex + \if@EXT + \RequirePackage{luatextra} + \defaultfontfeatures{Mapping=tex-text} + \fi +\else + \ifxetex + \if@EXT + \RequirePackage{xltxtra} + \defaultfontfeatures{Mapping=tex-text} + \fi + \else % pdflatex/inputenc hack + \RequirePackage[utf8]{inputenc} + \def\setmainfont#1{} + \def\setsansfont#1{} + \def\setmonofont#1{} + \endinput + \fi \fi -\RequirePackage{xunicode} +\@ifpackageloaded{xunicode}{}{\RequirePackage{xunicode}} -%%% Cyrillic letter TeX definitions for XeTeX +%%% Cyrillic letter TeX definitions for XeTeX/LuaTeX % This definition set is complete for all Slavic Cyrillic % languages (Russian, Ukrainian, Belorussian, % Rusyn, Serbian, Macedonian and Bulgarian alphabets). -- cgit v1.2.3