ld.dtd: updated to comply with crg

Makefiles: updated to comply with new HELM server configuration
top: some traces of old command line option "-m" removed

diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile
index a6fcf6c4811aa86a59db6c07dfa723d4253b0381..353b70187066fccd7e265ba76d5162bdef5e2a53 100644 (file)
--- a/helm/software/lambda-delta/Makefile
+++ b/helm/software/lambda-delta/Makefile
@@ -15,7 +15,11 @@ TAGS = test-si test-si-fast hal xml-si-crg xml-si profile
 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/pairis1.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
 
 include Makefile.common
 
@@ -37,10 +41,6 @@ profile: $(MAIN).opt etc
        $(H)for T in `seq 30`; do ./$(MAIN).opt -u -q -s 3 -S 1 $(O) $(INPUT) >> etc/log.txt; done
        $(H)grep "at exit" etc/log.txt | sort | uniq > etc/profile-new.txt
 
-hal: $(MAIN).opt etc
-       @echo "  HELENA -o -x -m $(INPUT)"
-       $(H)./$(MAIN).opt -o -x $(HOME) -m -s 1 -S 1 $(INPUT) > etc/log.txt
-
 xml-si: $(MAIN).opt etc
        @echo "  HELENA -u -x -s 2 $(INPUT)"
        $(H)./$(MAIN).opt -u -x $(HOME) -s 2 -S 1 $(INPUT) > etc/log.txt
@@ -76,9 +76,13 @@ lddl: index
        @echo "  GENERATE lddl.tar.bz2"
        $(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X etc/exclude.txt xml
 
+install-dtd: xml/ld.dtd
+       @echo "  INSTALL $<"
+       $(H)scp $< $(XMLDIR) 
+
 install-xml: etc/make-html.sh
        @echo "  INSTALL xml"
-       cp -a xml/index.txt xml/ld.dtd xml/brg-si/ $(XMLDIR)
+       $(H)cp -a xml/index.txt xml/ld.dtd xml/brg-si/ $(XMLDIR)
 
 # old targets ##########################################################
 

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index e3b12db5128137ac89127e6b16ef5f92939a5d98..7ab5447b6fdd6fc556ff1a4f23c7593f5848ef17 100644 (file)
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -6,9 +6,9 @@ else
 endif
 
 LDDLURL = http://helm.cs.unibo.it/lambda-delta/static/lddl
-LDDLDIR = /projects/helm/public_html/lambda-delta/static/lddl
-DOWNDIR = /projects/helm/public_html/lambda-delta/download
-XMLDIR  = /projects/helm/public_html/lambda-delta/xml
+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
 
 DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make))
 

diff --git a/helm/software/lambda-delta/src/toplevel/top.ml b/helm/software/lambda-delta/src/toplevel/top.ml
index be3059ea2320a5904f0b4235fdd5a3ff81ae4d1b..40a58673a01a837ba3255279671cad607ae07fc5 100644 (file)
--- a/helm/software/lambda-delta/src/toplevel/top.ml
+++ b/helm/software/lambda-delta/src/toplevel/top.ml
@@ -327,7 +327,7 @@ try
       flush_all ()
    in
    let help = 
-      "Usage: helena [ -LPVXcgijmopqu1 | -Ss <number> | -x <dir> | -hkr <string> ]* [ <file> ]*\n\n" ^
+      "Usage: helena [ -LPVXcgijopqu1 | -Ss <number> | -x <dir> | -hkr <string> ]* [ <file> ]*\n\n" ^
       "Summary levels: 0 just errors (default), 1 time stamps, 2 processed file names, \
        3 data information, 4 typing information, 5 reduction information\n\n" ^
        "Stages: 0 parsing, 1 to intermediate, 2 to untrusted, 3 to trusted (default)\n"

diff --git a/helm/software/lambda-delta/xml/ld.dtd b/helm/software/lambda-delta/xml/ld.dtd
index 1a3103c2a3de79316e9e698c32f33167242bea6b..e6e90f7386ee3aeb6336b30808c5c557f0676c96 100644 (file)
--- a/helm/software/lambda-delta/xml/ld.dtd
+++ b/helm/software/lambda-delta/xml/ld.dtd
@@ -10,6 +10,8 @@
 
 <!ENTITY % term '(%node;*,%leaf;)'>
 
+<!ENTITY % terms '(%term;*)'>
+
 <!ELEMENT Sort EMPTY>
 <!ATTLIST Sort
           position NMTOKEN #REQUIRED
@@ -21,6 +23,7 @@
 <!ELEMENT LRef EMPTY>
 <!ATTLIST LRef
           position NMTOKEN #REQUIRED
+         offset   NMTOKEN #IMPLIED
           name     NMTOKEN #IMPLIED
           mark     NMTOKEN #IMPLIED
          meta     CDATA   #IMPLIED
@@ -41,14 +44,14 @@
          meta  CDATA   #IMPLIED
 >
 
-<!ELEMENT Appl %term;>
+<!ELEMENT Appl %terms;>
 <!ATTLIST Appl
           arity NMTOKEN #IMPLIED
           mark  NMTOKEN #IMPLIED
          meta  CDATA   #IMPLIED
 >
 
-<!ELEMENT Abst %term;>
+<!ELEMENT Abst %terms;>
 <!ATTLIST Abst
           name  NMTOKENS #IMPLIED
           arity NMTOKEN  #IMPLIED
@@ -56,7 +59,7 @@
          meta  CDATA    #IMPLIED
 >
 
-<!ELEMENT Abbr %term;>
+<!ELEMENT Abbr %terms;>
 <!ATTLIST Abbr
           name  NMTOKENS #IMPLIED
           arity NMTOKEN  #IMPLIED