diff options
author | Karl Berry <karl@freefriends.org> | 2010-11-21 23:53:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-11-21 23:53:45 +0000 |
commit | 1a9e525f4cfeebc43345769293278fc86d237e0b (patch) | |
tree | 21467486865d88e8c2516ca68e54347ccbbf22d6 /Master/texmf-dist/source/latex/disser | |
parent | 67db10d00fe1667acb186aa61d485eecd5a8d828 (diff) |
disser 1.1.7 (22nov10)
git-svn-id: svn://tug.org/texlive/trunk@20522 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/disser')
-rw-r--r-- | Master/texmf-dist/source/latex/disser/autoref.dtx | 1 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/bachelor.dtx | 57 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/candidate.dtx | 61 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/custom.dtx | 7 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/disser.dtx | 47 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/disser.ins | 1 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/doctor.dtx | 35 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/gost705.dtx | 279 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/gost732.dtx | 7 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/master.dtx | 41 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/specialist.dtx | 153 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/titledefs.dtx | 5 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/disser/toc.dtx | 7 |
13 files changed, 570 insertions, 131 deletions
diff --git a/Master/texmf-dist/source/latex/disser/autoref.dtx b/Master/texmf-dist/source/latex/disser/autoref.dtx index c6b2885dd70..e1c60419c1d 100644 --- a/Master/texmf-dist/source/latex/disser/autoref.dtx +++ b/Master/texmf-dist/source/latex/disser/autoref.dtx @@ -13,6 +13,7 @@ % \end{macrocode} % Титульный лист. +% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} \if@titlepage\renewcommand\maketitle{ % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/bachelor.dtx b/Master/texmf-dist/source/latex/disser/bachelor.dtx index f459296b9f5..2bad720861b 100644 --- a/Master/texmf-dist/source/latex/disser/bachelor.dtx +++ b/Master/texmf-dist/source/latex/disser/bachelor.dtx @@ -15,7 +15,28 @@ % Титульный лист. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} -\if@titlepage\renewcommand\maketitle{ +\if@titlepage\renewcommand\maketitle[1][]{ +% \end{macrocode} +% Переопределения некоторых полей титульного листа для англоязычной версии. +% \begin{macrocode} +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\topicname{Topic} + \def\coursename{Speciality} + \def\studentname{Student} + \def\studentlabel{\studentname\hspace{6cm}} +\fi + % \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} @@ -24,12 +45,12 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \begin{macrocode} -\deflength\firstskip{1.5cm} -\deflength\secondskip{1.5cm} -\deflength\thirdskip{1ex} -\deflength\fourthskip{1ex} -\deflength\fifthskip{2cm} -\deflength\sixthskip{1.5ex} +\ifundeflength\firstskip{1.5cm} +\ifundeflength\secondskip{1.5cm} +\ifundeflength\thirdskip{1ex} +\ifundeflength\fourthskip{1ex} +\ifundeflength\fifthskip{2cm} +\ifundeflength\sixthskip{1.5ex} % \end{macrocode} % Горизонтальный отступ перед чертой в текстовым поле для имени, ученой @@ -60,33 +81,33 @@ % \end{macrocode} % \paragraph{Название организации} % \begin{macrocode} -\begin{center} -\instfont\@institution\par +\begin{center}% + {\instfont\@institution} \end{center} % \end{macrocode} % Диссертация допущена к защите % \begin{macrocode} -\vskip\firstskip\normalfont -\@approved +\vskip\firstskip +{\@approved} \vskip\secondskip % \end{macrocode} % Заголовок, тема. % \begin{macrocode} -\begin{center} - {\titlefont\@title\par} - \vskip\thirdskip\normalfont +\begin{center}% + {\titlefont\@title\par}% + \vskip\thirdskip% {\topiclabelfont\topiclabel\ }% - {\topicfont\@topic\par} - \vskip\fourthskip\normalfont - \courselabel\ \@coursenum~--\ \@course + {\topicfont\@topic} + \vskip\fourthskip\normalfont% + \courselabel\ \@coursenum~--\ \@course% \end{center} % \end{macrocode} % Специальность, автор, руководитель. % \begin{macrocode} -\vskip\fifthskip\normalfont +\vskip\fifthskip \begin{tabbing} \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index b91dd36d0ee..d3c18b108f8 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -15,7 +15,22 @@ % Титульный лист. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} -\if@titlepage\renewcommand\maketitle{ +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\sconname{Scientific Consultant} + \def\sconlabel{\sconname} + \def\sconsndname{\sconname} + \def\sconsndlabel{\sconname} + \def\topicname{Topic} + \def\asmanuscript{As Manuscript} +\fi + % \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} @@ -26,17 +41,19 @@ % \DescribeMacro{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} % \DescribeMacro{\seventhskip}\index{Расстояния!\verb*+\seventhskip+} % \begin{macrocode} -\newlength\firstskip -\ifDis@libcat - \setlength\firstskip{2ex} -\else - \setlength\firstskip{4ex} +\ifx\firstskip\undefined + \newlength\firstskip + \ifDis@libcat + \setlength\firstskip{2ex} + \else + \setlength\firstskip{4ex} + \fi \fi -\deflength\secondskip{2cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} -\deflength\sixthskip{0cm} +\ifundeflength\secondskip{2cm} +\ifundeflength\thirdskip{1cm} +\ifundeflength\fourthskip{1cm} +\ifundeflength\fifthskip{1cm} +\ifundeflength\sixthskip{0cm} % \end{macrocode} % Шрифты элементов титульного листа. @@ -61,7 +78,7 @@ \instfont\@institution\par \end{center} -\vskip\firstskip\normalfont +\vskip\firstskip \begin{flushright} % \end{macrocode} % Гриф секретности @@ -84,17 +101,17 @@ % \end{macrocode} % Автор % \begin{macrocode} - \vskip\secondskip\normalfont + \vskip\secondskip {\authorfont\@author} % \end{macrocode} % Название диссертации % \begin{macrocode} - \vskip\thirdskip\normalfont + \vskip\thirdskip {\topicfont\@topic\par} % \end{macrocode} % Шифр и наименование специальности % \begin{macrocode} - \vskip\fourthskip\normalfont + \vskip\fourthskip {\specfont\@specnum~--\ \@spec}\\[-6pt] \ifx\@specsndnum\empty\else {\specfont\@specsndnum~--\ \@specsnd} @@ -102,30 +119,26 @@ % \end{macrocode} % Диссертация на соискание ученой степени... % \begin{macrocode} - \vskip\fifthskip\normalfont + \vskip\fifthskip {\titlefont\@title} \end{center} % \end{macrocode} % Научный руководитель % \begin{macrocode} \ifx\@sa\empty\else - \vskip\sixthskip\normalfont - \disserfield{sa} + \vskip\sixthskip\disserfield{sa} \fi \ifx\@sasnd\empty\else - \vskip\sixthskip\normalfont - \disserfield{sasnd} + \vskip\sixthskip\disserfield{sasnd} \fi % \end{macrocode} % Научный консультант % \begin{macrocode} \ifx\@scon\empty\else - \vskip\sixthskip\normalfont - \disserfield{scon} + \vskip\sixthskip\disserfield{scon} \fi \ifx\@sconsnd\empty\else - \vskip\sixthskip\normalfont - \disserfield{sconsnd} + \vskip\sixthskip\disserfield{sconsnd} \fi % \end{macrocode} % \paragraph{Город и год} diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx index 375e88e2b09..c1ed00cde48 100644 --- a/Master/texmf-dist/source/latex/disser/custom.dtx +++ b/Master/texmf-dist/source/latex/disser/custom.dtx @@ -149,7 +149,9 @@ \let\shortcite\cite \let\citeasnoun\cite }{% - \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}} + \def\@noitemerr{% + \PackageWarning{natbib}{Empty `thebibliography' environment}% + } \endlist\vskip-\lastskip% } @@ -233,7 +235,8 @@ \fi % \end{macrocode} -% Команда, создающая цель для гиперссылок над заголовками ненумеруемых разделов. +% Команда, создающая цель для гиперссылок над заголовками ненумеруемых +% разделов. % \DescribeMacro{\hrefphantom}\index{Макросы!\verb*+\hrefphantom+} % \begin{macrocode} \providecommand\hrefphantom[1]{% diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index ed5bb05472c..18f9e1e8261 100644 --- a/Master/texmf-dist/source/latex/disser/disser.dtx +++ b/Master/texmf-dist/source/latex/disser/disser.dtx @@ -19,7 +19,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{disser.drv}[2010/05/22 1.1.6 Document class for dissertations] +\ProvidesFile{disser.drv}[2010/11/21 1.1.7 Document class for dissertations] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -36,8 +36,7 @@ \fi \hypersetup{ - pdfusetitle, - pdftitle = {Documented source code of the disser package}, + pdftitle = {Documented source code of disser class}, pdfauthor = {Stanislav Kruchinin}, pdfsubject = {disser}, pdfstartview = {FitH}, @@ -124,6 +123,7 @@ \DocInput{titledefs.dtx} \DocInput{titlepage.dtx} \DocInput{bachelor.dtx} + \DocInput{specialist.dtx} \DocInput{master.dtx} \DocInput{candidate.dtx} \DocInput{doctor.dtx} @@ -180,7 +180,7 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations] +\ProvidesClass{disser}[2010/06/13 1.1.7 Document class for dissertations] % \end{macrocode} % Подключение пакета \pkg{kvoptions} для обработки опций в формате @@ -197,6 +197,14 @@ % \begin{macrocode} \RequirePackage{ifpdf} +% \item подключение пакета \pkg{ifthen} для построчных сравнений. +% \DescribePackage{ifthen}\index{Пакеты!\verb*+ifthen+} +\RequirePackage{ifthen} + +% \end{macrocode} +% \item Англоязычная версия титульного листа. +% \begin{macrocode} +\newif\if@titlepage@en\@titlepage@enfalse % \end{macrocode} % \item Разрешено оставлять одну колонку при двухколонном наборе. % \begin{macrocode} @@ -213,6 +221,7 @@ % \item Типы документов (по умолчанию candidate). % \begin{macrocode} \newif\ifDis@bachelor\Dis@bachelorfalse +\newif\ifDis@specialist\Dis@specialistfalse \newif\ifDis@master\Dis@masterfalse \newif\ifDis@candidate\Dis@candidatetrue \newif\ifDis@doctor\Dis@doctorfalse @@ -387,6 +396,15 @@ % \begin{macrocode} \DeclareOption{bachelor}{% \Dis@bachelortrue + \Dis@specialistfalse + \Dis@masterfalse + \Dis@candidatefalse + \Dis@doctorfalse + \Dis@autoreffalse +} +\DeclareOption{specialist}{% + \Dis@bachelorfalse + \Dis@specialisttrue \Dis@masterfalse \Dis@candidatefalse \Dis@doctorfalse @@ -394,6 +412,7 @@ } \DeclareOption{master}{% \Dis@bachelorfalse + \Dis@specialistfalse \Dis@mastertrue \Dis@candidatefalse \Dis@doctorfalse @@ -451,11 +470,12 @@ % Файл с описанием разметки титульного листа по умолчанию. % \begin{macrocode} \ifx\Dis@substylefile\@empty - \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi - \ifDis@master \renewcommand*{\Dis@substylefile}{master.rtx}\fi - \ifDis@candidate\renewcommand*{\Dis@substylefile}{candidate.rtx}\fi - \ifDis@doctor \renewcommand*{\Dis@substylefile}{doctor.rtx}\fi - \ifDis@autoref \renewcommand*{\Dis@substylefile}{autoref.rtx}\fi + \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi + \ifDis@specialist \renewcommand*{\Dis@substylefile}{specialist.rtx}\fi + \ifDis@master \renewcommand*{\Dis@substylefile}{master.rtx}\fi + \ifDis@candidate \renewcommand*{\Dis@substylefile}{candidate.rtx}\fi + \ifDis@doctor \renewcommand*{\Dis@substylefile}{doctor.rtx}\fi + \ifDis@autoref \renewcommand*{\Dis@substylefile}{autoref.rtx}\fi \fi % \end{macrocode} @@ -529,11 +549,13 @@ }{} \DeclareFontShape{OT1}{cmr}{bx}{sl}{% <5><6><7><8><9>% - <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxsl10% + <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>% + <51.59>cmbxsl10% }{} \DeclareFontShape{OT1}{cmr}{bx}{it}{% <5><6><7><8><9>% - <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxti10% + <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>% + <51.59>cmbxti10% }{} \input{size\@ptsize.clo} \RequirePackage{exscale} @@ -562,6 +584,9 @@ % \DescribeMacro{\deflength}\index{Макросы!\verb*+\deflength+} % \begin{macrocode} \providecommand\deflength[2]{\newlength{#1}\setlength{#1}{#2}} +\providecommand\ifundeflength[2]{% +\ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi +} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/disser/disser.ins b/Master/texmf-dist/source/latex/disser/disser.ins index b288a638077..7bc55cad32c 100644 --- a/Master/texmf-dist/source/latex/disser/disser.ins +++ b/Master/texmf-dist/source/latex/disser/disser.ins @@ -45,6 +45,7 @@ This file is part of the disser package. } \rtxfile{titledefs} \rtxfile{bachelor} + \rtxfile{specialist} \rtxfile{master} \rtxfile{candidate} \rtxfile{doctor} diff --git a/Master/texmf-dist/source/latex/disser/doctor.dtx b/Master/texmf-dist/source/latex/disser/doctor.dtx index aa0632090a9..ddeeee7ce9c 100644 --- a/Master/texmf-dist/source/latex/disser/doctor.dtx +++ b/Master/texmf-dist/source/latex/disser/doctor.dtx @@ -15,7 +15,18 @@ % Титульный лист. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} -\if@titlepage\renewcommand\maketitle{ +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\sconname{Scientific Consultant} + \def\sconlabel{\sconname} + \def\sconsndname{\sconname} + \def\sconsndlabel{\sconname} + \def\topicname{Topic} + \def\asmanuscript{As Manuscript} +\fi + % \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} @@ -25,17 +36,19 @@ % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \DescribeMacro{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} % \begin{macrocode} -\newlength\firstskip -\ifDis@libcat - \setlength\firstskip{1ex} -\else - \setlength\firstskip{4ex} +\ifx\firstskip\undefined + \newlength\firstskip + \ifDis@libcat + \setlength\firstskip{1ex} + \else + \setlength\firstskip{4ex} + \fi \fi -\deflength\secondskip{3cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} -\deflength\sixthskip{0cm} +\ifundeflength\secondskip{3cm} +\ifundeflength\thirdskip{1cm} +\ifundeflength\fourthskip{1cm} +\ifundeflength\fifthskip{1cm} +\ifundeflength\sixthskip{0cm} % \end{macrocode} % Шрифты элементов титульного листа. diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index 01dd4f1cd45..97fd655650a 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -1,34 +1,166 @@ % \iffalse meta-comment -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% This bibliography style attempts -%% to format bibliography according to -%% GOST 7.1-84 with some conventional modifications. -%% -%% Based on style gost71u.bst by Maksym Polyakov. -%% -%% For the Russian bibliographic entries -%% you need to create field -%% language = {russian}. -%% Default language is English. -%% Field numpages for books must contain number of pages. -%% Optional field url will format url (using hyperref, if loaded). -%% -%% Requires 8-bit bibtex with switch -B and csf file -%% supporting cyrillic. -%% -%% bibtex8 -B -c <encoding>.csf <your_document> -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - +% +% This bibliography style attempts to format bibliography according to +% GOST R 7.0.5-2008 with some conventional modifications. +% +% Based on style gost71u.bst by Maksym Polyakov. +% +% For the Russian bibliographic entries you need to create field +% language = {russian}. +% +% Default language is English. +% Field numpages for books must contain number of pages. +% Optional field url will format url (using hyperref, if loaded). +% +% Requires 8-bit bibtex with switch -H and csf file supporting cyrillic. +% +% bibtex8 -H -c <encoding>.csf <your_document> +% +% Copyright (C) 2004-2010 by +% Stanislav Kruchinin <stanislav.kruchinin at gmail.com> +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any later +% version. This version of this license is in +% http://www.latex-project.org/lppl/lppl-1-3c.txt +% and 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 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% Current Maintainer of this work is Stanislav Kruchinin. +% +% This work consists of the main source file gost705.dtx +% and the derived files +% gost705.bst, gost705s.bst, gost705.pdf. +% +% Distribution: +% CTAN:macros/latex/contrib/disser/src/gost705.dtx +% +% Unpacking: +% (a) If disser.ins present: +% latex disser.ins +% (b) Without disser.ins: +% tex gost705.dtx +% +% Documentation: +% latex maik.dtx; ... +% +% Programm calls to get the documentation (example): +% pdflatex gost705.dtx +% makeindex -r -s dtx.ist gost705 +% pdflatex gost705.dtx +% pdflatex gost705.dtx +% +% Installation: +% TDS:bibtex/bst/disser/ +% TDS:doc/latex/disser/ +% TDS:source/latex/disser/ +% +%<*ignore> +\begingroup + \catcode123=1 % + \catcode125=2 % + \def\x{LaTeX2e}% +\expandafter\endgroup +\ifcase 0\ifx\install y1\fi\expandafter + \ifx\csname processbatchFile\endcsname\relax\else1\fi + \ifx\fmtname\x\else 1\fi\relax +\else\csname fi\endcsname +%</ignore> +%<*install> +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation} +\Msg{* gost705: Format bibliography according to GOST R 7.0.5-2008} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\let\MetaPrefix\relax +\preamble + +This is a generated file. + +This bibliography style attempts to format bibliography according to +GOST R 7.0.5-2008 with some conventional modifications. + +Based on style gost71u.bst by Maksym Polyakov. + +For the Russian bibliographic entries you need to create field + language = {russian}. + +Default language is English. +Field numpages for books must contain number of pages. +Optional field url will format url (using hyperref, if loaded). + +Requires 8-bit bibtex with switch -H and csf file supporting cyrillic. + +bibtex8 -H -c <encoding>.csf <your_document> + +Copyright (C) 2004-2010 by + Stanislav Kruchinin <stanislav.kruchinin at gmail.com> + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3c of this license or (at your option) any later +version. This version of this license is in + http://www.latex-project.org/lppl/lppl-1-3c.txt +and 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 2005/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +Current Maintainer of this work is Stanislav Kruchinin. + +This work consists of the main source file gost705.dtx +and the derived files + gost705.bst gost705s.bst gost705.pdf. + +\endpreamble +\let\MetaPrefix\DoubleperCent + +\generate{% + \usedir{bibtex/bst/disser}% + \file{gost705.bst}{\from{gost705.dtx}{gost705}}% + \file{gost705s.bst}{\from{gost705.dtx}{gost705s}}% +} + +\catcode32=13\relax% active space +\let =\space% +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* file into a directory searched by TeX:} +\Msg{*} +\Msg{* gost705.bst gost705s.bst} +\Msg{*} +\Msg{* To produce the documentation run the file `gost705.dtx'} +\Msg{* through LaTeX or pdfLaTeX.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +%</install> +%<*ignore> +\fi +%</ignore> %<*driver> -\ProvidesFile{gost705.drv}[2010/05/22 1.1.6 Bibliography style for dissertations.] +\ProvidesFile{gost705.drv}% + [2010/11/21 1.1.7 Bibliography style for GOST R 7.0.5-2008.] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, left=5.5cm,right=1cm,top=1.5cm,bottom=1.5cm]{geometry} \usepackage{ifpdf,indentfirst,color,makeidx} - \definecolor{darkblue}{rgb}{0,0,.6} \ifpdf \usepackage[pdftex,hyperindex,unicode]{hyperref} @@ -38,10 +170,9 @@ \fi \hypersetup{ - pdfusetitle, - pdftitle = {Documented source code of disser package}, + pdftitle = {Documented source code of gost705 style}, pdfauthor = {Stanislav Kruchinin}, - pdfsubject = {disser}, + pdfsubject = {gost705}, pdfstartview = {FitH}, pdfborder = {0 0 0}, bookmarksopen = true, @@ -107,7 +238,6 @@ \makeindex -\GetFileInfo{gost705.drv} \begin{document} \sloppy \DocInput{gost705.dtx} @@ -117,7 +247,7 @@ %</driver> % \fi % -% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \GetFileInfo{gost705.drv} % % \title{\pkg{gost705} и \pkg{gost705s} "--- стили оформления библиографии % в соответствии с ГОСТ Р 7.0.5-2008} @@ -172,6 +302,10 @@ ENTRY urldate isbn doi + archive + archivePrefix + primaryClass + eprint } {} { label } @@ -1033,11 +1167,9 @@ FUNCTION {output.address.publisher.date} FUNCTION {output.bibitem} { newline$ - "\bibitem[" write$ - "\BibPrefix" write$ + "\bibitem[\BibPrefix" write$ label write$ - "\BibPostfix" write$ - "]{" write$ + "\BibPostfix]{" write$ cite$ write$ "}" write$ newline$ @@ -1445,6 +1577,20 @@ FUNCTION {editor.organization.after} } % \end{macrocode} +% \DescribeBSTFunction{format.annote} +% \begin{macrocode} +FUNCTION {format.annote} +{ + annote empty$ + { "" } + { after.sentence 'output.state := + "\BibAnnote{" annote add.period$ * "}" * + } + if$ +} + +% \end{macrocode} +% \subsection{Создание гиперссылок} % \DescribeBSTFunction{format.url} % \begin{macrocode} FUNCTION {format.url} @@ -1482,19 +1628,6 @@ FUNCTION {output.url} } % \end{macrocode} -% \DescribeBSTFunction{format.annote} -% \begin{macrocode} -FUNCTION {format.annote} -{ - annote empty$ - { "" } - { after.sentence 'output.state := - "\BibAnnote{" annote add.period$ * "}" * - } - if$ -} - -% \end{macrocode} % \DescribeBSTFunction{format.isbn} % \begin{macrocode} FUNCTION {format.isbn} @@ -1522,6 +1655,30 @@ FUNCTION {add.doi} } % \end{macrocode} +% \DescribeBSTFunction{format.eprint} +% \begin{macrocode} +FUNCTION {format.eprint} +{ eprint empty$ + { "" } + { primaryClass empty$ + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * eprint * "}" * + } + { archivePrefix empty$ + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * primaryClass * "/" * eprint * "}" * + } + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" * + } + if$ + } + if$ + } + if$ +} + +% \end{macrocode} % \subsection{Описание типов библиографических ссылок} % \DescribeBSTFunction{article} % \begin{macrocode} @@ -1542,6 +1699,8 @@ FUNCTION {article} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1571,6 +1730,8 @@ FUNCTION {book} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1592,6 +1753,8 @@ FUNCTION {booklet} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1624,6 +1787,8 @@ FUNCTION {inbook} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1652,6 +1817,8 @@ FUNCTION {incollection} new.block note output new.block + format.eprint output + new.block output.url format.annote output fin.entry @@ -1689,6 +1856,8 @@ FUNCTION {inproceedings} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1735,6 +1904,8 @@ FUNCTION {manual} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1757,6 +1928,8 @@ FUNCTION {mastersthesis} new.block note output new.block + format.eprint output + new.block output.url format.annote output fin.entry @@ -1778,6 +1951,8 @@ FUNCTION {misc} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1802,6 +1977,8 @@ FUNCTION {phdthesis} format.pages.page output note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1826,6 +2003,8 @@ FUNCTION {docdisser} format.pages.page output note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1856,6 +2035,8 @@ FUNCTION {proceedings} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1881,6 +2062,8 @@ FUNCTION {techreport} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1898,6 +2081,8 @@ FUNCTION {unpublished} new.block note "note" output.check new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -2066,7 +2251,7 @@ MACRO {nl} {"Nano Lett."} READ % \end{macrocode} -% \subsection{Функции для сортировки списка литературы по именам авторов и названиям} +% \subsection{Сортировка списка литературы по именам авторов и названиям} % \begin{macrocode} %<*gost705s> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index 580d4c8cb27..99e2ab13567 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{gost732.drv}[2010/05/22 1.1.6 GOST 7.32-2001 implementation] +\ProvidesFile{gost732.drv}[2010/11/21 1.1.7 GOST 7.32-2001 implementation] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -36,8 +36,7 @@ \fi \hypersetup{ - pdfusetitle, - pdftitle = {Documented source code of disser package}, + pdftitle = {Documented source code of gost732 class}, pdfauthor = {Stanislav Kruchinin}, pdfsubject = {disser}, pdfstartview = {FitH}, @@ -113,7 +112,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2010/05/22 1.1.6 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2010/06/13 1.1.7 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax diff --git a/Master/texmf-dist/source/latex/disser/master.dtx b/Master/texmf-dist/source/latex/disser/master.dtx index 84b16d85bc2..49fafe8d40d 100644 --- a/Master/texmf-dist/source/latex/disser/master.dtx +++ b/Master/texmf-dist/source/latex/disser/master.dtx @@ -15,7 +15,26 @@ % Титульный лист. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} -\if@titlepage\renewcommand\maketitle{ +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\topicname{Topic} + \def\coursename{Speciality} + \def\studentname{Student} + \def\studentlabel{\studentname\hspace{6cm}} + \def\masterprogname{Master's Program} +\fi + % \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} @@ -24,12 +43,12 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \begin{macrocode} -\deflength\firstskip{1ex} -\deflength\secondskip{1ex} -\deflength\thirdskip{1ex} -\deflength\fourthskip{-1cm} -\deflength\fifthskip{0ex} -\deflength\sixthskip{1.5ex} +\ifundeflength\firstskip{1ex} +\ifundeflength\secondskip{1ex} +\ifundeflength\thirdskip{1ex} +\ifundeflength\fourthskip{-1cm} +\ifundeflength\fifthskip{0ex} +\ifundeflength\sixthskip{1.5ex} % \end{macrocode} % Горизонтальный отступ перед чертой в текстовым поле для имени, ученой @@ -61,7 +80,7 @@ % \end{macrocode} % Диссертация допущена к защите % \begin{macrocode} -\vskip\firstskip\normalfont +\vskip\firstskip \@approved \vskip\secondskip \begin{center} @@ -69,14 +88,14 @@ % Заголовок. % \begin{macrocode} {\titlefont\@title} - \vskip\thirdskip\normalfont + \vskip\thirdskip % \end{macrocode} % Тема % \begin{macrocode} {\topiclabelfont\topiclabel} {\topicfont\@topic} \end{center} -\vskip\fourthskip\normalfont +\vskip\fourthskip \begin{tabbing} \phantom{\masterproglabel}\=\\ % \end{macrocode} @@ -88,7 +107,7 @@ % \begin{macrocode} \masterproglabel\>\ \@masterprognum\ --\ \@masterprog \end{tabbing} -\vskip\fifthskip\normalfont +\vskip\fifthskip \begin{tabbing} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/disser/specialist.dtx b/Master/texmf-dist/source/latex/disser/specialist.dtx new file mode 100644 index 00000000000..d59903499f5 --- /dev/null +++ b/Master/texmf-dist/source/latex/disser/specialist.dtx @@ -0,0 +1,153 @@ +% \begin{macrocode} + +%<specialist>\ProvidesFile{specialist.rtx} + +%<*specialist> +% \end{macrocode} +% \subsubsection{Стиль работы специалиста} +% +% Нумерация. +% \begin{macrocode} +\newcommand\specialist@the{\default@the} +\specialist@the + +\def\diplomafield#1{% + \csname #1label\endcsname\\% + \csname @#1status\endcsname\ \csname @#1\endcsname +} + +% \end{macrocode} +% Титульный лист. +% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} +% \begin{macrocode} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} +\else + \def\appos{\CYRZ\cyra\cyrv\cyre\cyrd\cyru\cyryu\cyrshch\cyri\cyrishrt\ % + \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt} + \def\approved{<<\CYRD\cyro\cyrp\cyru\cyrs\cyrt\cyri\cyrt\cyrsftsn\ % + \cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre>>} +\fi + +% \end{macrocode} +% Вертикальные интервалы между элементами титульного листа. +% \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} +% \DescribeMacro{\secondskip}\index{Расстояния!\verb*+\secondskip+} +% \DescribeMacro{\thirdskip}\index{Расстояния!\verb*+\thirdskip+} +% \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} +% \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} +% \begin{macrocode} +\ifundeflength\firstskip{1.5cm} +\ifundeflength\secondskip{1.5cm} +\ifundeflength\thirdskip{3ex} +\ifundeflength\fourthskip{1ex} +\ifundeflength\fifthskip{1ex} +\ifundeflength\sixthskip{2cm} +\ifundeflength\seventhskip{1ex} + +% \end{macrocode} +% Горизонтальный отступ перед чертой в текстовым поле для имени, ученой +% степени и звания научного руководителя и консультанта. +% \DescribeMacro{\fieldhshift}\index{Расстояния!\verb*+\fieldhshift+} +% \begin{macrocode} +\setlength\fieldhshift{8.5cm} + +% \end{macrocode} +% Шрифты элементов титульного листа. +% \DescribeMacro{\titlefont}\index{Макросы!\verb*+\titlefont+} +% \DescribeMacro{\topiclabelfont}\index{Макросы!\verb*+\topiclabelfont+} +% \DescribeMacro{\topicfont}\index{Макросы!\verb*+\topicfont+} +% \begin{macrocode} +\def\titlefont{\Large\bfseries} +\def\topiclabelfont{\large} +\def\topicfont{\large\bfseries} + +% \end{macrocode} +% Работа +% \DescribeMacro{\workname}\index{Макросы!\verb*+\topicfont+} +% \begin{macrocode} +\def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra} + +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} +% \end{macrocode} +% \paragraph{Название организации} +% \begin{macrocode} +\begin{center} + {\instfont\@institution} +\end{center} + +% \end{macrocode} +% Работа +% \DescribeMacro{\workname}\index{Макросы!\verb*+\topicfont+} +% \begin{macrocode} +\def\@approved{ +\hfill +\begin{minipage}{.5\linewidth} + {\approved}\hrulefill\\[9pt]% + \appos\\% + \@apname% +\end{minipage} +} + +% \end{macrocode} +% Допустить к защите +% \begin{macrocode} +\vskip\firstskip +{\@approved} +\vskip\secondskip +% \end{macrocode} +% Заголовок, тема, автор +% \begin{macrocode} +\begin{center} + {\titlefont\@title} + \vskip\thirdskip + {\@group} + \vskip\fourthskip + {\@author} + \vskip\fifthskip + {\topicfont\@topic} +\end{center} +\normalfont +% \end{macrocode} +% Руководитель, рецензент +% \begin{macrocode} +\vskip\sixthskip +\hfill +\begin{minipage}{.5\linewidth} + \ifx\@sa\empty\else + \vskip\seventhskip\diplomafield{sa} + \fi + \ifx\@sasnd\empty\else + \vskip\seventhskip\diplomafield{sasnd} + \fi + \ifx\@rev\empty\else + \vskip\seventhskip\diplomafield{rev} + \fi + \ifx\@revsnd\empty\else + \vskip\seventhskip\diplomafield{revsnd} + \fi +\end{minipage} +% \end{macrocode} +% \paragraph{Город и год} +% \begin{macrocode} +\vfill +\begin{center} + {\@city\cdsep\@date} +\end{center} +\normalfont\clearpage +}\fi +%</specialist> +% \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/titledefs.dtx b/Master/texmf-dist/source/latex/disser/titledefs.dtx index 18e935047dc..25e47e07df5 100644 --- a/Master/texmf-dist/source/latex/disser/titledefs.dtx +++ b/Master/texmf-dist/source/latex/disser/titledefs.dtx @@ -15,7 +15,8 @@ % \DescribeMacro{\titlepagename}\index{Макросы!\verb+\titlepagename+} % Титульный лист % \begin{macrocode} -\def\titlepagename{\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ % +\def\titlepagename{% +\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ % \cyrl\cyri\cyrs\cyrt} % \end{macrocode} % \DescribeMacro{\keywordsname}\index{Макросы!\verb+\keywordsname+} @@ -85,7 +86,7 @@ % \begin{macrocode} \def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ % \cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt} -\def\studentlabel{\studentname\ \groupname\ \@group\hspace{2cm}} +\def\studentlabel{\studentname\ \groupname\ \@group\hspace{1.5cm}} % \end{macrocode} % \DescribeMacro{\saname}\index{Макросы!\verb+\saname+} % \DescribeMacro{\salabel}\index{Макросы!\verb+\salabel+} diff --git a/Master/texmf-dist/source/latex/disser/toc.dtx b/Master/texmf-dist/source/latex/disser/toc.dtx index 7ec27da000c..74f16a4a403 100644 --- a/Master/texmf-dist/source/latex/disser/toc.dtx +++ b/Master/texmf-dist/source/latex/disser/toc.dtx @@ -8,7 +8,8 @@ %<*toc> % \end{macrocode} % -% \subsection{Автоматически генерируемые списки (оглавление, предметный указатель и т.\,д.)} +% \subsection{Автоматически генерируемые списки (оглавление, предметный +% указатель и т.\,д.)} % % \subsubsection{Общие параметры} % @@ -43,6 +44,7 @@ % \end{macrocode} % \subsubsection{Оглавление} % +% Команда, создающая заголовок в тексте. % \DescribeMacro{\tocsection}\index{Макросы!\verb*+\tocsection+} % \begin{macrocode} \newcommand\tocsection{\chapter*{\contentsname}} @@ -64,6 +66,7 @@ % % \subsubsection{Список иллюстраций} % +% Команда, создающая заголовок в тексте. % \DescribeMacro{\lofsection}\index{Макросы!\verb*+\lofsection+} % \begin{macrocode} \newcommand\lofsection{\nchapter{\listfigurename}} @@ -89,6 +92,7 @@ % % \subsubsection{Список таблиц} % +% Команда, создающая заголовок в тексте. % \DescribeMacro{\lotsection}\index{Макросы!\verb*+\lotsection+} % \begin{macrocode} \newcommand\lotsection{\nchapter{\listtablename}} @@ -137,6 +141,7 @@ % % \subsubsection{Предметный указатель} % +% Команда, создающая заголовок в тексте. % \DescribeMacro{\indexsection}\index{Макросы!\verb*+\indexsection+} % \begin{macrocode} \providecommand\indexsection{\twocolumn[\@makeschapterhead{\indexname}]} |