X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fcontent_pres%2FboxPp.ml;h=bdd97a5e64aa5c3dbe6d275ab1ea0451ef3de5e3;hb=e085135177f7b3b74b410d47a4f3bca1784b60b1;hp=0c18475489b076db0fc5aa1feeb262ec83e21ca9;hpb=397b5f9d848e63a9703a1f90faf9869092ec8893;p=helm.git diff --git a/helm/software/components/content_pres/boxPp.ml b/helm/software/components/content_pres/boxPp.ml index 0c1847548..bdd97a5e6 100644 --- a/helm/software/components/content_pres/boxPp.ml +++ b/helm/software/components/content_pres/boxPp.ml @@ -185,6 +185,7 @@ let render_to_strings ~map_unicode_to_tex choose_action size markup = and aux_mpres = let text s = Pres.Mtext ([], s) in let mrow c = Pres.Mrow ([], c) in + let parentesize s = s in function | Pres.Mi (_, s) | Pres.Mn (_, s) @@ -198,8 +199,8 @@ let render_to_strings ~map_unicode_to_tex choose_action size markup = s else match Utf8Macro.tex_of_unicode s with - | Some s -> s ^ " " - | None -> " " ^ s ^ " " + | s::_ -> s ^ " " + | [] -> " " ^ s ^ " " end else s in @@ -209,11 +210,11 @@ let render_to_strings ~map_unicode_to_tex choose_action size markup = let children' = List.map aux_mpres children in (fun size -> render_row size false children') | Pres.Mfrac (_, m, n) -> - aux_mpres (mrow [ text "\\frac("; text ")"; text "("; n; text ")" ]) - | Pres.Msqrt (_, m) -> aux_mpres (mrow [ text "\\sqrt("; m; text ")" ]) + aux_mpres (mrow [ text " \\frac "; parentesize m ; parentesize n]) + | Pres.Msqrt (_, m) -> aux_mpres (mrow [ text " \\sqrt "; parentesize m; ]) | Pres.Mroot (_, r, i) -> aux_mpres (mrow [ - text "\\root("; i; text ")"; text "\\of("; r; text ")" ]) + text " \\root "; parentesize i; text " \\of "; parentesize r ]) | Pres.Mstyle (_, m) | Pres.Merror (_, m) | Pres.Mpadded (_, m) @@ -222,13 +223,13 @@ let render_to_strings ~map_unicode_to_tex choose_action size markup = | Pres.Mfenced (_, children) -> aux_mpres (mrow children) | Pres.Maction (_, []) -> assert false | Pres.Msub (_, m, n) -> - aux_mpres (mrow [ text "("; m; text ")\\sub("; n; text ")" ]) + aux_mpres (mrow [ parentesize m; text " \\sub "; parentesize n ]) | Pres.Msup (_, m, n) -> - aux_mpres (mrow [ text "("; m; text ")\\sup("; n; text ")" ]) + aux_mpres (mrow [ parentesize m; text " \\sup "; parentesize n ]) | Pres.Munder (_, m, n) -> - aux_mpres (mrow [ text "("; m; text ")\\below("; n; text ")" ]) + aux_mpres (mrow [ parentesize m; text " \\below "; parentesize n ]) | Pres.Mover (_, m, n) -> - aux_mpres (mrow [ text "("; m; text ")\\above("; n; text ")" ]) + aux_mpres (mrow [ parentesize m; text " \\above "; parentesize n ]) | Pres.Msubsup _ | Pres.Munderover _ | Pres.Mtable _ ->