Merge branch 'xespd' of git.246060.ru:f1x1t/latex-style-esdpx into xespd
This commit is contained in:
commit
1a4697c25e
@ -32,7 +32,7 @@
|
|||||||
\ifxetex
|
\ifxetex
|
||||||
\RequirePackage{fontspec}
|
\RequirePackage{fontspec}
|
||||||
\defaultfontfeatures{Mapping=tex-text}
|
\defaultfontfeatures{Mapping=tex-text}
|
||||||
% \defaultfontfeatures{Scale=MatchLowercase}
|
\defaultfontfeatures{Scale=MatchLowercase}
|
||||||
\fi
|
\fi
|
||||||
|
|
||||||
\newcommand{\XESPDfontShape}{\rmfamily}
|
\newcommand{\XESPDfontShape}{\rmfamily}
|
||||||
@ -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}
|
||||||
|
@ -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}{%
|
||||||
\hypersetup{%
|
\ifxetex
|
||||||
\XESPD@lang,unicode=true,pdfusetitle,breaklinks=false,%
|
\hypersetup{xetex,%
|
||||||
bookmarks=true,bookmarksnumbered=false,bookmarksopen=false,%
|
breaklinks,pdftitle=\XESPDtheUnitName,%
|
||||||
pdfborder={0 0 0},pdfborderstyle={},backref=false,colorlinks=false,%
|
\XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
|
||||||
pdftitle=\XESPDtheUnitName,pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
|
pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
|
||||||
|
\else
|
||||||
|
\hypersetup{%
|
||||||
|
breaklinks,pdftitle=\XESPDtheUnitName,%
|
||||||
|
\XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
|
||||||
|
pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
|
||||||
|
\fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,13 +38,13 @@
|
|||||||
\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}
|
||||||
|
\let\cyr\relax
|
||||||
\setkeys{\XESPD@lang}{babelshorthands=true}
|
\setkeys{\XESPD@lang}{babelshorthands=true}
|
||||||
\setotherlanguage{english}
|
\setotherlanguage{english}
|
||||||
\else
|
\else
|
||||||
|
@ -73,7 +73,6 @@
|
|||||||
\RequirePackage{xespdinfo}
|
\RequirePackage{xespdinfo}
|
||||||
\RequirePackage{xespdtitlebase}
|
\RequirePackage{xespdtitlebase}
|
||||||
\RequirePackage{xespdtitle}
|
\RequirePackage{xespdtitle}
|
||||||
|
|
||||||
\RequirePackage{xltabular}
|
\RequirePackage{xltabular}
|
||||||
\RequirePackage{multirow}
|
\RequirePackage{multirow}
|
||||||
\newcommand{\HY}{\hyphenpenalty=25\exhyphenpenalty=25}
|
\newcommand{\HY}{\hyphenpenalty=25\exhyphenpenalty=25}
|
||||||
|
@ -136,7 +136,7 @@
|
|||||||
\par\vspace{10mm \@plus 2mm \@minus 4mm}\noindent
|
\par\vspace{10mm \@plus 2mm \@minus 4mm}\noindent
|
||||||
\parbox[c][.30\vsize][t]{\hsize}{%
|
\parbox[c][.30\vsize][t]{\hsize}{%
|
||||||
\ifthenelse{\equal{\XESPDtheTitleFieldIV}{}}{}
|
\ifthenelse{\equal{\XESPDtheTitleFieldIV}{}}{}
|
||||||
{\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}}
|
{\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}}
|
||||||
\ifthenelse{\equal{\XESPDtheTitleFieldV}{}}{}
|
\ifthenelse{\equal{\XESPDtheTitleFieldV}{}}{}
|
||||||
{\begin{center}\XESPDtitleFontV\XESPDtheTitleFieldV\end{center}}
|
{\begin{center}\XESPDtitleFontV\XESPDtheTitleFieldV\end{center}}
|
||||||
\ifthenelse{\equal{\XESPDtheTitleFieldVI}{}}{}
|
\ifthenelse{\equal{\XESPDtheTitleFieldVI}{}}{}
|
||||||
|
Loading…
Reference in New Issue
Block a user