-let exp_obj frm = function
- | _, uri, B.Abst w ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<ABST uri=%S/>@,%a" str exp_term w
- | _, uri, B.Abbr v ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<ABBR uri=%S/>@,%a" str exp_term v
- | _, uri, B.Void ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<VOID uri=%S/>" str
-
-let export_obj frm obj =
- F.fprintf frm "@,@[<v3> %a@]@," exp_obj obj
+let exp_entry c frm = function
+ | _, u, B.Abst (a, w) ->
+ let str = U.string_of_uri u in
+ let a = B.Name (true, U.name_of_uri u) :: a in
+ F.fprintf frm "<ABST uri=%S%a>%a</ABST>" str id a (exp_boxed c) w
+ | _, u, B.Abbr (a, v) ->
+ let str = U.string_of_uri u in
+ let a = B.Name (true, U.name_of_uri u) :: a in
+ F.fprintf frm "<ABBR uri=%S%a>%a</ABBR>" str id a (exp_boxed c) v
+ | _, u, B.Void a ->
+ let str = U.string_of_uri u in
+ let a = B.Name (true, U.name_of_uri u) :: a in
+ F.fprintf frm "<VOID uri=%S%a/>" str id a
+
+let export_entry frm entry =
+ F.fprintf frm "@,@[<v3> %a@]@," (exp_entry B.empty_lenv) entry