texlive[42626] Master/texmf-dist/tex/generic/tex4ht/multirow.4ht:

[commits+karl at tug.org]

Revision: 42626
          http://tug.org/svn/texlive?view=revision&revision=42626
Author:   karl
Date:     2016-12-03 00:30:10 +0100 (Sat, 03 Dec 2016)
Log Message:
-----------
multirow.4ht fix, tex4ht r207, https://puszcza.gnu.org.ua/bugs/?342

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=207

Modified Paths:
--------------
    trunk/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht	2016-12-02 23:00:22 UTC (rev 42625)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht	2016-12-02 23:30:10 UTC (rev 42626)
@@ -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 at 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 at piii#3\relax\end%
+  \multirow at dima=#2\ht\@arstrutbox
+  \advance\multirow at dima#2\dp\@arstrutbox
+  \ifdim#2pt<\z@\multirow at dima=-\multirow at dima\fi
+  \advance\multirow at dima \multirow at cntb\bigstrutjot
+  \if*#4\multirow at vbox{#1}{}{\hbox{\strut#6\strut}}%
+  \else \if=#4\multirow at setcolwidth{#6}%
+    \multirow at vbox{#1}{\hsize\multirow at colwidth\@parboxrestore}{\strut#6\strut\par}%
+  \else \multirow at vbox{#1}{\hsize#4\@parboxrestore}{\strut#6\strut\par}%
+  \fi \fi
+  \ifdim#2pt>\z@
+    \if#1t\relax\multirow at dima=\ht0\else
+      \multirow at dima=\ht\@arstrutbox
+      \ifmultirow at prefixt \advance\multirow at dima\bigstrutjot\fi
+      \if#1b\relax \advance\multirow at dima\dp\@arstrutbox
+        \ifmultirow at prefixb \advance\multirow at 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 at dima-\dp\@arstrutbox
+      \ifmultirow at prefixb \advance\multirow at dima-\bigstrutjot\fi
+      \if#1t\relax\advance\multirow at dima-\ht\@arstrutbox
+        \ifmultirow at prefixt \advance\multirow at dima-\bigstrutjot\fi
+        \advance\multirow at dima\ht0
+      \fi
+    \fi
+  \fi
+  \advance\multirow at dima#5\relax
+  \leavevmode\a:multirow
+  \setbox0\vtop{\vskip-\multirow at dima\box0\vss}\dp0=\z@
+  \ifmultirowdebug{\showboxdepth=5 \showboxbreadth=10 \showbox0}\fi
+  \box0\b:multirow
+}
 \NewConfigure{multirow}{2}
 
 \Hinput{multirow}