Merge branch 'master' of 192.168.250.218:a/latex-style-espdx

This commit is contained in:
Andrei Astafev 2018-09-24 14:56:11 +03:00
commit 73c8b39c48
4 changed files with 19 additions and 15 deletions

View File

@ -60,20 +60,20 @@
\newcommand{\ESPDtheGostFontName}{}
\newcommand{\ESPDgostFontName}[1]{\renewcommand{\ESPDtheGostFontName}{#1}}
\usepackage{fontspec}
\newcommand{\ESPDfontGostIII}{%
\ESPDfontSetBaseLineStretch
\ESPDfontIIIsize\setmainfont{\ESPDtheGostFontName}}
\newcommand{\ESPDfontGostIV}{%
\ESPDfontSetBaseLineStretch
\ESPDfontIVsize\setmainfont{\ESPDtheGostFontName}}
\newcommand{\ESPDfontGostIII}{%
\ESPDfontSetBaseLineStretch
\ESPDfontIIIsize\setmainfont{\ESPDtheGostFontName}}
\newcommand{\ESPDfontGostIV}{%
\ESPDfontSetBaseLineStretch
\ESPDfontIVsize\setmainfont{\ESPDtheGostFontName}}
\else
\RequirePackage{gostfont}
\newcommand{\ESPDfontGostIII}{%
\ESPDfontSetBaseLineStretch
\ESPDfontIIIsize\selectfont\GostBFont}
\newcommand{\ESPDfontGostIV}{%
\ESPDfontSetBaseLineStretch
\ESPDfontIVsize\selectfont\GostBFont}
\RequirePackage{gostfont}
\newcommand{\ESPDfontGostIII}{%
\ESPDfontSetBaseLineStretch
\ESPDfontIIIsize\selectfont\GostBFont}
\newcommand{\ESPDfontGostIV}{%
\ESPDfontSetBaseLineStretch
\ESPDfontIVsize\selectfont\GostBFont}
\fi
\newcommand{\ESPDfontTabHead}{\ESPDfontV}

View File

@ -39,6 +39,9 @@
\newcommand{\ESPDtitle}[1]{\ESPDunitName{#1}}
\renewcommand{\title}[1]{\ESPDunitName{#1}}
\newcommand{\ESPDtheProject}{}
\newcommand{\ESPDproject}[1]{\renewcommand{\ESPDtheProject}{#1}}
\newcommand{\ESPDtheDocName}{}
\newcommand{\ESPDdocName}[1]{\renewcommand{\ESPDtheDocName}{#1}}

View File

@ -92,7 +92,7 @@
\newcommand{\ESPDapprovingName}{%
\cyr\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyra\cyryu}
\newcommand{\ESPDapprovedName}{%
\cyr\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn}
\cyr\CYRU\CYRT\CYRV\CYRE\CYRR\CYRZH\CYRD\CYRE\CYRN}
\newcommand{\ESPDapprovingSheetName}{%
\cyr\CYRL\cyri\cyrs\cyrt\ %
\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyrya}

View File

@ -67,7 +67,8 @@
\ESPD@title@split@field{\ESPDtheTitleFieldIIIl}{\ESPDtheTitleFieldIIIr}}
\renewcommand{\ESPDtheTitleFieldIV}{%
\MakeUppercase{\ESPDtheTitle}\par\ESPDtheDocName}
{\MakeUppercase{\ESPDtheProject}\par\MakeUppercase{\ESPDtheTitle}\par\ESPDtheDocName}%
}
\renewcommand{\ESPDtheTitleFieldV}{}