2 files changed, 8 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/frenchb.4ht b/Master/texmf-dist/tex/generic/tex4ht/frenchb.4ht
index c51e0a58ba9..048bb5b011b 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/frenchb.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/frenchb.4ht
@@ -1,4 +1,4 @@
-% frenchb.4ht (2015-01-28-11:07), generated from tex4ht-4ht.tex
+% frenchb.4ht (2015-12-22-15:58), generated from tex4ht-4ht.tex
 % Copyright 2001-2009 Eitan M. Gurari
 % Copyright 2009-2015 TeX Users Group
 %
@@ -61,6 +61,10 @@
     :prefix\endcsname#1{\protect#1\ifx#1:{}\fi}
 \catcode`\:=11
 
+\ifFB@luatex@punct
+\FB@luatex@punctfalse
+\fi
+
 \Hinput{frenchb}
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index dbfc7296eda..60f0fdc3aef 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
@@ -1,4 +1,4 @@
-% ooffice.4ht (2015-09-29-15:23), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2015-12-22-15:58), generated from tex4ht-ooffice.tex
 % Copyright 2009-2015 TeX Users Group
 % Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2015-09-29-15:23}
+\immediate\write-1{version 2015-12-22-15:58}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -8225,33 +8225,7 @@ Y{0178}\i{00EF}%
 \if:Option
    \Configure{string-encoder}{url-encoder}
 %   \:CheckOption{url-il2-pl} \if:Option
-      \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}
 
 %   \else