xecyr (7oct19)

git-svn-id: svn://tug.org/texlive/trunk@52315 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 25 insertions, 69 deletions

diff --git a/Master/texmf-dist/tex/generic/xecyr/xu-ruenhyph.tex b/Master/texmf-dist/tex/generic/xecyr/xu-ruenhyph.tex
deleted file mode 100644
index 363814c6867..00000000000
--- a/Master/texmf-dist/tex/generic/xecyr/xu-ruenhyph.tex
+++ /dev/null
@@ -1,59 +0,0 @@
-% xu-ruenhyph.tex
-% Wrapper for XeTeX to read combined Russian/English hyphenation patterns
-% Alexey Shipunov, 2008/02/16-08-19
-% Public domain
-
-\begingroup
-
-% Please uncomment the pattern value you need before creating a new
-% format file containing Russian hyphenation patterns:
-
-\ifx\Pattern\undefined
-\def\Pattern{al}
-%\def\Pattern{as}
-%\def\Pattern{ct}
-%\def\Pattern{dv}
-%\def\Pattern{mg}
-%\def\Pattern{vl}
-%\def\Pattern{zn}
-\fi
-
-% For non-XeTeX use, also check the encoding options in ruhyphen.tex
-
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
-
-  \input hyphen
-  \input enrhm2
-  \input ruhyphen
-
-\else
-
-  \let\PATTERNS=\patterns
-  \def\patterns{%
-    \XeTeXinputencoding "KOI8-R"
-    \PATTERNS
-  }
-  
-  \input hyphen
-  \input enrhm2
-  \input ruhyph\Pattern
-  \input cyryo\Pattern
-  
-  % additional patterns from ruhyphen.tex, converted to Unicode
-  \PATTERNS{.^^^^043d^^^^04358 8^^^^043d^^^^0435.}
-  \PATTERNS{8^^^^0431^^^^044a. 8^^^^0432^^^^044a. 8^^^^0433^^^^044a.
-            8^^^^0434^^^^044a. 8^^^^0436^^^^044a. 8^^^^0437^^^^044a.
-            8^^^^043a^^^^044a. 8^^^^043b^^^^044a. 8^^^^043c^^^^044a.
-            8^^^^043d^^^^044a. 8^^^^043f^^^^044a. 8^^^^0440^^^^044a.
-            8^^^^0441^^^^044a. 8^^^^0442^^^^044a. 8^^^^0444^^^^044a.
-            8^^^^0445^^^^044a. 8^^^^0446^^^^044a. 8^^^^0447^^^^044a.
-            8^^^^0448^^^^044a. 8^^^^0449^^^^044a.}
-
-\fi
-
-\endgroup
-
-\lefthyphenmin2 % settings copied from ruhyphen.tex
-\righthyphenmin2
-
-\endinput
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).