From 3b0d4121fbdaa8b4dc48c1aeab08bd63d71d0307 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Dec 2006 01:23:33 +0000 Subject: tex4ht-1.0.2006_12_04_1651 git-svn-id: svn://tug.org/texlive/trunk@2598 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht | 107 +++++++++++++++------- 1 file changed, 72 insertions(+), 35 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht b/Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht index 7534bfe8f17..933c60f102d 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/pstricks.4ht @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% pstricks.4ht 2005-10-23-04:19 % -% Copyright (C) 1997--2005 Eitan M. Gurari % +% pstricks.4ht 2006-12-01-16:02 % +% Copyright (C) 1997--2006 Eitan M. Gurari % % % % This work may be distributed and/or modified under the % % conditions of the LaTeX Project Public License, either % @@ -24,42 +24,10 @@ % gurari@cse.ohio-state.edu % % http://www.cse.ohio-state.edu/~gurari % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2005-10-23-04:19} +\immediate\write-1{version 2006-12-01-16:02} \pend:def\pst@picture{\global\let\pst:EndPicture\EndPicture \let\EndPicture=\empty} -\def\endpspicture{% -\pst@killglue -\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 -\ifx\pst@tempa\@empty\else -\advance\pst@dimd-\pst@dimb -\pst@dimd=\pst@tempa\pst@dimd -\advance\pst@dimd\pst@dimb -\lower\pst@dimd -\fi -\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} \expand:after{\let\fi@star}\csname fi\endcsname \NewConfigure{pspicture}{2} \HAssign\ps:level=0 @@ -96,6 +64,75 @@ \pend:def\psframebox@ii{\a:pspicture} \append:def\psframebox@ii{\b:pspicture} +\ifx\psset@linecap\:UnDef + \def\endpspicture{% +\pst@killglue +\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 +\ifx\pst@tempa\@empty\else +\advance\pst@dimd-\pst@dimb +\pst@dimd=\pst@tempa\pst@dimd +\advance\pst@dimd\pst@dimb +\lower\pst@dimd +\fi +\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} + +\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% + \global\psk@shift\z@% restore value +} + +\fi \Hinput{pstricks} \endinput -- cgit v1.2.3