| `Number s -> s)
let rec pp_term = function
+ | AttributedTerm (`Href _, term) when print_attributes ->
+ sprintf "#[%s]" (pp_term term)
| AttributedTerm (_, term) when print_attributes ->
sprintf "@[%s]" (pp_term term)
| AttributedTerm (_, term) -> pp_term term
| term, None -> pp_term term
| term, Some typ -> "(" ^ pp_term term ^ ": " ^ pp_term typ ^ ")"
+and pp_box_spec (kind, spacing, indent) =
+ let int_of_bool b = if b then 1 else 0 in
+ let kind_string =
+ match kind with H -> "H" | V -> "V" | HV -> "HV" | HOV -> "HOV"
+ in
+ sprintf "%sBOX%d%d" kind_string (int_of_bool spacing) (int_of_bool indent)
+
and pp_layout = function
| Sub (t1, t2) -> sprintf "%s \\SUB %s" (pp_term t1) (pp_term t2)
| Sup (t1, t2) -> sprintf "%s \\SUP %s" (pp_term t1) (pp_term t2)
| Root (arg, index) ->
sprintf "\\ROOT %s \\OF %s" (pp_term index) (pp_term arg)
(* | Break -> "\\BREAK" *)
- | Box (H, terms) ->
- sprintf "\\HBOX [%s]" (String.concat " " (List.map pp_term terms))
- | Box (V, terms) ->
- sprintf "\\VBOX [%s]" (String.concat " " (List.map pp_term terms))
- | Box (HV, terms) ->
- sprintf "\\HVBOX [%s]" (String.concat " " (List.map pp_term terms))
- | Box (HOV, terms) ->
- sprintf "\\HOVBOX [%s]" (String.concat " " (List.map pp_term terms))
+(* | Space -> "\\SPACE" *)
+ | Box (box_spec, terms) ->
+ sprintf "\\%s [%s]" (pp_box_spec box_spec)
+ (String.concat " " (List.map pp_term terms))
and pp_magic = function
| List0 (t, sep_opt) ->
(pp_fold_kind k) (pp_term p_base) acc (pp_term p_rec)
| Default (p_some, p_none) ->
sprintf "\\DEFAULT \\[%s\\] \\[%s\\]" (pp_term p_some) (pp_term p_none)
+ | If (p_guard, p) ->
+ sprintf "\\IF \\[%s\\] \\[%s\\]" (pp_term p_guard) (pp_term p)
+ | Unless (p_guard, p) ->
+ sprintf "\\UNLESS \\[%s\\] \\[%s\\]" (pp_term p_guard) (pp_term p)
and pp_fold_kind = function
| `Left -> "left"