From a95aca9e5e7e0beb3d2f029663ea5215e31ad00d Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 11 Sep 2019 06:55:41 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5?= =?UTF-8?q?=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xespdfont.sty | 2 ++ xespdinfo.sty | 15 +++++++++++++-- xespdlang.sty | 8 ++++---- xespdtext.cls | 6 ++++++ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/xespdfont.sty b/xespdfont.sty index 1589cd0..3bc9490 100644 --- a/xespdfont.sty +++ b/xespdfont.sty @@ -31,6 +31,7 @@ \RequirePackage{ifxetex} \ifxetex \RequirePackage{fontspec} + \defaultfontfeatures{Mapping=tex-text} % \defaultfontfeatures{Scale=MatchLowercase} \fi @@ -84,6 +85,7 @@ \DeclareSymbolFont{letters}{\encodingdefault}{\rmdefault}{m}{it} \usepackage{unicode-math} \setmathfont{XITS Math} + \usepackage[T2A]{fontenc} \else \RequirePackage{mathptmx} \RequirePackage{gostfont} diff --git a/xespdinfo.sty b/xespdinfo.sty index 2b5b9f0..625eeca 100644 --- a/xespdinfo.sty +++ b/xespdinfo.sty @@ -96,7 +96,18 @@ \renewcommand{\date}[1]{\XESPDdate{#1}} \RequirePackage{xespdafterpkg} +\RequirePackage{ifxetex} \XESPD@after@package{hyperref}{% - \hypersetup{breaklinks,pdftitle=\XESPDtheUnitName,% - pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}} + \ifxetex + \hypersetup{xetex,% + breaklinks,pdftitle=\XESPDtheUnitName,% + \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,% + pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor} + \else + \hypersetup{% + breaklinks,pdftitle=\XESPDtheUnitName,% + \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,% + pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor} + \fi +} diff --git a/xespdlang.sty b/xespdlang.sty index d0cdab7..6fc3e50 100644 --- a/xespdlang.sty +++ b/xespdlang.sty @@ -35,16 +35,16 @@ \ProcessOptions\relax -\RequirePackage[T2A]{fontenc} +\RequirePackage{csquotes} \RequirePackage{ifxetex} \ifxetex - \RequirePackage[\XESPD@lang]{babel} +% \RequirePackage[\XESPD@lang]{babel} \RequirePackage{textcase} \RequirePackage{xltxtra} \RequirePackage{xunicode} - \RequirePackage{polyglossia} \RequirePackage{xecyr} - \setmainlanguage{russian} + \RequirePackage{polyglossia} + \setmainlanguage{\XESPD@lang} \setkeys{\XESPD@lang}{babelshorthands=true} \setotherlanguage{english} \else diff --git a/xespdtext.cls b/xespdtext.cls index ca0cf4d..a6b59d2 100644 --- a/xespdtext.cls +++ b/xespdtext.cls @@ -73,6 +73,12 @@ \RequirePackage{xespdinfo} \RequirePackage{xespdtitlebase} \RequirePackage{xespdtitle} +\RequirePackage{xltabular} +\RequirePackage{multirow} +\newcommand{\HY}{\hyphenpenalty=25\exhyphenpenalty=25} +\newcolumntype{Z}{>{\HY\raggedright\arraybackslash\hspace{0pt}}X} +\newcolumntype{M}{>{\HY\RaggedRight\arraybackslash\hspace{0pt}}c} +\newcolumntype{L}{>{\HY\RaggedRight\arraybackslash\hspace{0pt}}l} \linespread{1.25} From 4751b0469b84a5225512d269af60f21103225b1a Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 18 Sep 2019 05:51:13 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=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 --- xespdtitle.sty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xespdtitle.sty b/xespdtitle.sty index dbf68a6..3c4e1d9 100644 --- a/xespdtitle.sty +++ b/xespdtitle.sty @@ -135,7 +135,7 @@ \par\vspace{10mm \@plus 2mm \@minus 4mm}\noindent \parbox[c][.30\vsize][t]{\hsize}{% \ifthenelse{\equal{\XESPDtheTitleFieldIV}{}}{} - {\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}} + {\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}} \ifthenelse{\equal{\XESPDtheTitleFieldV}{}}{} {\begin{center}\XESPDtitleFontV\XESPDtheTitleFieldV\end{center}} \ifthenelse{\equal{\XESPDtheTitleFieldVI}{}}{} From 0e4aed2d85a68b97183fc1d33d1778e891591d61 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 16 Sep 2019 10:21:46 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=9B=D0=B8=D1=82=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ВП --- xespdstamp.sty | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xespdstamp.sty b/xespdstamp.sty index 58db99f..0df35ba 100644 --- a/xespdstamp.sty +++ b/xespdstamp.sty @@ -548,6 +548,8 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry} \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{% From c5f9dabbbd61a7849e60ded8c4fc3e5cad512942 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 26 Dec 2019 06:20:09 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=9B=D0=B8=D1=82=D0=B5=D1=80=D0=B0=20?= =?UTF-8?q?=D0=9E1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xespdrtis.sty | 22 +++++++++++----------- xespdtitle.sty | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xespdrtis.sty b/xespdrtis.sty index 5213d39..ce52ea1 100644 --- a/xespdrtis.sty +++ b/xespdrtis.sty @@ -57,20 +57,20 @@ %\XESPDtitleDesignedBy{Должность первого автора}{Фам. первого автора} %\XESPDtitleDesignedBy{Должность второго автора}{Фам. второго автора} -\RequirePackage{forloop} -\RequirePackage{makecell} +%\RequirePackage{forloop} +%\RequirePackage{makecell} -\newcount\lincnt -\long\def\addto#1#2{% - \expandafter\def\expandafter#1\expandafter{#1#2}} +%\newcount\lincnt +%\long\def\addto#1#2{% +% \expandafter\def\expandafter#1\expandafter{#1#2}} -\def\changeSheetLine{}\lincnt=28 % Количество строк +%\def\changeSheetLine{}\lincnt=28 % Количество строк % \addto\changeSheetLine{ 1 & & Все & & & & \makecell{РЕВМ.57 \\ 1/2} & & & \makecell{20.04. \\ 17} \\ \hline} - \loop - \addto\changeSheetLine{& & & & & & & & & \\ \hline} - \advance\lincnt -1 - \ifnum\lincnt>0 - \repeat +% \loop +% \addto\changeSheetLine{& & & & & & & & & \\ \hline} +% \advance\lincnt -1 +% \ifnum\lincnt>0 +% \repeat \newcommand{\XESPDprintEmptyChangeSheet}{ \renewcommand*{\arraystretch}{0.8}% Высота строк diff --git a/xespdtitle.sty b/xespdtitle.sty index dbf68a6..2579251 100644 --- a/xespdtitle.sty +++ b/xespdtitle.sty @@ -107,7 +107,7 @@ \XESPD@title@split@field{\XESPDtheTitleFieldVIIIl}{\XESPDtheTitleFieldVIIIr}} \renewcommand{\XESPDtheTitleFieldX}{\XESPDtheYear} -\renewcommand{\XESPDtheTitleFieldXI}{\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra} +\renewcommand{\XESPDtheTitleFieldXI}{\cyr\CYRL\cyri\cyrt\cyre\cyrr\cyra\ \cyr\CYRO\ \cyr\CYRO$_1$} \renewcommand{\XESPDtitleFontI}{\XESPDfontV} \renewcommand{\XESPDtitleFontII}{\XESPDfontV} From 892dcd6556cf7f7f9ffd972d6a3cc3815073a00b Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 14 Mar 2020 08:08:08 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xespdfont.sty | 2 +- xespdlang.sty | 1 + xespdtext.cls | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/xespdfont.sty b/xespdfont.sty index 1bc6383..42e0201 100644 --- a/xespdfont.sty +++ b/xespdfont.sty @@ -32,7 +32,7 @@ \ifxetex \RequirePackage{fontspec} \defaultfontfeatures{Mapping=tex-text} -% \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures{Scale=MatchLowercase} \fi \newcommand{\XESPDfontShape}{\rmfamily} diff --git a/xespdlang.sty b/xespdlang.sty index 6ae18d4..43bb5ef 100644 --- a/xespdlang.sty +++ b/xespdlang.sty @@ -44,6 +44,7 @@ \RequirePackage{xecyr} \RequirePackage{polyglossia} \setmainlanguage{\XESPD@lang} + \let\cyr\relax \setkeys{\XESPD@lang}{babelshorthands=true} \setotherlanguage{english} \else diff --git a/xespdtext.cls b/xespdtext.cls index 8f84418..a6b59d2 100644 --- a/xespdtext.cls +++ b/xespdtext.cls @@ -80,13 +80,6 @@ \newcolumntype{M}{>{\HY\RaggedRight\arraybackslash\hspace{0pt}}c} \newcolumntype{L}{>{\HY\RaggedRight\arraybackslash\hspace{0pt}}l} -\RequirePackage{xltabular} -\RequirePackage{multirow} -\newcommand{\HY}{\hyphenpenalty=25\exhyphenpenalty=25} -\newcolumntype{Z}{>{\HY\raggedright\arraybackslash\hspace{0pt}}X} -\newcolumntype{M}{>{\HY\RaggedRight\arraybackslash\hspace{0pt}}c} -\newcolumntype{L}{>{\HY\RaggedRight\arraybackslash\hspace{0pt}}l} - \linespread{1.25} \newcommand{\XESPD@float@style@single}{}