xespdfont.sty

@@ -81,7 +81,6 @@
   \DeclareSymbolFont{letters}{\encodingdefault}{\rmdefault}{m}{it}
   \usepackage{unicode-math}
   \setmathfont{XITS Math}
-  \usepackage[T2A]{fontenc}
 \else
   \RequirePackage[T2A]{fontenc}
   \RequirePackage{mathptmx}

xespdinfo.sty

@@ -105,18 +105,11 @@
 \renewcommand{\date}[1]{\XESPDdate{#1}}
 
 \RequirePackage{xespdafterpkg}
-\RequirePackage{ifxetex}
 \XESPD@after@package{hyperref}{%
-  \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,breaklinks=false,%
-      \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
+    bookmarks=true,bookmarksnumbered=false,bookmarksopen=false,%
-      pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
+    pdfborder={0 0 0},pdfborderstyle={},backref=false,colorlinks=false,%
-  \fi
+    pdftitle=\XESPDtheUnitName,pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
 }
 

xespdlang.sty

@@ -38,12 +38,13 @@
 \RequirePackage{csquotes}
 \RequirePackage{ifxetex}
 \ifxetex
+  \RequirePackage[\XESPD@lang]{babel}
   \RequirePackage{textcase}
   \RequirePackage{xltxtra}
   \RequirePackage{xunicode}
   \RequirePackage{xecyr}
   \RequirePackage{polyglossia}
-  \setmainlanguage{\XESPD@lang}
+  \setmainlanguage{russian}
   \setkeys{\XESPD@lang}{babelshorthands=true}
   \setotherlanguage{english}
 \else

xespdtext.cls

@@ -73,12 +73,6 @@
 \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}
 
 \RequirePackage{xltabular}
 \RequirePackage{multirow}