[tex4ht-commits] [SCM] tex4ht updated: r127 - trunk/lit

[karl at gnu.org.ua]

Author: karl
Date: 2014-07-14 02:00:56 +0300 (Mon, 14 Jul 2014)
New Revision: 127

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-4ht.tex
Log:
handle listings.sty escapechar, http://puszcza.gnu.org.ua/bugs/?221

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2014-07-13 22:41:39 UTC (rev 126)
+++ trunk/lit/ChangeLog	2014-07-13 23:00:56 UTC (rev 127)
@@ -1,12 +1,21 @@
 2014-07-13  Karl Berry  <karl at gnu.org>
 
+	* Makefile (tex4ht_4ht_derived): add listings.4ht.
+	* tex4ht-4ht.tex (listings.4ht): handle listings' escapechar
+	feature. From Michal Hoftich.
+	http://tex.stackexchange.com/q/188322/2891
+	http://puszcza.gnu.org.ua/bugs/?221
+
+2014-07-13  Karl Berry  <karl at gnu.org>
+
 	* Makefile (tex4ht_4ht_derived): add tocloft.4ht.
 	* tex4ht-4ht.tex (tocloft.4ht): new generated file,
 	to turn off tocloft toc's.  Fix from Michal Hoftich.
 	http://tex.stackexchange.com/q/190991/2891
 	http://puszcza.gnu.org.ua/bugs/?220
-	(TeX4ht license text): new macro without copyright line,
-	used in the new .4ht file.
+
+	* tex4ht-4ht.tex (TeX4ht license text): new macro without
+	copyright line, used in the new .4ht file.
 	(TeX4ht copyright): use that after the copyright line.
 
 2014-06-27  Karl Berry  <karl at gnu.org>

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2014-07-13 22:41:39 UTC (rev 126)
+++ trunk/lit/Makefile	2014-07-13 23:00:56 UTC (rev 127)
@@ -14,7 +14,7 @@
 derived = 
 
 derived += $(tex4ht_4ht_derived)
-tex4ht_4ht_derived = book.4ht tocloft.4ht
+tex4ht_4ht_derived = book.4ht listings.4ht tocloft.4ht
 # and many, many more.
 
 derived += $(tex4ht_bibtex2_derived)

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2014-07-13 22:41:39 UTC (rev 126)
+++ trunk/lit/tex4ht-4ht.tex	2014-07-13 23:00:56 UTC (rev 127)
@@ -335,29 +335,31 @@
 hence splitting the text from copyright line.
 
 \<TeX4ht license text\><<<
-%                                                        
-% 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   
+%
+% 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.                  
-%                                                        
+%   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 <tex4ht at tug.org>.                
-%                                                        
-% If you modify this program, changing the 
+%
+% This Current Maintainer of this work
+% is the TeX4ht Project <tex4ht at tug.org>.
+%
+% If you modify this program, changing the
 % version identification would be appreciated.
 \immediate\write-1{version |version}
 >>>
 
 
+This is prepended to the definition in tex4ht-cpright.tex, hence no need
+to include the above (new) ``TeX4ht license text''.  I don't understand.
+ 
 \<TeX4ht copyright\><<<
-%               2009--|the|year|space      TeX Users Group
-|<TeX4ht license text|>
+%           2009--|the|year|empty TeX Users Group
 >>>
 
 
@@ -31311,10 +31313,9 @@
 
 
 \<listings.4ht\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-% listings.4ht                          |version %
-% Copyright (C) |CopyYear.2001.       Eitan M. Gurari         %
-|<TeX4ht copyright|>
+% listings.4ht (|version), generated from |jobname.tex
+% Copyright |CopyYear.2001. Eitan M. Gurari
+|<TeX4ht copywrite|>
 |<listings sty|>
 |<lstmisc sty|>
 \Hinput{listings}
@@ -31323,7 +31324,9 @@
 
 
 \<listings sty\><<<
+\newif\iflstnest
 \append:defII\lst at EnterMode{%
+  \iflstnest\else
   \ifx \lsthk:EveryLine\:UnDef
      \let\lsthk:EveryLine\lsthk at EveryLine
   \fi
@@ -31332,10 +31335,10 @@
              \def\dd:listings{\d:listings\let\dd:listings\empty}}%
   \fi  
   \append:def\lsthk at 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
 >>>
@@ -31345,8 +31348,8 @@
 
 
 \<listings sty\><<<
-\append:defI\lst at Init{\csname a:listings-init\endcsname}
-\pend:def\lst at DeInit{\csname b:listings-init\endcsname}
+\append:defI\lst at Init{\csname a:listings-init\endcsname\global\lstnesttrue}
+\pend:def\lst at DeInit{\csname b:listings-init\endcsname\global\lstnestfalse}
 \NewConfigure{listings-init}{2}
 >>>