in
aux_mpres t
-let add_parens child_prec child_assoc child_pos curr_prec t =
+let add_parens child_prec curr_prec t =
(* eprintf
("add_parens: " ^^
"child_prec = %d\nchild_assoc = %s\nchild_pos = %s\ncurr_prec= %d\n\n%!")
child_prec (pp_assoc child_assoc) (CicNotationPp.pp_pos child_pos)
curr_prec; *)
if is_atomic t then t
- else if child_prec >= 0
- && (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))
- then begin (* parens should be added *)
+ else if child_prec >= 0 && child_prec < curr_prec then
+ begin (* parens should be added *)
(* prerr_endline "adding parens!"; *)
match t with
| Mpresentation.Mobject (_, box) ->
in
(* when mathonly is true no boxes should be generated, only mrows *)
(* "xref" is *)
- let rec aux xmlattrs mathonly xref pos prec t =
+ let rec aux xmlattrs mathonly xref prec t =
match t with
| A.AttributedTerm _ ->
- aux_attributes xmlattrs mathonly xref pos prec t
+ aux_attributes xmlattrs mathonly xref prec t
| A.Num (literal, _) ->
let attrs =
(RenderingAttrs.number_attributes `MathML)
box_of mathonly (A.H, false, false) [] [
Mpres.Mi ([], name);
Mpres.Mo ([], to_unicode "\\def");
- aux [] mathonly xref pos prec t ])
+ aux [] mathonly xref prec t ])
substs))
@ [ closed_brace ])
in
(List.map
(function
| None -> Mpres.Mtext ([], "_")
- | Some t -> aux xmlattrs mathonly xref pos prec t) l)) @
+ | Some t -> aux xmlattrs mathonly xref prec t) l)) @
[ Mpres.Mtext ([], "]")])
in
let lctxt_maction = toggle_action [ hidden_lctxt; local_context l ] in
@ (if l <> [] then [lctxt_maction] else []))
| A.Literal l -> aux_literal xmlattrs xref prec l
| A.UserInput -> Mpres.Mtext ([], "%")
- | A.Layout l -> aux_layout mathonly xref pos prec l
+ | A.Layout l -> aux_layout mathonly xref 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 t =
+ and aux_attributes xmlattrs mathonly xref prec t =
let reset = ref false in
let inferred_level = ref None in
let expected_level = ref None 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
(match attr with
| `Loc _
| `Raw _ -> ()
- | `Level (-1, _) -> reset := true
- | `Level (child_prec, child_assoc) ->
+ | `Level (-1) -> reset := true
+ | `Level child_prec ->
assert (!expected_level = None);
expected_level := !inferred_level;
- inferred_level := Some (child_prec, child_assoc)
+ inferred_level := Some child_prec
| `IdRef xref -> new_xref := xref :: !new_xref
- | `ChildPos pos -> new_pos := pos
| `XmlAttrs attrs -> new_xmlattrs := attrs @ !new_xmlattrs);
aux_attribute t
| t ->
let prec =
match !expected_level with
| None -> prec
- | Some (prec, _) -> prec
+ | Some prec -> prec
in
(match !inferred_level with
- | None -> aux !new_xmlattrs mathonly new_xref !new_pos prec t
- | Some (child_prec, child_assoc) ->
+ | None -> aux !new_xmlattrs mathonly new_xref prec t
+ | Some child_prec ->
let t' =
- aux !new_xmlattrs mathonly new_xref !new_pos child_prec t in
+ aux !new_xmlattrs mathonly new_xref child_prec t in
if !reset
then t'
- else add_parens child_prec child_assoc !new_pos prec t')
+ else add_parens child_prec prec t')
in
aux_attribute t
and aux_literal xmlattrs xref prec l =
| `Symbol s -> Mpres.Mo (attrs, to_unicode s)
| `Keyword s -> Mpres.Mtext (attrs, to_unicode s)
| `Number s -> Mpres.Mn (attrs, to_unicode s))
- and aux_layout mathonly xref pos prec l =
+ and aux_layout mathonly xref prec l =
let attrs = make_xref xref in
- let invoke' t = aux [] true (ref []) pos prec t in
+ let invoke' t = aux [] true (ref []) prec t in
(* use the one below to reset precedence and associativity *)
- let invoke_reinit t = aux [] mathonly xref `Inner ~-1 t in
+ let invoke_reinit t = aux [] mathonly xref ~-1 t in
match l with
| A.Sub (t1, t2) -> Mpres.Msub (attrs, invoke' t1, invoke_reinit t2)
| A.Sup (t1, t2) -> Mpres.Msup (attrs, invoke' t1, invoke_reinit 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
+ aux_children mathonly spacing xref prec
(CicNotationUtil.ungroup terms)
in
box_of mathonly kind attrs children
| A.Group terms ->
let children =
- aux_children mathonly false xref pos prec
+ aux_children mathonly false xref 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 terms =
+ and aux_children mathonly spacing xref 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 *)
aux_list false clusters
- (aux [] mathonly xref pos prec hd :: acc) []
+ (aux [] mathonly xref 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 *)
aux_list false clusters
- (aux [] mathonly xref pos prec hd :: acc) tl
+ (aux [] mathonly xref prec hd :: acc) tl
in
aux_list true [] []
in
in
List.map boxify_pres (find_clusters terms)
in
- aux [] false (ref []) `Inner prec
+ aux [] false (ref []) prec
let rec print_box (t: boxml_markup) =
Box.box2xml print_mpres t
projects / helm.git / blobdiff