From: Brion Vibber Date: Tue, 20 Apr 2004 08:35:49 +0000 (+0000) Subject: XHTML fixes X-Git-Tag: 1.3.0beta1~366 X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=478896221a8f1468a855d5a944cc82d41ef0a662;p=lhc%2Fweb%2Fwiklou.git XHTML fixes --- diff --git a/math/html.ml b/math/html.ml index 5f63e5e3b0..6a24b114ea 100644 --- 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 -> "",""^s^"",bs + true, s -> "",""^s^"",bs | false, s -> "",(s^""^bs^""),"")::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,""^s^"","" + true, s -> bs,""^s^"","" | false, s -> "",(s^""^bs^""),"")::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,""^s^"",bs) + true, s -> (cs,""^s^"",bs) | false, s -> ("",(s^""^bs^""^cs^""),""))::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^""^u,ms^""^u)) + | sf,true,false,[] -> let ustr,mstr = List.fold_left (fun (us,ms) (u,m,d) -> (us^""^u^"",ms^""^u^"")) ("","") (List.rev sf) in - "" ^ ustr ^ "" ^ mstr ^ "
" - | sf,false,true,[] -> let mstr,dstr = List.fold_left (fun (ms,ds) (u,m,d) -> (ms^""^m,ds^""^d)) + "" ^ ustr ^ "" ^ mstr ^ "
" + | sf,false,true,[] -> let mstr,dstr = List.fold_left (fun (ms,ds) (u,m,d) -> (ms^""^m^"",ds^""^d^"")) ("","") (List.rev sf) in - "" ^ mstr ^ "" ^ dstr ^ "
" + "" ^ mstr ^ "" ^ dstr ^ "
" | sf,true,true,[] -> let ustr,mstr,dstr = List.fold_left (fun (us,ms,ds) (u,m,d) -> - (us^""^u,ms^""^m,ds^""^d)) ("","","") (List.rev sf) in - "" ^ ustr ^ "" ^ mstr ^ "" ^ dstr ^ "
" + (us^""^u^"",ms^""^m^"",ds^""^d^"")) ("","","") (List.rev sf) in + "" ^ ustr ^ "" ^ mstr ^ "" ^ dstr ^ "
" 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 40d7565627..a814ea3e25 100644 --- 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], "
", Html.html_render [den]) + | "\\frac" -> FUN_AR2h ("\\frac ", fun num den -> Html.html_render [num], "
", Html.html_render [den]) | "\\cfrac" -> (tex_use_ams (); FUN_AR2h ("\\cfrac ", fun num den -> Html.html_render [num], "
", Html.html_render [den])) - | "\\over" -> FUN_INFIXh ("\\over ", fun num den -> Html.html_render num, "
", Html.html_render den) + | "\\over" -> FUN_INFIXh ("\\over ", fun num den -> Html.html_render num, "
", Html.html_render den) | "\\sqrt" -> FUN_AR1 "\\sqrt " | "\\pmod" -> FUN_AR1hl ("\\pmod ", ("(mod ", ")")) | "\\bmod" -> FUN_AR1hl ("\\bmod ", ("mod ", ""))