update in basic_2 and apps_2

diff --git a/helm/www/lambdadelta/BTM.html b/helm/www/lambdadelta/BTM.html
index 40a8fa2f30bf3bb6cecfc4050c74c75de4a91121..17efe350b9d0edfb41338d84fdbd2d0f83be8639 100644 (file)
--- a/helm/www/lambdadelta/BTM.html
+++ b/helm/www/lambdadelta/BTM.html
@@ -223,6 +223,6 @@
     <div xmlns:ld="http://lambdadelta.info/" class="spacer">
       <br />
     </div>
-    <div xmlns:ld="http://lambdadelta.info/" class="spacer">Last update: Thu, 16 May 2013 16:37:26 +0200</div>
+    <div xmlns:ld="http://lambdadelta.info/" class="spacer">Last update: Sat, 01 Jun 2013 18:41:06 +0200</div>
 </body>
 </html>

diff --git a/helm/www/lambdadelta/apps_2.html b/helm/www/lambdadelta/apps_2.html
index f8b26841b9a867cf97c08d3f755b289ee313772e..6e81b110f6b47e51b26cbb4fe26b6c316a1e642e 100644 (file)
--- a/helm/www/lambdadelta/apps_2.html
+++ b/helm/www/lambdadelta/apps_2.html
@@ -72,29 +72,29 @@
           <tr>
             <td class="snns component cyan">sizes</td>
             <td class="snns plane cyan">files</td>
-            <td class="snnn number cyan">5  </td>
+            <td class="snnn number cyan">4  </td>
             <td class="snns plane cyan">characters</td>
-            <td class="snnn number cyan">5790</td>
+            <td class="snnn number cyan">3928</td>
             <td class="snns plane cyan">nodes</td>
-            <td class="ssnn number cyan">9846</td>
+            <td class="ssnn number cyan">3637</td>
           </tr>
           <tr>
             <td class="snns component green">propositions</td>
             <td class="snns plane green">theorems</td>
-            <td class="snnn number green">4</td>
+            <td class="snnn number green">2</td>
             <td class="snns plane green">lemmas</td>
             <td class="snnn number green">1</td>
             <td class="snns plane green">total</td>
-            <td class="ssnn number green">5</td>
+            <td class="ssnn number green">3</td>
           </tr>
           <tr>
             <td class="snss component yellow">concepts</td>
             <td class="snss plane yellow">declared</td>
             <td class="snsn number yellow">3</td>
             <td class="snss plane yellow">defined</td>
-            <td class="snsn number yellow">10</td>
+            <td class="snsn number yellow">9</td>
             <td class="snss plane yellow">total</td>
-            <td class="sssn number yellow">13</td>
+            <td class="sssn number yellow">12</td>
           </tr>
         </tbody>
       </table>
@@ -138,29 +138,17 @@
             </td>
           </tr>
           <tr>
-            <td class="snns component yellow">MLTT1</td>
-            <td class="snns plane yellow" />
-            <td class="snns file yellow">genv_primitive</td>
-            <td class="ssnn file yellow">judgement</td>
+            <td class="snns component red">functional</td>
+            <td class="snns plane red">reduction and type machine</td>
+            <td class="snns file red">rtm</td>
+            <td class="ssnn file red">rtm_step ( ? ⇨ ? )</td>
           </tr>
           <tr>
-            <td class="snns component orange">functional</td>
-            <td class="snns plane orange">reduction and type machine</td>
-            <td class="snns file orange">rtm</td>
-            <td class="ssnn file orange">rtm_step ( ? ⇨ ? )</td>
-          </tr>
-          <tr>
-            <td class="nnns component orange">
+            <td class="nnss component red">
               <br />
             </td>
-            <td class="snns plane orange">unfold</td>
-            <td class="snns file orange">lift ( ↑[?,?] ? )</td>
-            <td class="ssnn file orange">subst ( [?←?] ? )</td>
-          </tr>
-          <tr>
-            <td class="snss component red">examples</td>
-            <td class="snss plane red" />
-            <td class="snss file red" />
+            <td class="snss plane red">relocation</td>
+            <td class="snss file red">lift ( ↑[?,?] ? )</td>
             <td class="sssn file red">
               <br />
             </td>
@@ -199,6 +187,6 @@
     <div xmlns:ld="http://lambdadelta.info/" class="spacer">
       <br />
     </div>
-    <div xmlns:ld="http://lambdadelta.info/" class="spacer">Last update: Thu, 16 May 2013 16:37:26 +0200</div>
+    <div xmlns:ld="http://lambdadelta.info/" class="spacer">Last update: Sat, 01 Jun 2013 18:41:06 +0200</div>
 </body>
 </html>

diff --git a/helm/www/lambdadelta/basic_2.html b/helm/www/lambdadelta/basic_2.html
index 3766523d5d053a73f3f87b2478ca44178dc46609..9d7141b4c24da005415d14528f9eebfa5acb2a71 100644 (file)
--- a/helm/www/lambdadelta/basic_2.html
+++ b/helm/www/lambdadelta/basic_2.html
@@ -161,18 +161,18 @@
             <td class="snns plane cyan">files</td>
             <td class="snnn number cyan">169  </td>
             <td class="snns plane cyan">characters</td>
-            <td class="snnn number cyan">347556</td>
+            <td class="snnn number cyan">348328</td>
             <td class="snns plane cyan">nodes</td>
-            <td class="ssnn number cyan">969490</td>
+            <td class="ssnn number cyan">970177</td>
           </tr>
           <tr>
             <td class="snns component green">propositions</td>
             <td class="snns plane green">theorems</td>
             <td class="snnn number green">75</td>
             <td class="snns plane green">lemmas</td>
-            <td class="snnn number green">707</td>
+            <td class="snnn number green">716</td>
             <td class="snns plane green">total</td>
-            <td class="ssnn number green">782</td>
+            <td class="ssnn number green">791</td>
           </tr>
           <tr>
             <td class="snss component yellow">concepts</td>
@@ -1004,6 +1004,6 @@
     <div xmlns:ld="http://lambdadelta.info/" class="spacer">
       <br />
     </div>
-    <div xmlns:ld="http://lambdadelta.info/" class="spacer">Last update: Thu, 16 May 2013 16:37:26 +0200</div>
+    <div xmlns:ld="http://lambdadelta.info/" class="spacer">Last update: Sat, 01 Jun 2013 18:41:06 +0200</div>
 </body>
 </html>

diff --git a/helm/www/lambdadelta/bin/Makefile.common b/helm/www/lambdadelta/bin/Makefile.common
new file mode 100644 (file)
index 0000000..bf94497
--- /dev/null
+++ b/helm/www/lambdadelta/bin/Makefile.common
@@ -0,0 +1,27 @@
+H=@
+
+include ../../etc/Makefile.defs
+
+DIST=$(EXEC)---$(VERSION)
+DATE=$(shell date +%y%m%d)
+
+OCAMLOPTIONS = -linkpkg -thread -rectypes -package \"$(REQUIRES)\" 
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS) 
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS)
+
+all: $(EXEC).native
+
+$(EXEC).native: $(wildcard *.ml) $(wildcard *.mli) $(wildcard *.mly) $(wildcard *.mll)
+       @echo "  OCAMLBUILD $(EXEC).native" 
+       $(H)ocamlbuild -ocamlc "$(OCAMLC)" -ocamlopt "$(OCAMLOPT)" -yaccflags "$(YACCFLAGS)" $(EXEC).native 
+
+clean:
+       ocamlbuild -clean
+       rm -rf $(DIST) $(DIST).tgz
+
+dist:
+       mkdir -p $(DIST)/Sources
+       cp ReadMe $(DIST)
+       cp *.ml *.mli *.mll *.mly Makefile _tags $(DIST)/Sources
+       cd $(DIST); ln -s Sources/$(EXEC).native $(EXEC)
+       tar -cvzf $(DIST).tgz $(DIST)

diff --git a/helm/www/lambdadelta/bin/xhtbl/Makefile b/helm/www/lambdadelta/bin/xhtbl/Makefile
index c9bea1a53ea1a862f7b705ca42197ed1b58b3e20..e1b330db9edebac773ca5b4e9ebc22a5acd1a69a 100644 (file)
--- a/helm/www/lambdadelta/bin/xhtbl/Makefile
+++ b/helm/www/lambdadelta/bin/xhtbl/Makefile
@@ -5,7 +5,7 @@ REQUIRES = str
 
 YACCFLAGS = -v
 
-include Makefile.common
+include ../Makefile.common
 
 test:
        @$(MAKE) --no-print-directory -C ../../ www

diff --git a/helm/www/lambdadelta/bin/xhtbl/Makefile.common b/helm/www/lambdadelta/bin/xhtbl/Makefile.common
deleted file mode 100644 (file)
index bf94497..0000000
--- a/helm/www/lambdadelta/bin/xhtbl/Makefile.common
+++ /dev/null
@@ -1,27 +0,0 @@
-H=@
-
-include ../../etc/Makefile.defs
-
-DIST=$(EXEC)---$(VERSION)
-DATE=$(shell date +%y%m%d)
-
-OCAMLOPTIONS = -linkpkg -thread -rectypes -package \"$(REQUIRES)\" 
-OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS) 
-OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS)
-
-all: $(EXEC).native
-
-$(EXEC).native: $(wildcard *.ml) $(wildcard *.mli) $(wildcard *.mly) $(wildcard *.mll)
-       @echo "  OCAMLBUILD $(EXEC).native" 
-       $(H)ocamlbuild -ocamlc "$(OCAMLC)" -ocamlopt "$(OCAMLOPT)" -yaccflags "$(YACCFLAGS)" $(EXEC).native 
-
-clean:
-       ocamlbuild -clean
-       rm -rf $(DIST) $(DIST).tgz
-
-dist:
-       mkdir -p $(DIST)/Sources
-       cp ReadMe $(DIST)
-       cp *.ml *.mli *.mll *.mly Makefile _tags $(DIST)/Sources
-       cd $(DIST); ln -s Sources/$(EXEC).native $(EXEC)
-       tar -cvzf $(DIST).tgz $(DIST)