diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-28 21:05:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-28 21:05:36 +0000 |
commit | 8365cf9874f341707fdd51807a95343be77d0f37 (patch) | |
tree | 41b7a5f30c41992a038597508fc5e333c2de623a /Master/texmf-dist/tex/latex/bmstu | |
parent | 6a959a6fe62e4fd819bc95d0854d25b7136c136f (diff) |
bmstu (28jan23)
git-svn-id: svn://tug.org/texlive/trunk@65656 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bmstu')
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu-appendix.sty (renamed from Master/texmf-dist/tex/latex/bmstu/sty/bmstu-appendix.sty) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu-biblio.sty (renamed from Master/texmf-dist/tex/latex/bmstu/sty/bmstu-biblio.sty) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu-defabbr.sty (renamed from Master/texmf-dist/tex/latex/bmstu/sty/bmstu-defabbr.sty) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu-essay.sty (renamed from Master/texmf-dist/tex/latex/bmstu/sty/bmstu-essay.sty) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu-figure.sty (renamed from Master/texmf-dist/tex/latex/bmstu/sty/bmstu-figure.sty) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu-listing.sty (renamed from Master/texmf-dist/tex/latex/bmstu/sty/bmstu-listing.sty) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu-title.sty (renamed from Master/texmf-dist/tex/latex/bmstu/sty/bmstu-title.sty) | 140 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu-toc.sty (renamed from Master/texmf-dist/tex/latex/bmstu/sty/bmstu-toc.sty) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/bmstu.cls | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bmstu/img/bmstu-logo.pdf | bin | 129396 -> 0 bytes |
10 files changed, 91 insertions, 69 deletions
diff --git a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-appendix.sty b/Master/texmf-dist/tex/latex/bmstu/bmstu-appendix.sty index a276edec33e..c5dae6e2709 100644 --- a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-appendix.sty +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu-appendix.sty @@ -1,5 +1,5 @@ %% bmstu_appendix.sty -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-biblio.sty b/Master/texmf-dist/tex/latex/bmstu/bmstu-biblio.sty index 0b08161c90b..1000df7eb46 100644 --- a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-biblio.sty +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu-biblio.sty @@ -1,5 +1,5 @@ %% bmstu_biblio.sty -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-defabbr.sty b/Master/texmf-dist/tex/latex/bmstu/bmstu-defabbr.sty index 9c557ac6bdf..e9c7851556d 100644 --- a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-defabbr.sty +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu-defabbr.sty @@ -1,5 +1,5 @@ %% bmstu_defabbr.sty -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-essay.sty b/Master/texmf-dist/tex/latex/bmstu/bmstu-essay.sty index 55766d90580..316623de2ff 100644 --- a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-essay.sty +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu-essay.sty @@ -1,5 +1,5 @@ %% bmstu_essay.sty -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-figure.sty b/Master/texmf-dist/tex/latex/bmstu/bmstu-figure.sty index d2817ca6686..dde6c6b2bc9 100644 --- a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-figure.sty +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu-figure.sty @@ -1,5 +1,5 @@ %% bmstu_figure.sty -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-listing.sty b/Master/texmf-dist/tex/latex/bmstu/bmstu-listing.sty index 1f39686a0eb..b4a0c0148a7 100644 --- a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-listing.sty +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu-listing.sty @@ -1,5 +1,5 @@ %% bmstu_listing.sty -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-title.sty b/Master/texmf-dist/tex/latex/bmstu/bmstu-title.sty index ea707bdc7a0..d2dea472453 100644 --- a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-title.sty +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu-title.sty @@ -1,5 +1,5 @@ %% bmstu_title.sty -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -10,7 +10,7 @@ % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. -% +% % The Current Maintainer of this work is Mikael Novikov. % % This work consists of all files listed in manifest.txt. @@ -51,9 +51,9 @@ \begin{wrapfigure}[7]{l}{0.14\linewidth} \vspace{3.4mm} \hspace{-8mm} - \includegraphics[width=0.89\linewidth]{img/bmstu-logo} + \includegraphics[width=0.89\linewidth]{bmstu-logo} \end{wrapfigure} - + { \singlespacing \small Министерство науки и высшего образования Российской Федерации \\ @@ -64,13 +64,13 @@ (национальный исследовательский университет)>> \\ (МГТУ им. Н.~Э.~Баумана) \\ } - + \vspace{-4.2mm} \vhrulefill{0.9mm} \\ \vspace{-7mm} \vhrulefill{0.2mm} \\ \vspace{2.8mm} - + { \small ФАКУЛЬТЕТ \longunderline{<<#1>>} \\ @@ -84,12 +84,12 @@ { { \LARGE \bfseries - ОТЧЕТ \\ + РАСЧЕТНО-ПОЯСНИТЕЛЬНАЯ ЗАПИСКА \\ } \vspace{5mm} { \Large \itshape - ПО НАУЧНО-ИССЛЕДОВАТЕЛЬСКОЙ РАБОТЕ \\ + К НАУЧНО-ИССЛЕДОВАТЕЛЬСКОЙ РАБОТЕ \\ \vspace{5mm} НА ТЕМУ: \\ <<#1>> \\ @@ -124,124 +124,146 @@ } % Создание поля студента -\newcommand{\titlepagestudent}[2] +\RequirePackage{pgffor} + +\newcommand*\titlepagestudentscontent{} + +\newcommand{\maketitlepagestudent}[1] { - Студент \fixunderline{#1}{25mm}{(Группа)} & - \fixunderline{}{40mm}{(Подпись, дата)} \vspace{1.3mm} & - \fixunderline{#2}{40mm}{(И.~О.~Фамилия)} \\ + \foreach \s/\g in {#1} { + \gappto\titlepagestudentscontent{Студент \fixunderline} + \xappto\titlepagestudentscontent{{\g}} + \gappto\titlepagestudentscontent{{25mm}{(Группа)} &} + \gappto\titlepagestudentscontent{\fixunderline{}{40mm}{(Подпись, дата)} \vspace{1.3mm} &} + \gappto\titlepagestudentscontent{\fixunderline} + \xappto\titlepagestudentscontent{{\s}} + \gappto\titlepagestudentscontent{{40mm}{(И.~О.~Фамилия)} \\} + } } % Создание прочих полей -\newcommand{\titlepageothers}[2] +\newcommand*\titlepageotherscontent{} + +\newcommand{\maketitlepageothers}[2] { - #1 & - \fixunderline{}{40mm}{(Подпись, дата)} \vspace{1.3mm} & - \fixunderline{#2}{40mm}{(И.~О.~Фамилия)} \\ + \foreach \c in {#2} { + \gappto\titlepagestudentscontent{#1 &} + \gappto\titlepagestudentscontent{\fixunderline{}{40mm}{(Подпись, дата)} \vspace{1.3mm} &} + \gappto\titlepagestudentscontent{\fixunderline} + \xappto\titlepagestudentscontent{{\c}} + \gappto\titlepagestudentscontent{{40mm}{(И.~О.~Фамилия)} \\} + } } % Установка исполнителей работы -\newcommand{\titlepageauthors}[7] +\newcommand{\titlepageauthors}[5] { { + \renewcommand{\titlepagestudentscontent}{} + \maketitlepagestudent{#1} + + \renewcommand{\titlepageotherscontent}{} + \maketitlepageothers{#2}{#3} + \maketitlepageothers{Консультант}{#4} + \maketitlepageothers{Нормоконтролер}{#5} + \small \begin{tabularx}{\textwidth}{@{}>{\hsize=.5\hsize}X>{\hsize=.25\hsize}X>{\hsize=.25\hsize}X@{}} - \titlepagestudent{#1}{#2} - \titlepageothers{#3}{#4} - \ifthenelse{\isempty{#5}}{}{\titlepageothers{Консультант}{#5}} - \ifthenelse{\isempty{#6}}{}{\titlepageothers{Консультант}{#6}} - \ifthenelse{\isempty{#7}}{}{\titlepageothers{Нормоконтролер}{#7}} + \titlepagestudentscontent + + \titlepageotherscontent \end{tabularx} } } % Создание титульной страницы РПЗ к ВКР -\newcommand{\makethesistitle}[9] +\newcommand{\makethesistitle}[7] { - \documentmeta{РПЗ к ВКР}{#5}{#4}{#3} - + \documentmeta{РПЗ к ВКР}{#4}{}{#3} + \begin{titlepage} \centering - + \titlepageheader{#1}{#2} \vspace{15.8mm} - + \titlepagenotetitle{К ВЫПУСКНОЙ КВАЛИФИКАЦИОННОЙ РАБОТЕ}{#3} \vfill - - \titlepageauthors{#4}{#5}{Руководитель ВКР}{#6}{#7}{#8}{#9} + + \titlepageauthors{#4}{Руководитель ВКР}{#5}{#6}{#7} \vspace{14mm} - + \textit{{\the\year} г.} \end{titlepage} - + \setcounter{page}{2} } % Создание титульной страницы отчета по НИР -\newcommand{\makeresearchtitle}[8] +\newcommand{\makeresearchtitle}[6] { - \documentmeta{Отчет по НИР}{#5}{#4}{#3} - + \documentmeta{Отчет по НИР}{#4}{}{#3} + \begin{titlepage} \centering - + \titlepageheader{#1}{#2} \vspace{15.8mm} - + \titlepageresearchtitle{#3} \vfill - - \titlepageauthors{#4}{#5}{Руководитель НИР}{#6}{#7}{#8}{} + + \titlepageauthors{#4}{Руководитель НИР}{#5}{#6}{} \vspace{14mm} - + \textit{{\the\year} г.} \end{titlepage} - + \setcounter{page}{2} } % Создание титульной страницы РПЗ к КР -\newcommand{\makecourseworktitle}[8] +\newcommand{\makecourseworktitle}[6] { - \documentmeta{РПЗ к КР}{#5}{#4}{#3} - + \documentmeta{РПЗ к КР}{#4}{}{#3} + \begin{titlepage} \centering - + \titlepageheader{#1}{#2} \vspace{15.8mm} - + \titlepagenotetitle{К КУРСОВОЙ РАБОТЕ}{#3} \vfill - - \titlepageauthors{#4}{#5}{Руководитель курсовой работы}{#6}{#7}{#8}{} + + \titlepageauthors{#4}{Руководитель курсовой работы}{#5}{#6}{} \vspace{14mm} - + \textit{{\the\year} г.} \end{titlepage} - + \setcounter{page}{2} } % Создание титульной страницы отчета -\newcommand{\makereporttitle}[9] +\newcommand{\makereporttitle}[8] { - \documentmeta{Отчет}{#8}{#3 #4}{#5} - + \documentmeta{Отчет}{#7}{по #3 по курсу #4}{#5} + \begin{titlepage} \centering - + \titlepageheader{#1}{#2} \vspace{15.8mm} - + \titlepagereporttitle{#3}{#4}{#5}{#6} \vfill - - \titlepageauthors{#7}{#8}{Преподаватель}{#9}{}{}{} + + \titlepageauthors{#7}{Преподаватель}{#8}{}{} \vspace{14mm} - + \textit{{\the\year} г.} \end{titlepage} - + \setcounter{page}{2} -}
\ No newline at end of file +} diff --git a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-toc.sty b/Master/texmf-dist/tex/latex/bmstu/bmstu-toc.sty index 809698a1705..c3c86c6a028 100644 --- a/Master/texmf-dist/tex/latex/bmstu/sty/bmstu-toc.sty +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu-toc.sty @@ -1,5 +1,5 @@ %% bmstu_toc.sty -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/bmstu/bmstu.cls b/Master/texmf-dist/tex/latex/bmstu/bmstu.cls index 10f59f876dd..48bca7b78c0 100644 --- a/Master/texmf-dist/tex/latex/bmstu/bmstu.cls +++ b/Master/texmf-dist/tex/latex/bmstu/bmstu.cls @@ -1,5 +1,5 @@ %% bmstu.cls -%% Copyright 2022 Mikael Novikov +%% Copyright 2023 Mikael Novikov % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -17,10 +17,10 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{bmstu}[2022/01/24 v1.0.0 BMSTU class] +\ProvidesClass{bmstu}[2023/01/28 v2.0.0 BMSTU class] % Установка базового класса -\LoadClass[14pt]{extreport} +\LoadClass[a4paper,oneside,14pt]{extreport} % Настройка кодировки и языков \RequirePackage[T1,T2A]{fontenc} diff --git a/Master/texmf-dist/tex/latex/bmstu/img/bmstu-logo.pdf b/Master/texmf-dist/tex/latex/bmstu/img/bmstu-logo.pdf Binary files differdeleted file mode 100644 index 226943b0b46..00000000000 --- a/Master/texmf-dist/tex/latex/bmstu/img/bmstu-logo.pdf +++ /dev/null |