diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex/eskdx/source')
29 files changed, 343 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdafterpkg.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdafterpkg.sty.in index c0e23309ccb..8ea002c7307 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdafterpkg.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdafterpkg.sty.in @@ -21,7 +21,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdafterpkg}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Apply Commands After Package] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Apply Commands After Package] \newcommand*\ESKD@after@package[1]{% \expandafter\ifx\csname ver@#1.\@pkgextension\endcsname\relax diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdappsheet.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdappsheet.sty.in index 6ee98fb04a0..d063232c88f 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdappsheet.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdappsheet.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdappsheet}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Approving Sheet GOST 2.105] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Approving Sheet GOST 2.105] \RequirePackage{eskdlang} \RequirePackage{eskdtitle} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdbiblist.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdbiblist.sty.in index a762210f5d9..20c65296460 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdbiblist.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdbiblist.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdbiblist}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Bibliography List] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Bibliography List] \renewcommand{\@biblabel}[1]{#1.} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdcap.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdcap.sty.in index 45c8e0cb268..e0c77ab0148 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdcap.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdcap.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdcap}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Captions] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Captions] \RequirePackage{caption} \DeclareCaptionLabelSeparator{dash}{ -- } diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdchngsheet.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdchngsheet.sty.in index bcf9887b5b2..2390ac6bc55 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdchngsheet.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdchngsheet.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdchngsheet}[m4_dnl -m4_FILE_ID([[$Date: 2006-12-17 05:16:36 +0200 (Вск, 17 Дек 2006) $]]) Sheet of Changes GOST 2.503-90] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Sheet of Changes GOST 2.503-90] \RequirePackage{eskdlang} \RequirePackage{eskdstamp} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskddstu.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskddstu.sty.in index 14a33a051ff..debac790a55 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskddstu.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskddstu.sty.in @@ -18,10 +18,31 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskddstu}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Ukrainian DSTU implementation] +m4_FILE_ID([[$Date:: 2010-01-20#$]]) Ukrainian DSTU implementation] -m4_dnl -\renewcommand{\thefootnote}{\arabic{footnote})} + +% 3008, . 7.10.3 + +% {list} +% +\setlength{\ESKDexplanIndent}{\parindent} + +% \makelabel +\newcommand{\ESKD@dstu@expl@label}[1]{% + \ifthenelse{\equal{}{#1}} + {} + {\hspace{\ESKDexplanIndent}#1}% +} + +\renewenvironment{ESKDexplanation}[1][\ESKDexplanWidth]{% + \begin{list}{}{\setlength{\parsep}{0pt}% + \setlength{\topsep}{0pt}% + \setlength{\itemsep}{0pt}% + \setlength{\labelsep}{0pt}% + \setlength{\labelwidth}{0pt}% + \setlength{\leftmargin}{0pt}% + \let\makelabel\ESKD@dstu@expl@label}}{% + \end{list}} m4_dnl vim:ft=tex:sw=2:ai diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdexplan.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdexplan.sty.in index 2abc30db7e4..8fe2f936980 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdexplan.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdexplan.sty.in @@ -18,17 +18,23 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdexplan}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) ESKD Explanation] +m4_FILE_ID([[$Date:: 2010-01-19#$]]) ESKD Explanation] \RequirePackage{eskdlang} +\newlength{\ESKDexplanIndent} +% +% , 2.105-95 +% . +\setlength{\ESKDexplanIndent}{0pt} + \newenvironment{ESKDexplanation}[1][\ESKDexplanWidth]{% \begin{list}{}{\setlength{\parsep}{0pt}% \setlength{\topsep}{0pt}% \setlength{\itemsep}{0pt}% \setlength{\labelsep}{0pt}% \setlength{\labelwidth}{#1}% - \setlength{\leftmargin}{#1}}}{% + \setlength{\leftmargin}{\labelwidth+\ESKDexplanIndent}}}{% \end{list}} m4_dnl vim:ft=tex:sw=2:ai diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdfont.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdfont.sty.in index 53733b8d110..062d66c774c 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdfont.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdfont.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdfont}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Font Definitions] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Font Definitions] \newcommand{\ESKDfontBaseLineStretch}{1} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdfootnote.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdfootnote.sty.in index f742c96488a..21249491757 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdfootnote.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdfootnote.sty.in @@ -18,14 +18,64 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdfootnote}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Footnote Settings] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Footnote Settings] + +% . +% - footnote page, +% , +% . +% zref + +% amsmath zref +% eskdtext +% +\RequirePackage{amsmath} +\RequirePackage{zref-perpage} + +% +\zmakeperpage{footnote} \let\footnotesize\small -m4_dnl +% eskddstu.sty. +% T 2.105-95 . +% +% +\renewcommand{\thefootnote}{\arabic{footnote})} + +% +% . +% << >>. +% , . , +% . +% \fnasterisk +% \fnsymbol +\def\fnasterisk#1{\expandafter\@fnasterisk\csname c@#1\endcsname} +\def\@fnasterisk#1{% + \ifcase#1% + % empty for zero value + \or*% + \or**% + \or***% + \or****% + \else\PackageError{eskdfootnote}{Too many asterisks}% + {GOST 2.105-95 does not recommend to use\MessageBreak + more then 4 asterisks in footnotes.\MessageBreak + Use 'footnotearabic' option in documentclass instead}% + \fi% +} + +% +\DeclareOption{footnotearabic}{\renewcommand{\thefootnote}{\arabic{footnote})}} +\DeclareOption{footnoteasterisk}{\renewcommand{\thefootnote}{\fnasterisk{footnote}}} +\ProcessOptions\relax + +% . +% , +% , , , . \renewcommand\@makefntext[1]{% \parindent 15mm% - \noindent - \hb@xt@15mm{\hss\@makefnmark}#1} + \noindent% + \hbox to \parindent{}\hbox{\hss\@makefnmark} #1} m4_dnl vim:ft=tex:sw=2:ai diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdfreesize.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdfreesize.sty.in new file mode 100644 index 00000000000..8648ba6364a --- /dev/null +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdfreesize.sty.in @@ -0,0 +1,174 @@ +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2003/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% This Current Maintainer of this work is Konstantin Korikov. +% +% This work consists of all files listed in manifest.txt. +% + +% +% ( +% eskdx): + +m4_ESKDX_INIT +m4_FILE_INIT +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{eskdfreesize}[m4_dnl +m4_FILE_ID([[$Date:: 2010-02-20#$]]) Inserting Free Size Sheets] + +\RequirePackage{eskdstamp} + +% pdflatex. +% T , latex , +% +% , documentclass +\RequirePackage{ifpdf} +\ifpdf{} +\else{\PackageWarningNoLine{eskdfreesize} + {It's better to compile this document with pdflatex.\MessageBreak + In DVI you will get only part of the inserted big sheet}} +\fi + + + +% eskdstamp \savebox +% , +% +\newcommand{\ESKDdrawFrameFree}{% + \put(\ESKDltu{\ESKDframeX},\ESKDltu{\ESKDframeY}){% + \setlength{\unitlength}{1mm}% + \begin{picture}(0,0)(0,0) + \linethickness{\ESKDlineThick} + \put(0,\ESKDltu{\ESKDframeH}){\line(1,0){\ESKDltu{\ESKDframeW}}} + \put(0,0){\line(1,0){\ESKDltu{\ESKDframeW}}} + \put(0,0){\line(0,1){\ESKDltu{\ESKDframeH}}} + \put(\ESKDltu{\ESKDframeW},0){\line(0,1){\ESKDltu{\ESKDframeH}}} + \end{picture}}} + +% 32 +\newcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDemptyFormatName}} + +% 32 +\newcommand{\ESKDdrawColumnXXXIIfree}{% + \setlength{\ESKD@tmpdima}{\ESKDframeX+\ESKDframeW-50mm}% + \setlength{\ESKD@tmpdimb}{\ESKDframeY-3.7mm}% + \put(\ESKDltu{\ESKD@tmpdima},\ESKDltu{\ESKD@tmpdimb}){% + \makebox[50mm][r]{\ESKDfontIII\ESKDtheColumnXXXIIfree}}} + + + +% . +% eskdx, +% eskdstamp.sty, +% freesize +\ESKDnewStyle{freesize}{8mm} +\ESKDputOnStyle{freesize}{frame}{\ESKDdrawFrameFree} +\ESKDputOnStyle{freesize}{stamp}{\ESKDdrawStampIIa} +\ifESKD@enable@columns@xix + \ESKDputOnStyle{freesize}{columnsxix}{\ESKDdrawColumnsXIX} +\fi +\ifESKD@enable@column@xxvi + \ESKDputOnStyle{freesize}{columnxxvi}{\ESKDdrawColumnXXVI} +\fi +\ifESKD@enable@columns@xxvii + \ESKDputOnStyle{freesize}{columnsxxvii}{\ESKDdrawColumnsXXVIIi} +\fi +\ifESKD@enable@column@xxxi + \ESKDputOnStyle{freesize}{columnxxxi}{\ESKDdrawColumnXXXI} +\fi +\ifESKD@enable@column@xxxii + % 32 + \ESKDputOnStyle{freesize}{columnxxxii}{\ESKDdrawColumnXXXIIfree} +\fi +\ifESKD@enable@column@xxxiii + \ESKDputOnStyle{freesize}{columnxxxiii}{\ESKDdrawColumnXXXIII} +\fi +\ifESKD@enable@column@xxxiv + \ESKDputOnStyle{freesize}{columnxxxiv}{\ESKDdrawColumnXXXIV} +\fi +\ifESKD@zonelabels% + \ESKDputOnStyle{freesize}{zonelabels}{\ESKDdrawZoneLabelsI} +\fi + + +% +\newcounter{ESKD@free@sizepagebegin} +\newcounter{ESKD@free@sizepageend} + +% - +\newcommand{\ESKDfreeSize}[3]{% + \ESKDclearDoublePage% + \setcounter{ESKD@free@sizepagebegin}{\value{page}}% + \pdfpagewidth=#1% + \pdfpageheight=#2% + \setlength{\ESKD@origin@y}{#2-1in}% + \setlength{\ESKDframeW}{\pdfpagewidth-\ESKD@margin@si-\ESKD@margin@so}% + \setlength{\ESKDframeH}{\pdfpageheight-\ESKD@margin@t-\ESKD@margin@b}% + \ESKDstyle{freesize}% + \expandafter{#3}% + % \jobname.log + \ESKDclearDoublePage% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDemptyFormatName}}% 32 + \setcounter{ESKD@free@sizepageend}{\value{page}}% + \addtocounter{ESKD@free@sizepageend}{-1}% + \ifthenelse{\value{ESKD@free@sizepagebegin}<\value{ESKD@free@sizepageend}}% + {\immediate\write0{eskdfreesize: sheet(s) with size (#1 x #2) inserted + at page(s) \noexpand[\arabic{ESKD@free@sizepagebegin}% + -\arabic{ESKD@free@sizepageend}\noexpand]}} + {\immediate\write0{eskdfreesize: sheet(s) with size (#1 x #2) inserted + at page(s) \noexpand[\arabic{ESKD@free@sizepageend}\noexpand]}} + % ӣ + \setlength{\ESKD@origin@y}{\paperheight-1in}% + \pdfpageheight=\paperheight% + \pdfpagewidth=\paperwidth% + \setlength{\ESKDframeW}{\paperwidth-\ESKD@margin@si-\ESKD@margin@so}% + \setlength{\ESKDframeH}{\paperheight-\ESKD@margin@t-\ESKD@margin@b}% + \ESKDstyle{\ESKD@default@style@other}% + \newpage% +} + + +% +\newcommand{\ESKDlandscapeAIII}[1]{% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDa3FormatName}}% + \ESKDfreeSize{420mm}{297mm}{#1}} + +\newcommand{\ESKDportraitAIII}[1]{% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDa3FormatName}}% + \ESKDfreeSize{297mm}{420mm}{#1}} + +\newcommand{\ESKDlandscapeAII}[1]{% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDa2FormatName}}% + \ESKDfreeSize{594mm}{420mm}{#1}} + +\newcommand{\ESKDportraitAII}[1]{% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDa2FormatName}}% + \ESKDfreeSize{420mm}{594mm}{#1}} + +\newcommand{\ESKDlandscapeAI}[1]{% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDa1FormatName}}% + \ESKDfreeSize{841mm}{594mm}{#1}} + +\newcommand{\ESKDportraitAI}[1]{% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDa1FormatName}}% + \ESKDfreeSize{594mm}{841mm}{#1}} + +\newcommand{\ESKDlandscapeAZERO}[1]{% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDa0FormatName}}% + \ESKDfreeSize{1189mm}{841mm}{#1}} + +\newcommand{\ESKDportraitAZERO}[1]{% + \renewcommand\ESKDtheColumnXXXIIfree{\@nameuse{ESKDa0FormatName}}% + \ESKDfreeSize{841mm}{1189mm}{#1}} + +\newcommand{\ESKDlandscapeBanner}[1]{% + % 4. + % + \ESKDfreeSize{5000mm}{297mm}{#1}} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdgraph.cls.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdgraph.cls.in index 3e981bf2d8b..3ef8d0cbc33 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdgraph.cls.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdgraph.cls.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesClass{eskdgraph}[m4_dnl -m4_FILE_ID([[$Date: 2006-12-15 00:40:50 +0200 (Птн, 15 Дек 2006) $]]) Graphical Documentation] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Graphical Documentation] \DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}} \DeclareOption{ukrainian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdhash.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdhash.sty.in index 00ecb99db59..1edc76f6112 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdhash.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdhash.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdhash}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Hash Routines] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Hash Routines] \newcommand{\ESKD@hash@new}[1]{% \global\expandafter\newcount\csname ESKD@hash@c@#1\endcsname diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdindent.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdindent.sty.in index fb615d0d713..f69c21e3e80 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdindent.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdindent.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdindent}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Paragraph Indent] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Paragraph Indent] \RequirePackage{indentfirst} m4_dnl diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdinfo.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdinfo.sty.in index a91d0449ff9..4d5f08dd4ec 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdinfo.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdinfo.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdinfo}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Document Information] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Document Information] m4_dnl \newcommand{\ESKDtheDepartment}{} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdlang.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdlang.sty.in index 37a41444fe7..eba4913aa55 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdlang.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdlang.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdlang}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Language] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Language] \newcommand{\ESKD@lang}{russian} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdlist.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdlist.sty.in index fc354d1379c..74ef89208d8 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdlist.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdlist.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdlist}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) List] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) List] \RequirePackage{calc} m4_dnl diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdpara.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdpara.sty.in index c177c121cff..acbd98a8959 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdpara.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdpara.sty.in @@ -19,7 +19,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdpara}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Paragraphs] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Paragraphs] \RequirePackage{eskdsect} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdplain.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdplain.sty.in index 1b457926d8e..1de82cfb1a6 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdplain.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdplain.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdplain}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Plain Page Style] +m4_FILE_ID([[$Date:: 2011-05-09#$]]) Plain Page Style] \RequirePackage{eskdstamp} \RequirePackage{calc} @@ -26,12 +26,22 @@ m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Plai \def\ESKD@plain@vt{% \setlength{\ESKD@tmpdimc}{% \ESKDframeY+\ESKDframeH-\ESKD@padding@v}} + \def\ESKD@plain@vb{% \setlength{\ESKD@tmpdimc}{% \ESKDframeY+\ESKD@padding@v-15mm}} -\def\ESKD@plain@hl{\raggedright} + +\def\ESKD@plain@hl{% + \ifESKD@twoside + \ifodd\c@page\raggedright\else\raggedleft\fi + \else\raggedright\fi} + +\def\ESKD@plain@hr{% + \ifESKD@twoside + \ifodd\c@page\raggedleft\else\raggedright\fi + \else\raggedleft\fi} + \def\ESKD@plain@hc{\centering} -\def\ESKD@plain@hr{\raggedleft} \let\ESKD@plain@ha\ESKD@plain@hc \let\ESKD@plain@va\ESKD@plain@vb @@ -49,7 +59,9 @@ m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Plai \setlength{\ESKD@tmpdimb}{\ESKDframeW-2\ESKD@padding@h} \ESKD@plain@va \put(\ESKDltu{\ESKD@tmpdima},\ESKDltu{\ESKD@tmpdimc}){% - \parbox[b][15mm][c]{\ESKD@tmpdimb}{\ESKD@plain@ha\thepage}}} + \parbox[b][15mm][c]{\ESKD@tmpdimb}{% + \reset@font\normalsize\normalsfcodes + \ESKD@plain@ha\thepage}}} \ESKDnewStyle{plain}{0mm} \ESKDputOnStyle{plain}{pagenumber}{\ESKDdrawPlainPageNumber} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdrussian.def.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdrussian.def.in index 1c500912cb5..90cecd2975d 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdrussian.def.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdrussian.def.in @@ -17,7 +17,7 @@ m4_ESKDX_INIT m4_FILE_INIT \ProvidesFile{eskdrussian.def}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Language File] +m4_FILE_ID([[$Date:: 2010-01-17#$]]) Language File] \newcommand{\ESKDcolumnIVname}{% \cyr\CYRL\cyri\cyrt.} @@ -80,6 +80,8 @@ m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Lang \cyr\CYRF\cyro\cyrr\cyrm\cyra\cyrt\ \CYRA{}3} \@namedef{ESKDa4FormatName}{% \cyr\CYRF\cyro\cyrr\cyrm\cyra\cyrt\ \CYRA{}4} +\@namedef{ESKDemptyFormatName}{% + \cyr\CYRF\cyro\cyrr\cyrm\cyra\cyrt\ \ \ \ } \newcommand{\ESKDcolumnXXXIIIname}{% \cyr\CYRZ\cyro\cyrn\cyra} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdsect.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdsect.sty.in index 18bbfe0d802..42ffb60be56 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdsect.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdsect.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdsect}[m4_dnl -m4_FILE_ID([[$Date: 2006-12-16 04:15:21 +0200 (Суб, 16 Дек 2006) $]]) Sectioning] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Sectioning] \newcommand{\ESKD@point@style}{single} @@ -122,21 +122,26 @@ m4_dnl \newcommand{\ESKD@point@style@single}{ \newcounter{point} \renewcommand{\thepoint}{\arabic{point}} + \newcommand{\theHpoint}{\arabic{point}} \ESKD@point@style@singletrue} \newcommand{\ESKD@point@style@section}{ \newcounter{point}[section] - \renewcommand{\thepoint}{\thesection.\arabic{point}}} + \renewcommand{\thepoint}{\thesection.\arabic{point}} + \newcommand{\theHpoint}{\theHsection.\arabic{point}}} \newcommand{\ESKD@point@style@subsection}{ \newcounter{point}[subsection] - \renewcommand{\thepoint}{\thesubsection.\arabic{point}}} + \renewcommand{\thepoint}{\thesubsection.\arabic{point}} + \newcommand{\theHpoint}{\theHsubsection.\arabic{point}}} \@nameuse{ESKD@point@style@\ESKD@point@style} \newcounter{subpoint}[point] \newcounter{subsubpoint}[subpoint] \renewcommand{\thesubpoint}{\thepoint.\arabic{subpoint}} +\newcommand{\theHsubpoint}{\theHpoint.\arabic{subpoint}} \renewcommand{\thesubsubpoint}{\thesubpoint.\arabic{subsubpoint}} +\newcommand{\theHsubsubpoint}{\theHsubpoint.\arabic{subsubpoint}} \newcommand{\point}{% \par\refstepcounter{point}\thepoint\quad} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdspec.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdspec.sty.in index 5295043ac9e..d436e2ff5f9 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdspec.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdspec.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdspec}[m4_dnl -m4_FILE_ID([[$Date: 2006-12-17 05:16:36 +0200 (Вск, 17 Дек 2006) $]]) Specification GOST 2.106.95] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Specification GOST 2.106.95] \RequirePackage{eskdlang} \RequirePackage{eskdstamp} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdspecii.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdspecii.sty.in index 2064b433f3d..2dd2b7c9638 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdspecii.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdspecii.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdspecii}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Specification GOST 2.106.95 Form 2] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Specification GOST 2.106.95 Form 2] \RequirePackage{eskdlang} \RequirePackage{eskdstamp} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdstamp.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdstamp.sty.in index acacc69c758..66faf87bb50 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdstamp.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdstamp.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdstamp}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Stamp GOST 2.104-68] +m4_FILE_ID([[$Date:: 2011-05-06#$]]) Stamp GOST 2.104-68] \RequirePackage{calc} @@ -646,14 +646,16 @@ m4_dnl 27, 28, 29, 30 \setlength{\unitlength}{1mm}% \begin{picture}(0,0)(0,0) \linethickness{\ESKDlineThick} -\put(0,7){\line(1,0){120}} -\put(0,0){\line(0,1){7}} -\put(14,0){\line(0,1){7}} -\put(67,0){\line(0,1){7}} -\put(0,0){\parbox[b][7mm][c]{14mm}{% +\put(0,14){\line(1,0){120}} +\put(0,0){\line(0,1){14}} +\put(14,0){\line(0,1){14}} +\put(67,0){\line(0,1){14}} +\put(0,0){\parbox[b][14mm][c]{14mm}{% \centering\ESKDfontIII\ESKDtheColumnXXVII}} -\put(14,2.3){\makebox[53mm][c]{\ESKDfontIII\ESKDtheColumnXXVIII}} -\put(67,2.3){\makebox[53mm][c]{\ESKDfontIII\ESKDtheColumnXXIX}} +\put(15,0){\parbox[b][14mm][c]{51mm}{% + \centering\ESKDfontIII\ESKDtheColumnXXVIII}} +\put(68,0){\parbox[b][14mm][c]{51mm}{% + \centering\ESKDfontIII\ESKDtheColumnXXIX}} \end{picture}}} \newsavebox{\ESKD@column@xxx@box} \AtBeginDocument{% @@ -928,7 +930,7 @@ m4_dnl 1 \fi m4_dnl 2 -\ESKDnewStyle{formII}{\ifESKD@enable@columns@xxvii 55mm\else 40mm\fi} +\ESKDnewStyle{formII}{\ifESKD@enable@columns@xxvii 62mm\else 40mm\fi} \ESKDputOnStyle{formII}{frame}{\ESKDdrawFrame} \ESKDputOnStyle{formII}{stamp}{\ESKDdrawStampII} \ifESKD@enable@columns@xix @@ -969,7 +971,7 @@ m4_dnl 2 2 \ESKDputOnStyle{formIIab}{zonelabels}{\ESKDdrawZoneLabelsII} \fi -m4_dnl +m4_dnl \newlength{\ESKD@curpad@h} \newlength{\ESKD@curpad@v} \setlength{\ESKD@curpad@h}{\ESKD@padding@h} @@ -1021,20 +1023,36 @@ m4_dnl \EveryShipout{\ESKD@ShipoutPicture} \RequirePackage{chngpage} +\RequirePackage{ifpdf} m4_dnl +% \ESKD@tmpdima --- width +% \ESKD@tmpdimb --- height \newcommand{\ESKDstyle}[1]{% \pagestyle{empty}% \def\ESKD@curstyle{#1}% -\changetext{\paperheight-\ESKD@margin@t-\ESKD@margin@b-2\ESKD@curpad@v% - \expandafter-\@nameuse{ESKD@style@sh@\ifESKD@ignstamp empty\else #1\fi}-\textheight}{}{}{}{}% +\ifpdf% + \setlength{\ESKD@tmpdimb}{\pdfpageheight}% + \setlength{\ESKD@tmpdima}{\pdfpagewidth}% +\else% + \setlength{\ESKD@tmpdima}{\paperwidth}% + \setlength{\ESKD@tmpdimb}{\paperheight}% +\fi% +\changetext{\ESKD@tmpdimb-\ESKD@margin@t-\ESKD@margin@b-2\ESKD@curpad@v% + \expandafter-\@nameuse{ESKD@style@sh@\ifESKD@ignstamp empty\else #1\fi}-\textheight}% + {\ESKD@tmpdima-\ESKD@margin@si-\ESKD@margin@so-2\ESKD@padding@h-\textwidth}{}{}{}% \let\ESKD@thisstyle\@empty} m4_dnl \newcommand{\ESKDthisStyle}[1]{% \thispagestyle{empty}% \def\ESKD@thisstyle{#1}% -\setlength{\vsize}{\paperheight-\ESKD@margin@t-\ESKD@margin@b-2\ESKD@curpad@v% +\ifpdf% + \setlength{\ESKD@tmpdimb}{\pdfpageheight}% +\else% + \setlength{\ESKD@tmpdimb}{\paperheight}% +\fi% +\setlength{\vsize}{\ESKD@tmpdimb-\ESKD@margin@t-\ESKD@margin@b-2\ESKD@curpad@v% \expandafter-\@nameuse{ESKD@style@sh@\ifESKD@ignstamp empty\else #1\fi}}% \setlength{\@colht}{\vsize}\setlength{\@colroom}{\vsize}} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdtab.cls.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdtab.cls.in index 8949e68be2e..78ced744330 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdtab.cls.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdtab.cls.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesClass{eskdtab}[m4_dnl -m4_FILE_ID([[$Date: 2006-12-15 00:40:50 +0200 (Птн, 15 Дек 2006) $]]) Tabular Documentation] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Tabular Documentation] \DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}} \DeclareOption{ukrainian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdtext.cls.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdtext.cls.in index 159d66b4cf8..36c7791e803 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdtext.cls.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdtext.cls.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesClass{eskdtext}[m4_dnl -m4_FILE_ID([[$Date: 2006-12-15 00:40:50 +0200 (Птн, 15 Дек 2006) $]]) Textual Documentation] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Textual Documentation] \newcommand{\ESKD@docfont}{14pt} \newcommand{\ESKD@float@style}{single} @@ -44,6 +44,8 @@ m4_FILE_ID([[$Date: 2006-12-15 00:40:50 +0200 (Птн, 15 Дек 2006) $]]) Text \DeclareOption{equationsingle}{\renewcommand{\ESKD@equation@style}{single}} \DeclareOption{equationsection}{\renewcommand{\ESKD@equation@style}{section}} \DeclareOption{equationsubsection}{\renewcommand{\ESKD@equation@style}{subsection}} +\DeclareOption{footnotearabic}{\PassOptionsToPackage{\CurrentOption}{eskdfootnote}} +\DeclareOption{footnoteasterisk}{\PassOptionsToPackage{\CurrentOption}{eskdfootnote}} \DeclareOption{twoside}{% \PassOptionsToClass{\CurrentOption}{extarticle}% \PassOptionsToPackage{\CurrentOption}{eskdstamp}} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdtitle.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdtitle.sty.in index 35b09c64f73..9ac32d0d299 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdtitle.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdtitle.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdtitle}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Title GOST 2.105] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Title GOST 2.105] \RequirePackage{eskdstamp} \RequirePackage{eskdlang} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdtitlebase.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdtitlebase.sty.in index 0eb107a7857..404abfa2251 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdtitlebase.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdtitlebase.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdtitlebase}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Base Title Commands] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Base Title Commands] m4_dnl \newcommand{\ESKDtitleApprovedBy}[2]{% diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdtotal.sty.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdtotal.sty.in index dfaee588b00..5f8d8225c91 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdtotal.sty.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdtotal.sty.in @@ -18,7 +18,7 @@ m4_ESKDX_INIT m4_FILE_INIT \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eskdtotal}[m4_dnl -m4_FILE_ID([[$Date: 2006-12-17 06:01:41 +0200 (Вск, 17 Дек 2006) $]]) Total number of tables, figures, etc] +m4_FILE_ID([[$Date:: 2010-01-14#$]]) Total number of tables, figures, etc] \RequirePackage{eskdsect} diff --git a/Master/texmf-dist/doc/latex/eskdx/source/eskdukrainian.def.in b/Master/texmf-dist/doc/latex/eskdx/source/eskdukrainian.def.in index 0c6480f102b..d2d2aaa6f73 100644 --- a/Master/texmf-dist/doc/latex/eskdx/source/eskdukrainian.def.in +++ b/Master/texmf-dist/doc/latex/eskdx/source/eskdukrainian.def.in @@ -17,7 +17,7 @@ m4_ESKDX_INIT m4_FILE_INIT \ProvidesFile{eskdukrainian.def}[m4_dnl -m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Language File] +m4_FILE_ID([[$Date:: 2010-01-17#$]]) Language File] \newcommand{\ESKDcolumnIVname}{% \cyr\CYRL\cyri\cyrt.} @@ -80,6 +80,8 @@ m4_FILE_ID([[$Date: 2006-11-28 05:25:58 +0200 (Вто, 28 Ноя 2006) $]]) Lang \cyr\CYRF\cyro\cyrr\cyrm\cyra\cyrt\ \CYRA{}3} \@namedef{ESKDa4FormatName}{% \cyr\CYRF\cyro\cyrr\cyrm\cyra\cyrt\ \CYRA{}4} +\@namedef{ESKDemptyFormatName}{% + \cyr\CYRF\cyro\cyrr\cyrm\cyra\cyrt\ \ \ \ } \newcommand{\ESKDcolumnXXXIIIname}{% \cyr\CYRZ\cyro\cyrn\cyra} |