Merge branch 'xespd' of git.246060.ru:f1x1t/latex-style-esdpx into xespd

This commit is contained in:
Andrei Astafev 2020-10-12 12:43:36 +03:00
commit 1a4697c25e
5 changed files with 17 additions and 10 deletions

View File

@ -32,7 +32,7 @@
\ifxetex
\RequirePackage{fontspec}
\defaultfontfeatures{Mapping=tex-text}
% \defaultfontfeatures{Scale=MatchLowercase}
\defaultfontfeatures{Scale=MatchLowercase}
\fi
\newcommand{\XESPDfontShape}{\rmfamily}
@ -81,6 +81,7 @@
\DeclareSymbolFont{letters}{\encodingdefault}{\rmdefault}{m}{it}
\usepackage{unicode-math}
\setmathfont{XITS Math}
\usepackage[T2A]{fontenc}
\else
\RequirePackage[T2A]{fontenc}
\RequirePackage{mathptmx}

View File

@ -105,11 +105,18 @@
\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{%
\XESPD@lang,unicode=true,pdfusetitle,breaklinks=false,%
bookmarks=true,bookmarksnumbered=false,bookmarksopen=false,%
pdfborder={0 0 0},pdfborderstyle={},backref=false,colorlinks=false,%
pdftitle=\XESPDtheUnitName,pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
breaklinks,pdftitle=\XESPDtheUnitName,%
\XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
\fi
}

View File

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

View File

@ -73,7 +73,6 @@
\RequirePackage{xespdinfo}
\RequirePackage{xespdtitlebase}
\RequirePackage{xespdtitle}
\RequirePackage{xltabular}
\RequirePackage{multirow}
\newcommand{\HY}{\hyphenpenalty=25\exhyphenpenalty=25}