summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-02 23:30:10 +0000
committerKarl Berry <karl@freefriends.org>2016-12-02 23:30:10 +0000
commit007c2bc1c1d913427563c5de3f7a8f4a32bfaef2 (patch)
tree70ec1cd7a63912bdc789dde56038b1ba2b84daab /Master/texmf-dist
parent8e96ca083471a730df14fb680fb72ce9302dd84a (diff)
multirow.4ht fix, tex4ht r207, https://puszcza.gnu.org.ua/bugs/?342
git-svn-id: svn://tug.org/texlive/trunk@42626 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/multirow.4ht74
1 files changed, 37 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht b/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht
index bc777de3703..d943d480a49 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht
@@ -1,43 +1,43 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% multirow.4ht 2009-05-21-09:32 %
-% Copyright (C) 2004--2009 Eitan M. Gurari %
-% %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any %
-% later version. The latest version of this license is %
-% in %
-% http://www.latex-project.org/lppl.txt %
-% and version 1.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later. %
-% %
-% This work has the LPPL maintenance status "maintained".%
-% %
-% This Current Maintainer of this work %
-% is Eitan M. Gurari. %
-% %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be %
-% appreciated. %
-% \message{signature} %
-% %
-% gurari@cse.ohio-state.edu %
-% http://www.cse.ohio-state.edu/~gurari %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+% multirow.4ht 2016-12-03-00:18 %
+% Copyright (C) 2004-2009 Eitan M. Gurari %
+% Copyright 2009-2016 TeX Users Group
- \def\@xmultirow#1[#2]#3[#4]#5{\@tempcnta=#1%
- \@tempdima\@tempcnta\ht\@arstrutbox
- \advance\@tempdima\@tempcnta\dp\@arstrutbox
- \ifnum\@tempcnta<0\@tempdima=-\@tempdima\fi
- \advance\@tempdima#2\bigstrutjot
- \leavevmode \a:multirow
- \if*#3\vtop to \@tempdima{\vfill\multirowsetup
- \hbox{\strut#5\strut}\vfill}%
+ \def\@xmultirow[#1]#2[#3]#4[#5]#6{%
+ \expandafter\multirow@piii#3\relax\end%
+ \multirow@dima=#2\ht\@arstrutbox
+ \advance\multirow@dima#2\dp\@arstrutbox
+ \ifdim#2pt<\z@\multirow@dima=-\multirow@dima\fi
+ \advance\multirow@dima \multirow@cntb\bigstrutjot
+ \if*#4\multirow@vbox{#1}{}{\hbox{\strut#6\strut}}%
+ \else \if=#4\multirow@setcolwidth{#6}%
+ \multirow@vbox{#1}{\hsize\multirow@colwidth\@parboxrestore}{\strut#6\strut\par}%
+ \else \multirow@vbox{#1}{\hsize#4\@parboxrestore}{\strut#6\strut\par}%
+ \fi \fi
+ \ifdim#2pt>\z@
+ \if#1t\relax\multirow@dima=\ht0\else
+ \multirow@dima=\ht\@arstrutbox
+ \ifmultirow@prefixt \advance\multirow@dima\bigstrutjot\fi
+ \if#1b\relax \advance\multirow@dima\dp\@arstrutbox
+ \ifmultirow@prefixb \advance\multirow@dima\bigstrutjot\fi
+ \fi
+ \fi
\else
- \vtop to \@tempdima{\hsize#3\@parboxrestore
- \vfill \multirowsetup \strut#5\strut\par\vfill}%
- \fi \b:multirow}
+ \if#1b\relax\else
+ \advance\multirow@dima-\dp\@arstrutbox
+ \ifmultirow@prefixb \advance\multirow@dima-\bigstrutjot\fi
+ \if#1t\relax\advance\multirow@dima-\ht\@arstrutbox
+ \ifmultirow@prefixt \advance\multirow@dima-\bigstrutjot\fi
+ \advance\multirow@dima\ht0
+ \fi
+ \fi
+ \fi
+ \advance\multirow@dima#5\relax
+ \leavevmode\a:multirow
+ \setbox0\vtop{\vskip-\multirow@dima\box0\vss}\dp0=\z@
+ \ifmultirowdebug{\showboxdepth=5 \showboxbreadth=10 \showbox0}\fi
+ \box0\b:multirow
+}
\NewConfigure{multirow}{2}
\Hinput{multirow}