From 1a0bf760935b9ac1240722ccff9b3a8f37be4925 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Jul 2014 23:09:29 +0000 Subject: tex4ht bugs #220, #221 git-svn-id: svn://tug.org/texlive/trunk@34598 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/listings.4ht | 57 +++++++++++------------ Master/texmf-dist/tex/generic/tex4ht/tocloft.4ht | 25 ++++++++++ 2 files changed, 51 insertions(+), 31 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/tex4ht/tocloft.4ht (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht index 832533ea25b..c2dd1fc1abd 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht @@ -1,32 +1,27 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% listings.4ht 2009-05-21-09:32 % -% Copyright (C) 2001--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} +% listings.4ht (2014-07-13-16:08), generated from tex4ht-4ht.tex +% Copyright 2001--2009 Eitan M. Gurari +% 2009--2014 TeX Users Group +% +% 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". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2014-07-13-16:08} +\newif\iflstnest \append:defII\lst@EnterMode{% + \iflstnest\else \ifx \lsthk:EveryLine\:UnDef \let\lsthk:EveryLine\lsthk@EveryLine \fi @@ -35,14 +30,14 @@ \def\dd:listings{\d:listings\let\dd:listings\empty}}% \fi \append:def\lsthk@EveryPar{\dd:listings}% - \a:listings\bgroup + \a:listings\fi\bgroup \Configure{$}{}{}{}% \aftergroup\lst:EnterMode } -\def\lst:EnterMode{\b:listings\egroup} +\def\lst:EnterMode{\iflstnest\else\b:listings\fi\egroup} \NewConfigure{listings}{4} \let\dd:listings=\empty -\append:defI\lst@Init{\csname a:listings-init\endcsname} -\pend:def\lst@DeInit{\csname b:listings-init\endcsname} +\append:defI\lst@Init{\csname a:listings-init\endcsname\global\lstnesttrue} +\pend:def\lst@DeInit{\csname b:listings-init\endcsname\global\lstnestfalse} \NewConfigure{listings-init}{2} \lst@AddToHook{TextStyle}{% \Configure{listings}{}{}{}{}% diff --git a/Master/texmf-dist/tex/generic/tex4ht/tocloft.4ht b/Master/texmf-dist/tex/generic/tex4ht/tocloft.4ht new file mode 100644 index 00000000000..c7873a9f393 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/tocloft.4ht @@ -0,0 +1,25 @@ +% tocloft.4ht (2014-07-13-16:08), generated from tex4ht-4ht.tex +% Copyright 2014 TeX Users Group +% +% 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 the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2014-07-13-16:08} + +\@cftnctoctrue + +\Hinput{tocloft} +\endinput + -- cgit v1.2.3