XHTML fixes

diff --git a/math/html.ml b/math/html.ml
index 5f63e5e..6a24b11 100644 (file)
--- a/math/html.ml
+++ b/math/html.ml
@@ -73,15 +73,15 @@ let rec html_render_deep ctx = function
   | TEX_INFIXh (_,f,a,b)::r -> (html_liberal (); (f a b)::html_render_deep ctx r)
   | TEX_CURLY ls::r -> html_render_deep ctx (ls @ r)
   | TEX_DQ (a,b)::r  -> (let bs = html_render_flat ctx [b] in match html_render_size ctx a with
-                        true, s ->  "","<font size=+2>"^s^"</font>",bs
+                        true, s ->  "","<font size='+2'>"^s^"</font>",bs
                       | false, s -> "",(s^"<sub>"^bs^"</sub>"),"")::html_render_deep ctx r
   | TEX_UQ (a,b)::r  -> (let bs = html_render_flat ctx [b] in match html_render_size ctx a with
-                        true, s ->  bs,"<font size=+2>"^s^"</font>",""
+                        true, s ->  bs,"<font size='+2'>"^s^"</font>",""
                       | false, s -> "",(s^"<sup>"^bs^"</sup>"),"")::html_render_deep ctx r
   | TEX_FQ (a,b,c)::r -> (html_liberal ();
                         (let bs = html_render_flat ctx [b] in let cs = html_render_flat ctx [c] in
                          match html_render_size ctx a with
-                         true, s ->  (cs,"<font size=+2>"^s^"</font>",bs)
+                         true, s ->  (cs,"<font size='+2'>"^s^"</font>",bs)
                        | false, s -> ("",(s^"<sub>"^bs^"</sub><sup>"^cs^"</sup>"),""))::html_render_deep ctx r)
   | TEX_FUN1hl (_,(f1,f2),a)::r -> ("",f1,"")::(html_render_deep ctx [a]) @ ("",f2,"")::html_render_deep ctx r
   | TEX_FUN1hf (_,ff,a)::r -> (html_render_deep (new_ctx ff) [a]) @ html_render_deep ctx r
@@ -104,15 +104,15 @@ let rec html_render_table = function
   | sf,u,d,(("",a,_) as c)::r      -> html_render_table (c::sf,u,true,r)
   | sf,u,d,((_,a,_) as c)::r       -> html_render_table (c::sf,true,true,r)
   | sf,false,false,[]              -> mapjoin (function (u,m,d) -> m) (List.rev sf)
-  | sf,true,false,[]               -> let ustr,mstr = List.fold_left (fun (us,ms) (u,m,d) -> (us^"<td>"^u,ms^"<td>"^u))
+  | sf,true,false,[]               -> let ustr,mstr = List.fold_left (fun (us,ms) (u,m,d) -> (us^"<td>"^u^"</td>",ms^"<td>"^u^"</td>"))
                                        ("","") (List.rev sf) in
-                                       "<table><tr align=center valign=bottom>" ^ ustr ^ "</tr><tr align=center>" ^ mstr ^ "</tr></table>"
-  | sf,false,true,[]               -> let mstr,dstr = List.fold_left (fun (ms,ds) (u,m,d) -> (ms^"<td>"^m,ds^"<td>"^d))
+                                       "<table><tr align='center' valign='bottom'>" ^ ustr ^ "</tr><tr align='center'>" ^ mstr ^ "</tr></table>"
+  | sf,false,true,[]               -> let mstr,dstr = List.fold_left (fun (ms,ds) (u,m,d) -> (ms^"<td>"^m^"</td>",ds^"<td>"^d^"</td>"))
                                        ("","") (List.rev sf) in
-                                       "<table><tr align=center>" ^ mstr ^ "</tr><tr align=center valign=top>" ^ dstr ^ "</tr></table>"
+                                       "<table><tr align='center'>" ^ mstr ^ "</tr><tr align='center' valign='top'>" ^ dstr ^ "</tr></table>"
   | sf,true,true,[]               -> let ustr,mstr,dstr = List.fold_left (fun (us,ms,ds) (u,m,d) ->
-                                       (us^"<td>"^u,ms^"<td>"^m,ds^"<td>"^d)) ("","","") (List.rev sf) in
-                                       "<table><tr align=center valign=bottom>" ^ ustr ^ "</tr><tr align=center>" ^ mstr ^ "</tr><tr align=center valign=top>" ^ dstr ^ "</tr></table>"
+                                       (us^"<td>"^u^"</td>",ms^"<td>"^m^"</td>",ds^"<td>"^d^"</td>")) ("","","") (List.rev sf) in
+                                       "<table><tr align='center' valign='bottom'>" ^ ustr ^ "</tr><tr align='center'>" ^ mstr ^ "</tr><tr align='center' valign='top'>" ^ dstr ^ "</tr></table>"
 
 let html_render tree = html_render_table ([],false,false,html_render_deep CTX_NORMAL tree)
 

diff --git a/math/texutil.ml b/math/texutil.ml
index 40d7565..a814ea3 100644 (file)
--- a/math/texutil.ml
+++ b/math/texutil.ml
@@ -417,9 +417,9 @@ let find = function
     | "\\choose"           -> FUN_INFIX "\\choose "
     | "\\atop"             -> FUN_INFIX "\\atop "
     | "\\binom"            -> FUN_AR2 "\\binom "
-    | "\\frac"             -> FUN_AR2h ("\\frac ", fun num den -> Html.html_render [num], "<hr style=\"{background: black}\">", Html.html_render [den])
+    | "\\frac"             -> FUN_AR2h ("\\frac ", fun num den -> Html.html_render [num], "<hr style=\"{background: black}\"/>", Html.html_render [den])
     | "\\cfrac"            -> (tex_use_ams (); FUN_AR2h ("\\cfrac ", fun num den -> Html.html_render [num], "<hr style=\"{background: black}\">", Html.html_render [den]))
-    | "\\over"             -> FUN_INFIXh ("\\over ", fun num den -> Html.html_render num, "<hr style=\"{background: black}\">", Html.html_render den)
+    | "\\over"             -> FUN_INFIXh ("\\over ", fun num den -> Html.html_render num, "<hr style=\"{background: black}\"/>", Html.html_render den)
     | "\\sqrt"             -> FUN_AR1 "\\sqrt "
     | "\\pmod"             -> FUN_AR1hl ("\\pmod ", ("(mod ", ")"))
     | "\\bmod"             -> FUN_AR1hl ("\\bmod ", ("mod ", ""))