Обновление настроек

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}

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
+}
 

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

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}