Compare commits

7 Commits

6 changed files with 48 additions and 29 deletions

View File

@ -2,7 +2,13 @@
Установка: Установка:
``` ```sh
git clone https://git.246060.ru:f1x1t/latex-style-espdx.git ~/texmf/tex/latex/espdx git clone https://git.246060.ru/f1x1t/latex-style-espdx ~/texmf/tex/latex/espdx
```
или
```sh
git clone git@git.246060.ru:/f1x1t/latex-style-esdpx ~/texmf/tex/latex/espdx
``` ```

View File

@ -102,8 +102,10 @@
\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\tabledata{}\lincnt=28 % Количество строк \def\tabledata{}\lincnt=27 % Количество строк
% \addto\tabledata{ 1 & & Все & & & & \makecell{РЕВМ.57 \\ 1/2} & & & \makecell{20.04. \\ 17} \\ \hline} % \addto\tabledata{ 4 & & Все & & & & \makecell{РЕВМ.120 \\ 1/2} & & & \makecell{27.09. \\ 2019} \\ \hline} % utk
\addto\tabledata{ 3 & & Все & & & & \makecell{РЕВМ.121 \\ 1/2} & & & \makecell{27.09. \\ 2019} \\ \hline} % pbu
% \addto\tabledata{ 4 & & Все & & & & \makecell{РЕВМ.122 \\ 1/2} & & & \makecell{27.09. \\ 2019} \\ \hline} % kims
\loop \loop
\addto\tabledata{& & & & & & & & & \\ \hline} \addto\tabledata{& & & & & & & & & \\ \hline}
\advance\lincnt -1 \advance\lincnt -1

View File

@ -48,6 +48,12 @@
\newcommand{\ESPDtheFileName}{} \newcommand{\ESPDtheFileName}{}
\newcommand{\ESPDfileName}[1]{\renewcommand{\ESPDtheFileName}{#1}} \newcommand{\ESPDfileName}[1]{\renewcommand{\ESPDtheFileName}{#1}}
\newcommand{\ESPDtheREVMBase}{}
\newcommand{\ESPDREVMBase}[1]{\renewcommand{\ESPDtheREVMBase}{#1}}
\newcommand{\ESPDtheREVMType}{}
\newcommand{\ESPDREVMType}[1]{\renewcommand{\ESPDtheREVMType}{#1}}
\newcommand{\ESPDtheLetterI}{} \newcommand{\ESPDtheLetterI}{}
\newcommand{\ESPDtheLetterII}{} \newcommand{\ESPDtheLetterII}{}
\newcommand{\ESPDtheLetterIII}{} \newcommand{\ESPDtheLetterIII}{}

View File

@ -83,12 +83,12 @@
\setlength{\ESPDsectionSkipAfter}{5mm \@plus 1mm \@minus 2mm} \setlength{\ESPDsectionSkipAfter}{5mm \@plus 1mm \@minus 2mm}
\newlength{\ESPDsubsectionSkipBefore} \newlength{\ESPDsubsectionSkipBefore}
\newlength{\ESPDsubsectionSkipAfter} \newlength{\ESPDsubsectionSkipAfter}
\setlength{\ESPDsubsectionSkipBefore}{-6pt \@plus -3mm \@minus -2mm} \setlength{\ESPDsubsectionSkipBefore}{-6pt \@plus -0mm \@minus -0mm}
\setlength{\ESPDsubsectionSkipAfter}{6pt \@plus 1mm \@minus 2mm} \setlength{\ESPDsubsectionSkipAfter}{6pt \@plus 0mm \@minus 0mm}
\newlength{\ESPDsubsubsectionSkipBefore} \newlength{\ESPDsubsubsectionSkipBefore}
\newlength{\ESPDsubsubsectionSkipAfter} \newlength{\ESPDsubsubsectionSkipAfter}
\setlength{\ESPDsubsubsectionSkipBefore}{-6pt \@plus -3mm \@minus -2mm} \setlength{\ESPDsubsubsectionSkipBefore}{-6pt \@plus -0mm \@minus -0mm}
\setlength{\ESPDsubsubsectionSkipAfter}{6pt \@plus 1mm \@minus 2mm} \setlength{\ESPDsubsubsectionSkipAfter}{6pt \@plus 0mm \@minus 0mm}
\providecommand{\plus}{\@plus} \providecommand{\plus}{\@plus}
\providecommand{\minus}{\@minus} \providecommand{\minus}{\@minus}
@ -113,9 +113,9 @@
\let\oldsection\section \let\oldsection\section
\renewcommand\section{\clearpage\oldsection} \renewcommand\section{\clearpage\oldsection}
\renewcommand{\thesection}{\arabic{section}.} \renewcommand{\thesection}{\arabic{section}}
\renewcommand{\thesubsection}{\thesection\arabic{subsection}.} \renewcommand{\thesubsection}{\thesection.\arabic{subsection}}
\renewcommand{\thesubsubsection}{\thesubsection\arabic{subsubsection}.} \renewcommand{\thesubsubsection}{\thesubsection.\arabic{subsubsection}}
\newif\ifESPD@point@style@single \newif\ifESPD@point@style@single
\ESPD@point@style@singlefalse \ESPD@point@style@singlefalse
@ -155,27 +155,27 @@
\newcounter{pointIII}[subsection] \newcounter{pointIII}[subsection]
\newcounter{pointIV}[subsubsection] \newcounter{pointIV}[subsubsection]
\renewcommand{\thepointII}{\thesection\arabic{pointII}.} \renewcommand{\thepointII}{\thesection.\arabic{pointII}}
\renewcommand{\thepointIII}{\thesubsection\arabic{pointIII}.} \renewcommand{\thepointIII}{\thesubsection.\arabic{pointIII}}
\renewcommand{\thepointIV}{\thesubsubsection\arabic{pointIV}.} \renewcommand{\thepointIV}{\thesubsubsection.\arabic{pointIV}}
\newcommand{\pointII}{% \newcommand{\pointII}{%
\par\refstepcounter{pointII}\thepointII\hspace{0.45em}} \par\refstepcounter{pointII}\thepointII.\hspace{0.45em}}
\newcommand{\pointIII}{% \newcommand{\pointIII}{%
\par\refstepcounter{pointIII}\thepointIII\hspace{0.45em}} \par\refstepcounter{pointIII}\thepointIII.\hspace{0.45em}}
\newcommand{\pointIV}{% \newcommand{\pointIV}{%
\par\refstepcounter{pointIV}\thepointIV\hspace{0.45em}} \par\refstepcounter{pointIV}\thepointIV.\hspace{0.45em}}
\newcounter{subpointIII}[pointII] \newcounter{subpointIII}[pointII]
\newcounter{subpointIV}[pointIII] \newcounter{subpointIV}[pointIII]
\renewcommand{\thesubpointIII}{\thepointII\arabic{subpointIII}.} \renewcommand{\thesubpointIII}{\thepointII.\arabic{subpointIII}}
\renewcommand{\thesubpointIV}{\thepointIII\arabic{subpointIV}.} \renewcommand{\thesubpointIV}{\thepointIII.\arabic{subpointIV}}
\newcommand{\subpointIII}{% \newcommand{\subpointIII}{%
\par\refstepcounter{subpointIII}\thesubpointIII\hspace{0.45em}} \par\refstepcounter{subpointIII}\thesubpointIII.\hspace{0.45em}}
\newcommand{\subpointIV}{% \newcommand{\subpointIV}{%
\par\refstepcounter{subpointIV}\thesubpointIV\hspace{0.45em}} \par\refstepcounter{subpointIV}\thesubpointIV.\hspace{0.45em}}
@ -231,7 +231,7 @@
\ESPDsectAlign{section}{Center} \ESPDsectAlign{section}{Center}
\makeatletter \makeatletter
\renewcommand*{\@seccntformat}[1]{\csname the#1\endcsname\hspace{0.45em}} \renewcommand*{\@seccntformat}[1]{\csname the#1\endcsname.\hspace{0.45em}}
\makeatother \makeatother
\RequirePackage[titles]{tocloft} \RequirePackage[titles]{tocloft}
@ -241,12 +241,15 @@
\renewcommand{\cftsecpagefont}{\normalfont\normalsize} \renewcommand{\cftsecpagefont}{\normalfont\normalsize}
\renewcommand{\cftsubsecpagefont}{\normalfont\normalsize} \renewcommand{\cftsubsecpagefont}{\normalfont\normalsize}
\renewcommand{\cftsubsubsecpagefont}{\normalfont\normalsize} \renewcommand{\cftsubsubsecpagefont}{\normalfont\normalsize}
\renewcommand\cftsecafterpnum{\vskip0pt} \renewcommand{\cftsecaftersnum}{.}
\renewcommand\cftsubsecafterpnum{\vskip0pt} \renewcommand{\cftsubsecaftersnum}{.}
\renewcommand\cftsubsubsecafterpnum{\vskip0pt} \renewcommand{\cftsubsubsecaftersnum}{.}
\renewcommand\cftbeforesecskip{0pt} \renewcommand{\cftsecafterpnum}{\vskip0pt}
\renewcommand\cftbeforesubsecskip{0pt} \renewcommand{\cftsubsecafterpnum}{\vskip0pt}
\renewcommand\cftbeforesubsubsecskip{0pt} \renewcommand{\cftsubsubsecafterpnum}{\vskip0pt}
\renewcommand{\cftbeforesecskip}{0pt}
\renewcommand{\cftbeforesubsecskip}{0pt}
\renewcommand{\cftbeforesubsubsecskip}{0pt}
\renewcommand{\cftdot}{} \renewcommand{\cftdot}{}

View File

@ -560,6 +560,8 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
\put(85, 8.3){\makebox[25mm]{\ESPDfontGostIV\ESPDcolumnXXIIname}} \put(85, 8.3){\makebox[25mm]{\ESPDfontGostIV\ESPDcolumnXXIIname}}
\put(85, 2.3){\makebox[25mm]{\ESPDfontGostIV\ESPDtheColumnXXII}} \put(85, 2.3){\makebox[25mm]{\ESPDfontGostIV\ESPDtheColumnXXII}}
\put(110, 8.3){\makebox[35mm]{\ESPDfontGostIV\ESPDcolumnXXIIIname}} \put(110, 8.3){\makebox[35mm]{\ESPDfontGostIV\ESPDcolumnXXIIIname}}
\put(145, 7){\makebox[35mm]{\scriptsize{3237~\CYRV\CYRP}}}
\put(145, 3){\makebox[35mm]{\scriptsize{\CYRM\CYRO~\CYRR\CYRF}}}
\end{picture}}} \end{picture}}}
\newcommand{\ESPDdrawColumnsXIX}{% \newcommand{\ESPDdrawColumnsXIX}{%
\ESPDonFrontSideOnly{% \ESPDonFrontSideOnly{%

View File

@ -107,7 +107,7 @@
\ESPD@title@split@field{\ESPDtheTitleFieldVIIIl}{\ESPDtheTitleFieldVIIIr}} \ESPD@title@split@field{\ESPDtheTitleFieldVIIIl}{\ESPDtheTitleFieldVIIIr}}
\renewcommand{\ESPDtheTitleFieldX}{\ESPDtheYear} \renewcommand{\ESPDtheTitleFieldX}{\ESPDtheYear}
\renewcommand{\ESPDtheTitleFieldXI}{\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra} \renewcommand{\ESPDtheTitleFieldXI}{\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra\ \cyr\CYRO \cyr\CYRO_1}
\renewcommand{\ESPDtitleFontI}{\ESPDfontV} \renewcommand{\ESPDtitleFontI}{\ESPDfontV}
\renewcommand{\ESPDtitleFontII}{\ESPDfontV} \renewcommand{\ESPDtitleFontII}{\ESPDfontV}