tex4ht 1.0.2008_09_16_1413

git-svn-id: svn://tug.org/texlive/trunk@10669 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 41 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht b/Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht
index 2b1133472d7..1f9a922ac0c 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% pstricks.4ht                          2008-08-07-16:09 %
+% pstricks.4ht                          2008-09-16-11:44 %
 % Copyright (C) 1997--2008       Eitan M. Gurari         %
 %                                                        %
 % This work may be distributed and/or modified under the %
@@ -24,7 +24,7 @@
 %                             gurari@cse.ohio-state.edu  %
 %                 http://www.cse.ohio-state.edu/~gurari  %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2008-08-07-16:09}
+\immediate\write-1{version 2008-09-16-11:44}
 
 \pend:def\pst@picture{\global\let\pst:EndPicture\EndPicture
     \let\EndPicture=\empty}
@@ -99,7 +99,9 @@
 \endgroup}
 
 \else
-   \def\endpspicture{%
+   
+   \ifx \pst@LaTeX@Setup\:UnDef
+      \def\endpspicture{%
   \pst@killglue
   \global\pst@shift=\psk@shift% in fact of the following endgroup
   \endgroup
@@ -132,6 +134,42 @@
   \global\psk@shift\z@% restore value
 }
 
+   \else
+      \def\endpspicture{%
+  \pst@killglue
+%  \global\pst@shift=\psk@shift% in fact of the following endgroup
+  \endgroup
+  \egroup
+  \ifdim\wd\pst@hbox=\z@\else
+     \:warning{Hidden \string\@pstrickserr
+        {Extraneous space in the pspicture environment}}%
+  \fi
+  \ht\pst@hbox=\pst@dimd
+  \dp\pst@hbox=-\pst@dimb
+  \setbox\pst@hbox=\hbox{%
+    \kern-\pst@dima
+    \pst@dimd-\pst@shift
+    \advance\pst@dimd\pst@dimb
+    \lower\pst@dimd%
+    \box\pst@hbox%
+    \kern\pst@dimc}%
+  \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi@star
+  \ifnum \ps:level=0
+   \let\EndPicture\pst:EndPicture
+   \global\let\pst:EndPicture=\:UnDef
+   \a:pspicture\box\pst@hbox\b:pspicture
+\else
+   \xdef\pspicture:dim{\the\wd\pst@hbox,
+         \the\ht\pst@hbox, \the\ht\pst@hbox}%
+   \box\pst@hbox
+\fi
+%
+  \endgroup%
+  \psset@shift{0}% reset value
+%  \global\psk@shift\z@% restore value
+}
+
+   \fi
 \fi
 \Hinput{pstricks}
 \endinput