diff options
author | Karl Berry <karl@freefriends.org> | 2013-12-30 23:24:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-12-30 23:24:24 +0000 |
commit | 9e20deb048808f134469ae0d4a3e5bd3ddbc62b0 (patch) | |
tree | 7434833e23083c826571fe2bf3f521fc7249bc46 /Master/texmf-dist/source/latex/disser | |
parent | 17a0789fca5bb992152a9a9b2a0c97639c8af580 (diff) |
disser (30dec13)
git-svn-id: svn://tug.org/texlive/trunk@32509 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/disser')
-rw-r--r-- | Master/texmf-dist/source/latex/disser/candidate.dtx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/counters.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/custom.dtx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/disser.dtx | 11 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/disser.ins | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/gost705.dtx | 337 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/gost732.dtx | 16 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/titledefs.dtx | 52 |
8 files changed, 333 insertions, 101 deletions
diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index b6cc69d1f16..052b1df8693 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -20,13 +20,13 @@ \if@titlepage@en \def\appos{Head of Department} \def\saname{Scientific Supervisor} - \def\sasndname{\saname} \def\salabel{\saname} - \def\sasndlabel{\saname} + \def\sasndname{\saname} + \def\sasndlabel{\sasndname} \def\sconname{Scientific Consultant} \def\sconlabel{\sconname} \def\sconsndname{\sconname} - \def\sconsndlabel{\sconname} + \def\sconsndlabel{\sconsndname} \def\topicname{Topic} \def\asmanuscript{As Manuscript} \fi diff --git a/Master/texmf-dist/source/latex/disser/counters.dtx b/Master/texmf-dist/source/latex/disser/counters.dtx index f976030e538..738269e2200 100644 --- a/Master/texmf-dist/source/latex/disser/counters.dtx +++ b/Master/texmf-dist/source/latex/disser/counters.dtx @@ -62,7 +62,7 @@ % \begin{macrocode} \renewcommand\thepart{\@Roman\c@part} \renewcommand\thechapter{\@arabic\c@chapter} -\newcommand\theappendix{\@Asbuk\c@chapter} +\newcommand\theappendix{\Asbuk{chapter}} \renewcommand\thesection{% \ifnum\c@chapter > \z@ \thechapter.\@arabic\c@section% diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx index c2557c11b2f..668e1e12b1f 100644 --- a/Master/texmf-dist/source/latex/disser/custom.dtx +++ b/Master/texmf-dist/source/latex/disser/custom.dtx @@ -164,6 +164,7 @@ % \DescribeEnv{thebibliography}\index{Окружения!\verb*+thebibliography+} % \begin{macrocode} \renewenvironment{thebibliography}[1]{% + \setlength\bibsep{0pt} \bibsection \parindent \z@ \bibpreamble\bibfont @@ -189,11 +190,6 @@ % \end{macrocode} % \subsubsection{Плавающие объекты} % -% Плавающие рисунки <<в оборку>>. -% \DescribePackage{wrapfig}\index{Пакеты!\verb*+wrapfig+} -% \begin{macrocode} -\usepackage{wrapfig} -% \end{macrocode} % Пакеты \pkg{caption} и \pkg{subfig} для вложенной нумерации плавающих % объектов. % \DescribePackage{caption}\index{Пакеты!\verb*+caption+} diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index 53f79ef4126..4f01dfb9ab9 100644 --- a/Master/texmf-dist/source/latex/disser/disser.dtx +++ b/Master/texmf-dist/source/latex/disser/disser.dtx @@ -3,7 +3,7 @@ %% %% disser -- LaTeX document class for dissertations. %% -%% Copyright (c) 2004-2012 Stanislav Kruchinin +%% Copyright (c) 2004-2014 Stanislav Kruchinin %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,7 +19,8 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{disser.drv}[2012/11/21 1.2.0 Document class for dissertations] +\ProvidesFile{disser.drv}[2013/12/30 1.3.0 % + Document class for dissertations] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -64,6 +65,7 @@ \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +\usepackage{microtype} \MakeShortVerb{\|} @@ -180,7 +182,8 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2012/11/29 1.2.0 Document class for dissertations] +\ProvidesClass{disser}[2013/12/30 1.3.0 % + Document class for dissertations] % \end{macrocode} % Подключение пакета \pkg{kvoptions} для обработки опций в формате @@ -190,7 +193,7 @@ \RequirePackage{kvoptions} % \end{macrocode} -% Определение операторов условного выполнения. +% Определение операторов условного выполнения: % \begin{itemize} % \item подключение пакета \pkg{ifpdf}, определяющего команду |\ifpdf|. % \DescribePackage{ifpdf}\index{Пакеты!\verb*+ifpdf+} diff --git a/Master/texmf-dist/source/latex/disser/disser.ins b/Master/texmf-dist/source/latex/disser/disser.ins index 7bc55cad32c..e0ece32ef57 100644 --- a/Master/texmf-dist/source/latex/disser/disser.ins +++ b/Master/texmf-dist/source/latex/disser/disser.ins @@ -12,7 +12,7 @@ \input docstrip \preamble -Copyright (c) 2004-2010 Stanislav Kruchinin. +Copyright (c) 2004-2014 Stanislav Kruchinin. All rights reserved. This file is part of the disser package. @@ -52,9 +52,9 @@ This file is part of the disser package. \rtxfile{autoref} \clsfile{gost732} \nopostamble + \usedir{bibtex/bst/disser}% \file{gost705.bst}{\from{gost705.dtx}{gost705}} \file{gost705s.bst}{\from{gost705.dtx}{gost705s}} } -%\def\npostamble{}\usepostamble\npostamble \endbatchfile \endinput diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index deb3424936e..46b7cd6ea11 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -16,7 +16,7 @@ % % bibtex8 -H -c <encoding>.csf <your_document> % -% Copyright (C) 2004-2012 by +% Copyright (C) 2004-2014 by % Stanislav Kruchinin <stanislav.kruchinin at gmail.com> % % This work may be distributed and/or modified under the @@ -127,6 +127,7 @@ and the derived files \let\MetaPrefix\DoubleperCent \generate{% + \nopostamble \usedir{bibtex/bst/disser}% \file{gost705.bst}{\from{gost705.dtx}{gost705}}% \file{gost705s.bst}{\from{gost705.dtx}{gost705s}}% @@ -155,7 +156,7 @@ and the derived files %</ignore> %<*driver> \ProvidesFile{gost705.drv}% - [2012/11/21 1.2.0 Bibliography style for GOST R 7.0.5-2008] + [2013/12/25 1.3.0 Bibliography style for GOST R 7.0.5-2008] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -306,6 +307,20 @@ ENTRY archivePrefix primaryClass eprint + authortype + media + location + ipc + holder + credits + reqnumber + reqdate + pubdate + publication + prdate + prnumber + prcountry + pagetotal } {} { label } @@ -314,7 +329,7 @@ ENTRY % \subsection{Объявление и инициализация переменных и констант} % \begin{macrocode} INTEGERS { output.state before.all mid.sentence after.sentence after.block -after.dblslash after.slash after.column after.semicolumn } +after.dblslash after.slash after.colon after.semicolon after.dash } % \end{macrocode} % \DescribeBSTFunction{init.state.consts} @@ -327,8 +342,9 @@ FUNCTION {init.state.consts} #3 'after.block := #4 'after.dblslash := #5 'after.slash := - #6 'after.column := - #7 'after.semicolumn := + #6 'after.colon := + #7 'after.semicolon := + #8 'after.dash := } STRINGS { s t } @@ -371,11 +387,15 @@ FUNCTION {output.nonnull} { "~//" * change.language * " " * write$ } { output.state after.slash = { "~/ " * write$ } - { output.state after.column = + { output.state after.colon = { ": " * write$ } - { output.state after.semicolumn = + { output.state after.semicolon = { "; " * write$ } - { add.period$ " " * write$ } + { output.state after.dash = + { "~--- " * write$ } + { add.period$ " " * write$ } + if$ + } if$ } if$ @@ -460,24 +480,35 @@ FUNCTION {new.slash} } % \end{macrocode} -% \DescribeBSTFunction{new.column} +% \DescribeBSTFunction{new.colon} % \begin{macrocode} -FUNCTION {new.column} +FUNCTION {new.colon} { output.state before.all = 'skip$ - { after.column 'output.state := } + { after.colon 'output.state := } if$ } % \end{macrocode} -% \DescribeBSTFunction{new.semicolumn} +% \DescribeBSTFunction{new.semicolon} % \begin{macrocode} -FUNCTION {new.semicolumn} +FUNCTION {new.semicolon} { output.state before.all = 'skip$ - { after.semicolumn 'output.state := } + { after.semicolon 'output.state := } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{new.dash} +% \begin{macrocode} +FUNCTION {new.dash} +{ + output.state before.all = + 'skip$ + { after.dash 'output.state := } if$ } @@ -623,14 +654,14 @@ FUNCTION {bbl.edby} % { "\bbledby{}" } { curlanguage "english" = { "Ed. by " } - { curlanguage "german" = - { "ed. " } - { curlanguage "russian" = - { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" } - { "language is not defined: " language "edited by" * * + { curlanguage "german" = + { "ed. " } + { curlanguage "russian" = + { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" } + { "language is not defined: " language "edited by" * * warning$ "edited by" } - if$ - } + if$ + } if$ } if$ @@ -643,15 +674,15 @@ FUNCTION {bbl.cmplr} { curlanguage "english" = { "Compiler " } - { curlanguage "german" = - { "Hrsg. " } - { curlanguage "russian" = - { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" } - { "language is not defined: " language "compiler" * * warning$ "compiler" } + { curlanguage "german" = + { "Hrsg. " } + { curlanguage "russian" = + { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" } + { "language is not defined: " language "compiler" * * warning$ "compiler" } + if$ + } if$ - } - if$ - } + } if$ } @@ -1009,7 +1040,7 @@ FUNCTION {bbl.mthesis} { curlanguage "russian" = { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language * warning$ "In" } + { "language is not defined: " language * warning$ "Master thesis" } if$ } if$ @@ -1029,7 +1060,7 @@ FUNCTION {bbl.phdthesis} { curlanguage "russian" = { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language * warning$ "In" } + { "language is not defined: " language * warning$ "PhD thesis" } if$ } if$ @@ -1049,6 +1080,63 @@ FUNCTION {bbl.docdisser} { curlanguage "russian" = { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } + { "language is not defined: " language * warning$ "Dr. Sci. dissertation" } + if$ + } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{bbl.req} +% \begin{macrocode} +FUNCTION {bbl.req} +{ + curlanguage "english" = + { "req." } + { curlanguage "german" = + { "ang." } + { curlanguage "russian" = + { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" } + { "language is not defined: " language * warning$ "req" } + if$ + } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{bbl.publ} +% \begin{macrocode} +FUNCTION {bbl.publ} +{ + curlanguage "english" = + { "publ." } + { curlanguage "german" = + { "ausg." } + { curlanguage "russian" = + { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" } + { "language is not defined: " language * warning$ "In" } + if$ + } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{bbl.prio} +% \begin{macrocode} +FUNCTION {bbl.prio} +{ + curlanguage "english" = + { "priority" } + { curlanguage "german" = + { "Prioritat" } + { curlanguage "russian" = + { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" } { "language is not defined: " language * warning$ "In" } if$ } @@ -1244,7 +1332,7 @@ FUNCTION {output.address.publisher.date} { address output publisher empty$ 'skip$ - { new.column } + { new.colon } if$ } if$ @@ -1531,8 +1619,7 @@ FUNCTION {format.volume} % \DescribeBSTFunction{format.number} % \begin{macrocode} FUNCTION {format.number} -{ - number empty$ +{ number empty$ { "" } { bbl.nr number tie.or.space.connect } if$ @@ -1615,7 +1702,7 @@ FUNCTION {author.after} 'skip$ { author num.names$ #3 > { format.authors.after output - new.semicolumn + new.semicolon } 'skip$ if$ @@ -1632,7 +1719,7 @@ FUNCTION {bookauthor.after} 'skip$ { bookauthor num.names$ #3 > { format.bookauthors.after output - new.semicolumn + new.semicolon } 'skip$ if$ @@ -1648,19 +1735,19 @@ FUNCTION {editor.organization.after} compiler empty$ 'skip$ { format.compiler.after output - new.semicolumn + new.semicolon } if$ editor empty$ 'skip$ { format.editors.after output - new.semicolumn + new.semicolon } if$ organization empty$ 'skip$ { organization output - new.semicolumn + new.semicolon } if$ } @@ -1730,14 +1817,18 @@ FUNCTION {format.isbn} } % \end{macrocode} -% \DescribeBSTFunction{add.doi} +% \DescribeBSTFunction{add.doi.url} % \begin{macrocode} -FUNCTION {add.doi} +FUNCTION {add.doi.url} { duplicate$ empty$ 'skip$ { doi empty$ - 'skip$ - { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * } + { url empty$ + 'skip$ + { "\href{" url * "}{" * swap$ * "}" * } + if$ + } + { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * } if$ } if$ @@ -1758,12 +1849,90 @@ FUNCTION {format.eprint} "{" * primaryClass * "/" * eprint * "}" * } { " \href{http://arxiv.org/abs/" eprint * "}" * - "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" * + "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" * } if$ } - if$ - } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{add.number} +% \begin{macrocode} +FUNCTION {add.number} +{ duplicate$ empty$ + { "" } + { bbl.nr swap$ tie.or.space.connect } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{in.square.brackets} +% \begin{macrocode} +FUNCTION {in.square.brackets} +{ + duplicate$ empty$ + { pop$ "" } + { "[" swap$ * "]" * } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{in.round.brackets} +% \begin{macrocode} +FUNCTION {in.round.brackets} +{ + duplicate$ empty$ + { pop$ "" } + { "(" swap$ * ")" * } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{format.type.number} +% \begin{macrocode} +FUNCTION {format.type.number} +{ + type empty$ + { "" } + { + number empty$ + { "" } + { type number tie.or.space.connect } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{format.reqdate} +% \begin{macrocode} +FUNCTION {format.reqdate} +{ reqdate empty$ + { "" } + { bbl.req reqdate tie.or.space.connect } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{format.pubdate} +% \begin{macrocode} +FUNCTION {format.pubdate} +{ pubdate empty$ + { "" } + { bbl.publ pubdate tie.or.space.connect } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{format.prdate} +% \begin{macrocode} +FUNCTION {format.prdate} +{ prdate empty$ + { "" } + { bbl.prio prdate tie.or.space.connect } if$ } @@ -1777,7 +1946,7 @@ FUNCTION {article} author.before format.title "title" output.check new.dblslash - journal emphasize add.doi "journal" output.check + journal emphasize add.doi.url "journal" output.check new.block format.date output new.block @@ -1802,7 +1971,7 @@ FUNCTION {book} { output.bibitem author.before - format.btitle add.doi "title" output.check + format.btitle add.doi.url "title" output.check new.slash editor.organization.after new.sentence @@ -1857,7 +2026,7 @@ FUNCTION {inbook} { output.bibitem author.before - format.btitle add.doi "title" output.check + format.btitle add.doi.url "title" output.check new.dblslash bookauthor.before booktitle "booktitle" output.check @@ -1892,7 +2061,7 @@ FUNCTION {incollection} output.bibitem author.before new.sentence - format.title add.doi "title" output.check + format.title add.doi.url "title" output.check new.dblslash booktitle "booktitle" output.check new.slash @@ -1922,7 +2091,7 @@ FUNCTION {inproceedings} output.bibitem author.before new.sentence - format.title add.doi "title" output.check + format.title add.doi.url "title" output.check new.dblslash booktitle "booktitle" output.check new.slash @@ -1936,7 +2105,7 @@ FUNCTION {inproceedings} format.date "year" output.check } { address output.nonnull - new.column + new.colon publisher output format.date "year" output.check } @@ -2009,7 +2178,7 @@ FUNCTION {mastersthesis} output.bibitem format.authors "author" output.check new.block - format.btitle add.doi "title" output.check + format.btitle add.doi.url "title" output.check new.block bbl.mthesis format.thesis.type output.nonnull school "school" output.check @@ -2056,8 +2225,8 @@ FUNCTION {phdthesis} output.bibitem format.authors "author" output.check new.sentence - format.btitle add.doi "title" output.check - new.column + format.btitle add.doi.url "title" output.check + new.colon bbl.phdthesis format.thesis.type output.nonnull new.slash school "school" output.check @@ -2082,8 +2251,8 @@ FUNCTION {docdisser} output.bibitem format.authors "author" output.check new.sentence - format.btitle add.doi "title" output.check - new.column + format.btitle add.doi.url "title" output.check + new.colon bbl.docdisser format.thesis.type output.nonnull new.slash school "school" output.check @@ -2106,7 +2275,7 @@ FUNCTION {docdisser} FUNCTION {proceedings} { output.bibitem - format.btitle add.doi "title" output.check + format.btitle add.doi.url "title" output.check new.slash editor.organization.after new.block @@ -2140,13 +2309,13 @@ FUNCTION {techreport} output.bibitem author.before new.sentence - format.title add.doi "title" output.check - new.column + format.title add.doi.url "title" output.check + new.colon format.tr.number output.nonnull editor.organization.after new.block address output - new.column + new.colon institution "institution" output.check format.date "year" output.check new.block @@ -2160,13 +2329,57 @@ FUNCTION {techreport} } % \end{macrocode} +% \DescribeBSTFunction{patent} +% \begin{macrocode} +FUNCTION {patent} +{ + output.bibitem + title output.nonnull + add.blank + media in.square.brackets output + new.colon + format.type.number output + add.blank + location output + new.colon + ipc output + new.slash + format.authors.after "author" output.check + add.blank + authortype in.round.brackets output.nonnull + new.semicolon + holder output.nonnull + new.semicolon + credits output.nonnull + new.dash + reqnumber add.number output + new.semicolon + format.reqdate output + new.semicolon + format.pubdate output + publication output + new.semicolon + format.prdate output + prnumber output + prcountry in.round.brackets output + new.block + note output + new.sentence + output.url + format.annote output + new.block + pagetotal output + fin.entry +} + +% \end{macrocode} % \DescribeBSTFunction{unpublished} % \begin{macrocode} FUNCTION {unpublished} { output.bibitem author.before - format.btitle "title" output.check + format.btitle add.doi.url "title" output.check editor.organization.after new.block note "note" output.check diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index abe8c62e269..50203ab3790 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -125,7 +125,7 @@ and the derived files \fi %</ignore> %<*driver> -\ProvidesFile{gost732.drv}[2012/11/21 1.2.0 GOST 7.32-2001 implementation] +\ProvidesFile{gost732.drv}[2013/12/30 1.3.0 GOST 7.32-2001 implementation] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -201,23 +201,11 @@ and the derived files % % \tableofcontents % -% \section{Введение} -% -% Насколько известно автору, на данный момент отсутствуют ГОСТы, -% регламентирующие структуру и правила оформления диссертаций. -% Диссертационные советы, как правило, не предъявляют каких-либо требований -% к форматированию, за исключением тех, что реализованы в классе \pkg{disser} и -% библиографическом стиле \pkg{gost705}. -% Однако, если возникнет вопрос о соответствии верстки диссертации каким-либо -% ГОСТам, то следует воспользоваться наиболее подходящим среди существующих -% стандартов --- ГОСТ~7.32-2001 <<Отчет о научно-исследовательской работе>>, -% который реализован в данном классе. -% % \section{Исходный текст}\parindent=0pt % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2012/11/21 1.2.0 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2013/12/30 1.3.0 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax diff --git a/Master/texmf-dist/source/latex/disser/titledefs.dtx b/Master/texmf-dist/source/latex/disser/titledefs.dtx index 5b8fae69b40..72133c82021 100644 --- a/Master/texmf-dist/source/latex/disser/titledefs.dtx +++ b/Master/texmf-dist/source/latex/disser/titledefs.dtx @@ -96,7 +96,7 @@ \cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn} \def\sasndname{\saname} \def\salabel{\saname} -\def\sasndlabel{\saname} +\def\sasndlabel{\sasndname} % \end{macrocode} % \DescribeMacro{\scname}\index{Макросы!\verb+\scname+} % \DescribeMacro{\sclabel}\index{Макросы!\verb+\sclabel+} @@ -338,7 +338,7 @@ % \begin{macrocode} \AtBeginDocument{% \addto\captionsrussian{% - \def\contentsname{\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre} + \def\contentsname{\cyr\CYRO\cyrg\cyrl\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre} } } @@ -349,14 +349,25 @@ % \begin{macrocode} \providecommand*\introname{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre} \providecommand*\intro{\nchapter{\introname}} + +% \end{macrocode} +% \item Обзор литературы +% \DescribeMacro{\reviewname}\index{Макросы!\verb*+\reviewname+} +% \begin{macrocode} +\providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ % +\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} +\providecommand*\review{\nchapter{\reviewname}} + % \end{macrocode} % \item Заключение % \DescribeMacro{\conclusionname}\index{Макросы!\verb*+\conclusionname+} +% \DescribeMacro{\conclusion}\index{Макросы!\verb*+\conclusion+} % \begin{macrocode} \providecommand*\conclusionname{% \cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre } \providecommand*\conclusion{\nchapter{\conclusionname}} + % \end{macrocode} % \item Список сокращений и условных обозначений % \DescribeMacro{\defsname}\index{Макросы!\verb*+\defsname+} @@ -369,22 +380,43 @@ \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt} } \providecommand*\defs{\nchapter{\defsname}} -% \end{macrocode} -% \item Обзор литературы -% \DescribeMacro{\reviewname}\index{Макросы!\verb*+\reviewname+} -% \begin{macrocode} -\providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ % -\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} -\providecommand*\review{\nchapter{\reviewname}} + % \end{macrocode} % \item Словарь терминов % \DescribeMacro{\dictname}\index{Макросы!\verb*+\dictname+} +% \DescribeMacro{\dict}\index{Макросы!\verb*+\dict+} % \begin{macrocode} -\providecommand*\dictname{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\ % +\providecommand*\dictname{% +{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\ % \cyrt\cyre\cyrr\cyrm\cyri\cyrn\cyro\cyrv} +} \providecommand*\dict{\nchapter{\dictname}} % \end{macrocode} +% \item Список литературы +% \DescribeMacro{\contentsname}\index{Макросы!\verb*+\contentsname+} +% \begin{macrocode} +\AtBeginDocument{% + \addto\captionsrussian{% + \def\bibname{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ % + \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} + } +} + +% \end{macrocode} +% \item Список иллюстративного материала +% \DescribeMacro{\listfigurename}\index{Макросы!\verb*+\listfigurename+} +% \begin{macrocode} +\AtBeginDocument{% + \addto\captionsrussian{% + \def\listfigurename{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ % + \cyri\cyrl\cyrl\cyryu\cyrs\cyrt\cyrr\cyra\cyrt\cyri\cyrv\cyrn\cyro% + \cyrg\cyro % + \cyrm\cyra\cyrt\cyre\cyrr\cyri\cyra\cyrl\cyra} + } +} + +% \end{macrocode} % \end{itemize} % % \subsubsection{Элементы титульного листа} |