Рамки

This commit is contained in:
Andrei Astafev 2020-03-14 21:07:06 +03:00
parent 42149c9c63
commit 02dc36f83b
7 changed files with 349 additions and 313 deletions

58
xespdframe.sty Normal file
View File

@ -0,0 +1,58 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xespdframe}[2019/05/09 v0.98 Frame Page Style]
\RequirePackage{xespdstamp}
\RequirePackage{calc}
\RequirePackage{setspace}
\def\XESPD@frame@vt{%
\setlength{\XESPD@tmpdimc}{%
\XESPDframeY+\XESPDframeH-\XESPD@padding@v}}
\def\XESPD@frame@vb{%
\setlength{\XESPD@tmpdimc}{%
\XESPDframeY+\XESPD@padding@v-15mm}}
\def\XESPD@frame@hl{%
\ifXESPD@twoside
\ifodd\c@page\raggedright\else\raggedleft\fi
\else\raggedright\fi}
\def\XESPD@frame@hr{%
\ifXESPD@twoside
\ifodd\c@page\raggedleft\else\raggedright\fi
\else\raggedleft\fi}
\def\XESPD@frame@hc{\centering}
\let\XESPD@frame@ha\XESPD@frame@hc
\let\XESPD@frame@va\XESPD@frame@vb
\DeclareOption{numbertop}{\let\XESPD@frame@va\XESPD@frame@vt}
\DeclareOption{numberbottom}{\let\XESPD@frame@va\XESPD@frame@vb}
\DeclareOption{numberleft}{\let\XESPD@frame@ha\XESPD@frame@hl}
\DeclareOption{numbercenter}{\let\XESPD@frame@ha\XESPD@frame@hc}
\DeclareOption{numberright}{\let\XESPD@frame@ha\XESPD@frame@hr}
\ProcessOptions\relax
% Колонтитул
\newcommand{\XESPDdrawFramePageNumber}{
\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPD@padding@h}
\setlength{\XESPD@tmpdimb}{\XESPDframeW-2\XESPD@padding@h}
\XESPD@frame@va
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimc}){%
\parbox[b][25mm][c]{\XESPD@tmpdimb}{%
\begin{singlespace}
\reset@font\normalsize
\XESPD@frame@ha\thepage \\ \MakeUppercase\XESPDtheSignature
\end{singlespace}}}}
\XESPDnewStyle{frame}{0mm}
\XESPDputOnStyle{frame}{pagenumber}{\XESPDdrawFramePageNumber}
\renewcommand{\XESPDdrawFrame}{}
\XESPDdefaultTitleStyle{title}
\XESPDdefaultFirstStyle{frame}
\XESPDdefaultStyle{frame}

View File

@ -23,7 +23,6 @@
\ProvidesClass{xespdgraph}[2020/03/20 v1.00 Graphical Documentation]
\DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
\DeclareOption{ukrainian}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
\DeclareOption{koi8-r}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
\DeclareOption{koi8-u}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
\DeclareOption{cp1251}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}

View File

@ -22,6 +22,8 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xespdsect}[2020/03/20 v1.00 Sectioning]
\RequirePackage{calc}
\newcommand{\XESPD@point@style}{single}
\DeclareOption{pointsingle}{\renewcommand{\XESPD@point@style}{single}}
@ -69,25 +71,25 @@
\expandafter\renewcommand\csname\string XESPD#1Align\endcsname{%
\@nameuse{XESPDsectAlign#2}}}
\newcommand{\XESPDsectionStyle}{\normalfont\Large\bfseries\MakeUppercase}
\newcommand{\XESPDsubsectionStyle}{\normalfont\large\bfseries}
\newcommand{\XESPDsubsubsectionStyle}{\normalfont\normalsize\bfseries}
\newcommand{\XESPDsectionStyle}{\normalfont\normalsize\MakeUppercase}
\newcommand{\XESPDsubsectionStyle}{\normalfont\normalsize}
\newcommand{\XESPDsubsubsectionStyle}{\normalfont\normalsize}
\newcommand{\XESPDsectStyle}[2]{%
\expandafter\renewcommand\csname\string XESPD#1Style\endcsname{#2}}
\newlength{\XESPDsectionSkipBefore}
\newlength{\XESPDsectionSkipAfter}
\setlength{\XESPDsectionSkipBefore}{-15mm \@plus -3mm \@minus -2mm}
\setlength{\XESPDsectionSkipAfter}{15mm \@plus 1mm \@minus 2mm}
\setlength{\XESPDsectionSkipBefore}{-5mm \@plus -3mm \@minus -2mm}
\setlength{\XESPDsectionSkipAfter}{5mm \@plus 1mm \@minus 2mm}
\newlength{\XESPDsubsectionSkipBefore}
\newlength{\XESPDsubsectionSkipAfter}
\setlength{\XESPDsubsectionSkipBefore}{-15mm \@plus -3mm \@minus -2mm}
\setlength{\XESPDsubsectionSkipAfter}{15mm \@plus 1mm \@minus 2mm}
\setlength{\XESPDsubsectionSkipBefore}{-6pt \@plus -0mm \@minus -0mm}
\setlength{\XESPDsubsectionSkipAfter}{6pt \@plus 0mm \@minus 0mm}
\newlength{\XESPDsubsubsectionSkipBefore}
\newlength{\XESPDsubsubsectionSkipAfter}
\setlength{\XESPDsubsubsectionSkipBefore}{-15mm \@plus -3mm \@minus -2mm}
\setlength{\XESPDsubsubsectionSkipAfter}{15mm \@plus 1mm \@minus 2mm}
\setlength{\XESPDsubsubsectionSkipBefore}{-6pt \@plus -0mm \@minus -0mm}
\setlength{\XESPDsubsubsectionSkipAfter}{6pt \@plus 0mm \@minus 0mm}
\providecommand{\plus}{\@plus}
\providecommand{\minus}{\@minus}
@ -109,6 +111,9 @@
{\XESPDsubsubsectionSkipAfter}%
{\XESPDsubsubsectionAlign\XESPDsubsubsectionStyle}}
\let\oldsection\section
\renewcommand\section{\clearpage\oldsection}
\renewcommand{\thesection}{\arabic{section}}
\renewcommand{\thesubsection}{\thesection.\arabic{subsection}}
\renewcommand{\thesubsubsection}{\thesubsection.\arabic{subsubsection}}
@ -140,11 +145,18 @@
\newcommand{\theHsubsubpoint}{\theHsubpoint.\arabic{subsubpoint}}
\newcommand{\point}{%
\par\refstepcounter{point}\thepoint\quad}
\par\refstepcounter{point}\thepoint\hspace{0.45em}}
\newcommand{\subpoint}{%
\par\refstepcounter{subpoint}\thesubpoint\quad}
\par\refstepcounter{subpoint}\thesubpoint\hspace{0.45em}}
\newcommand{\subsubpoint}{%
\par\refstepcounter{subsubpoint}\thesubsubpoint\quad}
\par\refstepcounter{subsubpoint}\thesubsubpoint\hspace{0.45em}}
\newcommand{\XESPDforeword}{\section*{\MakeTextUppercase{\XESPDforewordName{}}}}
\newcommand{\XESPDabbreviationsList}{
\section*{\MakeUppercase{\XESPDabbreviationsListName{}}}
\pdfbookmark[1]{\XESPDabbreviationsListName{}}{toc}
\addcontentsline{toc}{section}{\XESPDabbreviationsListName{}}}
\newcounter{appendix}
\renewcommand{\theappendix}{\Asbuk{appendix}}
@ -183,12 +195,39 @@
\end{list}%
\par\nobreak\addvspace{\XESPDappendixSkip}}
\renewcommand\tableofcontents{%
\begingroup
\XESPDsectAlign{section}{Center}
\section*{\contentsname
\@mkboth{%
\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
\endgroup
\@starttoc{toc}}
%\renewcommand\tableofcontents{%
% \begingroup
% \XESPDsectAlign{section}{Center}
% \section*{\contentsname
% \@mkboth{%
% \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
% \endgroup
% \@starttoc{toc}}
\RequirePackage[style]{abstract}
\renewcommand{\abstitlestyle}[1]{\center\normalsize\MakeUppercase #1}
\XESPDsectAlign{section}{Center}
\makeatletter
\renewcommand*{\@seccntformat}[1]{\csname the#1\endcsname.\hspace{0.45em}}
\makeatother
\RequirePackage[titles]{tocloft}
\renewcommand{\cftsecfont}{\normalfont\normalsize}
\renewcommand{\cftsubsecfont}{\normalfont\normalsize}
\renewcommand{\cftsubsubsecfont}{\normalfont\normalsize}
\renewcommand{\cftsecpagefont}{\normalfont\normalsize}
\renewcommand{\cftsubsecpagefont}{\normalfont\normalsize}
\renewcommand{\cftsubsubsecpagefont}{\normalfont\normalsize}
\renewcommand{\cftsecaftersnum}{.}
\renewcommand{\cftsubsecaftersnum}{.}
\renewcommand{\cftsubsubsecaftersnum}{.}
\renewcommand{\cftsecafterpnum}{\vskip0pt}
\renewcommand{\cftsubsecafterpnum}{\vskip0pt}
\renewcommand{\cftsubsubsecafterpnum}{\vskip0pt}
\renewcommand{\cftbeforesecskip}{0pt}
\renewcommand{\cftbeforesubsecskip}{0pt}
\renewcommand{\cftbeforesubsubsecskip}{0pt}
\renewcommand{\cftdot}{}

View File

@ -20,7 +20,7 @@
%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xespdspec}[2020/03/20 v1.00 Specification GOST 2.106.95]
\ProvidesPackage{xespdspec}[2010/01/14 v0.98 Specification GOST 2.106.95]
\RequirePackage{xespdlang}
\RequirePackage{xespdstamp}
@ -28,117 +28,66 @@
\RequirePackage{array}
\RequirePackage{longtable}
\newcommand{\XESPDdrawSpecification}{
\put(\XESPDltu{\XESPDframeX},\XESPDltu{\XESPDframeY}){%
\begin{picture}(0,0)
\XESPD@tmpdimb=\XESPDframeH
\XESPD@tmpdima=\XESPD@style@sh@formII
\XESPD@tmpdimc=8mm
\advance\XESPD@tmpdimb -\XESPD@tmpdima
\advance\XESPD@tmpdimb -15mm
\divide\XESPD@tmpdimb by \XESPD@tmpdimc
\XESPD@tmpcnta=\XESPD@tmpdimb
\XESPD@tmpdimb=\XESPD@tmpdimc
\multiply\XESPD@tmpdimb by \XESPD@tmpcnta
\advance\XESPD@tmpdimb 15mm
\XESPD@tmpdima=\XESPDframeH
\advance\XESPD@tmpdima -\XESPD@tmpdimb
\linethickness{\XESPDlineThick}
\put(6,\XESPDltu{\XESPD@tmpdima}){\line(0,1){\XESPDltu{\XESPD@tmpdimb}}}
\put(12,\XESPDltu{\XESPD@tmpdima}){\line(0,1){\XESPDltu{\XESPD@tmpdimb}}}
\put(20,\XESPDltu{\XESPD@tmpdima}){\line(0,1){\XESPDltu{\XESPD@tmpdimb}}}
\put(90,\XESPDltu{\XESPD@tmpdima}){\line(0,1){\XESPDltu{\XESPD@tmpdimb}}}
\put(153,\XESPDltu{\XESPD@tmpdima}){\line(0,1){\XESPDltu{\XESPD@tmpdimb}}}
\put(163,\XESPDltu{\XESPD@tmpdima}){\line(0,1){\XESPDltu{\XESPD@tmpdimb}}}
\XESPD@tmpdimb=\XESPDframeH
\advance\XESPD@tmpdimb -15mm
\put(0,\XESPDltu{\XESPD@tmpdimb}){\line(1,0){\XESPDltu{\XESPDframeW}}}
\linethickness{\XESPDlineThin}
\multiput(0,\XESPDltu{\XESPD@tmpdima})(0, 8){\the\XESPD@tmpcnta}{%
\line(1,0){\XESPDltu{\XESPDframeW}}}
\end{picture}}}
\XESPDtabColumnsWidth{6mm 6mm 8mm 70mm 63mm 10mm 22mm}
\setlength{\XESPDtabHeadH}{15mm}
\newlength{\XESPDspecAddHspace}
\setlength{\XESPDspecAddHspace}{2mm}
\newenvironment{XESPDspecification}
{\XESPDtabLTPreamble{%
>{\XESPDfontTabBody\centering}
p{\argi -2\tabcolsep}
>{\XESPDfontTabBody\centering}
p{\argii -2\tabcolsep}
>{\XESPDfontTabBody\centering}
p{\argiii -2\tabcolsep}
>{\XESPDfontTabBody\centering}
p{\argiv -2\tabcolsep}
@{\hspace{\XESPDspecAddHspace}}
>{\XESPDfontTabBody\raggedright\XESPDtabStrut}
p{\argv -\XESPDspecAddHspace}
<{\XESPDtabStrut}
>{\XESPDfontTabBody\centering}
p{\argvi -2\tabcolsep}
>{\XESPDfontTabBody\raggedright\XESPDtabStrut}
p{\argvii -\XESPDspecAddHspace}
<{\XESPDtabStrut}
}
%
{%
\parbox[c][\XESPDtabHeadH][c]{\argi -2\tabcolsep}{\centering\begin{sideways}%
\XESPDsmartScaleBox{\XESPDtabHeadH}{\XESPDfontTabHead\XESPDspecColumnIname}%
\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argii -2\tabcolsep}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecColumnIIname\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argiii -2\tabcolsep}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecColumnIIIname\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argiv -2\tabcolsep}
{\centering\XESPDfontTabHead%
\XESPDspecColumnIVname}&
\parbox[c][\XESPDtabHeadH][c]{\argv -\XESPDspecAddHspace}{\centering\XESPDfontTabHead%
\XESPDspecColumnVname}&
\parbox[c][\XESPDtabHeadH][c]{\argvi -2\tabcolsep}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecColumnVIname\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argvii -2\tabcolsep}{\centering%
\XESPDsmartScaleBox{\argvii -2\tabcolsep}{\XESPDfontTabHead\XESPDspecColumnVIIname}}%
\tabularnewline%
}
}
%
{\XESPDtabLTAmble}
% % создадим окружение "спецификация"
% \newenvironment{XESPDspecification}{%
% \XESPDputOnStyle{formII}{specification}{\XESPDdrawSpecification{}}
% \XESPDputOnStyle{formIIab}{specification}{\XESPDdrawSpecification{1}}
% \begin{XESPDzeroPadding}%
% \setlength{\tabcolsep}{0.5mm}%
% \setlength{\LTpre}{0mm}%
% \setlength{\LTpost}{0mm}%
% \setlength{\LTleft}{0mm}%
% \setlength{\LTright}{\fill}%
% \newcolumntype{s}{>{\XESPDfontTabBody}c}%
% \newcolumntype{n}{% вставим с двух сторон подпорки по 8мм
% >{\XESPDfontTabBody\raggedright\parbox[c][8mm][c]{0mm}{\rule{0mm}{0mm}}}%
% p{60mm}%
% <{\parbox[c][8mm][c]{0mm}{\rule{0mm}{0mm}}}}%
% \newcolumntype{a}{>{\XESPDfontTabBody}p{21mm}}%
% \noindent%
%
% % с помощью @-выражения зададим небольшой отступ для содержимого графы "наименование"
% \begin{longtable}{ssss@{\hspace{2mm}}n@{\hspace{2mm}}sa}
%
% % изменим некоторые константы longtable для того, чтобы
% % таблица занимала всё свободное место
% \XESPD@tmpdimc=8mm
% \advance\XESPD@tmpdima 6\XESPD@tmpdimc
% \global\@colht\XESPD@tmpdima
% \global\@colroom\XESPD@tmpdima
%
% % заполним шапку таблицы
% \parbox[c][15mm][c]{5mm}{\centering\begin{sideways}\XESPDfontTabHead%
% \XESPDspecColumnIname\end{sideways}}&
% \parbox[c][15mm][c]{5mm}{\centering\begin{sideways}\XESPDfontTabHead%
% \XESPDspecColumnIIname\end{sideways}}&
% \parbox[c][15mm][c]{7mm}{\centering\begin{sideways}\XESPDfontTabHead%
% \XESPDspecColumnIIIname\end{sideways}}&
% \parbox[c][15mm][c]{69mm}{\centering\XESPDfontTabHead%
% \XESPDspecColumnIVname}&
% \parbox[c][15mm][c]{61mm}{\centering\XESPDfontTabHead%
% \XESPDspecColumnVname}&
% \parbox[c][15mm][c]{9mm}{\centering\begin{sideways}\XESPDfontTabHead%
% \XESPDspecColumnVIname\end{sideways}}&
% \parbox[c][15mm][c]{21mm}{\centering\XESPDfontTabHead%
% \XESPDspecColumnVIIname}\\
% % первые и последние строки листов сделаем пустыми
% % для эстетичности
% &&&&&&%
% \endhead
% &&&&&&%
% \endfoot}{%
% \end{longtable}%
% \end{XESPDzeroPadding}%
% \XESPDremoveFromStyle{formII}{spec}%
% \XESPDremoveFromStyle{formIIab}{spec}}
\newenvironment{XESPDspecification}{%
\XESPDputOnStyle{formII}{specification}{\XESPDdrawSpecification}
\XESPDputOnStyle{formIIab}{specification}{\XESPDdrawSpecification}
\begin{XESPDzeroPadding}%
\setlength{\tabcolsep}{0.5mm}%
\setlength{\LTpre}{0mm}%
\setlength{\LTpost}{0mm}%
\setlength{\LTleft}{0mm}%
\setlength{\LTright}{\fill}%
\newcolumntype{s}{>{\XESPDfontTabBody}c}%
\newcolumntype{n}{>{\parbox[c][8mm][c]{1mm}{%
\rule{0mm}{0mm}}\XESPDfontTabBody}l}%
\noindent%
\begin{longtable}{ssssnss}
\parbox[c][15mm][c]{5mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecColumnIname\end{sideways}}&
\parbox[c][15mm][c]{5mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecColumnIIname\end{sideways}}&
\parbox[c][15mm][c]{7mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecColumnIIIname\end{sideways}}&
\parbox[c][15mm][c]{69mm}{\centering\XESPDfontTabHead%
\XESPDspecColumnIVname}&
\parbox[c][15mm][c]{61mm}{\centering\XESPDfontTabHead%
\XESPDspecColumnVname}&
\parbox[c][15mm][c]{9mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecColumnVIname\end{sideways}}&
\parbox[c][15mm][c]{21mm}{\centering\XESPDfontTabHead%
\XESPDspecColumnVIIname}\endhead}{%
\end{longtable}%
\end{XESPDzeroPadding}%
\XESPDremoveFromStyle{formII}{spec}%
\XESPDremoveFromStyle{formIIab}{spec}}

View File

@ -20,155 +20,160 @@
%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xespdspecii}[2020/03/20 v1.00 Specification GOST 2.106.95 Form 2]
\ProvidesPackage{xespdspecii}[2010/01/14 v0.98 Specification GOST 2.106.95 Form 2]
\RequirePackage{xespdlang}
\RequirePackage{xespdstamp}
\RequirePackage{rotating}
\RequirePackage{chngpage}
\RequirePackage{lscape}
\RequirePackage{array}
\RequirePackage{longtable}
\newcommand{\XESPDdrawSpecificationII}{
\put(\XESPDltu{\XESPDframeX},\XESPDltu{\XESPDframeY}){%
\begin{picture}(0,0)
\XESPD@tmpdimb=\XESPDframeW
\XESPD@tmpdimc=8mm
\advance\XESPD@tmpdimb -70mm
\divide\XESPD@tmpdimb by \XESPD@tmpdimc
\XESPD@tmpcnta=\XESPD@tmpdimb
\XESPD@tmpdimb=\XESPD@tmpdimc
\multiply\XESPD@tmpdimb by \XESPD@tmpcnta
\advance\XESPD@tmpdimb 15mm
\linethickness{\XESPDlineThick}
\put(0,6){\line(1,0){\XESPDltu{\XESPD@tmpdimb}}}
\put(0,12){\line(1,0){\XESPDltu{\XESPD@tmpdimb}}}
\put(0,20){\line(1,0){\XESPDltu{\XESPD@tmpdimb}}}
\put(0,90){\line(1,0){\XESPDltu{\XESPD@tmpdimb}}}
\put(0,162){\line(1,0){\XESPDltu{\XESPD@tmpdimb}}}
\put(0,172){\line(1,0){\XESPDltu{\XESPD@tmpdimb}}}
\put(0,182){\line(1,0){\XESPDltu{\XESPD@tmpdimb}}}
\put(0,257){\line(1,0){\XESPDltu{\XESPD@tmpdimb}}}
\put(15,0){\line(0,1){\XESPDltu{\XESPDframeH}}}
\linethickness{\XESPDlineThin}
\multiput(23,0)(8, 0){\the\XESPD@tmpcnta}{%
\line(0,1){\XESPDltu{\XESPDframeH}}}
\end{picture}}}
\XESPDtabColumnsWidth{6mm 6mm 8mm 70mm 72mm 10mm 10mm 75mm 30mm}
\setlength{\XESPDtabHeadH}{15mm}
\newlength{\XESPDspecIIaddHspace}
\setlength{\XESPDspecIIaddHspace}{2mm}
% поскольку плазовая спецификация имеет нестандартное размещение граф
% (штам и графы 19-23 размещаются параллельно на длинных сторонах листа)
% придется изменить рамку и перенести некоторые графы
\newcommand{\XESPD@specii@sizes}{
\advance\XESPDframeW 15mm
\advance\XESPDframeH -10mm
\setlength{\XESPD@margin@si}{5mm}
\setlength{\XESPD@margin@so}{5mm}
\setlength{\XESPD@margin@t}{20mm}
\setlength{\XESPD@margin@b}{5mm}
% необходимо слегка поправить отступы
\changepage{}{}{}{-15mm}{}{10mm}{}{}{}}
% макрос для переключения обратно
\newcommand{\XESPD@no@specii@sizes}{
\changepage{}{}{}{15mm}{}{-10mm}{}{}{}
\setlength{\XESPD@margin@si}{20mm}
\setlength{\XESPD@margin@so}{5mm}
\setlength{\XESPD@margin@t}{5mm}
\setlength{\XESPD@margin@b}{5mm}
\advance\XESPDframeW -15mm
\advance\XESPDframeH 10mm}
% переключаемся
\XESPD@specii@sizes
\ifXESPD@enable@columns@xix
\newcommand{\XESPDdrawSpecIIcolumnsXIX}{%
\setlength{\XESPD@tmpdima}{\XESPDframeY+\XESPDframeH}
\put(\XESPDltu{\XESPDframeX},\XESPDltu{\XESPD@tmpdima}){%
\usebox{\XESPD@columns@xix@box}}}
\fi
\ifXESPD@enable@columns@xxiv
\newcommand{\XESPDdrawSpecIIcolumnsXXIV}{%
\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPDframeW-120mm}
\setlength{\XESPD@tmpdimb}{\XESPDframeY+\XESPDframeH}
\newcommand{\XESPDdrawSpecIIstampII}{%
\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPDframeW}
\setlength{\XESPD@tmpdimb}{\XESPDframeY+\XESPDframeH-185mm}
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\usebox{\XESPD@columns@xxiv@box}}}
\begin{sideways}\usebox{\XESPD@stamp@ii@box}\end{sideways}}
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\begin{sideways}\XESPD@stamp@ii@var\end{sideways}}}
\newcommand{\XESPDdrawSpecIIstampIIa}{%
\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPDframeW}
\setlength{\XESPD@tmpdimb}{\XESPDframeY+\XESPDframeH-185mm}
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\begin{sideways}\usebox{\XESPD@stamp@ii@a@box}\end{sideways}}
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\begin{sideways}\XESPD@stamp@ii@a@var\end{sideways}}}
\ifXESPD@enable@columns@xxvii
\newcommand{\XESPDdrawSpecIIcolumnsXXVII}{%
\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPDframeW-48mm}
\setlength{\XESPD@tmpdimb}{\XESPDframeY+\XESPDframeH-120mm}
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\begin{sideways}\usebox{\XESPD@columns@xxvii@ii@box}\end{sideways}}%
\addtolength{\XESPD@tmpdima}{8mm}%
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\begin{sideways}\usebox{\XESPD@column@xxx@box}\end{sideways}}}
\fi
\XESPDnewStyle{specII}{\XESPD@style@sh@formII}
\ifXESPD@enable@column@xxxi
\newcommand{\XESPDdrawSpecIIcolumnXXXI}{%
\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPDframeW+1.2mm}%
\setlength{\XESPD@tmpdimb}{\XESPDframeY+\XESPDframeH-120mm}%
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\begin{sideways}%
\makebox[70mm][r]{\XESPDfontIII\XESPDcolumnXXXIname\hspace{4em}}%
\end{sideways}}}
\fi
\ifXESPD@enable@column@xxxii
\newcommand{\XESPDdrawSpecIIcolumnXXXII}{%
\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPDframeW+1.2mm}%
\setlength{\XESPD@tmpdimb}{\XESPDframeY+\XESPDframeH-50mm}%
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\begin{sideways}%
\makebox[50mm][r]{\XESPDfontIII\XESPDtheColumnXXXII}%
\end{sideways}}}
\fi
\XESPDnewStyle{specII}{0mm}
\XESPDputOnStyle{specII}{frame}{\XESPDdrawFrame}
\XESPDputOnStyle{specII}{stamp}{\XESPDdrawStampII}
\XESPDputOnStyle{specII}{specii}{\XESPDtabDrawBody\XESPDtabDrawHead}
\XESPDputOnStyle{specII}{stamp}{\XESPDdrawSpecIIstampII}
\XESPDputOnStyle{specII}{specification}{\XESPDdrawSpecificationII}
\ifXESPD@enable@columns@xix
\XESPDputOnStyle{specII}{columnsxix}{\XESPDdrawSpecIIcolumnsXIX}
\XESPDputOnStyle{specII}{columnsxix}{\XESPDdrawColumnsXIX}
\fi
\ifXESPD@enable@columns@xxiv
\XESPDputOnStyle{specII}{columnsxxiv}{\XESPDdrawSpecIIcolumnsXXIV}
\XESPDputOnStyle{specII}{columnsxxiv}{\XESPDdrawColumnsXXIV}
\fi
\ifXESPD@enable@columns@xxvii
\XESPDputOnStyle{specII}{columnsxxvii}{\XESPDdrawColumnsXXVIIii}
\XESPDputOnStyle{specII}{columnsxxvii}{\XESPDdrawSpecIIcolumnsXXVII}
\fi
\ifXESPD@enable@column@xxxi
\XESPDputOnStyle{specII}{columnxxxi}{\XESPDdrawColumnXXXI}
\XESPDputOnStyle{specII}{columnxxxi}{\XESPDdrawSpecIIcolumnXXXI}
\fi
\ifXESPD@enable@column@xxxii
\XESPDputOnStyle{specII}{columnxxxii}{\XESPDdrawColumnXXXII}
\XESPDputOnStyle{specII}{columnxxxii}{\XESPDdrawSpecIIcolumnXXXII}
\fi
\XESPDnewStyle{specIIa}{\XESPD@style@sh@formIIb}
\XESPDnewStyle{specIIa}{0mm}
\XESPDputOnStyle{specIIa}{frame}{\XESPDdrawFrame}
\XESPDputOnStyle{specIIa}{stamp}{\XESPDdrawStampIIa}
\XESPDputOnStyle{specIIa}{specii}{\XESPDtabDrawBody[1]\XESPDtabDrawHead}
\XESPDputOnStyle{specIIa}{stamp}{\XESPDdrawSpecIIstampIIa}
\XESPDputOnStyle{specIIa}{specification}{\XESPDdrawSpecificationII}
\ifXESPD@enable@columns@xix
\XESPDputOnStyle{specIIa}{columnsxix}{\XESPDdrawSpecIIcolumnsXIX}
\fi
\ifXESPD@enable@columns@xxiv
\XESPDputOnStyle{specIIa}{columnsxxiv}{\XESPDdrawSpecIIcolumnsXXIV}
\XESPDputOnStyle{specIIa}{columnsxix}{\XESPDdrawColumnsXIX}
\fi
\ifXESPD@enable@column@xxxi
\XESPDputOnStyle{specIIa}{columnxxxi}{\XESPDdrawColumnXXXI}
\XESPDputOnStyle{specIIa}{columnxxxi}{\XESPDdrawSpecIIcolumnXXXI}
\fi
\ifXESPD@enable@column@xxxii
\XESPDputOnStyle{specIIa}{columnxxxii}{\XESPDdrawColumnXXXII}
\XESPDputOnStyle{specIIa}{columnxxxii}{\XESPDdrawSpecIIcolumnXXXII}
\fi
\XESPDputOnStyle{specII}{comment}{\XESPDtabDrawComment}
\XESPDdefaultFirstStyle{specII}
\XESPDdefaultStyle{specIIa}
\newenvironment{XESPDspecificationII}{%
\begin{XESPDzeroPadding}%
\changetext{}{-55mm}{}{}{}%
\begin{landscape}
\setlength{\tabcolsep}{0.5mm}%
\setlength{\LTpre}{0mm}%
\setlength{\LTpost}{0mm}%
\setlength{\LTleft}{0mm}%
\setlength{\LTright}{\fill}%
\newcolumntype{s}{>{\XESPDfontTabBody}c}%
\newcolumntype{n}{>{\parbox[c][8mm][c]{1mm}{%
\rule{0mm}{0mm}}\XESPDfontTabBody}l}%
\noindent%
\begin{longtable}{ssssnssss}
\parbox[c][15mm][c]{5mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnIname\end{sideways}}&
\parbox[c][15mm][c]{5mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnIIname\end{sideways}}&
\parbox[c][15mm][c]{7mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnIIIname\end{sideways}}&
\parbox[c][15mm][c]{69mm}{\centering\XESPDfontTabHead%
\XESPDspecIIcolumnIVname}&
\parbox[c][15mm][c]{71mm}{\centering\XESPDfontTabHead%
\XESPDspecIIcolumnVname}&
\parbox[c][15mm][c]{9mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnVIname\end{sideways}}&
\parbox[c][15mm][c]{9mm}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnVIIname\end{sideways}}&
\parbox[c][15mm][c]{74mm}{\centering\XESPDfontTabHead%
\XESPDspecIIcolumnVIIIname}&
\parbox[c][15mm][c]{29mm}{\centering\XESPDfontTabHead%
\XESPDspecIIcolumnIXname}\endhead}{%
\end{longtable}%
\end{landscape}%
\changetext{}{55mm}{}{}{}%
\end{XESPDzeroPadding}}
\newenvironment{XESPDspecificationII}
{\XESPDtabLTPreamble{%
>{\XESPDfontTabBody\centering}
p{\argi -2\tabcolsep}
>{\XESPDfontTabBody\centering}
p{\argii -2\tabcolsep}
>{\XESPDfontTabBody\centering}
p{\argiii -2\tabcolsep}
>{\XESPDfontTabBody\centering}
p{\argiv -2\tabcolsep}
@{\hspace{\XESPDspecIIaddHspace}}
>{\XESPDfontTabBody\raggedright\XESPDtabStrut}
p{\argv -\XESPDspecIIaddHspace}
<{\XESPDtabStrut}
>{\XESPDfontTabBody\centering}
p{\argvi -2\tabcolsep}
>{\XESPDfontTabBody\centering}
p{\argvii -2\tabcolsep}
@{\hspace{\XESPDspecIIaddHspace}}
>{\XESPDfontTabBody\raggedright\XESPDtabStrut}
p{\argviii -\XESPDspecIIaddHspace}
<{\XESPDtabStrut}
>{\XESPDfontTabBody\raggedright\XESPDtabStrut}
p{\argix -2\tabcolsep}
<{\XESPDtabStrut}
}
%
{%
\parbox[c][\XESPDtabHeadH][c]{\argi -2\tabcolsep}{\centering\begin{sideways}%
\XESPDsmartScaleBox{\XESPDtabHeadH}{\XESPDfontTabHead\XESPDspecIIcolumnIname}%
\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argii -2\tabcolsep}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnIIname\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argiii -2\tabcolsep}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnIIIname\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argiv -2\tabcolsep}{\centering\XESPDfontTabHead%
\XESPDspecIIcolumnIVname}&
\parbox[c][\XESPDtabHeadH][c]{\argv -\XESPDspecIIaddHspace}{\centering\XESPDfontTabHead%
\XESPDspecIIcolumnVname}&
\parbox[c][\XESPDtabHeadH][c]{\argvi -2\tabcolsep}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnVIname\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argvii -2\tabcolsep}{\centering\begin{sideways}\XESPDfontTabHead%
\XESPDspecIIcolumnVIIname\end{sideways}}&
\parbox[c][\XESPDtabHeadH][c]{\argviii -2\tabcolsep}{\centering\XESPDfontTabHead%
\XESPDspecIIcolumnVIIIname}&
\parbox[c][\XESPDtabHeadH][c]{\argix -2\tabcolsep}{\centering\XESPDfontTabHead%
\XESPDspecIIcolumnIXname}\tabularnewline%
}
}
{\XESPDtabLTAmble}

View File

@ -33,7 +33,7 @@
\newcommand{\XESPD@default@style@title}{title}
\newcommand{\XESPD@default@style@first}{formII}
\newcommand{\XESPD@default@style@other}{formIIb}
\newcommand{\XESPD@default@style@other}{formIIab}
\newlength{\XESPD@margin@si}
\newlength{\XESPD@margin@so}
@ -51,8 +51,8 @@
\newlength{\XESPD@padding@h}
\newlength{\XESPD@padding@v}
\setlength{\XESPD@padding@h}{3mm}
\setlength{\XESPD@padding@v}{10mm}
\setlength{\XESPD@padding@h}{0mm}
\setlength{\XESPD@padding@v}{5mm}
\newif\ifXESPD@ignstamp
\XESPD@ignstampfalse
@ -95,8 +95,7 @@
\newif\ifXESPD@zonelabels
\XESPD@zonelabelsfalse
\RequirePackage{xkeyval}
\RequirePackage{keyval}
\DeclareOption{a0paper}{\renewcommand{\XESPD@paper}{a0}}
\DeclareOption{a1paper}{\renewcommand{\XESPD@paper}{a1}}
@ -112,16 +111,24 @@
\define@key{xespd}{reduceheight}{\addtolength{\XESPD@margin@b}{#1}}
\DeclareOption{formI}{%
\renewcommand{\XESPD@default@style@first}{formI}
\renewcommand{\XESPD@default@style@other}{formIIa}
\renewcommand{\XESPD@default@style@other}{formIIab}
\renewcommand{\XESPD@default@style@title}{title}}
\DeclareOption{formII}{%
\renewcommand{\XESPD@default@style@first}{formII}
\renewcommand{\XESPD@default@style@other}{formIIb}
\renewcommand{\XESPD@default@style@other}{formIIab}
\renewcommand{\XESPD@default@style@title}{title}}
\DeclareOption{emptystyle}{%
\renewcommand{\XESPD@default@style@first}{empty}
\renewcommand{\XESPD@default@style@other}{empty}
\renewcommand{\XESPD@default@style@title}{empty}}
\DeclareOption{xespd}{%
\setlength{\XESPD@margin@t}{20mm}%
\setlength{\XESPD@margin@b}{10mm}%
\setlength{\XESPD@margin@si}{20mm}
\setlength{\XESPD@margin@so}{10mm}
\renewcommand{\XESPD@default@style@first}{empty}
\renewcommand{\XESPD@default@style@other}{empty}
\renewcommand{\XESPD@default@style@title}{xespdtitle}}
\DeclareOption{stitching}{\setlength{\XESPD@margin@si}{20mm}}
\DeclareOption{nostitching}{%
\setlength{\XESPD@margin@si}{5mm}%
@ -188,6 +195,7 @@ tmargin=\XESPD@margin@t+\XESPD@padding@v,%
bmargin=\XESPD@margin@b+\XESPD@padding@v,%
inner=\XESPD@margin@si+\XESPD@padding@h,%
outer=\XESPD@margin@so+\XESPD@padding@h,%
marginparsep=0mm,marginparwidth=0mm,%
headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
\RequirePackage{lastpage}
@ -358,12 +366,7 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
\fi
\ifXESPD@enable@column@vii
\put(135, 16.3){\makebox[20mm]{\XESPDfontIII%
\ifnum \XESPD@pagenum{LastPage} = 1
\ifXESPD@twoside\XESPDcolumnVIItwosideName\else\XESPDcolumnVIIname\fi
\else
% единицу надо вставлять только если страниц больше одной
\ifXESPD@twoside\XESPDcolumnVIItwosideName\else\XESPDcolumnVIIname\fi\ \thepage
\fi}}
\ifXESPD@twoside\XESPDcolumnVIItwosideName\else\XESPDcolumnVIIname\fi\ \thepage}}
\fi
\end{picture}}
\newcommand{\XESPDdrawStampI}{%
@ -520,29 +523,33 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
\put(\XESPDltu{\XESPDstampX},\XESPDltu{\XESPDstampY}){%
\XESPD@stamp@ii@b@var}}
% Рамка
\ifXESPD@enable@columns@xix
\newsavebox{\XESPD@columns@xix@box}
\AtBeginDocument{%
\savebox{\XESPD@columns@xix@box}{%
\setlength{\unitlength}{1mm}%
\begin{picture}(0,0)(0,0)
\begin{picture}(0,0)(-5,0)
\linethickness{\XESPDlineThick}
\put(0,12){\line(1,0){145}}
\put(0,7){\line(1,0){145}}
\put(0,0){\line(1,0){145}}
\put(0,0){\line(0,1){12}}
\put(25,0){\line(0,1){12}}
\put(60,0){\line(0,1){12}}
\put(85,0){\line(0,1){12}}
\put(110,0){\line(0,1){12}}
\put(145,0){\line(0,1){12}}
\put(0, 8.3){\makebox[25mm]{\XESPDfontIII\XESPDcolumnXIXname}}
\put(0, 2.3){\makebox[25mm]{\XESPDfontIII\XESPDtheColumnXIX}}
\put(25, 8.3){\makebox[35mm]{\XESPDfontIII\XESPDcolumnXXname}}
\put(60, 8.3){\makebox[25mm]{\XESPDfontIII\XESPDcolumnXXIname}}
\put(60, 2.3){\makebox[25mm]{\XESPDfontIII\XESPDtheColumnXXI}}
\put(85, 8.3){\makebox[25mm]{\XESPDfontIII\XESPDcolumnXXIIname}}
\put(85, 2.3){\makebox[25mm]{\XESPDfontIII\XESPDtheColumnXXII}}
\put(110, 8.3){\makebox[35mm]{\XESPDfontIII\XESPDcolumnXXIIIname}}
\put(0, 8.3){\makebox[25mm]{\XESPDfontGostIV\XESPDcolumnXIXname}}
\put(0, 2.3){\makebox[25mm]{\XESPDfontGostIV\XESPDtheColumnXIX}}
\put(25, 8.3){\makebox[35mm]{\XESPDfontGostIV\XESPDcolumnXXname}}
\put(60, 8.3){\makebox[25mm]{\XESPDfontGostIV\XESPDcolumnXXIname}}
\put(60, 2.3){\makebox[25mm]{\XESPDfontGostIV\XESPDtheColumnXXI}}
\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{%
@ -585,18 +592,17 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
\put(1,13){\begin{turn}{180}\parbox[b][12mm][c]{68mm}{%
\centering\XESPDfontV\XESPDtheColumnII}\end{turn}}
\end{picture}}}
% Ориентацию листа определим исходя из величин ширины и высоты
% Так сделано для нормальной работы xespdfreesize
\newcommand{\XESPDdrawColumnXXVI}{
\ifthenelse{\lengthtest{\XESPDframeW<\XESPDframeH}}
{\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPDframeW-14mm}%
\newcommand{\XESPDdrawColumnXXVI}{%
\ifXESPD@column@xxvi@portrait%
\setlength{\XESPD@tmpdima}{\XESPDframeX+\XESPDframeW-14mm}%
\setlength{\XESPD@tmpdimb}{\XESPDframeY+\XESPDframeH}%
\put(\XESPDltu{\XESPD@tmpdima},\XESPDltu{\XESPD@tmpdimb}){%
\begin{turn}{270}\usebox{\XESPD@column@xxvi@box}\end{turn}}}
{\setlength{\XESPD@tmpdima}{\XESPDframeY+\XESPDframeH-14mm}%
\begin{turn}{270}\usebox{\XESPD@column@xxvi@box}\end{turn}}%
\else%
\setlength{\XESPD@tmpdima}{\XESPDframeY+\XESPDframeH-14mm}%
\put(\XESPDltu{\XESPDframeX},\XESPDltu{\XESPD@tmpdima}){%
\usebox{\XESPD@column@xxvi@box}}}
}
\usebox{\XESPD@column@xxvi@box}}%
\fi}
\fi
\ifXESPD@enable@columns@xxvii
@ -915,49 +921,30 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
\XESPDputOnStyle{formII}{columnxxxii}{\XESPDdrawColumnXXXII}
\fi
\XESPDnewStyle{formIIa}{15mm}
\XESPDputOnStyle{formIIa}{frame}{\XESPDdrawFrame}
\XESPDputOnStyle{formIIa}{stamp}{%
\XESPDnewStyle{formIIab}{15mm}
\XESPDputOnStyle{formIIab}{frame}{\XESPDdrawFrame}
\XESPDputOnStyle{formIIab}{stamp}{%
\ifXESPD@twoside%
\ifodd\c@page\XESPDdrawStampIIa\else\XESPDdrawStampIIb\fi%
\else\XESPDdrawStampIIa\fi}
\ifXESPD@enable@columns@xix
\XESPDputOnStyle{formIIa}{columnsxix}{%
\XESPDputOnStyle{formIIab}{columnsxix}{%
\ifXESPD@twoside\ifodd\c@page\XESPDdrawColumnsXIX\fi%
\else\XESPDdrawColumnsXIX\fi}
\fi
\ifXESPD@enable@column@xxvi
\XESPDputOnStyle{formIIa}{columnxxvi}{\XESPDdrawColumnXXVI}
\fi
\ifXESPD@enable@column@xxxi
\XESPDputOnStyle{formIIa}{columnxxxi}{\XESPDdrawColumnXXXI}
\XESPDputOnStyle{formIIab}{columnxxxi}{\XESPDdrawColumnXXXI}
\fi
\ifXESPD@enable@column@xxxii
\XESPDputOnStyle{formIIa}{columnxxxii}{\XESPDdrawColumnXXXII}
\XESPDputOnStyle{formIIab}{columnxxxii}{\XESPDdrawColumnXXXII}
\fi
\ifXESPD@zonelabels
\XESPDputOnStyle{formIIa}{zonelabels}{\XESPDdrawZoneLabelsII}
\XESPDputOnStyle{formIIab}{zonelabels}{\XESPDdrawZoneLabelsII}
\fi
\XESPDnewStyle{formIIb}{15mm}
\XESPDputOnStyle{formIIb}{frame}{\XESPDdrawFrame}
\XESPDputOnStyle{formIIb}{stamp}{%
\ifXESPD@twoside%
\ifodd\c@page\XESPDdrawStampIIa\else\XESPDdrawStampIIb\fi%
\else\XESPDdrawStampIIa\fi}
\XESPDnewStyle{xespdtitle}{0mm}
\ifXESPD@enable@columns@xix
\XESPDputOnStyle{formIIb}{columnsxix}{%
\ifXESPD@twoside\ifodd\c@page\XESPDdrawColumnsXIX\fi%
\else\XESPDdrawColumnsXIX\fi}
\fi
\ifXESPD@enable@column@xxxi
\XESPDputOnStyle{formIIb}{columnxxxi}{\XESPDdrawColumnXXXI}
\fi
\ifXESPD@enable@column@xxxii
\XESPDputOnStyle{formIIb}{columnxxxii}{\XESPDdrawColumnXXXII}
\fi
\ifXESPD@zonelabels
\XESPDputOnStyle{formIIb}{zonelabels}{\XESPDdrawZoneLabelsII}
\XESPDputOnStyle{xespdtitle}{columnsxix}{\XESPDdrawColumnsXIX}
\fi
\newlength{\XESPD@curpad@h}

View File

@ -25,7 +25,6 @@
\RequirePackage{xkeyval}
\DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
\DeclareOption{ukrainian}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
\DeclareOption{koi8-r}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
\DeclareOption{koi8-u}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
\DeclareOption{cp1251}{\PassOptionsToPackage{\CurrentOption}{xespdlang}}
@ -70,7 +69,7 @@
\LoadClass{article}
\RequirePackage{xespdlang}
\RequirePackage[formII]{xespdstamp}
\RequirePackage[a4paper,formII]{xespdstamp}
\RequirePackage{xespdinfo}
\RequirePackage{calc}