From: Ferruccio Guidi Date: Sun, 11 Sep 2011 14:03:37 +0000 (+0000) Subject: the refactoring continues ... X-Git-Tag: make_still_working~2292 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=354731c43c5d5b8d050564025e26fdc3bc85acb9;p=helm.git the refactoring continues ... --- diff --git a/helm/software/helena/Makefile b/helm/software/helena/Makefile index d8aa348f4..248d12606 100644 --- a/helm/software/helena/Makefile +++ b/helm/software/helena/Makefile @@ -14,24 +14,22 @@ TAGS = test-si test-si-fast profile xml-si xml-si-crg html test-html \ install-html install-lddl install-dtd install-xml instal-css -XMLS = xml/brg-si/grundlagen/l/not.ld.xml \ - xml/brg-si/grundlagen/l/et.ld.xml \ - xml/brg-si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ - xml/brg-si/grundlagen/l/e/pairis1.ld.xml \ - xml/brg-si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ - xml/crg-si/grundlagen/l/not.ld.xml \ - xml/crg-si/grundlagen/l/et.ld.xml \ - xml/crg-si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ - xml/crg-si/grundlagen/l/e/pairis1.ld.xml \ - xml/crg-si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ - xml/brg-si/grundlagen/ccs.ldc.xml +XMLS = xml/brg_si/grundlagen/l/not.ld.xml \ + xml/brg_si/grundlagen/l/et.ld.xml \ + xml/brg_si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ + xml/brg_si/grundlagen/l/e/pairis1.ld.xml \ + xml/brg_si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ + xml/crg_si/grundlagen/l/not.ld.xml \ + xml/crg_si/grundlagen/l/et.ld.xml \ + xml/crg_si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ + xml/crg_si/grundlagen/l/e/pairis1.ld.xml \ + xml/crg_si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ + xml/brg_si/grundlagen/ccs.ldc.xml include Makefile.common INPUT = examples/grundlagen/grundlagen.aut -SLS = helena.sl automath.sl - test-si: $(MAIN).opt etc @echo " HELENA -p -o -c $(INPUT)" $(H)./$(MAIN).opt -p -o -c -S 3 $(O) $(INPUT) > etc/log.txt @@ -63,7 +61,7 @@ etc: %.ld: @echo " XSLT $@" $(H)mkdir -p $(LOCALLDDLDIR)/$(@D) - $(H)$(XSLT) -o $(LOCALLDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml + $(H)$(XSLT) -o $(LOCALLDDLDIR)/$@.html $(BASEURL) xml/lddl.xsl xml/$@.xml %.ldc: @echo " SKIP $@" @@ -99,12 +97,4 @@ install-css: xml/ld-html.css install-xml: etc/make-html.sh @echo " INSTALL xml" - $(H)scp -r xml/index.txt xml/ld.dtd xml/brg-si/ xml/crg-si/ $(XMLDIR) - -install-icons: - @echo " INSTALL *.png *.ico" - $(H)scp icons/*.png icons/*.ico $(DOWNDIR) - -install-jed: - @echo " INSTALL $(SLS)" - $(H)scp $(SLS:%=$(HOME)/jed/%) $(DOWNDIR) + $(H)scp -r xml/index.txt xml/ld.dtd xml/brg_si/ xml/crg_si/ $(XMLDIR) diff --git a/helm/software/helena/Makefile.common b/helm/software/helena/Makefile.common index 80019a800..00c54f873 100644 --- a/helm/software/helena/Makefile.common +++ b/helm/software/helena/Makefile.common @@ -1,6 +1,6 @@ H=@ ifeq ($(origin OCAMLPATH), undefined) - OCAMLFIND = OCAMLPATH=$(HOME)/svn/software/components/METAS ocamlfind + OCAMLFIND = OCAMLPATH=$(HOME)/svn/helm-stable/software/components/METAS ocamlfind else OCAMLFIND = ocamlfind endif @@ -9,8 +9,8 @@ RELISE = $(MAIN:%=%_$(shell cat MakeVersion)) LDDLURL = http://lambda-delta.info/static/lddl LDDLDIR = mowgli:/projects/helm/public_html/lambda-delta/static/lddl -DOWNDIR = mowgli:/projects/helm/public_html/lambda-delta/download -XMLDIR = mowgli:/projects/helm/public_html/lambda-delta/xml +DOWNDIR = $(HOME)/svn/helm-stable/www/lambda_delta/download +XMLDIR = mowgli:/projects/helm/public_html/lambda_delta/xml LOCALLDDLDIR = $(HOME)/public_html/lddl DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make)) diff --git a/helm/software/helena/icons/b3.png b/helm/software/helena/icons/b3.png deleted file mode 100644 index 3ed538923..000000000 Binary files a/helm/software/helena/icons/b3.png and /dev/null differ diff --git a/helm/software/helena/icons/b4.png b/helm/software/helena/icons/b4.png deleted file mode 100644 index ccfd1a99a..000000000 Binary files a/helm/software/helena/icons/b4.png and /dev/null differ diff --git a/helm/software/helena/icons/b5.png b/helm/software/helena/icons/b5.png deleted file mode 100644 index 30cace1d1..000000000 Binary files a/helm/software/helena/icons/b5.png and /dev/null differ diff --git a/helm/software/helena/icons/b9.png b/helm/software/helena/icons/b9.png deleted file mode 100644 index 0de559867..000000000 Binary files a/helm/software/helena/icons/b9.png and /dev/null differ diff --git a/helm/software/helena/icons/basic-32.png b/helm/software/helena/icons/basic-32.png deleted file mode 100644 index 350f6bcb0..000000000 Binary files a/helm/software/helena/icons/basic-32.png and /dev/null differ diff --git a/helm/software/helena/icons/crux-16.ico b/helm/software/helena/icons/crux-16.ico deleted file mode 100644 index 7323c8af8..000000000 Binary files a/helm/software/helena/icons/crux-16.ico and /dev/null differ diff --git a/helm/software/helena/icons/crux-32.png b/helm/software/helena/icons/crux-32.png deleted file mode 100644 index be5524e5e..000000000 Binary files a/helm/software/helena/icons/crux-32.png and /dev/null differ diff --git a/helm/software/helena/icons/helena-32.png b/helm/software/helena/icons/helena-32.png deleted file mode 100644 index 4a065aefe..000000000 Binary files a/helm/software/helena/icons/helena-32.png and /dev/null differ diff --git a/helm/software/helena/icons/helena-label.png b/helm/software/helena/icons/helena-label.png deleted file mode 100644 index 55487ab99..000000000 Binary files a/helm/software/helena/icons/helena-label.png and /dev/null differ diff --git a/helm/software/helena/icons/rainbow.png b/helm/software/helena/icons/rainbow.png deleted file mode 100644 index 45925baa7..000000000 Binary files a/helm/software/helena/icons/rainbow.png and /dev/null differ diff --git a/helm/software/helena/src/common/options.ml b/helm/software/helena/src/common/options.ml index c133bed7c..8cc200ad9 100644 --- a/helm/software/helena/src/common/options.ml +++ b/helm/software/helena/src/common/options.ml @@ -45,7 +45,7 @@ let kernel_id () = | Brg -> "brg" | Bag -> "bag" in - let si = if !si then "-si" else "" in + let si = if !si then "_si" else "" in id ^ si let get_baseuri () = diff --git a/helm/software/helena/xml/ld-html-entity.xsl b/helm/software/helena/xml/ld-html-entity.xsl deleted file mode 100644 index 676d37722..000000000 --- a/helm/software/helena/xml/ld-html-entity.xsl +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - -
- - - - - - - - - - - - - - -
-
- - - - -
-
- -
-
- - - - Declaration - - - - - - Definition - - - -
diff --git a/helm/software/helena/xml/ld-html-library.xsl b/helm/software/helena/xml/ld-html-library.xsl deleted file mode 100644 index c7914ed64..000000000 --- a/helm/software/helena/xml/ld-html-library.xsl +++ /dev/null @@ -1,283 +0,0 @@ - - - - - - - - - - - - , - - - - / - - - - + - - - - .​ - - - - ( - - - - ) - - - - [ - - - - ] - - - - < - - - - > - - - - : - - - - = - - - - " - - - - Informal description: - - - - Validation parameters: - - - - sort hierarchy = - - - - kernel options = - - - - - - - - - - - - - &Pi; - - - - &Pi; - - - &lambda; - - - &lambda; - &infin; - - - &lambda; - - - - - - - - - &delta; - - - - - - &chi; - - - - - - - - - - - - - - - - - - - - - .html - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &lambda;&delta; Digital Library (LDDL) - - - diff --git a/helm/software/helena/xml/ld-html-root.xsl b/helm/software/helena/xml/ld-html-root.xsl deleted file mode 100644 index 72958381b..000000000 --- a/helm/software/helena/xml/ld-html-root.xsl +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - lambda-delta digital library (LDDL) - - - -
- - [lambda-delta home] -
-
- -
-
- [Spacer] -
- - - -
- - - -
- - - - - - - - - - - -
-
- -
diff --git a/helm/software/helena/xml/ld-html-term.xsl b/helm/software/helena/xml/ld-html-term.xsl deleted file mode 100644 index 4e0c488b5..000000000 --- a/helm/software/helena/xml/ld-html-term.xsl +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/helm/software/helena/xml/ld-html.css b/helm/software/helena/xml/ld-html.css deleted file mode 100644 index 705e15993..000000000 --- a/helm/software/helena/xml/ld-html.css +++ /dev/null @@ -1,105 +0,0 @@ -@charset "UTF-8"; - -/* general ******************************************************************/ - -body { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); - margin: 2.5%; -} - -a:link, a:visited { - text-decoration: underline; -} - -a:active, a:hover, a:focus { - background: rgb(192, 192, 192); -} - -/* blocks *******************************************************************/ - -.spacer { - text-align: center; -} - -.head1 { - margin: 0.5em 0; - text-align: center; - font-weight: bold; - font-size: xx-large; -} - -.head2 { - margin: 0.5em 0; - text-align: left; - font-weight: bold; - font-size: x-large; -} - -.text { - margin: 1em 0; - text-align: left; -} - -/* inline decorations *******************************************************/ - -.icon32 { - border: 0; - width: 32px; - height: 32px; -} - -.rule { - border: 0; - height: 4px; - width: 100%; -} - -.w3c { - margin: 0 0.5em; - border: 0; - width: 88px; - height: 32px; /* this should be 31px */ -} - -/* terms ********************************************************************/ - -.separator { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.sort { - background: rgb(255, 255, 255); - color: rgb(128, 0, 255); -} - -.lref { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.gref { - background: rgb(255, 255, 255); - color: rgb(0, 0, 255); -} - -.appl { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.cast { - background: rgb(255, 255, 255); - color: rgb(255, 0, 0); -} - -.local { - background: rgb(255, 255, 255); - color: rgb(0, 160, 0); -} - -.global { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} diff --git a/helm/software/helena/xml/ld-html.xsl b/helm/software/helena/xml/ld-html.xsl deleted file mode 100644 index d21a6bbf9..000000000 --- a/helm/software/helena/xml/ld-html.xsl +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/helm/software/helena/xml/ld.css b/helm/software/helena/xml/ld.css new file mode 100644 index 000000000..92d2e8d92 --- /dev/null +++ b/helm/software/helena/xml/ld.css @@ -0,0 +1,63 @@ +@charset "UTF-8"; + +/* general ******************************************************************/ + +body { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); + margin: 2.5%; +} + +a:link, a:visited { + text-decoration: underline; +} + +a:active, a:hover, a:focus { + background: rgb(192, 192, 192); +} + +/* blocks *******************************************************************/ + +.spacer { + text-align: center; +} + +.head1 { + margin: 0.5em 0; + text-align: center; + font-weight: bold; + font-size: xx-large; +} + +.head2 { + margin: 0.5em 0; + text-align: left; + font-weight: bold; + font-size: x-large; +} + +.text { + margin: 1em 0; + text-align: left; +} + +/* inline decorations *******************************************************/ + +.icon32 { + border: 0; + width: 32px; + height: 32px; +} + +.rule { + border: 0; + height: 4px; + width: 100%; +} + +.w3c { + margin: 0 0.5em; + border: 0; + width: 88px; + height: 32px; /* this should be 31px */ +} diff --git a/helm/software/helena/xml/ld.dtd b/helm/software/helena/xml/ld.dtd index 3939d6f5b..3dd881315 100644 --- a/helm/software/helena/xml/ld.dtd +++ b/helm/software/helena/xml/ld.dtd @@ -1,6 +1,6 @@ - + @@ -103,7 +103,7 @@ @@ -135,6 +135,6 @@ diff --git a/helm/software/helena/xml/lddl.css b/helm/software/helena/xml/lddl.css new file mode 100644 index 000000000..41a635d45 --- /dev/null +++ b/helm/software/helena/xml/lddl.css @@ -0,0 +1,43 @@ +@charset "UTF-8"; + +/* terms ********************************************************************/ + +.separator { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); +} + +.sort { + background: rgb(255, 255, 255); + color: rgb(128, 0, 255); +} + +.lref { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); +} + +.gref { + background: rgb(255, 255, 255); + color: rgb(0, 0, 255); +} + +.appl { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); +} + +.cast { + background: rgb(255, 255, 255); + color: rgb(255, 0, 0); +} + +.local { + background: rgb(255, 255, 255); + color: rgb(0, 160, 0); +} + +.global { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); +} diff --git a/helm/software/helena/xml/lddl.xsl b/helm/software/helena/xml/lddl.xsl new file mode 100644 index 000000000..2711cff96 --- /dev/null +++ b/helm/software/helena/xml/lddl.xsl @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + diff --git a/helm/software/helena/xml/lddl_entry.xsl b/helm/software/helena/xml/lddl_entry.xsl new file mode 100644 index 000000000..676d37722 --- /dev/null +++ b/helm/software/helena/xml/lddl_entry.xsl @@ -0,0 +1,61 @@ + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+
+ + + + +
+
+ +
+
+ + + + Declaration + + + + + + Definition + + + +
diff --git a/helm/software/helena/xml/lddl_library.xsl b/helm/software/helena/xml/lddl_library.xsl new file mode 100644 index 000000000..c7914ed64 --- /dev/null +++ b/helm/software/helena/xml/lddl_library.xsl @@ -0,0 +1,283 @@ + + + + + + + + + + + + , + + + + / + + + + + + + + + .​ + + + + ( + + + + ) + + + + [ + + + + ] + + + + < + + + + > + + + + : + + + + = + + + + " + + + + Informal description: + + + + Validation parameters: + + + + sort hierarchy = + + + + kernel options = + + + + + + + + + + + + + &Pi; + + + + &Pi; + + + &lambda; + + + &lambda; + &infin; + + + &lambda; + + + + + + + + + &delta; + + + + + + &chi; + + + + + + + + + + + + + + + + + + + + + .html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &lambda;&delta; Digital Library (LDDL) + + + diff --git a/helm/software/helena/xml/lddl_root.xsl b/helm/software/helena/xml/lddl_root.xsl new file mode 100644 index 000000000..c4cf27cd8 --- /dev/null +++ b/helm/software/helena/xml/lddl_root.xsl @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + lambda_delta digital library (LDDL) + + + + +
+ + [lambda_delta home] +
+
+ +
+
+ [Spacer] +
+ + + +
+ + + +
+ + + + + + + + + + + +
+
+ +
diff --git a/helm/software/helena/xml/lddl_term.xsl b/helm/software/helena/xml/lddl_term.xsl new file mode 100644 index 000000000..4e0c488b5 --- /dev/null +++ b/helm/software/helena/xml/lddl_term.xsl @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +