- selection attribute of maction is now explicitly generated

- all the conjectures are now put in a table to avoid too many
  changes that make Xml Diffing difficult.

diff --git a/helm/ocaml/cic_transformations/content2pres.ml b/helm/ocaml/cic_transformations/content2pres.ml
index 2404fbea3971fd2ffa99286fa53ff92bbd55f19a..9356c288540066c7b207c4d02d75ba539866954e 100644 (file)
--- a/helm/ocaml/cic_transformations/content2pres.ml
+++ b/helm/ocaml/cic_transformations/content2pres.ml
@@ -215,7 +215,8 @@ and proof2pres term2pres p =
                None -> P.Mtext([],"NO PROOF!!!")
              | Some c -> c) in 
           let action = 
-            P.Maction([None,"actiontype","toggle"],
+            P.Maction([None,"actiontype","toggle" ;
+                       None,"selection","1"],
               [(make_concl "proof of" ac);
                 body]) in
           P.Mtable ([None,"align","baseline 1"; None,"equalrows","false";
@@ -620,66 +621,75 @@ let content2pres term2pres (id,params,metasenv,obj) =
          (match metasenv with
              None -> []
            | Some metasenv' ->
-              (P.Mtr []
+              [P.Mtr []
                 [P.Mtd []
-                  (P.Mrow []
-                    [P.Mtext [] "CONJECTURES:"])]) ::
-               List.map
-                (function
-                  (id,n,context,ty) ->
-                    P.Mtr []
-                     [P.Mtd []
-                      (P.Mrow []
-                        (List.map
-                          (function
-                              (_,None) ->
-                                P.Mrow []
-                                 [ P.Mi [] "_" ;
-                                   P.Mo [] ":?" ;
-                                   P.Mi [] "_"]
-                            | (_,Some (`Declaration d))
-                            | (_,Some (`Hypothesis d)) ->
-                               let
-                                { K.dec_name = dec_name ;
-                                  K.dec_type = ty } = d
-                                in
-                                 P.Mrow []
-                                  [ P.Mi []
-                                     (match dec_name with
-                                         None -> "_"
-                                       | Some n -> n) ;
-                                    P.Mo [] ":" ;
-                                    term2pres ty]
-                            | (_,Some (`Definition d)) ->
-                               let
-                                { K.def_name = def_name ;
-                                  K.def_term = bo } = d
-                                in
-                                 P.Mrow []
-                                  [ P.Mi []
-                                     (match def_name with
-                                         None -> "_"
-                                       | Some n -> n) ;
-                                    P.Mo [] ":=" ;
-                                    term2pres bo]
-                            | (_,Some (`Proof p)) ->
-                               let proof_name = p.K.proof_name in
-                                P.Mrow []
-                                 [ P.Mi []
-                                    (match proof_name with
-                                        None -> "_"
-                                      | Some n -> n) ;
-                                   P.Mo [] ":=" ;
-                                   proof2pres term2pres p]
-                          ) context @
-                        [ P.Mo [] "|-" ] @
-                        [ P.Mi [] (string_of_int n) ;
-                          P.Mo [] ":" ;
-                          term2pres ty ]
-                      ))
-                     ]
-                ) metasenv'
-         ) @
+                  (* Conjectures are in their own table to make *)
+                  (* diffing the DOM trees easier.              *)
+                  (P.Mtable
+                    [None,"align","baseline 1";
+                     None,"equalrows","false";
+                     None,"columnalign","left"]
+                   ((P.Mtr []
+                      [P.Mtd []
+                       (P.Mrow []
+                         [P.Mtext [] "CONJECTURES:"])])::
+                    List.map
+                     (function
+                       (id,n,context,ty) ->
+                         P.Mtr []
+                          [P.Mtd []
+                           (P.Mrow []
+                             (List.map
+                               (function
+                                   (_,None) ->
+                                     P.Mrow []
+                                      [ P.Mi [] "_" ;
+                                        P.Mo [] ":?" ;
+                                        P.Mi [] "_"]
+                                 | (_,Some (`Declaration d))
+                                 | (_,Some (`Hypothesis d)) ->
+                                    let
+                                     { K.dec_name = dec_name ;
+                                       K.dec_type = ty } = d
+                                     in
+                                      P.Mrow []
+                                       [ P.Mi []
+                                          (match dec_name with
+                                              None -> "_"
+                                            | Some n -> n) ;
+                                         P.Mo [] ":" ;
+                                         term2pres ty]
+                                 | (_,Some (`Definition d)) ->
+                                    let
+                                     { K.def_name = def_name ;
+                                       K.def_term = bo } = d
+                                     in
+                                      P.Mrow []
+                                       [ P.Mi []
+                                          (match def_name with
+                                              None -> "_"
+                                            | Some n -> n) ;
+                                         P.Mo [] ":=" ;
+                                         term2pres bo]
+                                 | (_,Some (`Proof p)) ->
+                                    let proof_name = p.K.proof_name in
+                                     P.Mrow []
+                                      [ P.Mi []
+                                         (match proof_name with
+                                             None -> "_"
+                                           | Some n -> n) ;
+                                        P.Mo [] ":=" ;
+                                        proof2pres term2pres p]
+                               ) context @
+                             [ P.Mo [] "|-" ] @
+                             [ P.Mi [] (string_of_int n) ;
+                               P.Mo [] ":" ;
+                               term2pres ty ]
+                           ))
+                          ]
+                     ) metasenv'
+                  ))]]
+         )  @
         [P.Mtr []
           [P.Mtd []
             (P.Mrow []