MediaWiki 1.11.0

[autoinstallsdev/mediawiki.git] / math / html.ml

diff --git a/math/html.ml b/math/html.ml
index 6a24b114eabc260a9461364a78e6942843588707..e880f07350b4a98efae867928901bfa747983a2b 100644 (file)
--- a/math/html.ml
+++ b/math/html.ml
@@ -47,10 +47,17 @@ let rec html_render_flat ctx = function
                          match html_render_size ctx a with
                          true, s -> raise Too_difficult_for_html
                        | false, s -> s^"<sub>"^bs^"</sub><sup>"^cs^"</sup>")^html_render_flat ctx r)
+  | TEX_DQN (a)::r  -> (html_liberal ();
+                 let bs = html_render_flat ctx [a] in "<sub>"^bs^"</sub>")^html_render_flat ctx r
+  | TEX_UQN (a)::r  -> (html_liberal ();
+                 let bs = html_render_flat ctx [a] in "<sup>"^bs^"</sup>")^html_render_flat ctx r
+  | TEX_FQN (a,b)::r -> (html_liberal ();
+                        (let bs = html_render_flat ctx [a] in let cs = html_render_flat ctx [b] in  "<sub>"^bs^"</sub><sup>"^cs^"</sup>")^html_render_flat ctx r)  
   | TEX_BOX (_,s)::r -> s^html_render_flat ctx r
   | TEX_LITERAL (TEX_ONLY _)::_ -> raise Too_difficult_for_html
   | TEX_FUN1 _::_ -> raise Too_difficult_for_html
   | TEX_FUN2  _::_ -> raise Too_difficult_for_html
+  | TEX_FUN2nb  _::_ -> raise Too_difficult_for_html
   | TEX_FUN2h  _::_ -> raise Too_difficult_for_html
   | TEX_FUN2sq  _::_ -> raise Too_difficult_for_html
   | TEX_INFIX _::_ -> raise Too_difficult_for_html
@@ -73,16 +80,21 @@ 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 ->  "","<span style='font-size: x-large; font-family: serif;'>"^s^"</span>",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,"<span style='font-size: x-large; font-family: serif;'>"^s^"</span>",""
                       | 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,"<span style='font-size: x-large; font-family: serif;'>"^s^"</span>",bs)
                        | false, s -> ("",(s^"<sub>"^bs^"</sub><sup>"^cs^"</sup>"),""))::html_render_deep ctx r)
+  | TEX_DQN (a)::r  -> (let bs = html_render_flat ctx [a] in "",("<sub>"^bs^"</sub>"),"")::html_render_deep ctx r
+  | TEX_UQN (a)::r  -> (let bs = html_render_flat ctx [a] in "",("<sup>"^bs^"</sup>"),"")::html_render_deep ctx r
+  | TEX_FQN (a,b)::r -> (html_liberal ();
+                        (let bs = html_render_flat ctx [a] in let cs = html_render_flat ctx [b] in
+                        ("",("<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
   | TEX_DECLh  (_,ff,a)::r -> (html_render_deep (new_ctx ff) a) @ html_render_deep ctx r
@@ -90,6 +102,7 @@ let rec html_render_deep ctx = function
   | TEX_LITERAL (TEX_ONLY _)::_ -> raise Too_difficult_for_html
   | TEX_FUN1 _::_ -> raise Too_difficult_for_html
   | TEX_FUN2 _::_ -> raise Too_difficult_for_html
+  | TEX_FUN2nb _::_ -> raise Too_difficult_for_html
   | TEX_FUN2sq  _::_ -> raise Too_difficult_for_html
   | TEX_INFIX _::_ -> raise Too_difficult_for_html
   | TEX_MATRIX _::_ -> raise Too_difficult_for_html
@@ -106,13 +119,23 @@ let rec html_render_table = function
   | 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^"</td>",ms^"<td>"^u^"</td>"))
                                        ("","") (List.rev sf) in
-                                       "<table><tr align='center' valign='bottom'>" ^ ustr ^ "</tr><tr align='center'>" ^ mstr ^ "</tr></table>"
+                    "\n<table>\n" ^
+                    "\t\t<tr style='text-align: center; vertical-align: bottom;'>" ^ ustr ^ "</tr>\n" ^
+                    "\t\t<tr style='text-align: center;'>" ^ mstr ^ "</tr>\n" ^ 
+                    "</table>\n"
   | 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>"
+                    "\n<table>\n" ^ 
+                    "\t\t<tr style='text-align: center;'>" ^ mstr ^ "</tr>\n" ^ 
+                    "\t\t<tr style='text-align: center; vertical-align: top;'>" ^ dstr ^ "</tr>\n" ^
+                    "</table>\n"
   | sf,true,true,[]               -> let ustr,mstr,dstr = List.fold_left (fun (us,ms,ds) (u,m,d) ->
                                        (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>"
+                                       "\n<table>\n" ^ 
+                    "\t\t<tr style='text-align: center; vertical-align: bottom;'>" ^ ustr ^ "</tr>\n" ^ 
+                    "\t\t<tr style='text-align: center;'>" ^ mstr ^ "</tr>\n" ^ 
+                    "\t\t<tr style='text-align: center; vertical-align: top;'>" ^ dstr ^ "</tr>\n" ^ 
+                    "</table>\n"
 
 let html_render tree = html_render_table ([],false,false,html_render_deep CTX_NORMAL tree)