X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FcicNotationPres.ml;fp=helm%2Focaml%2Fcic_notation%2FcicNotationPres.ml;h=a14ff349d8c5db23e9d9cebd83071e341f15f8c9;hb=915c3e1993cad4dcadefe7e6886e6cb8feefae8b;hp=c3ea73f1c95491aec319a37aa880a8665ba53085;hpb=904ecbd458b20b47d250889459f9aa9ebd26d04d;p=helm.git

diff --git a/helm/ocaml/cic_notation/cicNotationPres.ml b/helm/ocaml/cic_notation/cicNotationPres.ml
index c3ea73f1c..a14ff349d 100644
--- a/helm/ocaml/cic_notation/cicNotationPres.ml
+++ b/helm/ocaml/cic_notation/cicNotationPres.ml
@@ -169,7 +169,7 @@ let render ids_to_uris =
     | None -> None
     | Some id -> (try Some (Hashtbl.find ids_to_uris id) with Not_found -> None)
   in
-  let make_href xref uris =
+  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 =
@@ -179,7 +179,8 @@ let render ids_to_uris =
       | None, raw_uris -> Some (String.concat " " raw_uris)
       | Some uri, raw_uris -> Some (String.concat " " (uri :: raw_uris))
     in
-    make_attributes [Some "helm", "xref"; Some "xlink", "href"] [xref; uri]
+    xmlattrs
+    @ make_attributes [Some "helm", "xref"; Some "xlink", "href"] [xref; uri]
   in
   let make_xref xref = make_attributes [Some "helm","xref"] [xref] in
   let make_box = function
@@ -189,38 +190,43 @@ let render ids_to_uris =
     | m -> Box.Object ([], m)
   in
   (* when mathonly is true no boxes should be generated, only mrows *)
-  let rec aux mathonly xref pos prec uris t =
+  let rec aux xmlattrs mathonly xref pos prec uris t =
     match t with
     | A.AttributedTerm (attr, t) ->
-        aux_attribute mathonly xref pos prec uris t attr
-    | A.Ident (literal, _) -> P.Mi (make_href xref [], to_unicode literal)
-    | A.Num (literal, _) -> P.Mn (make_href xref [], to_unicode literal)
-    | A.Symbol (literal, _) -> P.Mo (make_href xref uris, to_unicode literal)
-    | A.Uri (literal, _) -> P.Mi (make_href xref [], to_unicode literal)
-    | A.Literal l -> aux_literal xref prec uris l
+        aux_attribute xmlattrs mathonly xref pos prec uris t attr
+    | A.Ident (literal, _) ->
+        P.Mi (make_href xmlattrs xref [], to_unicode literal)
+    | A.Num (literal, _) ->
+        P.Mn (make_href xmlattrs xref [], to_unicode literal)
+    | A.Symbol (literal, _) ->
+        P.Mo (make_href xmlattrs xref uris, to_unicode literal)
+    | A.Uri (literal, _) ->
+        P.Mi (make_href xmlattrs xref [], to_unicode literal)
+    | A.Literal l -> aux_literal xmlattrs xref prec uris l
     | A.Layout l -> aux_layout mathonly xref pos prec uris l
     | A.Magic _
     | A.Variable _ -> assert false  (* should have been instantiated *)
     | t ->
         prerr_endline (CicNotationPp.pp_term t);
         assert false
-  and aux_attribute mathonly xref pos prec uris t =
+  and aux_attribute xmlattrs mathonly xref pos prec uris t =
     function
-    | `Loc _ -> aux mathonly xref pos prec uris t
+    | `Loc _ -> aux xmlattrs mathonly xref pos prec uris t
     | `Level (child_prec, child_assoc) ->
-        let t' = aux mathonly xref pos child_prec uris t in
+        let t' = aux xmlattrs mathonly xref pos child_prec uris t in
         add_parens child_prec child_assoc pos prec t'
-    | `IdRef xref -> aux mathonly (Some xref) pos prec uris t
-    | `Href uris' -> aux mathonly xref pos prec uris' t
-  and aux_literal xref prec uris l =
-    let attrs = make_href xref uris in
+    | `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
       match l with
 	| `Symbol s -> P.Mo (attrs, to_unicode s)
-	| `Keyword s -> P.Mo (keyword_attributes @ 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 =
     let attrs = make_xref xref in
-    let invoke' t = aux true None pos prec uris t in
+    let invoke' t = aux [] true None pos prec uris 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)
@@ -235,6 +241,7 @@ let render ids_to_uris =
     | A.Box (kind, terms) ->
         let children = aux_children mathonly xref pos prec uris terms in
           box_of mathonly kind attrs children
+    | A.Break -> assert false (* TODO? *)
   and aux_children mathonly xref pos prec uris terms =
     let rec aux_list first =
       function
@@ -248,7 +255,7 @@ let render ids_to_uris =
 	      | `Right -> `Right
 	      | `Left -> `Inner
 	  in
-          [aux mathonly xref pos' prec uris t]
+          [aux [] mathonly xref pos' prec uris t]
       | t :: tl ->
 	  let pos' =
 	    match pos, first with
@@ -259,13 +266,13 @@ let render ids_to_uris =
 	      | `Right, _ -> `Inner
 	      | `Inner, _ -> `Inner
 	  in
-            (aux mathonly xref pos' prec uris t) :: aux_list false tl
+          (aux [] mathonly xref pos' prec uris t) :: aux_list false tl
     in
       match terms with
-        [t] -> [aux mathonly xref pos prec uris t]
+      | [t] -> [aux [] mathonly xref pos prec uris t]
       | tl -> aux_list true tl
   in
-  aux false None `None 0 []
+  aux [] false None `None 0 []
 
 let render_to_boxml id_to_uri t =
   let rec print_box (t: CicNotationPres.boxml_markup) =