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

This commit is contained in:
Andrei Astafev 2019-09-11 06:55:41 +03:00
parent c4b4a79740
commit a95aca9e5e
4 changed files with 25 additions and 6 deletions

View File

@ -31,6 +31,7 @@
\RequirePackage{ifxetex} \RequirePackage{ifxetex}
\ifxetex \ifxetex
\RequirePackage{fontspec} \RequirePackage{fontspec}
\defaultfontfeatures{Mapping=tex-text}
% \defaultfontfeatures{Scale=MatchLowercase} % \defaultfontfeatures{Scale=MatchLowercase}
\fi \fi
@ -84,6 +85,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{mathptmx} \RequirePackage{mathptmx}
\RequirePackage{gostfont} \RequirePackage{gostfont}

View File

@ -96,7 +96,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}{%
\hypersetup{breaklinks,pdftitle=\XESPDtheUnitName,% \ifxetex
pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}} \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
}

View File

@ -35,16 +35,16 @@
\ProcessOptions\relax \ProcessOptions\relax
\RequirePackage[T2A]{fontenc} \RequirePackage{csquotes}
\RequirePackage{ifxetex} \RequirePackage{ifxetex}
\ifxetex \ifxetex
\RequirePackage[\XESPD@lang]{babel} % \RequirePackage[\XESPD@lang]{babel}
\RequirePackage{textcase} \RequirePackage{textcase}
\RequirePackage{xltxtra} \RequirePackage{xltxtra}
\RequirePackage{xunicode} \RequirePackage{xunicode}
\RequirePackage{polyglossia}
\RequirePackage{xecyr} \RequirePackage{xecyr}
\setmainlanguage{russian} \RequirePackage{polyglossia}
\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}
\linespread{1.25} \linespread{1.25}