summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/disser
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-01 23:37:06 +0000
committerKarl Berry <karl@freefriends.org>2016-03-01 23:37:06 +0000
commitb95f9c7e171e1a8f67e1298413e18935c9a0c674 (patch)
tree24a9edf5ac55132594e33e05e814bfe7cc57027d /Master/texmf-dist/tex/latex/disser
parentd7e94044ef74416e843bd3e064b8d08cc64d53e1 (diff)
disser (28feb16)
git-svn-id: svn://tug.org/texlive/trunk@39909 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/disser')
-rw-r--r--Master/texmf-dist/tex/latex/disser/autoref.rtx19
-rw-r--r--Master/texmf-dist/tex/latex/disser/disser.cls24
-rw-r--r--Master/texmf-dist/tex/latex/disser/gost732.cls8
-rw-r--r--Master/texmf-dist/tex/latex/disser/master.rtx2
-rw-r--r--Master/texmf-dist/tex/latex/disser/titledefs.rtx2
5 files changed, 25 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx
index 9e3f11914b2..94fdab095ba 100644
--- a/Master/texmf-dist/tex/latex/disser/autoref.rtx
+++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx
@@ -18,11 +18,11 @@
\autoref@the
\if@titlepage\renewcommand\maketitle{
-\disser@deflength\firstskip{1cm}
-\disser@deflength\secondskip{2cm}
-\disser@deflength\thirdskip{1cm}
-\disser@deflength\fourthskip{1cm}
-\disser@deflength\fifthskip{1cm}
+\ifundeflength\firstskip{1cm}
+\ifundeflength\secondskip{3cm}
+\ifundeflength\thirdskip{1cm}
+\ifundeflength\fourthskip{1cm}
+\ifundeflength\fifthskip{1cm}
\def\titlefont{\normalsize}
\def\topicfont{\Large\bfseries}
@@ -32,16 +32,11 @@
\thispagestyle{empty}
\enlargethispage{1cm}
\vspace*{-2cm}
-\begin{center}
-\instfont\@institution\par
-\end{center}
-
-\vskip\firstskip
-\normalfont
\begin{flushright}
\ifDis@classified\classify\fi
- \asmanuscript
+ \vskip\firstskip
+ {\normalfont\asmanuscript}
\ifDis@facsimile\facsimile\fi
\end{flushright}
\begin{center}
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index e7aa503146c..c76c0438dd7 100644
--- a/Master/texmf-dist/tex/latex/disser/disser.cls
+++ b/Master/texmf-dist/tex/latex/disser/disser.cls
@@ -287,7 +287,7 @@
\DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal}
-\providecommand\disser@deflength[2]{\newlength{#1}\setlength{#1}{#2}}
+\providecommand\Dis@deflength[2]{\newlength{#1}\setlength{#1}{#2}}
\providecommand\ifundeflength[2]{%
\ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi
}
@@ -295,10 +295,10 @@
\setlength\lineskip{1\p@}
\setlength\normallineskip{1\p@}
-\newcommand\disser@singlespacing {\renewcommand\baselinestretch{1}\normalsize}
-\newcommand\disser@onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize}
-\newcommand\disser@doublespacing {\renewcommand\baselinestretch{2}\normalsize}
-\disser@onehalfspacing
+\newcommand\Dis@singlespacing {\renewcommand\baselinestretch{1}\normalsize}
+\newcommand\Dis@onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize}
+\newcommand\Dis@doublespacing {\renewcommand\baselinestretch{2}\normalsize}
+\Dis@onehalfspacing
\setlength\parindent{5ex}
@@ -899,10 +899,10 @@
\@endparpenalty -\@lowpenalty
\@itempenalty -\@lowpenalty
-\renewcommand\theenumi {\@arabic\c@enumi}
-\renewcommand\theenumii {\disser@asbuk\c@enumii}
-\renewcommand\theenumiii{\@roman\c@enumiii}
-\renewcommand\theenumiv {\disser@Asbuk\c@enumiv}
+\renewcommand\theenumi {\arabic{enumi}}
+\renewcommand\theenumii {\asbuk{enumii}}
+\renewcommand\theenumiii{\roman{enumiii}}
+\renewcommand\theenumiv {\Asbuk{enumiv}}
\newcommand\labelenumi {\theenumi.}
\newcommand\labelenumii {\theenumii.}
\newcommand\labelenumiii{\theenumiii.}
@@ -927,8 +927,8 @@
\renewcommand\floatpagefraction{.5}
\renewcommand\dbltopfraction{.7}
\renewcommand\dblfloatpagefraction{.5}
-\disser@deflength\abovecaptionskip{10\p@}
-\disser@deflength\belowcaptionskip{0\p@}
+\Dis@deflength\abovecaptionskip{10\p@}
+\Dis@deflength\belowcaptionskip{0\p@}
\newcommand\captionlabeldelim{.}
\newcommand\captionfont{\small}
\newcommand\captionlabelfont{\small\selectfont}
@@ -981,7 +981,7 @@
\providecommand\prethefootnote{}
\providecommand\postthefootnote{}
\providecommand\prefootnote{\;}
-\disser@deflength{\footnoteindent}{\parindent}
+\Dis@deflength{\footnoteindent}{\parindent}
\def\@makefnmark{\hbox{\prethefootnote%
\@textsuperscript{\normalfont\@thefnmark}%
diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls
index b42500ac88e..5798b4481a9 100644
--- a/Master/texmf-dist/tex/latex/disser/gost732.cls
+++ b/Master/texmf-dist/tex/latex/disser/gost732.cls
@@ -78,10 +78,10 @@
\renewcommand\conclusionname{%
\cyr\CYRZ\CYRA\CYRK\CYRL\CYRYU\CYRCH\CYRE\CYRN\CYRI\CYRE
}
-\renewcommand\theenumi {\disser@asbuk\c@enumi}
-\renewcommand\theenumii {\@arabic\c@enumii}
-\renewcommand\theenumiii{\@roman\c@enumiii}
-\renewcommand\theenumiv {\disser@Asbuk\c@enumiv}
+\renewcommand\theenumi {\asbuk{enumi}}
+\renewcommand\theenumii {\arabic{enumii}}
+\renewcommand\theenumiii{\roman{enumiii}}
+\renewcommand\theenumiv {\Asbuk{enumiv}}
\renewcommand\labelenumi {\theenumi)}
\renewcommand\labelenumii {\theenumii)}
diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx
index 35017e4c41d..d6f8e7e60e0 100644
--- a/Master/texmf-dist/tex/latex/disser/master.rtx
+++ b/Master/texmf-dist/tex/latex/disser/master.rtx
@@ -79,7 +79,7 @@
\ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi
\ifx\@rev\empty\else\diplomafield{rev}\\[\sixthskip]\fi
\ifx\@revsnd\empty\else\diplomafield{revsnd}\\[\sixthskip]\fi
- \ifx\@con\empty\else\diplomafield{con}\\[9pt]\fi
+ \ifx\@con\empty\else\diplomafield{con}\\[\sixthskip]\fi
\ifx\@consnd\empty\else\diplomafield{consnd}\fi
\end{tabbing}
\vfill
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index 3508d169b20..bc3e1b00631 100644
--- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx
+++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
@@ -160,7 +160,7 @@
}
}
-\disser@deflength\fieldhshift{8cm}
+\Dis@deflength\fieldhshift{8cm}
\providecommand\diplomafield[1]{%
\csname #1label\endcsname,\\%