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/tex | |
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/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/autoref.rtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/bachelor.rtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/candidate.rtx | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/disser.cls | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/doctor.rtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/gost732.cls | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/master.rtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/specialist.rtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/titledefs.rtx | 36 |
9 files changed, 46 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx index 5a88970eedc..f1df72acebe 100644 --- a/Master/texmf-dist/tex/latex/disser/autoref.rtx +++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx @@ -6,7 +6,7 @@ %% %% autoref.dtx (with options: `autoref') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index 9b6eead2b76..40c9b84e570 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -6,7 +6,7 @@ %% %% bachelor.dtx (with options: `bachelor') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index b0b85c1f0bf..a3d2b64c3c7 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -6,7 +6,7 @@ %% %% candidate.dtx (with options: `candidate') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -22,13 +22,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/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index e46edad9b4e..3300d06518a 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -18,7 +18,7 @@ %% toc.dtx (with options: `toc') %% custom.dtx (with options: `custom') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -27,7 +27,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 @@ -44,7 +44,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \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] \RequirePackage{kvoptions} @@ -336,7 +337,7 @@ \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% @@ -1433,6 +1434,7 @@ } \renewenvironment{thebibliography}[1]{% + \setlength\bibsep{0pt} \bibsection \parindent \z@ \bibpreamble\bibfont @@ -1455,7 +1457,6 @@ \endlist\vskip-\lastskip% } -\usepackage{wrapfig} \ifDis@subf \usepackage[config,font=small,labelsep=period]{caption,subfig} \def\thesubfigure{\textit{\asbuk{subfigure}}} diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index 09c90d59ba4..8a3caeca64d 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -6,7 +6,7 @@ %% %% doctor.dtx (with options: `doctor') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 8a9960f04e4..1c23feca17d 100644 --- a/Master/texmf-dist/tex/latex/disser/gost732.cls +++ b/Master/texmf-dist/tex/latex/disser/gost732.cls @@ -6,13 +6,13 @@ %% %% gost732.dtx (with options: `gost732') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. %% \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/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx index c78f985c04d..35017e4c41d 100644 --- a/Master/texmf-dist/tex/latex/disser/master.rtx +++ b/Master/texmf-dist/tex/latex/disser/master.rtx @@ -6,7 +6,7 @@ %% %% master.dtx (with options: `master') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. diff --git a/Master/texmf-dist/tex/latex/disser/specialist.rtx b/Master/texmf-dist/tex/latex/disser/specialist.rtx index c3bbfbe51e9..4dd26135432 100644 --- a/Master/texmf-dist/tex/latex/disser/specialist.rtx +++ b/Master/texmf-dist/tex/latex/disser/specialist.rtx @@ -6,7 +6,7 @@ %% %% specialist.dtx (with options: `specialist') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx index 0cecf30416e..1b20a952480 100644 --- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx +++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx @@ -6,7 +6,7 @@ %% %% titledefs.dtx (with options: `titledefs') %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% Copyright (c) 2004-2014 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -44,7 +44,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} \def\sconname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ % \cyrk\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt} \def\sconsndname{\sconname} @@ -114,16 +114,22 @@ \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} } } \providecommand*\introname{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre} \providecommand*\intro{\nchapter{\introname}} + +\providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ % +\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} +\providecommand*\review{\nchapter{\reviewname}} + \providecommand*\conclusionname{% \cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre } \providecommand*\conclusion{\nchapter{\conclusionname}} + \providecommand*\defsname{% {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ % \cyrs\cyro\cyrk\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrishrt\ \cyri\ % @@ -131,13 +137,29 @@ \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt} } \providecommand*\defs{\nchapter{\defsname}} -\providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ % -\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} -\providecommand*\review{\nchapter{\reviewname}} -\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}} +\AtBeginDocument{% + \addto\captionsrussian{% + \def\bibname{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ % + \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} + } +} + +\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} + } +} + \deflength\fieldhshift{8cm} \providecommand\diplomafield[1]{% |