From add1600e1ceef0f1c7e07a4d13c60edd7a3ea367 Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Sat, 9 Mar 2013 22:32:07 +0000 Subject: [PATCH] - update in basic_2 - contrib specific web pages moved out - improved Makefiles --- helm/www/lambdadelta/BTM.html | 2 +- helm/www/lambdadelta/Makefile | 41 ++- helm/www/lambdadelta/apps_2.html | 4 +- helm/www/lambdadelta/basic_2.html | 6 +- helm/www/lambdadelta/bin/xhtbl/Makefile | 29 +- helm/www/lambdadelta/web/home/BTM.ldw.xml | 15 - helm/www/lambdadelta/web/home/apps_2.ldw.xml | 52 ---- helm/www/lambdadelta/web/home/apps_2_src.tbl | 38 --- helm/www/lambdadelta/web/home/basic_2.ldw.xml | 78 ----- helm/www/lambdadelta/web/home/basic_2_blk.tbl | 52 ---- helm/www/lambdadelta/web/home/basic_2_src.tbl | 289 ------------------ 11 files changed, 43 insertions(+), 563 deletions(-) delete mode 100644 helm/www/lambdadelta/web/home/BTM.ldw.xml delete mode 100644 helm/www/lambdadelta/web/home/apps_2.ldw.xml delete mode 100644 helm/www/lambdadelta/web/home/apps_2_src.tbl delete mode 100644 helm/www/lambdadelta/web/home/basic_2.ldw.xml delete mode 100644 helm/www/lambdadelta/web/home/basic_2_blk.tbl delete mode 100644 helm/www/lambdadelta/web/home/basic_2_src.tbl diff --git a/helm/www/lambdadelta/BTM.html b/helm/www/lambdadelta/BTM.html index c13092e5c..4736b1932 100644 --- a/helm/www/lambdadelta/BTM.html +++ b/helm/www/lambdadelta/BTM.html @@ -20,6 +20,6 @@
classcontents














p
147101316192225283134374043
q
5111517232933354145




s
268141820242632384244


t
39122127303639






-
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2013-03-08T14:45:26+01:00
+
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2013-03-09T23:27:52+01:00
diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile index 388070cd0..0da13bb38 100644 --- a/helm/www/lambdadelta/Makefile +++ b/helm/www/lambdadelta/Makefile @@ -5,16 +5,21 @@ TAGS = www up \ test-html html install-html \ install-jed install-bib \ -LDDLURL = http://lambdadelta.info/static/lddl +LDURL = http://lambdadelta.info/ +LDDLURL = $(LDURL)static/lddl +HOMEDIR = . ETCDIR = etc DOWNDIR = download XSLTDIR = xslt XMLDIR = xml +SRCDIR = web/home +XHTBLDIR = bin/xhtbl HTMLDIR = $(HOME)/public_html/lddl JEDDIR = $(HOME)/mps/jed BIBDIR = $(HOME)/texmf/bibtex/bib -XHTBLDIR = bin/xhtbl + +WEBDIRS = $(SRCDIR) $(ETCDIR) REMOTE = helm.cs.unibo.it RDIR = /projects/helm/public_html/lambdadelta @@ -36,11 +41,39 @@ XMLS = brg_si/grundlagen/l/not.ld.xml \ crg_si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ brg_si/grundlagen/ccs.ldc.xml +LDWEB = ld_web.xsl ld_web_root.xsl ld_web_library.xsl + XMLLINT = xmllint --noout XSLT = xsltproc +XHTBL = $(XHTBLDIR)/xhtbl.native + +%.html: BASEURL = --stringparam baseurl $(LDURL) + +define HTML_TEMPLATE + HTML_$(2) = $$(HOMEDIR)/$(2).html + HTMLS += $$(HTML_$(2)) + + $$(HTML_$(2)): $(1) $$(XSLS) $$(LDWEB:%=$$(XSLTDIR)/%) + @echo " XSLT $$(notdir $$<)" + $$(H)$$(XSLT) -o $$@ $$(BASEURL) $$(XSLTDIR)/ld_web.xsl $$< +endef + +ifeq ($(MAKECMDGOALS), www) + LDWS = $(shell find -L $(WEBDIRS) -name "*.ldw.xml") + TBLS = $(shell find -L $(WEBDIRS) -name "*.tbl") + XSLS = $(addprefix $(XSLTDIR)/,xhtbl.xsl $(notdir $(TBLS:%.tbl=%.xsl))) + + $(XSLS): $(TBLS) $(XHTBL) + @echo " XHTBL *.tbl" + $(H)$(XHTBL) -O $(XSLTDIR) $(TBLS) + + $(foreach LDW,$(LDWS),$(eval $(call HTML_TEMPLATE,$(LDW),$(notdir $(LDW:%.ldw.xml=%))))) +endif all: www +www: $(HTMLS) + lint-xml: $(XMLS:%=$(XMLDIR)/%) @echo XMLLINT --valid $(H)$(XMLLINT) --valid $^ @@ -77,10 +110,6 @@ install-bib: $(BIB:%=$(BIBDIR)/%) @echo " INSTALL $(BIB)" $(H)scp $< $(DOWNDIR) $(H)scp $< $(DOWNDIR)/$(BIB:%.bib=%.txt) - -www: - $(H)$(MAKE) --no-print-directory -C $(XHTBLDIR) www - up: @echo " UPDATE $(REMOTE):$(RDIR)" $(H)ssh $(REMOTE) "svn up $(RDIR)" diff --git a/helm/www/lambdadelta/apps_2.html b/helm/www/lambdadelta/apps_2.html index 118a8993a..20e4c26bd 100644 --- a/helm/www/lambdadelta/apps_2.html +++ b/helm/www/lambdadelta/apps_2.html @@ -32,7 +32,7 @@
Here is a numerical acount of the specification's contents and its timeline.
-
categoryobjects




sizesfiles5characters5613nodes10024
propositionstheorems4lemmas1total5
conceptsdeclared3defined10total13
+
categoryobjects




sizesfiles5characters5613nodes9842
propositionstheorems4lemmas1total5
conceptsdeclared3defined10total13
@@ -57,6 +57,6 @@
The source files are grouped in directories, one for each component.
-
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2013-03-08T14:45:26+01:00
+
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2013-03-09T23:27:52+01:00
diff --git a/helm/www/lambdadelta/basic_2.html b/helm/www/lambdadelta/basic_2.html index a6330c5f5..3955a0574 100644 --- a/helm/www/lambdadelta/basic_2.html +++ b/helm/www/lambdadelta/basic_2.html @@ -29,7 +29,7 @@
Here is a numerical acount of the specification's contents and its timeline.
-
categoryobjects




sizesfiles249characters476391nodes1271266
propositionstheorems85lemmas1109total1194
conceptsdeclared45defined82total127
+
categoryobjects




sizesfiles252characters483454nodes1296744
propositionstheorems85lemmas1119total1204
conceptsdeclared46defined82total128