Merge remote-tracking branch 'origin/test' into xespd

This commit is contained in:
Andrei Astafev 2020-03-13 21:38:32 +03:00
commit 784b3df1cf
4 changed files with 20 additions and 7 deletions

View File

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

View File

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

View File

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

View File

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