summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/disser
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-05 21:37:27 +0000
committerKarl Berry <karl@freefriends.org>2017-03-05 21:37:27 +0000
commit76eb9c1d1aaa84b6d3edc7bd56d9f19ccd77371a (patch)
tree02f4a9fbd36f5be458c9ffc818e90f60b82c8afe /Master/texmf-dist/tex/latex/disser
parentfd9e6506431c90e66891bb9e63e38334837c415c (diff)
disser (5mar17)
git-svn-id: svn://tug.org/texlive/trunk@43400 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/disser')
-rw-r--r--Master/texmf-dist/tex/latex/disser/disser.cls74
-rw-r--r--Master/texmf-dist/tex/latex/disser/gost732.cls2
-rw-r--r--Master/texmf-dist/tex/latex/disser/titledefs.rtx4
3 files changed, 21 insertions, 59 deletions
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index 4153eecd01a..f501c0b9467 100644
--- a/Master/texmf-dist/tex/latex/disser/disser.cls
+++ b/Master/texmf-dist/tex/latex/disser/disser.cls
@@ -44,7 +44,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2016/06/26 1.4.0 Document class for dissertations]
+\ProvidesClass{disser}[2017/03/03 1.4.1 Document class for dissertations]
\RequirePackage{kvoptions}
@@ -65,7 +65,6 @@
\newif\ifDis@libcat\Dis@libcatfalse
\newif\ifDis@classified\Dis@classifiedfalse
\newif\ifDis@facsimile\Dis@facsimilefalse
-\newif\ifDis@ams\Dis@amstrue
\newif\ifDis@href\Dis@hreffalse
\newif\ifDis@subf\Dis@subffalse
\newif\ifDis@times\Dis@timesfalse
@@ -78,7 +77,6 @@
\DeclareOption{libcat}{\Dis@libcattrue}
\DeclareOption{classified}{\Dis@classifiedtrue}
\DeclareOption{facsimile}{\Dis@facsimiletrue}
-\DeclareOption{noams}{\Dis@amsfalse}
\DeclareOption{natbib}{\Dis@natbibtrue}
\DeclareOption{fixint}{\Dis@fixinttrue}
\DeclareOption{colorlinks}{\Dis@colorlinkstrue}
@@ -129,8 +127,6 @@
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-\DeclareOption{times}{\Dis@timestrue}
-\DeclareOption{mtpro}{\Dis@mtprotrue}
\DeclareOption{openbib}{%
\AtEndOfPackage{%
\renewcommand\@openbib@code{%
@@ -169,6 +165,7 @@
}
\DeclareOption{candidate}{%
\Dis@bachelorfalse
+ \Dis@specialistfalse
\Dis@masterfalse
\Dis@candidatetrue
\Dis@doctorfalse
@@ -176,6 +173,7 @@
}
\DeclareOption{doctor}{%
\Dis@bachelorfalse
+ \Dis@specialistfalse
\Dis@masterfalse
\Dis@candidatefalse
\Dis@doctortrue
@@ -183,6 +181,7 @@
}
\DeclareOption{autoref}{%
\Dis@bachelorfalse
+ \Dis@specialistfalse
\Dis@masterfalse
\Dis@candidatefalse
\Dis@doctorfalse
@@ -498,6 +497,13 @@
\newlength{\chapterindent}
\setlength{\chapterindent}{0\p@}
+\providecommand\schapteralign{\chapteralign}
+\providecommand\schapterfont{\chapterfont}
+\providecommand\beforeschapter{\beforechapter}
+\providecommand\afterschapter{\afterchapter}
+\newlength{\schapterindent}
+\setlength{\schapterindent}{0\p@}
+
\newcommand*\chaptermark[1]{}
\newcommand\chapter{%
@@ -551,9 +557,9 @@
\def\@makeschapterhead#1{{%
\parindent\z@
- \normalfont\hskip\chapterindent%
+ \normalfont\hskip\schapterindent%
\interlinepenalty\@M
- \chapteralign\chapterfont\beforechapter #1\afterchapter
+ \schapteralign\schapterfont\beforeschapter #1\afterschapter
}}
\newcommand*\l@chapter[2]{%
@@ -1338,57 +1344,6 @@
%%% From File: custom.dtx
-\ifDis@ams
- \usepackage[intlimits]{amsmath}
- \usepackage{amssymb,amsfonts}
-\fi
-
-\ifDis@times
- \AtBeginDocument{
- \DeclareRobustCommand{\English}{%
- \expandafter\set@hyphenmins\englishhyphenmins
- \language\l@english}%
- \let\Eng=\English
- }
- \ifDis@mtpro
- \AtBeginDocument{%
- \IfFileExists{mtpro2.sty}{
- \usepackage[subscriptcorrection,nofontinfo]{mtpro2}
- }{
- \IfFileExists{mtpro.sty}{
- \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro}
- }{
- \PackageWarning{disser}%
- {Unable to find mtpro2 or mtpro package. Math font is unchanged.}
- }
- }
- }
- \else
- \AtEndOfPackage{%
- \IfFileExists{newtxmath.sty}{
- \usepackage[varg,cmbraces,cmintegrals]{newtxmath}
- }{
- \PackageWarning{disser}%
- {Unable to find txfonts package. Font is unchanged.}
- }
- }
- \fi
- \AtEndOfPackage{%
- \IfFileExists{pscyr.sty}{
- \usepackage{pscyr}
- \renewcommand\rmdefault{ftm}
- \renewcommand\ttdefault{cmtt}
- }{
- \IfFileExists{cyrtimes.sty}{
- \usepackage{cyrtimes}
- }{
- \PackageWarning{disser}%
- {Unable to find pscyr or cyrtimes package. Font is unchanged.}
- }
- }
- }
-\fi
-
\ifDis@fixint
\DeclareSymbolFont{EulerExtension}{U}{euex}{m}{n}
\DeclareMathSymbol\intop\mathop{EulerExtension}{"52}
@@ -1476,8 +1431,9 @@
}
\ifDis@subf
- \usepackage[config,font=small,labelsep=period]{caption}
+ \usepackage[font=small,labelsep=period]{caption}
\usepackage[list=true,subrefformat=parens]{subcaption}
+ \captionsetup{compatibility=false}
\DeclareCaptionSubType[asbuk]{figure}
\def\thesubfigure{\textit{\asbuk{subfigure}}}
\providecommand\thefigsubsep{,~}
diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls
index 8d8ba6ed28d..e61a2461b52 100644
--- a/Master/texmf-dist/tex/latex/disser/gost732.cls
+++ b/Master/texmf-dist/tex/latex/disser/gost732.cls
@@ -62,6 +62,8 @@
\CYRI\ \CYRS\CYRO\CYRK\CYRR\CYRA\CYRSHCH\CYRE\CYRN\CYRI\CYRYA
}
+\def\nomname{\defsname}
+
\renewcommand\defs{%
\nchapter{\defsname}
}
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index bc3e1b00631..b031d30f0e2 100644
--- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx
+++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
@@ -138,6 +138,10 @@
}
\providecommand*\defs{\nchapter{\defsname}}
+\AtBeginDocument{%
+ \addto\captionsrussian{\def\nomname{\defsname}}
+}
+
\providecommand*\dictname{%
{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\ %
\cyrt\cyre\cyrr\cyrm\cyri\cyrn\cyro\cyrv}