- grafiteParser: we added the comand "defined" as a presentational

[helm.git] / matita / matita / contribs / lambdadelta / Makefile

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 15c38d0094d475efeb3213e8d8c31912a2ed1bae..9b90b999771b145f9e18838334231824b762a2f0 100644 (file)
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -132,9 +132,10 @@ define STATS_TEMPLATE
   $$(STT_$(1)): P1  = $$(shell grep "^theorem " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): P2  = $$(shell grep "^lemma " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): P3  = $$(shell grep "^fact " $$(MAS_$(1)) | wc -l)
-  $$(STT_$(1)): P4  = $$(shell grep qed $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): P4  = $$(shell grep "qed[.-]" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): C1  = $$(shell grep "^inductive \|^record " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): C2  = $$(shell grep "^definition \|^let rec " $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): C3  = $$(shell grep "defined[.-]" $$(MAS_$(1)) | wc -l)  
   $$(STT_$(1)): M1  = $$(shell grep "^axiom " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M2  = $$(shell grep "$$(OPEN)\*[^*:]*$$$$" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M3  = $$(shell grep "(\*\*)" $$(MAS_$(1)) | wc -l)
@@ -164,7 +165,8 @@ $$(STT_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt $(1)/$(1)_mac.txt
        @printf '\x1B[1;40;33m'
        @printf '%-8s %6i' Declared $$(C1)
        @printf '   %-8s %4i' Defined $$(C2)    
-       @printf '   %-29s' ''
+       @printf '   %-7s %7i' Proved $$(C3)
+       @printf '   %-11s' ''
        @printf '\x1B[0m\n'
        @printf '\x1B[1;40;31m'
        @printf '%-8s %6i' Axioms $$(M1)
@@ -200,30 +202,30 @@ define SUMMARY_TEMPLATE
 
   $$(SUM_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt $(1)/$(1)_mac.txt
        @printf '  SUMMARY $(1)\n'
-       @printf 'name "$$(basename $$(@F))"\n\n'                >  $$@
-       @printf 'table {\n'                                     >> $$@
-       @printf '   class "gray"   [ "category"\n'              >> $$@
-       @printf '      [ "objects" * ]\n'                       >> $$@
-       @printf '   ]\n'                                        >> $$@
-       @printf '   class "cyan"   [ "sizes"\n'                 >> $$@
-       @printf '      [ "files"      "$$(S4)" ]\n'             >> $$@
-       @printf '      [ "characters" "$$(word 1, $$(S1))" ]\n' >> $$@
-       @printf '      [ "nodes"      "$$(word 3, $$(S0))" ]\n' >> $$@
-       @printf '   ]\n'                                        >> $$@  
-       @printf '   class "green"  [ "propositions"\n'          >> $$@
-       @printf '      [ "theorems" "$$(P1)" ]\n'               >> $$@
-       @printf '      [ "lemmas"   "$$(P2)" ]\n'               >> $$@
-       @printf '      [ "total"    "$$(P3)" ]\n'               >> $$@
-       @printf '   ]\n'                                        >> $$@
-       @printf '   class "yellow" [ "concepts"\n'              >> $$@
-       @printf '      [ "declared" "$$(C1)" ]\n'               >> $$@
-       @printf '      [ "defined"  "$$(C2)" ]\n'               >> $$@
-       @printf '      [ "total"    "$$(C3)" ]\n'               >> $$@
-       @printf '   ]\n'                                        >> $$@
-       @printf '}\n\n'                                         >> $$@
-       @printf 'class "component" { 0 }\n\n'                   >> $$@
-       @printf 'class "plane"     { 1 } { 3 } { 5 }\n\n'       >> $$@
-       @printf 'class "number"    { 2 } { 4 } { 6 }\n'         >> $$@
+       @printf 'name "$$(basename $$(@F))"\n\n'                  >  $$@
+       @printf 'table {\n'                                       >> $$@
+       @printf '   class "gray"   [ "category"\n'                >> $$@
+       @printf '      [ "objects" * ]\n'                         >> $$@
+       @printf '   ]\n'                                          >> $$@
+       @printf '   class "cyan"   [ "sizes"\n'                   >> $$@
+       @printf '      [ "files"      "$$(S4)" ]\n'               >> $$@
+       @printf '      [ "characters" "$$(word 1, $$(S1))" ]\n'   >> $$@
+       @printf '      [ "nodes"      "$$(word 3, $$(S0))" ]\n'   >> $$@
+       @printf '   ]\n'                                          >> $$@        
+       @printf '   class "green"  [ "propositions"\n'            >> $$@
+       @printf '      [ "theorems" "$$(P1)" ]\n'                 >> $$@
+       @printf '      [ "lemmas"   "$$(P2)" ]\n'                 >> $$@
+       @printf '      [ "total"    "$$(P3)" ]\n'                 >> $$@
+       @printf '   ]\n'                                          >> $$@
+       @printf '   class "yellow" [ "concepts"\n'                >> $$@
+       @printf '      [ "declared" "$$(C1)" ]\n'                 >> $$@
+       @printf '      [ "defined"  "$$(C2)" ]\n'                 >> $$@
+       @printf '      [ "total"    "$$(C3)" ]\n'                 >> $$@
+       @printf '   ]\n'                                          >> $$@
+       @printf '}\n\n'                                           >> $$@
+       @printf 'class "capitalize italic" { 0 }\n\n'             >> $$@
+       @printf 'class "italic"            { 1 } { 3 } { 5 }\n\n' >> $$@
+       @printf 'class "right italic"      { 2 } { 4 } { 6 }\n'   >> $$@
 
 .PHONY: $$(SUM_$(1))
 endef
@@ -247,7 +249,7 @@ trim: $(TRIMS:%=%.trimmed)
 # contrib ####################################################################
 
 contrib:
-       @echo "  TAR -czf $(CONTRIB).tar.gz root *.ma"
+       @echo "  TAR -czf $(CONTRIB).tar.gz root $(XPACKAGES)"
        $(H)tar -czf $(CONTRIB).tar.gz root $(XMAS)
 
 ##############################################################################