added an 'a parameter to mpresentation type so that it and boxes could

[helm.git] / helm / ocaml / cic_transformations / mpresentation.mli

diff --git a/helm/ocaml/cic_transformations/mpresentation.mli b/helm/ocaml/cic_transformations/mpresentation.mli
index 83f243e6d3ba440bb1ab988ef3a5afe0a107f786..60ba3c9e11f7eb19d2797f4039e05ecbcbdec934 100644 (file)
--- a/helm/ocaml/cic_transformations/mpresentation.mli
+++ b/helm/ocaml/cic_transformations/mpresentation.mli
@@ -23,8 +23,7 @@
  * http://cs.unibo.it/helm/.
  *)
 
-type 
-  mpres = 
+type 'a mpres = 
   (* token elements *)
     Mi of attr * string
   | Mn of attr * string
@@ -34,45 +33,50 @@ type
   | Ms of attr * string
   | Mgliph of attr * string
   (* General Layout Schemata *)
-  | Mrow of attr * mpres list
-  | Mfrac of attr * mpres * mpres
-  | Msqrt of attr * mpres
-  | Mroot of attr * mpres * mpres
-  | Mstyle of attr * mpres
-  | Merror of attr * mpres
-  | Mpadded of attr * mpres
-  | Mphantom of attr * mpres
-  | Mfenced of attr * mpres list
-  | Menclose of attr * mpres
+  | Mrow of attr * 'a mpres list
+  | Mfrac of attr * 'a mpres * 'a mpres
+  | Msqrt of attr * 'a mpres
+  | Mroot of attr * 'a mpres * 'a mpres
+  | Mstyle of attr * 'a mpres
+  | Merror of attr * 'a mpres
+  | Mpadded of attr * 'a mpres
+  | Mphantom of attr * 'a mpres
+  | Mfenced of attr * 'a mpres list
+  | Menclose of attr * 'a mpres
   (* Script and Limit Schemata *)
-  | Msub of attr * mpres * mpres
-  | Msup of attr * mpres * mpres
-  | Msubsup of attr * mpres * mpres *mpres 
-  | Munder of attr * mpres * mpres
-  | Mover of attr * mpres * mpres
-  | Munderover of attr * mpres * mpres *mpres 
-(* | Multiscripts of ???  NOT IMPLEMEMENTED *)
+  | Msub of attr * 'a mpres * 'a mpres
+  | Msup of attr * 'a mpres * 'a mpres
+  | Msubsup of attr * 'a mpres * 'a mpres *'a mpres 
+  | Munder of attr * 'a mpres * 'a mpres
+  | Mover of attr * 'a mpres * 'a mpres
+  | Munderover of attr * 'a mpres * 'a mpres *'a mpres 
   (* Tables and Matrices *)
-  | Mtable of attr * row list
+  | Mtable of attr * 'a row list
   (* Enlivening Expressions *)
-  | Maction of attr * mpres list
+  | Maction of attr * 'a mpres list
+  (* Embedding *)
+  | Mobject of attr * 'a
 
-and row = Mtr of attr * mtd list
+and 'a row = Mtr of attr * 'a mtd list
 
-and mtd = Mtd of attr * mpres
+and 'a mtd = Mtd of attr * 'a mpres
 
 and attr = (string option * string * string) list
 
 ;;
 
-val smallskip : mpres 
-val indented : mpres -> mpres
+val smallskip : 'a mpres 
+val indented : 'a mpres -> 'a mpres
 val standard_tbl_attr : attr
-val two_rows_table : attr -> mpres -> mpres -> mpres
-val two_rows_table_with_brackets : attr -> mpres -> mpres -> mpres -> mpres
-val two_rows_table_without_brackets : attr -> mpres -> mpres -> mpres -> mpres
-val row_with_brackets : attr -> mpres -> mpres -> mpres -> mpres
-val row_without_brackets : attr -> mpres -> mpres -> mpres -> mpres
-val print_mpres : mpres -> Xml.token Stream.t
-val document_of_mpres : mpres -> Xml.token Stream.t
+val two_rows_table : attr -> 'a mpres -> 'a mpres -> 'a mpres
+val two_rows_table_with_brackets :
+  attr -> 'a mpres -> 'a mpres -> 'a mpres -> 'a mpres
+val two_rows_table_without_brackets :
+  attr -> 'a mpres -> 'a mpres -> 'a mpres -> 'a mpres
+val row_with_brackets :
+  attr -> 'a mpres -> 'a mpres -> 'a mpres -> 'a mpres
+val row_without_brackets :
+  attr -> 'a mpres -> 'a mpres -> 'a mpres -> 'a mpres
+val print_mpres : ('a -> Xml.token Stream.t) -> 'a mpres -> Xml.token Stream.t
+val document_of_mpres : 'a mpres -> Xml.token Stream.t