Правки

xespdfont.sty

@@ -65,15 +65,11 @@
 
 \RequirePackage{ifxetex}
 \ifxetex
-  \newcommand{\XESPDtheGostFontName}{}
-  \newcommand{\XESPDgostFontName}[1]{\renewcommand{\XESPDtheGostFontName}{#1}}
+  \newfontfamily\gostafont{GOST A}
   \newcommand{\XESPDfontGostIII}{%
-    \XESPDfontSetBaseLineStretch
-    \XESPDfontIIIsize\setmainfont{\XESPDtheGostFontName}}
+    \XESPDfontSetBaseLineStretch\XESPDfontIIIsize\gostafont}
   \newcommand{\XESPDfontGostIV}{%
-    \XESPDfontSetBaseLineStretch
-    \XESPDfontIVsize\setmainfont{\XESPDtheGostFontName}}
-  \XESPDgostFontName{GOST A}
+    \XESPDfontSetBaseLineStretch\XESPDfontIVsize\gostafont}
   \setsansfont[Mapping=tex-text]{Arial}
   \setromanfont[Mapping=tex-text]{XITS}
   \setmainfont[Ligatures=TeX]{Times New Roman}

xespdinfo.sty

@@ -83,6 +83,15 @@
 \newcommand{\XESPDtheApprovedBy}{}
 \newcommand{\XESPDapprovedBy}[1]{\renewcommand{\XESPDtheApprovedBy}{#1}}
 
+\newcommand{\XESPDtheFileName}{}
+\newcommand{\XESPDfileName}[1]{\renewcommand{\XESPDtheFileName}{#1}}
+
+\newcommand{\XESPDtheREVMBase}{}
+\newcommand{\XESPDREVMBase}[1]{\renewcommand{\XESPDtheREVMBase}{#1}}
+
+\newcommand{\XESPDtheREVMType}{}
+\newcommand{\XESPDREVMType}[1]{\renewcommand{\XESPDtheREVMType}{#1}}
+
 \newcommand{\XESPDtheYear}{\number\year}
 \newcommand{\XESPDtheMonth}{\number\month}
 \newcommand{\XESPDtheDay}{\number\day}
@@ -98,8 +107,9 @@
 \RequirePackage{xespdafterpkg}
 \XESPD@after@package{hyperref}{%
   \hypersetup{%
-    breaklinks,pdftitle=\XESPDtheUnitName,%
-    \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
-    pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
+    \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}
 }
 

xespdrtis.sty

@@ -1,7 +1,9 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{xespdrtis}[2018/09/30 v0.98 Document Information]
 
+\RequirePackage{xespdinfo}
 \RequirePackage{xespdtitle}
+
 \RequirePackage{calc}
 \RequirePackage{indentfirst}
 \RequirePackage[defaultlines=3,all]{nowidow}
@@ -45,43 +47,6 @@
   \fi
 }
 
-\ifthenelse{\equal{\XESPDtheDocName}{Техническое задание на разработку}}{
-  \RequirePackage[numbertop,numbercenter]{xespdplain} % без рамок
-  \XESPDsignature{}
-  \XESPDtitleApprovingSheet{}
-}{ % Если не ТЗР
-  \RequirePackage[numbertop,numbercenter]{xespdframe} % рамки
-  \RequirePackage{xespdchngsheet}
-  \newcommand{\XESPDtheFileName}{}
-  \newcommand{\XESPDfileName}[1]{\renewcommand{\XESPDtheFileName}{#1}}
-
-  \newcommand{\XESPDtheREVMBase}{}
-  \newcommand{\XESPDREVMBase}[1]{\renewcommand{\XESPDtheREVMBase}{#1}}
-
-  \newcommand{\XESPDtheREVMType}{}
-  \newcommand{\XESPDREVMType}[1]{\renewcommand{\XESPDtheREVMType}{#1}}
-
-  \ifthenelse{\equal{\XESPDtheDocName}{Описание программы}}{%
-    \XESPDREVMType{01 13 01}
-    \XESPDfileName{\XESPDtheREVMBase{}or}
-  }{}
-  \ifthenelse{\equal{\XESPDtheDocName}{Текст программы}}{
-    \XESPDREVMType{01 12 01}
-    \XESPDfileName{\XESPDtheREVMBase{}tp}
-  }{}
-  \ifthenelse{\equal{\XESPDtheDocName}{Программа и методика испытаний}}{
-    \XESPDREVMType{01 51 01}
-    \XESPDfileName{\XESPDtheREVMBase{}pm}
-  }{}
-  \ifthenelse{\equal{\XESPDtheDocName}{Руководство оператора}}{
-    \XESPDREVMType{01 34 01}
-    \XESPDfileName{\XESPDtheREVMBase{}ro}
-  }{}
-
-  \XESPDsignature{РЕВМ.\XESPDtheREVMBase{}\textendash{}\XESPDtheREVMType{}}
-  \XESPDtitleApprovingSheet{РЕВМ.\XESPDtheREVMBase{}\textendash{}\XESPDtheREVMType{}\textendash{}ЛУ}
-}
-
 %\XESPDdepartment{Ведомство}
 %\XESPDcompany{Предприятие}
 %\XESPDclassCode{Код по классификатору}

xespdtz.sty.x

@@ -1,8 +1,10 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{xespdtz}[2018/09/14 v0.98 Document Information]
-\RequirePackage{kvoptions}
 \RequirePackage[numbertop,numbercenter]{xespdplain}
+\RequirePackage{kvoptions}
 
+\DeclareStringOption{docname}
+\DeclareStringOption{title}
 \DeclareStringOption{project}
 \ProcessKeyvalOptions*
 
@@ -19,3 +21,11 @@
  \par\cyrk\cyro\cyrm\cyrp\cyrl\cyre\cyrk\cyrs\cyra\ \cyrp\cyrr\cyro\cyrg\cyrr\cyra\cyrm\cyrm\ \XESPDtheTitle}%
 }
 
+\renewcommand{\XESPDtheTitleFieldIV}{% только для Контейнера
+  {\MakeUppercase{\xespdtz@project}
+  \vspace{3pt}
+  \par\XESPDtheDocName
+  \vspace{3pt}
+  \par\XESPDtheTitle}%
+}
+