Титул

xespdtitle.sty

@@ -25,7 +25,9 @@
 \RequirePackage{xespdstamp}
 \RequirePackage{xespdlang}
 \RequirePackage{xespdinfo}
+\RequirePackage{xespdtotal}
 \RequirePackage{xespdtitlebase}
+\RequirePackage{ifthen}
 
 \newcommand{\XESPD@title@split@field}[2]{%
   \parbox[t]{.4\hsize}{\raggedright#1}\hfill
@@ -46,18 +48,18 @@
 \renewcommand{\XESPDtheTitleFieldIIIl}{%
   \ifx\XESPD@title@approving@sheet\@undefined
     \expandafter\ifx\csname XESPD@title@agreed@name@1\endcsname\relax\else
-      \textbf{\MakeUppercase{\XESPDagreedName}}\\
+      \text{\MakeUppercase{\XESPDagreedName}}\\
       \XESPD@title@make@stamp{agreed}{1}
     \fi
   \else
-    \textbf{\MakeUppercase{\XESPDapprovedName}}\\
+    \textrm{\MakeUppercase{\XESPDapprovedName}}\\
     \XESPD@title@approving@sheet
   \fi}
 \def\XESPDtheTitleFieldIIIr{}
 \renewcommand{\XESPDtheTitleFieldIIIr}{%
   \ifx\XESPD@title@approving@sheet\@undefined
     \expandafter\ifx\csname XESPD@title@approved@name@1\endcsname\relax\else
-      \textbf{\MakeUppercase{\XESPDapprovingName}}\\
+      \text{\MakeUppercase{\XESPDapprovingName}}\\
       \XESPD@title@make@stamp{approved}{1}
     \fi
   \fi}
@@ -65,14 +67,19 @@
   \XESPD@title@split@field{\XESPDtheTitleFieldIIIl}{\XESPDtheTitleFieldIIIr}}
 
 \renewcommand{\XESPDtheTitleFieldIV}{%
-  \MakeUppercase{\XESPDtheTitle}\par\XESPDtheDocName}
+    {\MakeUppercase{\XESPDtheTitle}\par\XESPDtheDocName}%
+}
 
 \renewcommand{\XESPDtheTitleFieldV}{}
 
 \renewcommand{\XESPDtheTitleFieldVI}{%
   \MakeUppercase{\XESPDtheSignature}}
 
-\renewcommand{\XESPDtheTitleFieldVII}{}
+\renewcommand{\XESPDtheTitleFieldVIa}{%
+  {\XESPDtheFileName}}
+
+%\renewcommand{\XESPDtheTitleFieldVII}{}
+\renewcommand{\XESPDtheTitleFieldVII}{\normalfont\cyr\CYRL\cyri\cyrs\cyrt\cyro\cyrv\ \XESPDtotal{page}}
 
 \def\XESPDtheTitleFieldVIIIl{}
 \renewcommand{\XESPDtheTitleFieldVIIIl}{%
@@ -100,18 +107,19 @@
   \XESPD@title@split@field{\XESPDtheTitleFieldVIIIl}{\XESPDtheTitleFieldVIIIr}}
 
 \renewcommand{\XESPDtheTitleFieldX}{\XESPDtheYear}
+\renewcommand{\XESPDtheTitleFieldXI}{\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra\ \cyr\CYRO\ \cyr\CYRO$_1$}
 
 \renewcommand{\XESPDtitleFontI}{\XESPDfontV}
-\renewcommand{\XESPDtitleFontII}{\XESPDfontIII}
+\renewcommand{\XESPDtitleFontII}{\XESPDfontV}
-\renewcommand{\XESPDtitleFontIII}{%
+\renewcommand{\XESPDtitleFontIII}{\XESPDfontV}
-  \XESPDfontIII\renewcommand{\baselinestretch}{1.50}\selectfont}
 \renewcommand{\XESPDtitleFontIV}{\XESPDfontV}
 \renewcommand{\XESPDtitleFontV}{\XESPDfontV}
 \renewcommand{\XESPDtitleFontVI}{\XESPDfontV}
-\renewcommand{\XESPDtitleFontVII}{\XESPDfontIII}
+\renewcommand{\XESPDtitleFontVIa}{\XESPDfontV}
-\renewcommand{\XESPDtitleFontVIII}{%
+\renewcommand{\XESPDtitleFontVII}{\XESPDfontV}
-  \XESPDfontIII\renewcommand{\baselinestretch}{1.25}\selectfont}
+\renewcommand{\XESPDtitleFontVIII}{\XESPDfontV}
 \renewcommand{\XESPDtitleFontX}{\XESPDfontV}
+\renewcommand{\XESPDtitleFontXI}{\XESPDfontV}
 
 \renewcommand{\maketitle}{%
   \begin{XESPDtitlePage}
@@ -120,18 +128,23 @@
   \parbox[c][.28\vsize][t]{\hsize}{%
     \begin{center}\XESPDtitleFontI\bfseries\XESPDtheTitleFieldI\end{center}
     \vspace{5mm \@plus 15mm \@minus 3mm}
-    \begin{center}\XESPDtitleFontII\XESPDtheTitleFieldII\end{center}
-    \vspace{10mm \@plus 20mm \@minus 6mm}
 	\begin{center}\XESPDtitleFontIII\XESPDtheTitleFieldIII\end{center}}
   \par\vspace{10mm \@plus 2mm \@minus 4mm}\noindent
   \parbox[c][.30\vsize][t]{\hsize}{%
-    \begin{center}\XESPDtitleFontIV\bfseries\XESPDtheTitleFieldIV\end{center}
+    \ifthenelse{\equal{\XESPDtheTitleFieldIV}{}}{}
-    \begin{center}\XESPDtitleFontV\XESPDtheTitleFieldV\end{center}
+    {\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}}
-    \begin{center}\XESPDtitleFontVI\XESPDtheTitleFieldVI\end{center}
+    \ifthenelse{\equal{\XESPDtheTitleFieldV}{}}{}
-    \begin{center}\XESPDtitleFontVII\XESPDtheTitleFieldVII\end{center}}
+    {\begin{center}\XESPDtitleFontV\XESPDtheTitleFieldV\end{center}}
+    \ifthenelse{\equal{\XESPDtheTitleFieldVI}{}}{}
+    {\begin{center}\XESPDtitleFontVI\XESPDtheTitleFieldVI\end{center}}
+    \ifthenelse{\equal{\XESPDtheTitleFieldVIa}{}}{}
+    {\begin{center}\XESPDtitleFontVI\XESPDtheTitleFieldVIa\end{center}}
+    \ifthenelse{\equal{\XESPDtheTitleFieldVII}{}}{}
+    {\begin{center}\XESPDtitleFontVII\XESPDtheTitleFieldVII\end{center}}}
   \par\vspace{4mm \@plus 2mm \@minus 2mm}\noindent
   \begin{center}\XESPDtitleFontVIII\XESPDtheTitleFieldVIII\end{center}
   \vfill
   \begin{center}\XESPDtitleFontX\XESPDtheTitleFieldX\end{center}
+  \begin{flushright}\XESPDtitleFontXI\XESPDtheTitleFieldXI\hspace{20mm}\enspace\end{flushright}% Литера
   \end{XESPDtitlePage}}
 

xespdtitlebase.sty

@@ -59,28 +59,33 @@
 \newcommand{\XESPDtheTitleFieldIV}{}
 \newcommand{\XESPDtheTitleFieldV}{}
 \newcommand{\XESPDtheTitleFieldVI}{}
+\newcommand{\XESPDtheTitleFieldVIa}{}
 \newcommand{\XESPDtheTitleFieldVII}{}
 \newcommand{\XESPDtheTitleFieldVIII}{}
 \newcommand{\XESPDtheTitleFieldIX}{}
 \newcommand{\XESPDtheTitleFieldX}{}
+\newcommand{\XESPDtheTitleFieldXI}{}
 \newcommand{\XESPDtitleFontI}{}
 \newcommand{\XESPDtitleFontII}{}
 \newcommand{\XESPDtitleFontIII}{}
 \newcommand{\XESPDtitleFontIV}{}
 \newcommand{\XESPDtitleFontV}{}
 \newcommand{\XESPDtitleFontVI}{}
+\newcommand{\XESPDtitleFontVIa}{}
 \newcommand{\XESPDtitleFontVII}{}
 \newcommand{\XESPDtitleFontVIII}{}
 \newcommand{\XESPDtitleFontIX}{}
 \newcommand{\XESPDtitleFontX}{}
+\newcommand{\XESPDtitleFontXI}{}
 
 \def\XESPD@title@after@page{%
   \XESPDclearDoublePage
   \XESPDstyle{\XESPD@default@style@other}
   \XESPDthisStyle{\XESPD@default@style@first}}
 
+% ### Выравнивание титульной страницы
 \newenvironment{XESPDtitlePage}{%
-  \begin{XESPDpadding}{5mm}{5mm}
+  \begin{XESPDpadding}{0mm}{5mm}
   \XESPDstyle{\XESPD@default@style@title}}{%
   \end{XESPDpadding}
   \aftergroup\XESPD@title@after@page}