From a95aca9e5e7e0beb3d2f029663ea5215e31ad00d Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 11 Sep 2019 06:55:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5?=
 =?UTF-8?q?=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xespdfont.sty |  2 ++
 xespdinfo.sty | 15 +++++++++++++--
 xespdlang.sty |  8 ++++----
 xespdtext.cls |  6 ++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/xespdfont.sty b/xespdfont.sty
index 1589cd0..3bc9490 100644
--- a/xespdfont.sty
+++ b/xespdfont.sty
@@ -31,6 +31,7 @@
 \RequirePackage{ifxetex}
 \ifxetex
   \RequirePackage{fontspec}
+  \defaultfontfeatures{Mapping=tex-text}
 %  \defaultfontfeatures{Scale=MatchLowercase}
 \fi
 
@@ -84,6 +85,7 @@
   \DeclareSymbolFont{letters}{\encodingdefault}{\rmdefault}{m}{it}
   \usepackage{unicode-math}
   \setmathfont{XITS Math}
+  \usepackage[T2A]{fontenc}
 \else
   \RequirePackage{mathptmx}
   \RequirePackage{gostfont}
diff --git a/xespdinfo.sty b/xespdinfo.sty
index 2b5b9f0..625eeca 100644
--- a/xespdinfo.sty
+++ b/xespdinfo.sty
@@ -96,7 +96,18 @@
 \renewcommand{\date}[1]{\XESPDdate{#1}}
 
 \RequirePackage{xespdafterpkg}
+\RequirePackage{ifxetex}
 \XESPD@after@package{hyperref}{%
-  \hypersetup{breaklinks,pdftitle=\XESPDtheUnitName,%
-    pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}}
+  \ifxetex
+    \hypersetup{xetex,%
+      breaklinks,pdftitle=\XESPDtheUnitName,%
+      \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
+      pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
+  \else
+    \hypersetup{%
+      breaklinks,pdftitle=\XESPDtheUnitName,%
+      \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
+      pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
+  \fi
+}
 
diff --git a/xespdlang.sty b/xespdlang.sty
index d0cdab7..6fc3e50 100644
--- a/xespdlang.sty
+++ b/xespdlang.sty
@@ -35,16 +35,16 @@
 
 \ProcessOptions\relax
 
-\RequirePackage[T2A]{fontenc}
+\RequirePackage{csquotes}
 \RequirePackage{ifxetex}
 \ifxetex
-  \RequirePackage[\XESPD@lang]{babel}
+%  \RequirePackage[\XESPD@lang]{babel}
   \RequirePackage{textcase}
   \RequirePackage{xltxtra}
   \RequirePackage{xunicode}
-  \RequirePackage{polyglossia}
   \RequirePackage{xecyr}
-  \setmainlanguage{russian}
+  \RequirePackage{polyglossia}
+  \setmainlanguage{\XESPD@lang}
   \setkeys{\XESPD@lang}{babelshorthands=true}
   \setotherlanguage{english}
 \else
diff --git a/xespdtext.cls b/xespdtext.cls
index ca0cf4d..a6b59d2 100644
--- a/xespdtext.cls
+++ b/xespdtext.cls
@@ -73,6 +73,12 @@
 \RequirePackage{xespdinfo}
 \RequirePackage{xespdtitlebase}
 \RequirePackage{xespdtitle}
+\RequirePackage{xltabular}
+\RequirePackage{multirow}
+\newcommand{\HY}{\hyphenpenalty=25\exhyphenpenalty=25}
+\newcolumntype{Z}{>{\HY\raggedright\arraybackslash\hspace{0pt}}X}
+\newcolumntype{M}{>{\HY\RaggedRight\arraybackslash\hspace{0pt}}c}
+\newcolumntype{L}{>{\HY\RaggedRight\arraybackslash\hspace{0pt}}l}
 
 \linespread{1.25}