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

[karl at gnu.org.ua]

Author: karl
Date: 2015-01-27 01:54:49 +0200 (Tue, 27 Jan 2015)
New Revision: 135

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-html4.tex
Log:
generate {html4-l2-url,html4-russian-accents}.4ht as separate files since they have different encodings

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2015-01-23 19:12:15 UTC (rev 134)
+++ trunk/lit/ChangeLog	2015-01-26 23:54:49 UTC (rev 135)
@@ -1,3 +1,10 @@
+2015-01-26  Michal Hoftich <michal.h21 at gmail.com> and Karl Berry <karl at gnu.org>
+
+	* tex4ht-html4.tex: generate {html4-l2-url,html4-russian-accents}.4ht
+	as separate files, to avoid having html4.4ht with multiple encodings,
+	which lualatex does not like to read.
+	* Makefile (tex4ht_html4_derived): add the new files.
+
 2015-01-23  Karl Berry  <karl at gnu.org>
 
 	* html4.4ht-released: new file, copied from current TL.

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2015-01-23 19:12:15 UTC (rev 134)
+++ trunk/lit/Makefile	2015-01-26 23:54:49 UTC (rev 135)
@@ -15,7 +15,7 @@
 
 derived += $(tex4ht_4ht_derived)
 tex4ht_4ht_derived = \
-  book.4ht listings.4ht \
+  book.4ht listings.4ht multicol.4ht \
   scrartcl.4ht scrbook.4ht scrreprt.4ht \
   titlesec.4ht tocloft.4ht
 # and many, many more.
@@ -66,7 +66,8 @@
 
 derived += $(tex4ht_html4_derived)
 tex4ht_html4_derived = \
-  html4.4ht html4-math.4ht html4-uni.4ht onmouseover.4ht exerqz.4ht
+  html4.4ht html4-math.4ht html4-uni.4ht html4-l2-url html4-russian-accents \
+  onmouseover.4ht exerqz.4ht  
 
 derived += $(tex4ht_info_mml_derived)
 tex4ht_info_mml_derived = infomml.4ht

Modified: trunk/lit/tex4ht-html4.tex
===================================================================
--- trunk/lit/tex4ht-html4.tex	2015-01-23 19:12:15 UTC (rev 134)
+++ trunk/lit/tex4ht-html4.tex	2015-01-26 23:54:49 UTC (rev 135)
@@ -1,6 +1,5 @@
 % $Id$
 % Compile 3 times: latex tex4ht-html4
-%           or   xhlatex tex4ht-html4 "html,3,sections+"
 % Copy html4.4ht into the work directory before each of the 
 %            first two compilations
 %
@@ -10,7 +9,7 @@
 % See tex4ht-cpright.tex for license text.
 
 \ifx \HTML\UnDef
-   \def\HTML{html4,html4-math,html4-uni} 
+   \def\HTML{html4,html4-math,html4-uni,html4-l2-url,html4-russian-accents} 
    \def\CONFIG{\jobname}
    \def\MAKETITLE{\author{Eitan M. Gurari}}
    \def\next{\input mktex4ht.4ht  \endinput}
@@ -67,16 +66,16 @@
 
 \<html4\><<<
 % html4.4ht (|version), generated from |jobname.tex
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) |CopyYear.1997. Eitan M. Gurari
+% Copyright 2009-2015 TeX Users Group
+% Copyright |CopyYear.1997. Eitan M. Gurari
 |<TeX4ht copywrite|>
 >>>
 
 
 \<html4-math\><<<
 % html4-math.4ht (|version), generated from |jobname.tex
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) |CopyYear.1999. Eitan M. Gurari
+% Copyright 2009-2015 TeX Users Group
+% Copyright |CopyYear.1999. Eitan M. Gurari
 |<TeX4ht copywrite|>
 >>>
 
@@ -6925,8 +6924,8 @@
   \string:RestoreCatcodes\endcsname{\catcode`\%|=\the
   \catcode`\%}\catcode`\%|=14\fi
 % onmouseover.4ht (|version), generated from |jobname.tex
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) |CopyYear.2001. Eitan M. Gurari
+% Copyright 2009-2015 TeX Users Group
+% Copyright |CopyYear.2001. Eitan M. Gurari
 |<TeX4ht copywrite|>
 
 \hbadness=10000 \vbadness=10000 \hfuzz=99in \vfuzz=\hfuzz
@@ -13075,6 +13074,17 @@
 
 
 \<russian\><<<
+\input{html4-russian-accents.4ht}
+>>>
+
+\<html4-russian-accents\><<<
+% html4-russian-accents.4ht (|version), generated from |jobname.tex
+% Copyright 2009-2015 TeX Users Group
+% Copyright |CopyYear.1999. Eitan M. Gurari
+%
+% Extracted to a separate file so the main file has a consistent
+% (and UTF-8 compatible) encoding.
+|<TeX4ht copywrite|>
 \Configure{accent}\"\ddot{|<diaeresis codes|>å{00EB}%
            {\@use at text@encoding \@curr at enc A}{00C4}%
            {\@use at text@encoding \@curr at enc E}{00CB}%
@@ -13098,7 +13108,7 @@
 >>> 
 
 %%%%%%%%%%%%%%%%%%
-\section{Assents Style}
+\section{Accents Style}
 %%%%%%%%%%%%%%%%%%
 
 \<configure html4-math accents\><<<
@@ -18097,6 +18107,17 @@
 
 
 \<il2-pl.tcx url encoder\><<<
+\input{html4-l2-url.4ht}
+>>>
+
+\<html4-l2-url\><<<
+% html4-l2-url.4ht (|version), generated from |jobname.tex
+% Copyright 2009-2015 TeX Users Group
+% Copyright |CopyYear.1999. Eitan M. Gurari
+%
+% Extracted to a separate file so the main file has a consistent
+% (and UTF-8 compatible) encoding.
+|<TeX4ht copywrite|>
 \Configure{url-encoder}
       {%}{%25}
       {&}{%26}
@@ -20057,8 +20078,8 @@
 
 \<exerqz\><<<
 % exerqz.4ht (|version), generated from |jobname.tex
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) |CopyYear.1999. Eitan M. Gurari, Donald P. Story
+% Copyright 2009-2015 TeX Users Group
+% Copyright |CopyYear.1999. Eitan M. Gurari, Donald P. Story
 |<TeX4ht copywrite|>
 |<exerqz's vars|>
 |<predefined exerquiz javascript|>