diff --git a/xespdfont.sty b/xespdfont.sty index 3bc9490..38542d6 100644 --- a/xespdfont.sty +++ b/xespdfont.sty @@ -85,8 +85,8 @@ \DeclareSymbolFont{letters}{\encodingdefault}{\rmdefault}{m}{it} \usepackage{unicode-math} \setmathfont{XITS Math} - \usepackage[T2A]{fontenc} \else + \RequirePackage[T2A]{fontenc} \RequirePackage{mathptmx} \RequirePackage{gostfont} \RequirePackage[defaultroman]{mstimes} diff --git a/xespdinfo.sty b/xespdinfo.sty index 625eeca..7e73542 100644 --- a/xespdinfo.sty +++ b/xespdinfo.sty @@ -96,18 +96,10 @@ \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{% - breaklinks,pdftitle=\XESPDtheUnitName,% - \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,% - pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor} - \fi + \hypersetup{% + breaklinks,pdftitle=\XESPDtheUnitName,% + \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,% + pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor} } diff --git a/xespdrtis.sty b/xespdrtis.sty index 6534b30..ae7cf28 100644 --- a/xespdrtis.sty +++ b/xespdrtis.sty @@ -1,6 +1,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xespdrtis}[2018/09/30 v0.98 Document Information] +\RequirePackage{xespdtitle} \RequirePackage{calc} \RequirePackage{indentfirst} \RequirePackage[defaultlines=3,all]{nowidow} @@ -60,8 +61,6 @@ \newcommand{\XESPDtheREVMType}{} \newcommand{\XESPDREVMType}[1]{\renewcommand{\XESPDtheREVMType}{#1}} - \XESPDsignature{РЕВМ.\XESPDtheREVMBase{}\textendash{}\XESPDtheREVMType{}} - \XESPDtitleApprovingSheet{РЕВМ.\XESPDtheREVMBase{}\textendash{}\XESPDtheREVMType{}\textendash{}ЛУ} \ifthenelse{\equal{\XESPDtheDocName}{Описание программы}}{% \XESPDREVMType{01 13 01} \XESPDfileName{\XESPDtheREVMBase{}or} @@ -78,6 +77,9 @@ \XESPDREVMType{01 34 01} \XESPDfileName{\XESPDtheREVMBase{}ro} }{} + + \XESPDsignature{РЕВМ.\XESPDtheREVMBase{}\textendash{}\XESPDtheREVMType{}} + \XESPDtitleApprovingSheet{РЕВМ.\XESPDtheREVMBase{}\textendash{}\XESPDtheREVMType{}\textendash{}ЛУ} } %\XESPDdepartment{Ведомство} diff --git a/xespdtitle.sty b/xespdtitle.sty index dbf68a6..4550df3 100644 --- a/xespdtitle.sty +++ b/xespdtitle.sty @@ -148,6 +148,6 @@ \begin{center}\XESPDtitleFontVIII\XESPDtheTitleFieldVIII\end{center} \vfill \begin{center}\XESPDtitleFontX\XESPDtheTitleFieldX\end{center} - \begin{flushright}\XESPDtitleFontXI\XESPDtheTitleFieldXI\hspace{20mm}\enspace\end{flushright}% Литера +% \begin{flushright}\XESPDtitleFontXI\XESPDtheTitleFieldXI\hspace{20mm}\enspace\end{flushright}% Литера \end{XESPDtitlePage}}