basic support for imposed flavour in procedural object rendering

[helm.git] / helm / software / components / binaries / transcript / grafite.ml

diff --git a/helm/software/components/binaries/transcript/grafite.ml b/helm/software/components/binaries/transcript/grafite.ml
index e88406b5801bcddde3f43923a867ee534cb23a5d..83b745980ead119f83b76191ced70b16a2649013 100644 (file)
--- a/helm/software/components/binaries/transcript/grafite.ml
+++ b/helm/software/components/binaries/transcript/grafite.ml
@@ -72,33 +72,33 @@ let command_of_obj obj =
 let command_of_macro macro =
    G.Executable (floc, G.Macro (floc, macro))
 
-let set key value =
-   command_of_obj (G.Set (floc, key, value))
-
 let require value =
    command_of_obj (G.Include (floc, value ^ ".ma"))
 
 let coercion value =
    command_of_obj (G.Coercion (floc, UM.uri_of_string value, true, 0, 0))
 
-let inline (uri, prefix) =
-    command_of_macro (G.Inline (floc, G.Declarative, uri, prefix))
+let inline (kind, uri, prefix) =
+    let kind = match kind with
+       | T.Declarative -> G.Declarative
+       | T.Procedural  -> G.Procedural None 
+    in
+    command_of_macro (G.Inline (floc, kind, uri, prefix, None))
 
 let out_alias och name uri =
    Printf.fprintf och "alias id \"%s\" = \"%s\".\n\n" name uri
 
-let commit och items =
+let commit kind och items =
    let trd (_, _, x) = x in
-   let trd_rth (_, _, x, y) = x, y in
+   let trd_rth kind (_, _, x, y) = kind, x, y in
    let commit = function
       | T.Heading heading   -> out_preamble och heading
       | T.Line line         -> out_line_comment och line
-      | T.BaseUri uri       -> out_command och (set "baseuri" uri)
       | T.Include script    -> out_command och (require script)
-      | T.Coercion specs    -> out_command och (coercion (snd specs))
+      | T.Coercion specs    -> out_unexported och "COERCION" (snd specs)
       | T.Notation specs    -> out_unexported och "NOTATION" (snd specs) (**)
       | T.Inline (_, T.Var, src, _) -> out_alias och (UriManager.name_of_uri (UriManager.uri_of_string src)) src 
-      | T.Inline specs      -> out_command och (inline (trd_rth specs))
+      | T.Inline specs      -> out_command och (inline (trd_rth kind specs))
       | T.Section specs     -> out_unexported och "UNEXPORTED" (trd specs)
       | T.Comment comment   -> out_comment och comment
       | T.Unexport unexport -> out_unexported och "UNEXPORTED" unexport