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

[karl at gnu.org.ua]

Author: karl
Date: 2015-12-23 01:56:12 +0200 (Wed, 23 Dec 2015)
New Revision: 159

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-4ht.tex
   trunk/lit/tex4ht-ooffice.tex
Log:
luatex, encodings, and babel form Michal, https://puszcza.gnu.org.ua/bugs/?267

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2015-10-25 23:00:46 UTC (rev 158)
+++ trunk/lit/ChangeLog	2015-12-22 23:56:12 UTC (rev 159)
@@ -1,3 +1,16 @@
+2015-12-19  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-ooffice.tex (il2-pl.tcx url encoder): Fix the file
+	encoding. It is related to a earlier bug in tex4ht-html4.tex,
+	where input encoding error was reported with package babel when
+	LuaLaTeX was used for compilation.  Just
+	\input{html4-l2-url.4ht}.
+	Report from Guido Milanese, Dec 18 23:29:28 CET 2015,
+	http://tug.org/pipermail/tex4ht/2015q4/001326.html.
+
+	* tex4ht-4ht.tex (<frenchb luatex>, frenchn.4ht): disable LuaTeX
+	callback which causes tex4ht command to fail.
+
 2015-10-25  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-fonts-noncjk.tex (tcrm-uni): Updated support for textcomp

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2015-10-25 23:00:46 UTC (rev 158)
+++ trunk/lit/Makefile	2015-12-22 23:56:12 UTC (rev 159)
@@ -15,7 +15,8 @@
 
 derived += $(tex4ht_4ht_derived)
 tex4ht_4ht_derived = \
-  book.4ht graphicx.4ht listings.4ht memoir.4ht multicol.4ht quoting.4ht \
+  book.4ht frenchb.4ht graphicx.4ht listings.4ht \
+  memoir.4ht multicol.4ht quoting.4ht \
   scrartcl.4ht scrbook.4ht scrreprt.4ht spanish.4ht subscript.4ht \
   titlesec.4ht tocloft.4ht wrapfig.4ht
 # and many, many more.

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2015-10-25 23:00:46 UTC (rev 158)
+++ trunk/lit/tex4ht-4ht.tex	2015-12-22 23:56:12 UTC (rev 159)
@@ -21443,6 +21443,7 @@
 |<TeX4ht copyright|>
 |<declare frenchb shorthand|>
 |<frenchb nbsp|>
+|<frenchb luatex|>
 \Hinput{frenchb}
 \endinput
 >>>        \AddFile{8}{frenchb}
@@ -21482,6 +21483,12 @@
 \NewConfigure{system-nbsp}{2}
 >>>
 
+\<frenchb luatex\><<<
+\ifFB at luatex@punct
+\FB at luatex@punctfalse
+\fi
+>>>
+
 \<pre 2001/09/09 v1.5g frenchb\><<<
 \AtBeginDocument{%
  \def\:temp{\frenchb:shorthand{frenchb}{nbsp}{\ }{\FDP at space}\string :}%

Modified: trunk/lit/tex4ht-ooffice.tex
===================================================================
--- trunk/lit/tex4ht-ooffice.tex	2015-10-25 23:00:46 UTC (rev 158)
+++ trunk/lit/tex4ht-ooffice.tex	2015-12-22 23:56:12 UTC (rev 159)
@@ -7877,33 +7877,7 @@
 
 
 \<il2-pl.tcx url encoder\><<<
-\Configure{url-encoder}
-      {%}{%25}
-      {&}{%26}
-      {'}{%27}
-      {<}{%3C}
-      {>}{%3E}
-      {_}{_}
-      {^}{^}
-      {±}{&#x0105;}
-      {æ}{&#x0107;}
-      {ê}{&#x0119;}
-      {³}{&#x0142;}
-      {ó}{&#x00F3;}
-      {ñ}{&#x0144;}
-      {¶}{&#x015B;}
-      {¼}{&#x017A;}
-      {¿}{&#x017C;}
-      {¡}{&#x0104;}
-      {Æ}{&#x0106;}
-      {Ê}{&#x0118;}
-      {£}{&#x0141;}
-      {Ó}{&#x00D3;}
-      {Ñ}{&#x0143;}
-      {¦}{&#x015A;}
-      {¬}{&#x0179;}
-      {¯}{&#x017B;}
-      {}{}
+\input{html4-l2-url.4ht}
 >>>