eskdx 0.98 (13may11)

git-svn-id: svn://tug.org/texlive/trunk@22465 c570f23f-e606-0410-a88d-b1316a301751

29 files changed, 344 insertions, 48 deletions

diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdafterpkg.sty b/Master/texmf-dist/tex/latex/eskdx/eskdafterpkg.sty
index 960c71ddef2..e2df602dfcd 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdafterpkg.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdafterpkg.sty
@@ -23,7 +23,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdafterpkg}[2006/11/28 v0.97 Apply Commands After Package]
+\ProvidesPackage{eskdafterpkg}[2010/01/14 v0.98 Apply Commands After Package]
 
 \newcommand*\ESKD@after@package[1]{%
   \expandafter\ifx\csname ver@#1.\@pkgextension\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdappsheet.sty b/Master/texmf-dist/tex/latex/eskdx/eskdappsheet.sty
index 6892c691786..9b51271e945 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdappsheet.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdappsheet.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdappsheet}[2006/11/28 v0.97 Approving Sheet GOST 2.105]
+\ProvidesPackage{eskdappsheet}[2010/01/14 v0.98 Approving Sheet GOST 2.105]
 
 \RequirePackage{eskdlang}
 \RequirePackage{eskdtitle}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdbiblist.sty b/Master/texmf-dist/tex/latex/eskdx/eskdbiblist.sty
index ec57c86233f..729687345f4 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdbiblist.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdbiblist.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdbiblist}[2006/11/28 v0.97 Bibliography List]
+\ProvidesPackage{eskdbiblist}[2010/01/14 v0.98 Bibliography List]
 
 \renewcommand{\@biblabel}[1]{#1.}
 
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdcap.sty b/Master/texmf-dist/tex/latex/eskdx/eskdcap.sty
index daf66c38603..e1bc6b69a0c 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdcap.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdcap.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdcap}[2006/11/28 v0.97 Captions]
+\ProvidesPackage{eskdcap}[2010/01/14 v0.98 Captions]
 
 \RequirePackage{caption}
 \DeclareCaptionLabelSeparator{dash}{ -- }
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdchngsheet.sty b/Master/texmf-dist/tex/latex/eskdx/eskdchngsheet.sty
index 2c5988a6243..c2a831733c0 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdchngsheet.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdchngsheet.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdchngsheet}[2006/12/17 v0.97 Sheet of Changes GOST 2.503-90]
+\ProvidesPackage{eskdchngsheet}[2010/01/14 v0.98 Sheet of Changes GOST 2.503-90]
 
 \RequirePackage{eskdlang}
 \RequirePackage{eskdstamp}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskddstu.sty b/Master/texmf-dist/tex/latex/eskdx/eskddstu.sty
index cc7a038423e..e02474b42fb 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskddstu.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskddstu.sty
@@ -20,8 +20,30 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskddstu}[2006/11/28 v0.97 Ukrainian DSTU implementation]
+\ProvidesPackage{eskddstu}[2010/01/20 v0.98 Ukrainian DSTU implementation]
 
-\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}}
 
 
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdexplan.sty b/Master/texmf-dist/tex/latex/eskdx/eskdexplan.sty
index 1e9bf09422e..1c55105d776 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdexplan.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdexplan.sty
@@ -20,16 +20,22 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdexplan}[2006/11/28 v0.97 ESKD Explanation]
+\ProvidesPackage{eskdexplan}[2010/01/19 v0.98 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}}
 
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdfont.sty b/Master/texmf-dist/tex/latex/eskdx/eskdfont.sty
index 465f139aa90..f0bb3eaa5ff 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdfont.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdfont.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdfont}[2006/11/28 v0.97 Font Definitions]
+\ProvidesPackage{eskdfont}[2010/01/14 v0.98 Font Definitions]
 
 \newcommand{\ESKDfontBaseLineStretch}{1}
 
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdfootnote.sty b/Master/texmf-dist/tex/latex/eskdx/eskdfootnote.sty
index 791340d40ce..909d3742a60 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdfootnote.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdfootnote.sty
@@ -20,12 +20,63 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdfootnote}[2006/11/28 v0.97 Footnote Settings]
+\ProvidesPackage{eskdfootnote}[2010/01/14 v0.98 Footnote Settings]
+
+% Нумероваться сноски должны в пределах одной страницы.
+% Самое очевидное решение - переподчинить счетчик footnote счетчику page,
+% но такой метод будет давать сбои, если сноска вставлена
+% близко к концу страницы.
+% Эту проблему решил Обердайк в своем пакете zref
+
+% пакет amsmath должен быть загружен ПЕРЕД zref
+% возможно стоит загружать его в классе eskdtext
+% а не здесь 
+\RequirePackage{amsmath}
+\RequirePackage{zref-perpage}
+
+% привязываем сброс счетчика сносок к границам страниц
+\zmakeperpage{footnote} 
 
 \let\footnotesize\small
 
+% Нижеследующая строка была взята из 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}
 
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdfreesize.sty b/Master/texmf-dist/tex/latex/eskdx/eskdfreesize.sty
new file mode 100644
index 00000000000..5986dcc2051
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdfreesize.sty
@@ -0,0 +1,176 @@
+% 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):
+
+
+%
+% This is automaticaly generated file, do not edit it.
+%
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{eskdfreesize}[2010/02/20 v0.98 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/tex/latex/eskdx/eskdgraph.cls b/Master/texmf-dist/tex/latex/eskdx/eskdgraph.cls
index 9c898e15f0b..007fa601c93 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdgraph.cls
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdgraph.cls
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{eskdgraph}[2006/12/15 v0.97 Graphical Documentation]
+\ProvidesClass{eskdgraph}[2010/01/14 v0.98 Graphical Documentation]
 
 \DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}}
 \DeclareOption{ukrainian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdhash.sty b/Master/texmf-dist/tex/latex/eskdx/eskdhash.sty
index 74fab186c3c..ee1292d38bf 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdhash.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdhash.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdhash}[2006/11/28 v0.97 Hash Routines]
+\ProvidesPackage{eskdhash}[2010/01/14 v0.98 Hash Routines]
 
 \newcommand{\ESKD@hash@new}[1]{%
   \global\expandafter\newcount\csname ESKD@hash@c@#1\endcsname
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdindent.sty b/Master/texmf-dist/tex/latex/eskdx/eskdindent.sty
index 40668ea9762..844ae352e45 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdindent.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdindent.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdindent}[2006/11/28 v0.97 Paragraph Indent]
+\ProvidesPackage{eskdindent}[2010/01/14 v0.98 Paragraph Indent]
 
 \RequirePackage{indentfirst}
 \setlength{\parindent}{15mm}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdinfo.sty b/Master/texmf-dist/tex/latex/eskdx/eskdinfo.sty
index e834799dc63..1fc70ab089d 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdinfo.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdinfo.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdinfo}[2006/11/28 v0.97 Document Information]
+\ProvidesPackage{eskdinfo}[2010/01/14 v0.98 Document Information]
 
 \newcommand{\ESKDtheDepartment}{}
 \newcommand{\ESKDdepartment}[1]{\renewcommand{\ESKDtheDepartment}{#1}}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdlang.sty b/Master/texmf-dist/tex/latex/eskdx/eskdlang.sty
index 079426b63ed..64bbc14bae1 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdlang.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdlang.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdlang}[2006/11/28 v0.97 Language]
+\ProvidesPackage{eskdlang}[2010/01/14 v0.98 Language]
 
 \newcommand{\ESKD@lang}{russian}
 
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdlist.sty b/Master/texmf-dist/tex/latex/eskdx/eskdlist.sty
index f835afe624c..bfc76409ff6 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdlist.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdlist.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdlist}[2006/11/28 v0.97 List]
+\ProvidesPackage{eskdlist}[2010/01/14 v0.98 List]
 \RequirePackage{calc}
 
 \renewcommand{\theenumi}{\asbuk{enumi}}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdpara.sty b/Master/texmf-dist/tex/latex/eskdx/eskdpara.sty
index c835a081b35..adada61cf08 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdpara.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdpara.sty
@@ -21,7 +21,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdpara}[2006/11/28 v0.97 Paragraphs]
+\ProvidesPackage{eskdpara}[2010/01/14 v0.98 Paragraphs]
 
 \RequirePackage{eskdsect}
 
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdplain.sty b/Master/texmf-dist/tex/latex/eskdx/eskdplain.sty
index c942caf7f7b..1f52526047c 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdplain.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdplain.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdplain}[2006/11/28 v0.97 Plain Page Style]
+\ProvidesPackage{eskdplain}[2011/05/09 v0.98 Plain Page Style]
 
 \RequirePackage{eskdstamp}
 \RequirePackage{calc}
@@ -28,12 +28,22 @@
 \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
@@ -51,7 +61,9 @@
   \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/tex/latex/eskdx/eskdrussian.def b/Master/texmf-dist/tex/latex/eskdx/eskdrussian.def
index 0117cca3c02..f8ec0e1995c 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdrussian.def
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdrussian.def
@@ -19,7 +19,7 @@
 % This is automaticaly generated file, do not edit it.
 %
 
-\ProvidesFile{eskdrussian.def}[2006/11/28 v0.97 Language File]
+\ProvidesFile{eskdrussian.def}[2010/01/17 v0.98 Language File]
 
 \newcommand{\ESKDcolumnIVname}{%
   \cyr\CYRL\cyri\cyrt.}
@@ -82,6 +82,8 @@
   \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/tex/latex/eskdx/eskdsect.sty b/Master/texmf-dist/tex/latex/eskdx/eskdsect.sty
index 50963e0475a..27cc6d731c3 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdsect.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdsect.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdsect}[2006/12/16 v0.97 Sectioning]
+\ProvidesPackage{eskdsect}[2010/01/14 v0.98 Sectioning]
 
 \newcommand{\ESKD@point@style}{single}
 
@@ -118,21 +118,26 @@
 \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/tex/latex/eskdx/eskdspec.sty b/Master/texmf-dist/tex/latex/eskdx/eskdspec.sty
index 7496ea313a7..042344555d7 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdspec.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdspec.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdspec}[2006/12/17 v0.97 Specification GOST 2.106.95]
+\ProvidesPackage{eskdspec}[2010/01/14 v0.98 Specification GOST 2.106.95]
 
 \RequirePackage{eskdlang}
 \RequirePackage{eskdstamp}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdspecii.sty b/Master/texmf-dist/tex/latex/eskdx/eskdspecii.sty
index 613caa2ce75..45ddaa2a486 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdspecii.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdspecii.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdspecii}[2006/11/28 v0.97 Specification GOST 2.106.95 Form 2]
+\ProvidesPackage{eskdspecii}[2010/01/14 v0.98 Specification GOST 2.106.95 Form 2]
 
 \RequirePackage{eskdlang}
 \RequirePackage{eskdstamp}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty b/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty
index fc59692a076..1f1958b776f 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdstamp}[2006/11/28 v0.97 Stamp GOST 2.104-68]
+\ProvidesPackage{eskdstamp}[2011/05/06 v0.98 Stamp GOST 2.104-68]
 
 \RequirePackage{calc}
 
@@ -616,14 +616,16 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
 \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{%
@@ -887,7 +889,7 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
   \ESKDputOnStyle{formI}{zonelabels}{\ESKDdrawZoneLabelsI}
 \fi
 
-\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
@@ -978,18 +980,34 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry}
 \EveryShipout{\ESKD@ShipoutPicture}
 
 \RequirePackage{chngpage}
+\RequirePackage{ifpdf}
 
+% \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}
 
 \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/tex/latex/eskdx/eskdtab.cls b/Master/texmf-dist/tex/latex/eskdx/eskdtab.cls
index 47906fbf08e..285d62dd539 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdtab.cls
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdtab.cls
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{eskdtab}[2006/12/15 v0.97 Tabular Documentation]
+\ProvidesClass{eskdtab}[2010/01/14 v0.98 Tabular Documentation]
 
 \DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}}
 \DeclareOption{ukrainian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdtext.cls b/Master/texmf-dist/tex/latex/eskdx/eskdtext.cls
index 64b6ba2e4c2..bdc5950b659 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdtext.cls
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdtext.cls
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{eskdtext}[2006/12/15 v0.97 Textual Documentation]
+\ProvidesClass{eskdtext}[2010/01/14 v0.98 Textual Documentation]
 
 \newcommand{\ESKD@docfont}{14pt}
 \newcommand{\ESKD@float@style}{single}
@@ -46,6 +46,8 @@
 \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/tex/latex/eskdx/eskdtitle.sty b/Master/texmf-dist/tex/latex/eskdx/eskdtitle.sty
index 5e92ee1f5ad..b0764982fb6 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdtitle.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdtitle.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdtitle}[2006/11/28 v0.97 Title GOST 2.105]
+\ProvidesPackage{eskdtitle}[2010/01/14 v0.98 Title GOST 2.105]
 
 \RequirePackage{eskdstamp}
 \RequirePackage{eskdlang}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdtitlebase.sty b/Master/texmf-dist/tex/latex/eskdx/eskdtitlebase.sty
index 338a225e24c..a4e046f7ae4 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdtitlebase.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdtitlebase.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdtitlebase}[2006/11/28 v0.97 Base Title Commands]
+\ProvidesPackage{eskdtitlebase}[2010/01/14 v0.98 Base Title Commands]
 
 \newcommand{\ESKDtitleApprovedBy}[2]{%
   \@namedef{ESKD@title@approved@post@1}{#1}
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdtotal.sty b/Master/texmf-dist/tex/latex/eskdx/eskdtotal.sty
index 2bc12352eda..afce86d6f12 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdtotal.sty
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdtotal.sty
@@ -20,7 +20,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eskdtotal}[2006/12/17 v0.97 Total number of tables, figures, etc]
+\ProvidesPackage{eskdtotal}[2010/01/14 v0.98 Total number of tables, figures, etc]
 
 \RequirePackage{eskdsect}
 
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdukrainian.def b/Master/texmf-dist/tex/latex/eskdx/eskdukrainian.def
index d173aac4194..95b31844bf3 100644
--- a/Master/texmf-dist/tex/latex/eskdx/eskdukrainian.def
+++ b/Master/texmf-dist/tex/latex/eskdx/eskdukrainian.def
@@ -19,7 +19,7 @@
 % This is automaticaly generated file, do not edit it.
 %
 
-\ProvidesFile{eskdukrainian.def}[2006/11/28 v0.97 Language File]
+\ProvidesFile{eskdukrainian.def}[2010/01/17 v0.98 Language File]
 
 \newcommand{\ESKDcolumnIVname}{%
   \cyr\CYRL\cyri\cyrt.}
@@ -82,6 +82,8 @@
   \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}