added (linked to matita) executable cicbrowser: when invoked it only shows

a cicBrowser window which can be used to browse the library

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 6a2a88623b5620f4695834c884514fe9fdbc98ec..07fd7f3382a31c9da6e5a713bb7eb76c38d6e441 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -41,21 +41,23 @@ CCMOS =                             \
 
 LIB_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
 
-all: matita matitac
+all: matita matitac cicbrowser
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
 CCMXS = $(patsubst %.cmo,%.cmx,$(CCMOS))
 LIBX_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
-opt: matita.opt matitac.opt
+opt: matita.opt matitac.opt cicbrowser.opt
 else
 opt:
        @echo "Native code compilation is disabled"
 endif
 
 matita: $(LIB_DEPS) $(CMOS) matita.ml
+       rm -f cicbrowser
        $(OCAMLC) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
 matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
+       rm -f cicbrowser.opt
        $(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml
 
 matitac: $(LIB_DEPS) $(CCMOS) matitac.ml
@@ -63,6 +65,11 @@ matitac: $(LIB_DEPS) $(CCMOS) matitac.ml
 matitac.opt: $(LIBX_DEPS) $(CMXS) matitac.ml
        $(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) matitac.ml
 
+cicbrowser: matita
+       test -f $@ || ln $< $@
+cicbrowser.opt: matita.opt
+       test -f $@ || ln $< $@
+
 matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
        $(LABLGLADECC) $< > matitaGeneratedGui.ml
        $(OCAMLC) $(PKGS) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
@@ -76,7 +83,8 @@ matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
 
 clean:
        rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o   \
-               matita matita.opt matitac matitac.opt
+               matita matita.opt matitac matitac.opt   \
+               cicbrowser cicbrowser.opt
 distclean: clean
        rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
        rm -f config.log config.status Makefile buildTimeConf.ml

diff --git a/helm/matita/matita.glade b/helm/matita/matita.glade
index d9e922f98bc40ca50fa26e99d79710e5cc5b2222..fd460dd24b1161771c6ecb19a0d050efa2fe7649 100644 (file)
--- a/helm/matita/matita.glade
+++ b/helm/matita/matita.glade
@@ -4,7 +4,6 @@
 <glade-interface>
 
 <widget class="GtkWindow" id="MainWin">
-  <property name="visible">True</property>
   <property name="title" translatable="yes">Matita</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -491,7 +490,6 @@
 <widget class="GtkWindow" id="ToolBarWin">
   <property name="width_request">155</property>
   <property name="height_request">450</property>
-  <property name="visible">True</property>
   <property name="title" translatable="yes">Tactics</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index e8c030b61cc3aeeb208ba95b67b9f1a57b965f67..6e57c2e8ffd7614eb280330a8aaa249ac2f198cd 100644 (file)
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -221,9 +221,17 @@ let _ =
 
 let _ =
 (*   CicEnvironment.set_trust (fun _ -> false); *)
+(*
   (try
     load_script Sys.argv.(1)
   with Invalid_argument _ -> ());
-  gui#console#show ();
+*)
+  if Pcre.pmatch ~pat:"cicbrowser$" Sys.argv.(0) then begin
+    ignore (MatitaMathView.cicBrowser ~disambiguator ~currentProof ())
+  end else begin
+    gui#main#mainWin#show ();
+    gui#toolbar#toolBarWin#show ();
+    gui#console#show ()
+  end;
   GtkThread.main ()