From 0cabfcfe625cf91882bef76043e5cfef9849e982 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 23 Aug 2018 16:18:27 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=92=D1=8B=D1=80=D0=B0=D0=B2=D0=BD=D0=B8?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espdfont.sty | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/espdfont.sty b/espdfont.sty index 61f8dc3..e58a4ab 100644 --- a/espdfont.sty +++ b/espdfont.sty @@ -60,20 +60,20 @@ \newcommand{\ESPDtheGostFontName}{} \newcommand{\ESPDgostFontName}[1]{\renewcommand{\ESPDtheGostFontName}{#1}} \usepackage{fontspec} -\newcommand{\ESPDfontGostIII}{% - \ESPDfontSetBaseLineStretch - \ESPDfontIIIsize\setmainfont{\ESPDtheGostFontName}} -\newcommand{\ESPDfontGostIV}{% - \ESPDfontSetBaseLineStretch - \ESPDfontIVsize\setmainfont{\ESPDtheGostFontName}} + \newcommand{\ESPDfontGostIII}{% + \ESPDfontSetBaseLineStretch + \ESPDfontIIIsize\setmainfont{\ESPDtheGostFontName}} + \newcommand{\ESPDfontGostIV}{% + \ESPDfontSetBaseLineStretch + \ESPDfontIVsize\setmainfont{\ESPDtheGostFontName}} \else -\RequirePackage{gostfont} -\newcommand{\ESPDfontGostIII}{% - \ESPDfontSetBaseLineStretch - \ESPDfontIIIsize\selectfont\GostBFont} -\newcommand{\ESPDfontGostIV}{% - \ESPDfontSetBaseLineStretch - \ESPDfontIVsize\selectfont\GostBFont} + \RequirePackage{gostfont} + \newcommand{\ESPDfontGostIII}{% + \ESPDfontSetBaseLineStretch + \ESPDfontIIIsize\selectfont\GostBFont} + \newcommand{\ESPDfontGostIV}{% + \ESPDfontSetBaseLineStretch + \ESPDfontIVsize\selectfont\GostBFont} \fi \newcommand{\ESPDfontTabHead}{\ESPDfontV} From 1cb70c1e168264e0c09f929984db030ff0373ae1 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 21 Sep 2018 11:20:10 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20(=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D0=A2=D0=97)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espdinfo.sty | 3 +++ espdtitle.sty | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/espdinfo.sty b/espdinfo.sty index 8618748..8ac0024 100644 --- a/espdinfo.sty +++ b/espdinfo.sty @@ -39,6 +39,9 @@ \newcommand{\ESPDtitle}[1]{\ESPDunitName{#1}} \renewcommand{\title}[1]{\ESPDunitName{#1}} +\newcommand{\ESPDtheProject}{} +\newcommand{\ESPDproject}[1]{\renewcommand{\ESPDtheProject}{#1}} + \newcommand{\ESPDtheDocName}{} \newcommand{\ESPDdocName}[1]{\renewcommand{\ESPDtheDocName}{#1}} diff --git a/espdtitle.sty b/espdtitle.sty index fa20514..9ca9ac7 100644 --- a/espdtitle.sty +++ b/espdtitle.sty @@ -67,7 +67,8 @@ \ESPD@title@split@field{\ESPDtheTitleFieldIIIl}{\ESPDtheTitleFieldIIIr}} \renewcommand{\ESPDtheTitleFieldIV}{% - \MakeUppercase{\ESPDtheTitle}\par\ESPDtheDocName} + {\MakeUppercase{\ESPDtheProject}\par\MakeUppercase{\ESPDtheTitle}\par\ESPDtheDocName}% +} \renewcommand{\ESPDtheTitleFieldV}{} From 77a03eb08e496667919c5b1e918b182e7fc6eadd Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 24 Sep 2018 14:25:27 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D1=87=D0=B8=D0=BA:=20=D1=88=D1=80=D0=B8=D1=84=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espdtitle.sty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espdtitle.sty b/espdtitle.sty index 9ca9ac7..b3114d8 100644 --- a/espdtitle.sty +++ b/espdtitle.sty @@ -117,7 +117,7 @@ \renewcommand{\ESPDtitleFontVI}{\ESPDfontV} \renewcommand{\ESPDtitleFontVIa}{\ESPDfontV} \renewcommand{\ESPDtitleFontVII}{\ESPDfontV} -\renewcommand{\ESPDtitleFontVIII}{\ESPDfontIII} +\renewcommand{\ESPDtitleFontVIII}{\ESPDfontV} \renewcommand{\ESPDtitleFontX}{\ESPDfontV} \renewcommand{\ESPDtitleFontXI}{\ESPDfontV} From a92fd64ca7442bb5686a00a3f28f3932632f707b Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 24 Sep 2018 14:25:47 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A3=D0=A2=D0=92=D0=95=D0=A0=D0=96=D0=94?= =?UTF-8?q?=D0=95=D0=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espdrussian.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espdrussian.def b/espdrussian.def index 1e10fd7..5766529 100644 --- a/espdrussian.def +++ b/espdrussian.def @@ -92,7 +92,7 @@ \newcommand{\ESPDapprovingName}{% \cyr\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyra\cyryu} \newcommand{\ESPDapprovedName}{% - \cyr\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn} + \cyr\CYRU\CYRT\CYRV\CYRE\CYRR\CYRZH\CYRD\CYRE\CYRN} \newcommand{\ESPDapprovingSheetName}{% \cyr\CYRL\cyri\cyrs\cyrt\ % \cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyrya}