diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/disser/disser.cls')
| -rw-r--r-- | Master/texmf-dist/tex/latex/disser/disser.cls | 270 |
1 files changed, 150 insertions, 120 deletions
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index b4e040c3f16..960daf88995 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,39 +44,26 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2008/11/11 1.1.0 Document class for dissertations.] +\ProvidesClass{disser}[2008/04/08 1.1.1 Document class for dissertations.] \def\substyle@ext{.rtx} -\newif\if@restonecol -\newif\if@titlepage -\newif\if@openright -\RequirePackage{ifpdf} -\newif\ifDis@bachelor -\newif\ifDis@master -\newif\ifDis@candidate -\newif\ifDis@doctor -\newif\ifDis@autoref -\newif\ifDis@libcat -\newif\ifDis@facsimile - -\newif\ifDis@href -\newif\ifDis@subf -\newif\ifDis@times -\newif\ifDis@mtpro - -\@titlepagetrue -\Dis@bachelorfalse -\Dis@masterfalse -\Dis@candidatetrue -\Dis@doctorfalse -\Dis@autoreffalse -\Dis@timesfalse -\Dis@mtprofalse -\Dis@subffalse -\Dis@hreffalse -\Dis@libcatfalse -\Dis@facsimilefalse +\RequirePackage{ifpdf} +\newif\if@restonecol +\newif\if@titlepage\@titlepagetrue +\newif\if@openright\@openrightfalse +\newif\ifDis@bachelor\Dis@bachelorfalse +\newif\ifDis@master\Dis@masterfalse +\newif\ifDis@candidate\Dis@candidatetrue +\newif\ifDis@doctor\Dis@doctorfalse +\newif\ifDis@autoref\Dis@autoreffalse +\newif\ifDis@libcat\Dis@libcatfalse +\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 +\newif\ifDis@mtpro\Dis@mtprofalse \RequirePackage{kvoptions}[2006/08/17] @@ -85,14 +72,17 @@ \DeclareOption{subf}{\Dis@subftrue} \DeclareOption{libcat}{\Dis@libcattrue} + \DeclareOption{facsimile}{\Dis@facsimiletrue} +\DeclareOption{noams}{\Dis@amsfalse} + \SetupKeyvalOptions{ family=Dis, prefix=Dis@ } -\DeclareBoolOption[true]{fixint} +\DeclareBoolOption[true]{fixint} \DeclareOption{a4paper}{% \setlength\paperheight{297mm} @@ -119,7 +109,8 @@ \DeclareOption{11pt}{\renewcommand\@ptsize{11}} \DeclareOption{12pt}{\renewcommand\@ptsize{12}} \DeclareOption{14pt}{\renewcommand\@ptsize{14}} -\DeclareOption{17pt}{\renewcommand\@ptsize{17}} +\DeclareOption{16pt}{\renewcommand\@ptsize{16}} +\DeclareOption{18pt}{\renewcommand\@ptsize{18}} \DeclareOption{20pt}{\renewcommand\@ptsize{20}} \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse} @@ -375,8 +366,8 @@ \providecommand\partalign{\centering} \providecommand\partfont{\huge\bfseries} -\providecommand\prepart{} -\providecommand\postpart{\par} +\providecommand\beforepart{} +\providecommand\afterpart{\par} \def\partpagestyle#1{\gdef\@partpagestyle{#1}} \partpagestyle{empty} @@ -409,14 +400,14 @@ \ifnum \c@secnumdepth >-2\relax {\thepartfont\partalign\@seccntformat{part}} \fi% - {\partfont\partalign\prepart #2\postpart}% + {\partfont\partalign\beforepart #2\afterpart}% } \@endpart% } \def\@spart#1{% \partalign{\interlinepenalty \@M% - \partfont\prepart #1\postpart}% + \partfont\beforepart #1\afterpart}% \@endpart } @@ -467,11 +458,8 @@ \providecommand\chapteralign{\centering} \providecommand\chapterfont{\Large\bfseries} -\providecommand\prechapter{} -\providecommand\postchapter{\par\nobreak\vskip 20\p@} - -\def\chapterpagestyle#1{\gdef\@chapterpagestyle{#1}} -\chapterpagestyle{plain} +\providecommand\beforechapter{} +\providecommand\afterchapter{\par\nobreak\vskip 20\p@} \newcommand*\chaptermark[1]{} \newcommand\chapter{% @@ -510,7 +498,7 @@ {\thechapterfont\thechapteralign\@seccntformat{chapter}} \fi \interlinepenalty\@M - \chapterfont\chapteralign\prechapter #1\postchapter + \chapterfont\chapteralign\beforechapter #1\afterchapter } } @@ -527,7 +515,7 @@ {% \parindent \z@ \raggedright \normalfont\interlinepenalty\@M - \chapteralign{\chapterfont\prechapter #1\postchapter} + \chapteralign{\chapterfont\beforechapter #1\afterchapter} } } \newcommand*\l@chapter[2]{% @@ -564,8 +552,8 @@ \providecommand\appendixalign{\centering} \providecommand\appendixfont{\Large\bfseries} -\providecommand\preappendix{} -\providecommand\postappendix{\par\nobreak\vskip 20\p@} +\providecommand\beforeappendix{} +\providecommand\afterappendix{\par\nobreak\vskip 20\p@} \newcommand\appendix{ \setcounter{chapter}{0} \setcounter{section}{0} @@ -585,8 +573,8 @@ \let\oldchapteralign=\chapteralign \let\oldchapterfont=\chapterfont - \let\oldprechapter=\prechapter - \let\oldpostchapter=\postchapter + \let\oldbeforechapter=\afterchapter + \let\oldafterchapter=\afterchapter \let\oldthechapter=\thechapter \renewcommand\tocprethechapter{\tocpretheappendix} @@ -604,8 +592,8 @@ \renewcommand\chapteralign{\appendixalign} \renewcommand\chapterfont{\appendixfont} - \renewcommand\prechapter{\preappendix} - \renewcommand\postchapter{\postappendix} + \renewcommand\beforechapter{\beforeappendix} + \renewcommand\afterchapter{\afterappendix} \gdef\thechapter{\theappendix} } @@ -626,8 +614,8 @@ \let\chapteralign=\oldchapteralign \let\chapterfont=\oldchapterfont - \let\prechapter=\oldprechapter - \let\postchapter=\oldpostchapter + \let\beforechapter=\oldbeforechapter + \let\afterchapter=\oldafterchapter \gdef\thechapter{\oldthechapter} } @@ -1030,74 +1018,114 @@ %%% From File: page.dtx -\newcommand\evenheadfont{\slshape} -\newcommand\evenfootfont{} -\newcommand\oddheadfont{\slshape} -\newcommand\oddfootfont{} -\providecommand\chaptermarkfont{\slshape} -\providecommand\sectionmarkfont{\MakeUppercase} +\newcommand\evenheadfont{\reset@font} +\newcommand\evenfootfont{\reset@font} +\newcommand\oddheadfont{\reset@font} +\newcommand\oddfootfont{\reset@font} +\newcommand\headfont{\reset@font} +\newcommand\footfont{\reset@font} +\def\ps@footcenter{ + \let\@mkboth\@gobbletwo + \let\@oddhead\@empty + \let\@evenhead\@empty + \def\@oddfoot{\footfont\hfil\thepage\hfil} + \def\@evenfoot{\footfont\hfil\thepage\hfil} +} + +\if@twoside + \def\ps@footleft{ + \let\@mkboth\@gobbletwo + \let\@oddhead\@empty + \let\@evenhead\@empty + \def\@oddfoot{\oddfootfont\hfil\thepage} + \def\@evenfoot{\evenfootfont\thepage\hfil} + } +\else + \def\ps@footleft{ + \let\@mkboth\@gobbletwo + \let\@oddhead\@empty + \let\@evenhead\@empty + \def\@oddfoot{\footfont\thepage\hfil} + \def\@evenfoot{\footfont\thepage\hfil} + } +\fi + \if@twoside - \def\ps@headings{% + \def\ps@footright{ + \let\@mkboth\@gobbletwo + \let\@oddhead\@empty + \let\@evenhead\@empty + \def\@oddfoot{\oddfootfont\thepage\hfil} + \def\@evenfoot{\evenfootfont\hfil\thepage} + } +\else + \def\ps@footright{ + \let\@mkboth\@gobbletwo + \let\@oddhead\@empty + \let\@evenhead\@empty + \def\@oddfoot{\footfont\hfil\thepage} + \def\@evenfoot{\footfont\hfil\thepage} + } +\fi + +\def\ps@headcenter{ + \let\@mkboth\@gobbletwo + \def\@oddhead{\headfont\hfil\thepage\hfil} + \def\@evenhead{\headfont\hfil\thepage\hfil} + \let\@oddfoot\@empty + \let\@evenfoot\@empty +} + +\if@twoside + \def\ps@headright{ + \let\@mkboth\@gobbletwo + \def\@oddhead{\oddheadfont\thepage\hfil} + \def\@evenhead{\evenheadfont\hfil\thepage} + \let\@oddfoot\@empty \let\@evenfoot\@empty + } +\else + \def\ps@headright{ + \let\@mkboth\@gobbletwo + \def\@oddhead{\headfont\hfil\thepage} + \def\@oddhead{\headfont\hfil\thepage} \let\@oddfoot\@empty - \def\@evenhead{\thepage\hfil\evenheadfont\leftmark}% - \def\@oddhead{{\oddheadfont\rightmark}\hfil\thepage}% - \let\@mkboth\markboth - \def\chaptermark##1{% - \markboth{{\chaptermarkfont % - \ifnum \c@secnumdepth >\m@ne - \@tocseccntformat{chapter} \ % - \fi - ##1}}{}% - }% - \def\sectionmark##1{% - \markright{{\sectionmarkfont % - \ifnum \c@secnumdepth >\z@ - \@tocseccntformat{section}% - \fi - ##1}% - }% - }% - } % \def\ps@headings -\else % \if@twoside - \def\ps@headings{% + \let\@evenfoot\@empty + } +\fi + +\if@twoside + \def\ps@headleft{ + \let\@mkboth\@gobbletwo + \def\@oddhead{\oddheadfont\hfil\thepage} + \def\@evenhead{\evenheadfont\thepage\hfil} \let\@oddfoot\@empty - \def\@oddhead{ - {\slshape\rightmark}% - \hfil\thepage - }% - \let\@mkboth\markboth - \def\chaptermark##1{% - \markright {{\chaptermarkfont % - \ifnum\c@secnumdepth >\m@ne - \@tocseccntformat{chapter} \ % - \fi - ##1}}{}} - \def\sectionmark##1{% - \markright{{\sectionmarkfont % - \ifnum \c@secnumdepth >\z@ - \@tocseccntformat{section} \ % - \fi - ##1% - } - } - } + \let\@evenfoot\@empty + } +\else + \def\ps@headleft{ + \let\@mkboth\@gobbletwo + \def\@oddhead{\headfont\thepage\hfil} + \def\@evenhead{\headfont\thepage\hfil} + \let\@oddfoot\@empty + \let\@evenfoot\@empty } -\fi % \if@twoside +\fi + +\let\ps@plain=\ps@footcenter -\def\ps@myheadings{% - \let\@oddfoot\@empty\let\@evenfoot\@empty - \def\@evenhead{\thepage\hfil\evenheadfont\leftmark}% - \def\@oddhead{{\oddheadfont\rightmark}\hfil\thepage}% - \let\@mkboth\@gobbletwo - \let\chaptermark\@gobble - \let\sectionmark\@gobble -} \pagestyle{plain} + +\def\chapterpagestyle#1{\gdef\@chapterpagestyle{#1}} + +\chapterpagestyle{plain} \pagenumbering{arabic} \if@twoside\else\raggedbottom\fi -\if@twocolumn\twocolumn\sloppy\flushbottom -\else\onecolumn\fi +\if@twocolumn + \twocolumn\sloppy\flushbottom +\else + \onecolumn +\fi \newcommand\today{} @@ -1265,8 +1293,10 @@ \lccode`\-=`\- \defaulthyphenchar=127 \hyphenchar\font=127 -\usepackage[intlimits]{amsmath} -\usepackage{amssymb,amsfonts} +\ifDis@ams + \usepackage[intlimits]{amsmath} + \usepackage{amssymb,amsfonts} +\fi \ifDis@times \ifDis@mtpro \AtBeginDocument{% @@ -1317,7 +1347,7 @@ \renewcommand{\idotsint}{\DOTSI\protect\MultiIntegral{0}} }{} \fi -\usepackage[square, comma, sort&compress]{natbib} +\usepackage[square, comma, sort&compress, numbers]{natbib} \def\metaphantom#1{% \ifDis@href \Hy@GlobalStepCount\Hy@linkcounter @@ -1367,6 +1397,13 @@ \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}} \endlist\vskip-\lastskip% } +\usepackage{wrapfig} +\ifDis@subf + \usepackage[config,font=small,labelsep=period]{caption,subfig} + \def\thesubfigure{\textit{\asbuk{subfigure}}} + \providecommand\thefigsubsep{,~} + \def\p@subfigure{\@nameuse{thefigure}\thefigsubsep} +\fi \ifpdf \ifDis@href \usepackage[pdftex,unicode,hyperfigures=true]{hyperref} @@ -1392,13 +1429,6 @@ \usepackage{hypernat} \usepackage[all]{hypcap} \fi -\usepackage{wrapfig} -\ifDis@subf - \usepackage[config,font=small,labelsep=period]{caption,subfig} - \def\thesubfigure{\textit{\asbuk{subfigure}}} - \providecommand\thefigsubsep{,~} - \def\p@subfigure{\@nameuse{thefigure}\thefigsubsep} -\fi \endinput %% %% End of file `disser.cls'. |