From 9d85507cc05a02dc5f4ad00257fdfb320484d2df Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 12 Jul 2014 22:25:37 +0000
Subject: dtk (12jul14)

git-svn-id: svn://tug.org/texlive/trunk@34583 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/dtk/dtk12.clo | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/dtk/dtk12.clo')

diff --git a/Master/texmf-dist/tex/latex/dtk/dtk12.clo b/Master/texmf-dist/tex/latex/dtk/dtk12.clo
index aa5c895043a..a2344f19b8f 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk12.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk12.clo
@@ -1,4 +1,4 @@
-%%   $Id: dtk12.clo 37 2012-05-30 12:01:13Z herbert $
+%%   $Id: dtk12.clo 42 2014-07-08 17:34:44Z herbert $
 \ProvidesFile{dtk12.clo}[2012/04/10 v0.03 dtk class option (RN,hv)]
   
 \input{dtk.clo}%  Standardeinstellungen
@@ -9,11 +9,13 @@
 
 \newlength\fullwidth
 \newlength\marginwidth
-\setlength\fullwidth{\dimexpr\textwidth +\marginparwidth -4mm}% wegen Anschnitt
+\setlength\fullwidth{\dimexpr\textwidth +\marginparwidth}%  -4mm}% wegen Anschnitt
+%\marginparsep ist schon 7pt
 %\setlength\fullwidth{\dimexpr\textwidth +\marginparsep +\marginparwidth }
 %\setlength\marginwidth{\dimexpr\fullwidth -\textwidth}
 \setlength\marginwidth{\dimexpr\fullwidth +\marginparsep -\textwidth}
 
+
 \newlength\de@Width
 \newlength\de@sepWidth\de@sepWidth=3mm
 \newlength\de@Indent\de@Indent=\fullwidth
@@ -33,11 +35,11 @@
     {\minipage{\de@Width}\vspace{0pt}\minipage[t]{\wd\tempbox}\vspace{0pt}
        \usebox\tempbox\endminipage\kern\de@sepWidth%
      \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thetable:WideTable}%
-       \ifx\relax\de@OptCaption\relax\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
+       \ifx\de@OptCaption\@empty\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
      \endminipage\endminipage}%
     {\ifdim\de@Width>\textwidth\hspace*{-\de@Indent}\fi\vspace{0pt}\minipage{\de@Width}\vspace{0pt}%
      \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thetable:WideTable}%
-       \ifx\relax\de@OptCaption\relax\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
+       \ifx\de@OptCaption\@empty\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
      \endminipage\kern\de@sepWidth%
      \minipage[t]{\wd\tempbox}\vspace{0pt}\usebox\tempbox\endminipage\endminipage}%
    \end{table}}
@@ -45,26 +47,27 @@
 \def\Figure{\@ifnextchar[\Figure@i{\Figure@i[]}}
 \def\Figure@i[#1]{\@ifnextchar[{\Figure@ii[#1]}{\Figure@ii[#1][\fullwidth]}}
 \def\Figure@ii[#1][#2]#3{%
-  \def\de@OptCaption{#1}%
+  \def\OptCaption{#1}%
   \setlength\de@Width{#2}\addtolength\de@Width{-\de@sepWidth}%
   \setlength\de@Indent{#2}\addtolength\de@Indent{-\textwidth}%
-  \def\de@Caption{#3}%
+  \def\DefaultCaption{#3}%
   \begin{lrbox}{\tempbox}}
 \def\endFigure{%
-   \end{lrbox}\begin{figure}[!htb]%
+  \end{lrbox}\begin{figure}[!htb]%
    \abovecaptionskip=0pt\belowcaptionskip=0pt
    \ifthenelse{\isodd{\pageref{\thefigure:WideFigure}}}%
-    {\minipage{\de@Width}\vspace{0pt}\minipage[t]{\wd\tempbox}\vspace{0pt}
+    {\minipage{\de@Width}\minipage[b]{\wd\tempbox}
        \usebox\tempbox\endminipage\kern\de@sepWidth%
-     \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thefigure:WideFigure}%
-       \ifx\relax\de@OptCaption\relax\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
+     \minipage[b]{\dimexpr\de@Width-\wd\tempbox\relax}\label{\thefigure:WideFigure}%
+       \ifx\OptCaption\@empty\caption{\DefaultCaption}\else\caption[\OptCaption]{\DefaultCaption}\fi%
      \endminipage\endminipage}%
-    {\ifdim\de@Width>\textwidth\hspace*{-\de@Indent}\fi\vspace{0pt}\minipage{\de@Width}\vspace{0pt}%
-     \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thefigure:WideFigure}%
-       \ifx\relax\de@OptCaption\relax\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
+    {\ifdim\de@Width>\textwidth \hspace*{-\de@Indent}\fi\minipage{\de@Width}%
+     \minipage[b]{\dimexpr\de@Width-\wd\tempbox\relax}\label{\thefigure:WideFigure}%
+       \ifx\OptCaption\@empty\caption{\DefaultCaption}\else\caption[\OptCaption]{\DefaultCaption}\fi%
      \endminipage\kern\de@sepWidth%
-     \minipage[t]{\wd\tempbox}\vspace{0pt}\usebox\tempbox\endminipage\endminipage}%
+     \minipage[b]{\wd\tempbox}\usebox\tempbox\endminipage\endminipage}%
    \end{figure}}
+
 %
 \IfFileExists{paralist.sty}{%
 \RequirePackage[neverdecrease]{paralist}
-- 
cgit v1.2.3

