better static html pages, now they are generted in the install location

diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile
index 74154e0991f516faa7a77ed7cd1284ff70c03a55..c3901db48f30e27ce94f5126a3085b1d88058348 100644 (file)
--- a/helm/software/lambda-delta/Makefile
+++ b/helm/software/lambda-delta/Makefile
@@ -4,11 +4,13 @@ REQUIRES = unix str
 
 KEEP = README automath/*.aut
 
-CLEAN = log.txt
+CLEAN = etc/log.txt
 
 TAGS = test test-si test-si-fast hal xml-si
 
-XMLS = xml/grundlagen/l/not.ld.xml xml/grundlagen/l/con.ld.xml
+XMLS = xml/grundlagen/l/not.ld.xml xml/grundlagen/l/et.ld.xml \
+       xml/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \
+       xml/grundlagen/l/e/pairis1.ld.xml
 
 include Makefile.common
 
@@ -18,43 +20,39 @@ INPUT-ORIG = automath/grundlagen-orig.aut
 
 test: $(MAIN).opt
        @echo "  HELENA -a -r $(INPUT)"
-       $(H)./$(MAIN).opt -a -r -S 3 $(O) $(INPUT) > log.txt
+       $(H)./$(MAIN).opt -a -r -S 3 $(O) $(INPUT) > etc/log.txt
 
 test-si: $(MAIN).opt
        @echo "  HELENA -a -r -u $(INPUT)"
-       $(H)./$(MAIN).opt -a -r -u -S 3 $(O) $(INPUT) > log.txt
+       $(H)./$(MAIN).opt -a -r -u -S 3 $(O) $(INPUT) > etc/log.txt
 
 test-si-fast: $(MAIN).opt
        @echo "  HELENA -r -u $(INPUT)"
-       $(H)./$(MAIN).opt -r -u -S 1 $(O) $(INPUT) > log.txt
+       $(H)./$(MAIN).opt -r -u -S 1 $(O) $(INPUT) > etc/log.txt
 
 hal: $(MAIN).opt
        @echo "  HELENA -m $(INPUT)"
-       $(H)./$(MAIN).opt -m -s 1 -S 1 $(INPUT) > log.txt
+       $(H)./$(MAIN).opt -m -s 1 -S 1 $(INPUT) > etc/log.txt
 
 xml-si: $(MAIN).opt
        @echo "  HELENA -u -x $(INPUT)"
-       $(H)./$(MAIN).opt -u -x -s 2 -S 1 $(INPUT) > log.txt
+       $(H)./$(MAIN).opt -u -x -s 2 -S 1 $(INPUT) > etc/log.txt
 
-%.ld: BASEURL = --stringparam baseurl $(STATIC)
+%.ld: BASEURL = --stringparam baseurl $(LDDLURL)
 
 %.ld:
        @echo "  XSLT $@"
-       $(H)mkdir -p static/$(@D)
-       $(H)$(XSLT) -o static/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
+       $(H)mkdir -p $(LDDLDIR)/$(@D)
+       $(H)$(XSLT) -o $(LDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
 
-make-html.sh xml/index.txt index:
+etc/make-html.sh xml/index.txt index:
        @echo "  GENERATING INDEXES"
        $(H)find xml -name "*.ld.xml" | sed s/.xml//g | sed s/xml/ld:/g > xml/index.txt
-       $(H)sed "s/^/make --no-print-directory /" xml/index.txt | sed s.ld:/.. > make-html.sh
+       $(H)sed "s/^/make --no-print-directory /" xml/index.txt | sed s.ld:/.. > etc/make-html.sh
 
-html: make-html.sh
+html: etc/make-html.sh
        @echo "  MAKE */*.ld"
        $(H). $<
 
 test-html:
-       @$(MAKE) --no-print-directory $(XMLS:xml/%.xml=%) grundlagen/l/someapp.ld
-
-install-html:
-       @echo "  CP -r static/* /projects/helm/public_html/lambda-delta/static/"
-       $(H)cp -r static/* /projects/helm/public_html/lambda-delta/static/
+       @$(MAKE) --no-print-directory $(XMLS:xml/%.xml=%)

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index 0cf1f84ac14c454e6cbf72e4a10daf6f3a22f068..3649a8b07da9ab9d07da8da2c9ef19dbaa30e049 100644 (file)
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -1,6 +1,7 @@
 H=@
 
-STATIC = http://helm.cs.unibo.it/lambda-delta/static
+LDDLURL = http://helm.cs.unibo.it/lambda-delta/static/lddl
+LDDLDIR = /projects/helm/public_html/lambda-delta/static/lddl
 
 DIRECTORIES = $(shell cat Make)
 

diff --git a/helm/software/lambda-delta/xml/ld-html-library.xsl b/helm/software/lambda-delta/xml/ld-html-library.xsl
index b640b0b0df1715bd28ccaefde0a9eb31218e19a2..3479c3038176884dd8a772300c91c1027285e5ec 100644 (file)
--- a/helm/software/lambda-delta/xml/ld-html-library.xsl
+++ b/helm/software/lambda-delta/xml/ld-html-library.xsl
@@ -118,7 +118,7 @@
 
 <xsl:template name="mk_path">
    <xsl:param name="rpath" select="@uri"/>
-   <xsl:variable name="newrpath" select="substring-after($rpath, '/')"/>
+   <xsl:variable name="newrpath" select="substring-after($rpath,'/')"/>
    <xsl:choose>
       <xsl:when test="$newrpath">
          <xsl:variable name="segment" select="substring-before($rpath,$newrpath)"/>   
@@ -127,7 +127,7 @@
             <xsl:with-param name="name" select="substring-before($segment,'/')"/>
          </xsl:call-template>
         <xsl:call-template name="mk_path">
-           <xsl:with-param name="rpath" select="substring-after($rpath,'/')"/>
+           <xsl:with-param name="rpath" select="$newrpath"/>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>