* http://helm.cs.unibo.it/
*)
-module P = Mpresentation
+module Ast = CicNotationPt
+module Mpres = Mpresentation
-type mathml_markup = boxml_markup Mpresentation.mpres
+type mathml_markup = boxml_markup Mpres.mpres
and boxml_markup = mathml_markup Box.box
type markup = mathml_markup
let rec make_attributes l1 = function
| [] -> []
- | None :: tl -> make_attributes (List.tl l1) tl
- | Some s :: tl ->
- let p,n = List.hd l1 in
- (p,n,s) :: make_attributes (List.tl l1) tl
+ | hd :: tl ->
+ (match hd with
+ | None -> make_attributes (List.tl l1) tl
+ | Some s ->
+ let p,n = List.hd l1 in
+ (p,n,s) :: make_attributes (List.tl l1) tl)
let box_of_mpres =
function
- Mpresentation.Mobject (_, box) -> box
+ | Mpresentation.Mobject (attrs, box) ->
+ assert (attrs = []);
+ box
| mpres -> Box.Object ([], mpres)
let mpres_of_box =
function
- Box.Object (_, mpres) -> mpres
+ | Box.Object (attrs, mpres) ->
+ assert (attrs = []);
+ mpres
| box -> Mpresentation.Mobject ([], box)
let rec genuine_math =
let small_skip =
Mpresentation.Mspace (RenderingAttrs.small_skip_attributes `MathML)
+let rec add_mpres_attributes new_attr = function
+ | Mpresentation.Mobject (attr, box) ->
+ Mpresentation.Mobject (attr, add_box_attributes new_attr box)
+ | mpres ->
+ Mpresentation.set_attr (new_attr @ Mpresentation.get_attr mpres) mpres
+and add_box_attributes new_attr = function
+ | Box.Object (attr, mpres) ->
+ Box.Object (attr, add_mpres_attributes new_attr mpres)
+ | box -> Box.set_attr (new_attr @ Box.get_attr box) box
+
let box_of mathonly spec attrs children =
match children with
- | [t] -> t
+ | [t] -> add_mpres_attributes attrs t
| _ ->
let kind, spacing, indent = spec in
let dress children =
@ attrs
in
match kind with
- | CicNotationPt.H ->
+ | Ast.H ->
if List.for_all eligible_math children then
Mpresentation.Mrow (attrs',
dress (List.map promote_to_math children))
else
mpres_of_box (Box.H (attrs',
List.map box_of_mpres children))
-(* | CicNotationPt.H when List.for_all genuine_math children ->
+(* | Ast.H when List.for_all genuine_math children ->
Mpresentation.Mrow (attrs', dress children) *)
- | CicNotationPt.V ->
+ | Ast.V ->
mpres_of_box (Box.V (attrs',
List.map box_of_mpres children))
- | CicNotationPt.HV ->
+ | Ast.HV ->
mpres_of_box (Box.HV (attrs',
List.map box_of_mpres children))
- | CicNotationPt.HOV ->
+ | Ast.HOV ->
mpres_of_box (Box.HOV (attrs',
List.map box_of_mpres children))
let toggle_action children =
Mpresentation.Maction ([None, "actiontype", "toggle"], children)
-type child_pos = [ `None | `Left | `Right | `Inner ]
+type child_pos = [ `Left | `Right | `Inner ]
let pp_assoc =
function
| Gramext.RightA -> "RightA"
| Gramext.NonA -> "NonA"
-let pp_pos =
- function
- `None -> "`None"
- | `Left -> "`Left"
- | `Right -> "`Right"
- | `Inner -> "`Inner"
-
let is_atomic t =
let rec aux_mpres = function
- | P.Mi _
- | P.Mo _
- | P.Mn _
- | P.Ms _
- | P.Mtext _
- | P.Mspace _ -> true
- | P.Mobject (_, box) -> aux_box box
- | P.Maction (_, [mpres])
- | P.Mrow (_, [mpres]) -> aux_mpres mpres
+ | Mpres.Mi _
+ | Mpres.Mo _
+ | Mpres.Mn _
+ | Mpres.Ms _
+ | Mpres.Mtext _
+ | Mpres.Mspace _ -> true
+ | Mpres.Mobject (_, box) -> aux_box box
+ | Mpres.Maction (_, [mpres])
+ | Mpres.Mrow (_, [mpres]) -> aux_mpres mpres
| _ -> false
and aux_box = function
| Box.Space _
let add_parens child_prec child_assoc child_pos curr_prec t =
if is_atomic t then t
- else if child_prec < curr_prec
- || (child_prec = curr_prec &&
- child_assoc = Gramext.LeftA &&
- child_pos <> `Left)
- || (child_prec = curr_prec &&
- child_assoc = Gramext.RightA &&
- child_pos <> `Right)
+ else if child_prec >= 0
+ && (child_prec < curr_prec
+ || (child_prec = curr_prec &&
+ child_assoc = Gramext.LeftA &&
+ child_pos = `Right)
+ || (child_prec = curr_prec &&
+ child_assoc = Gramext.RightA &&
+ child_pos = `Left))
then (* parens should be added *)
+(* (prerr_endline "adding parens";
+ prerr_endline (Printf.sprintf "child_prec = %d\nchild_assoc = %s\nchild_pos = %s\ncurr_prec= %d"
+ child_prec (pp_assoc child_assoc) (CicNotationPp.pp_pos
+ child_pos) curr_prec); *)
match t with
| Mpresentation.Mobject (_, box) ->
mpres_of_box (Box.H ([], [ open_box_paren; box; closed_box_paren ]))
t
let render ids_to_uris =
- let module A = CicNotationPt in
+ let module A = Ast in
let module P = Mpresentation in
let use_unicode = true in
- let lookup_uri = function
- | None -> None
- | Some id -> (try Some (Hashtbl.find ids_to_uris id) with Not_found -> None)
+ let lookup_uri id =
+ (try
+ let uri = Hashtbl.find ids_to_uris id in
+ Some (UriManager.string_of_uri uri)
+ with Not_found -> None)
in
- let make_href xmlattrs xref uris =
- let xref_uri = lookup_uri xref in
- let raw_uris = List.map UriManager.string_of_uri uris in
- let uri =
- match xref_uri, raw_uris with
- | None, [] -> None
- | Some uri, [] -> Some uri
- | None, raw_uris -> Some (String.concat " " raw_uris)
- | Some uri, raw_uris -> Some (String.concat " " (uri :: raw_uris))
+ let make_href xmlattrs xref =
+ let xref_uris =
+ List.fold_right
+ (fun xref uris ->
+ match lookup_uri xref with
+ | None -> uris
+ | Some uri -> uri :: uris)
+ !xref []
+ in
+ let xmlattrs_uris, xmlattrs =
+ let xref_attrs, other_attrs =
+ List.partition
+ (function Some "xlink", "href", _ -> true | _ -> false)
+ xmlattrs
+ in
+ List.map (fun (_, _, uri) -> uri) xref_attrs,
+ other_attrs
in
+ let uris =
+ match xmlattrs_uris @ xref_uris with
+ | [] -> None
+ | uris ->
+ Some (String.concat " "
+ (HExtlib.list_uniq (List.sort String.compare uris)))
+ in
+ let xrefs =
+ match !xref with [] -> None | xrefs -> Some (String.concat " " xrefs)
+ in
+ xref := [];
xmlattrs
- @ make_attributes [Some "helm", "xref"; Some "xlink", "href"] [xref; uri]
+ @ make_attributes [Some "helm", "xref"; Some "xlink", "href"]
+ [xrefs; uris]
+ in
+ let make_xref xref =
+ let xrefs =
+ match !xref with [] -> None | xrefs -> Some (String.concat " " xrefs)
+ in
+ xref := [];
+ make_attributes [Some "helm","xref"] [xrefs]
in
- let make_xref xref = make_attributes [Some "helm","xref"] [xref] in
(* when mathonly is true no boxes should be generated, only mrows *)
- let rec aux xmlattrs mathonly xref pos prec uris t =
+ (* "xref" is *)
+ let rec aux xmlattrs mathonly xref pos prec t =
match t with
| A.AttributedTerm _ ->
- aux_attributes xmlattrs mathonly xref pos prec uris t
+ aux_attributes xmlattrs mathonly xref pos prec t
| A.Num (literal, _) ->
let attrs =
(RenderingAttrs.number_attributes `MathML)
- @ make_href xmlattrs xref uris
+ @ make_href xmlattrs xref
in
- P.Mn (attrs, literal)
+ Mpres.Mn (attrs, literal)
| A.Symbol (literal, _) ->
let attrs =
(RenderingAttrs.symbol_attributes `MathML)
- @ make_href xmlattrs xref uris
+ @ make_href xmlattrs xref
in
- P.Mo (attrs, to_unicode literal)
+ Mpres.Mo (attrs, to_unicode literal)
| A.Ident (literal, subst)
| A.Uri (literal, subst) ->
let attrs =
(RenderingAttrs.ident_attributes `MathML)
- @ make_href xmlattrs xref []
+ @ make_href xmlattrs xref
in
- let name = P.Mi (attrs, to_unicode literal) in
+ let name = Mpres.Mi (attrs, to_unicode literal) in
(match subst with
| Some []
| None -> name
(List.map
(fun (name, t) ->
box_of mathonly (A.H, false, false) [] [
- P.Mi ([], name);
- P.Mo ([], to_unicode "\\def");
- aux [] mathonly xref pos prec uris t ])
+ Mpres.Mi ([], name);
+ Mpres.Mo ([], to_unicode "\\def");
+ aux [] mathonly xref pos prec t ])
substs))
@ [ closed_brace ])
-(* (CicNotationUtil.dress semicolon
- (List.map
- (fun (var, t) ->
- let var_uri = UriManager.uri_of_string var in
- let var_name = UriManager.name_of_uri var_uri in
- let href_attr = Some "xlink", "href", var in
- box_of mathonly (A.H, false, false) [] [
- P.Mi ([href_attr], var_name);
- P.Mo ([], to_unicode "\\def");
- aux [] mathonly xref pos prec uris t ])
- substs)) *)
in
let substs_maction = toggle_action [ hidden_substs; substs' ] in
box_of mathonly (A.H, false, false) [] [ name; substs_maction ])
- | A.Literal l -> aux_literal xmlattrs xref prec uris l
- | A.UserInput -> P.Mtext ([], "%")
- | A.Layout l -> aux_layout mathonly xref pos prec uris l
+ | A.Literal l -> aux_literal xmlattrs xref prec l
+ | A.UserInput -> Mpres.Mtext ([], "%")
+ | A.Layout l -> aux_layout mathonly xref pos prec l
| A.Magic _
| A.Variable _ -> assert false (* should have been instantiated *)
| t ->
prerr_endline ("unexpected ast: " ^ CicNotationPp.pp_term t);
assert false
- and aux_attributes xmlattrs mathonly xref pos prec uris t =
+ and aux_attributes xmlattrs mathonly xref pos prec t =
+ let reset = ref false in
let new_level = ref None in
- let new_xref = ref None in
- let new_uris = ref [] in
+ let new_xref = ref [] in
let new_xmlattrs = ref [] in
+ let new_pos = ref pos in
+ let reinit = ref false in
let rec aux_attribute =
function
| A.AttributedTerm (attr, t) ->
(match attr with
| `Loc _
| `Raw _ -> ()
+ | `Level (-1, _) -> reset := true
| `Level (child_prec, child_assoc) ->
new_level := Some (child_prec, child_assoc)
- | `IdRef xref -> new_xref := Some xref
- | `Href hrefs -> new_uris := hrefs
- | `XmlAttrs attrs -> new_xmlattrs := attrs);
+ | `IdRef xref -> new_xref := xref :: !new_xref
+ | `ChildPos pos -> new_pos := pos
+ | `XmlAttrs attrs -> new_xmlattrs := attrs @ !new_xmlattrs);
aux_attribute t
| t ->
(match !new_level with
- | None -> aux !new_xmlattrs mathonly !new_xref pos prec !new_uris t
+ | None -> aux !new_xmlattrs mathonly new_xref !new_pos prec t
| Some (child_prec, child_assoc) ->
let t' =
- aux !new_xmlattrs mathonly !new_xref pos child_prec !new_uris t
+ aux !new_xmlattrs mathonly new_xref !new_pos child_prec t
in
- add_parens child_prec child_assoc pos prec t')
+ if !reset then t'
+ else add_parens child_prec child_assoc !new_pos prec t')
in
aux_attribute t
-(* function
- | `Loc _
- | `Raw _ -> aux xmlattrs mathonly xref pos prec uris t
- | `Level (child_prec, child_assoc) ->
- let t' = aux xmlattrs mathonly xref pos child_prec uris t in
- add_parens child_prec child_assoc pos prec t'
- | `IdRef xref -> aux xmlattrs mathonly (Some xref) pos prec uris t
- | `Href uris' -> aux xmlattrs mathonly xref pos prec uris' t
- | `XmlAttrs xmlattrs -> aux xmlattrs mathonly xref pos prec uris t *)
- and aux_literal xmlattrs xref prec uris l =
- let attrs = make_href xmlattrs xref uris in
+ and aux_literal xmlattrs xref prec l =
+ let attrs = make_href xmlattrs xref in
(match l with
- | `Symbol s -> P.Mo (attrs, to_unicode s)
- | `Keyword s -> P.Mo (attrs, to_unicode s)
- | `Number s -> P.Mn (attrs, to_unicode s))
- and aux_layout mathonly xref pos prec uris l =
+ | `Symbol s -> Mpres.Mo (attrs, to_unicode s)
+ | `Keyword s -> Mpres.Mo (attrs, to_unicode s)
+ | `Number s -> Mpres.Mn (attrs, to_unicode s))
+ and aux_layout mathonly xref pos prec l =
let attrs = make_xref xref in
- let invoke' t = aux [] true None pos prec uris t in
+ let invoke' t = aux [] true (ref []) pos prec t in
+ (* use the one below to reset precedence and associativity *)
+ let invoke_reinit t = aux [] mathonly xref `Inner ~-1 t in
match l with
- | A.Sub (t1, t2) -> P.Msub (attrs, invoke' t1, invoke' t2)
- | A.Sup (t1, t2) -> P.Msup (attrs, invoke' t1, invoke' t2)
- | A.Below (t1, t2) -> P.Munder (attrs, invoke' t1, invoke' t2)
- | A.Above (t1, t2) -> P.Mover (attrs, invoke' t1, invoke' t2)
+ | A.Sub (t1, t2) -> Mpres.Msub (attrs, invoke' t1, invoke_reinit t2)
+ | A.Sup (t1, t2) -> Mpres.Msup (attrs, invoke' t1, invoke_reinit t2)
+ | A.Below (t1, t2) -> Mpres.Munder (attrs, invoke' t1, invoke_reinit t2)
+ | A.Above (t1, t2) -> Mpres.Mover (attrs, invoke' t1, invoke_reinit t2)
| A.Frac (t1, t2)
- | A.Over (t1, t2) -> P.Mfrac (attrs, invoke' t1, invoke' t2)
+ | A.Over (t1, t2) ->
+ Mpres.Mfrac (attrs, invoke_reinit t1, invoke_reinit t2)
| A.Atop (t1, t2) ->
- P.Mfrac (atop_attributes @ attrs, invoke' t1, invoke' t2)
- | A.Sqrt t -> P.Msqrt (attrs, invoke' t)
- | A.Root (t1, t2) -> P.Mroot (attrs, invoke' t1, invoke' t2)
+ Mpres.Mfrac (atop_attributes @ attrs, invoke_reinit t1,
+ invoke_reinit t2)
+ | A.Sqrt t -> Mpres.Msqrt (attrs, invoke_reinit t)
+ | A.Root (t1, t2) ->
+ Mpres.Mroot (attrs, invoke_reinit t1, invoke_reinit t2)
| A.Box ((_, spacing, _) as kind, terms) ->
let children =
- aux_children mathonly spacing xref pos prec uris
+ aux_children mathonly spacing xref pos prec
(CicNotationUtil.ungroup terms)
in
box_of mathonly kind attrs children
| A.Group terms ->
let children =
- aux_children mathonly false xref pos prec uris
+ aux_children mathonly false xref pos prec
(CicNotationUtil.ungroup terms)
in
box_of mathonly (A.H, false, false) attrs children
| A.Break -> assert false (* TODO? *)
- and aux_children mathonly spacing xref pos prec uris terms =
+ and aux_children mathonly spacing xref pos prec terms =
let find_clusters =
let rec aux_list first clusters acc =
function
| (A.Layout A.Break) :: tl ->
aux_list first (List.rev acc :: clusters) [] tl
| [hd] ->
- let pos' =
- if first then
- pos
- else
- match pos with
- `None -> `Right
- | `Inner -> `Inner
- | `Right -> `Right
- | `Left -> `Inner
- in
+(* let pos' =
+ if first then
+ pos
+ else
+ match pos with
+ `None -> `Right
+ | `Inner -> `Inner
+ | `Right -> `Right
+ | `Left -> `Inner
+ in *)
aux_list false clusters
- (aux [] mathonly xref pos' prec uris hd :: acc) []
+ (aux [] mathonly xref pos prec hd :: acc) []
| hd :: tl ->
- let pos' =
- match pos, first with
- `None, true -> `Left
- | `None, false -> `Inner
- | `Left, true -> `Left
- | `Left, false -> `Inner
- | `Right, _ -> `Inner
- | `Inner, _ -> `Inner
- in
+(* let pos' =
+ match pos, first with
+ `None, true -> `Left
+ | `None, false -> `Inner
+ | `Left, true -> `Left
+ | `Left, false -> `Inner
+ | `Right, _ -> `Inner
+ | `Inner, _ -> `Inner
+ in *)
aux_list false clusters
- (aux [] mathonly xref pos' prec uris hd :: acc) tl
+ (aux [] mathonly xref pos prec hd :: acc) tl
in
aux_list true [] []
in
in
List.map boxify_pres (find_clusters terms)
in
- aux [] false None `None 0 []
+ aux [] false (ref []) `Inner ~-1
let rec print_box (t: boxml_markup) =
Box.box2xml print_mpres t
projects / helm.git / blobdiff