From 81947d17a59efed82644f2570c2d5e6fbff48b97 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Thu, 12 Sep 2019 02:16:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xespdinfo.sty                |  9 +++++++++
 xespdrtis.sty                | 39 ++----------------------------------
 xespdtz.sty => xespdtz.sty.x | 12 ++++++++++-
 3 files changed, 22 insertions(+), 38 deletions(-)
 rename xespdtz.sty => xespdtz.sty.x (72%)

diff --git a/xespdinfo.sty b/xespdinfo.sty
index 12be4d1..9bca2bb 100644
--- a/xespdinfo.sty
+++ b/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}
diff --git a/xespdrtis.sty b/xespdrtis.sty
index ae7cf28..5213d39 100644
--- a/xespdrtis.sty
+++ b/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{Код по классификатору}
diff --git a/xespdtz.sty b/xespdtz.sty.x
similarity index 72%
rename from xespdtz.sty
rename to xespdtz.sty.x
index b64792e..f775a3f 100644
--- a/xespdtz.sty
+++ b/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}%
+}
+