Merge branch 'xespd' of git.246060.ru:f1x1t/latex-style-esdpx into xespd

ВП

xespdfont.sty

@@ -32,7 +32,7 @@
 \ifxetex
   \RequirePackage{fontspec}
   \defaultfontfeatures{Mapping=tex-text}
-%  \defaultfontfeatures{Scale=MatchLowercase}
+  \defaultfontfeatures{Scale=MatchLowercase}
 \fi
 
 \newcommand{\XESPDfontShape}{\rmfamily}
@@ -65,15 +65,11 @@
 
 \RequirePackage{ifxetex}
 \ifxetex
-  \newcommand{\XESPDtheGostFontName}{}
+  \newfontfamily\gostafont{GOST A}
-  \newcommand{\XESPDgostFontName}[1]{\renewcommand{\XESPDtheGostFontName}{#1}}
   \newcommand{\XESPDfontGostIII}{%
-    \XESPDfontSetBaseLineStretch
+    \XESPDfontSetBaseLineStretch\XESPDfontIIIsize\gostafont}
-    \XESPDfontIIIsize\setmainfont{\XESPDtheGostFontName}}
   \newcommand{\XESPDfontGostIV}{%
-    \XESPDfontSetBaseLineStretch
+    \XESPDfontSetBaseLineStretch\XESPDfontIVsize\gostafont}
-    \XESPDfontIVsize\setmainfont{\XESPDtheGostFontName}}
-  \XESPDgostFontName{GOST A}
   \setsansfont[Mapping=tex-text]{Arial}
   \setromanfont[Mapping=tex-text]{XITS}
   \setmainfont[Ligatures=TeX]{Times New Roman}
@@ -85,6 +81,7 @@
   \DeclareSymbolFont{letters}{\encodingdefault}{\rmdefault}{m}{it}
   \usepackage{unicode-math}
   \setmathfont{XITS Math}
+  \usepackage[T2A]{fontenc}
 \else
   \RequirePackage[T2A]{fontenc}
   \RequirePackage{mathptmx}

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}
@@ -96,10 +105,18 @@
 \renewcommand{\date}[1]{\XESPDdate{#1}}
 
 \RequirePackage{xespdafterpkg}
+\RequirePackage{ifxetex}
 \XESPD@after@package{hyperref}{%
-  \hypersetup{%
+  \ifxetex
-    breaklinks,pdftitle=\XESPDtheUnitName,%
+    \hypersetup{xetex,%
-    \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
+      breaklinks,pdftitle=\XESPDtheUnitName,%
-    pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
+      \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
 }
 

xespdlang.sty

@@ -38,13 +38,13 @@
 \RequirePackage{csquotes}
 \RequirePackage{ifxetex}
 \ifxetex
-  \RequirePackage[\XESPD@lang]{babel}
   \RequirePackage{textcase}
   \RequirePackage{xltxtra}
   \RequirePackage{xunicode}
   \RequirePackage{xecyr}
   \RequirePackage{polyglossia}
-  \setmainlanguage{russian}
+  \setmainlanguage{\XESPD@lang}
+  \let\cyr\relax
   \setkeys{\XESPD@lang}{babelshorthands=true}
   \setotherlanguage{english}
 \else

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{Код по классификатору}
@@ -92,20 +57,20 @@
 %\XESPDtitleDesignedBy{Должность первого автора}{Фам. первого автора}
 %\XESPDtitleDesignedBy{Должность второго автора}{Фам. второго автора}
 
-\RequirePackage{forloop}
+%\RequirePackage{forloop}
-\RequirePackage{makecell}
+%\RequirePackage{makecell}
 
-\newcount\lincnt
+%\newcount\lincnt
-\long\def\addto#1#2{%
+%\long\def\addto#1#2{%
-  \expandafter\def\expandafter#1\expandafter{#1#2}}
+%  \expandafter\def\expandafter#1\expandafter{#1#2}}
 
-\def\changeSheetLine{}\lincnt=28 % Количество строк
+%\def\changeSheetLine{}\lincnt=28 % Количество строк
 %  \addto\changeSheetLine{ 1 & & Все & & & & \makecell{РЕВМ.57 \\ 1/2} & & & \makecell{20.04. \\ 17} \\ \hline}
-  \loop
+%  \loop
-    \addto\changeSheetLine{& & & & & & & & & \\ \hline}
+%    \addto\changeSheetLine{& & & & & & & & & \\ \hline}
-    \advance\lincnt -1
+%    \advance\lincnt -1
-    \ifnum\lincnt>0
+%    \ifnum\lincnt>0
-  \repeat
+%  \repeat
 
 \newcommand{\XESPDprintEmptyChangeSheet}{
 \renewcommand*{\arraystretch}{0.8}% Высота строк

xespdstamp.sty

@@ -548,6 +548,8 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
 \put(85, 8.3){\makebox[25mm]{\XESPDfontGostIV\XESPDcolumnXXIIname}}
 \put(85, 2.3){\makebox[25mm]{\XESPDfontGostIV\XESPDtheColumnXXII}}
 \put(110, 8.3){\makebox[35mm]{\XESPDfontGostIV\XESPDcolumnXXIIIname}}
+\put(145, 7){\makebox[35mm]{\scriptsize{3237~\CYRV\CYRP}}}
+\put(145, 3){\makebox[35mm]{\scriptsize{\CYRM\CYRO~\CYRR\CYRF}}}
 \end{picture}}}
 \newcommand{\XESPDdrawColumnsXIX}{%
   \XESPDonFrontSideOnly{%

xespdtext.cls

@@ -73,7 +73,6 @@
 \RequirePackage{xespdinfo}
 \RequirePackage{xespdtitlebase}
 \RequirePackage{xespdtitle}
-
 \RequirePackage{xltabular}
 \RequirePackage{multirow}
 \newcommand{\HY}{\hyphenpenalty=25\exhyphenpenalty=25}

xespdtitle.sty

@@ -107,7 +107,8 @@
   \XESPD@title@split@field{\XESPDtheTitleFieldVIIIl}{\XESPDtheTitleFieldVIIIr}}
 
 \renewcommand{\XESPDtheTitleFieldX}{\XESPDtheYear}
-\renewcommand{\XESPDtheTitleFieldXI}{\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra}
+\renewcommand{\XESPDtheTitleFieldXI}{\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra} % Литера
+%\renewcommand{\XESPDtheTitleFieldXI}{\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra\ \cyr\CYRO\ \cyr\CYRO$_1$} % Литера O_1
 
 \renewcommand{\XESPDtitleFontI}{\XESPDfontV}
 \renewcommand{\XESPDtitleFontII}{\XESPDfontV}
@@ -135,7 +136,7 @@
   \par\vspace{10mm \@plus 2mm \@minus 4mm}\noindent
   \parbox[c][.30\vsize][t]{\hsize}{%
     \ifthenelse{\equal{\XESPDtheTitleFieldIV}{}}{}
-	{\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}}
+    {\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}}
     \ifthenelse{\equal{\XESPDtheTitleFieldV}{}}{}
     {\begin{center}\XESPDtitleFontV\XESPDtheTitleFieldV\end{center}}
     \ifthenelse{\equal{\XESPDtheTitleFieldVI}{}}{}
@@ -148,6 +149,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}}
 

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}%
+}
+