summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/xecyr
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-07 21:05:00 +0000
committerKarl Berry <karl@freefriends.org>2019-10-07 21:05:00 +0000
commitb20f06b8fb854624dac510cb6055601940753432 (patch)
tree87907e16bd8dc55ee8793a08eb89e44ceec426e6 /Master/texmf-dist/tex/xelatex/xecyr
parentbd7d3c932c93859c248f542876101c00dd2fe6d7 (diff)
xecyr (7oct19)
git-svn-id: svn://tug.org/texlive/trunk@52315 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xecyr')
-rw-r--r--Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty35
1 files changed, 25 insertions, 10 deletions
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 <medvedev at project7.ru> 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).