Fix the read-rif utils so that it reads correctly rif which first input is neg.

_oasis

 OASISFormat: 0.4
 Name:        Lutin
-Version:     2.44
+Version:     2.45
 Authors:     Erwan Jahier
 Maintainers: erwan.jahier@imag.fr
 License:     PROP

doc/lutin-tuto/Makefile

@@ -67,7 +67,7 @@ png:$(OBJDIR)
 
 $(MAIN)-html.org: html-preambule.org main.org
 	rm -f $(MAIN)-html.org
-	echo "# XXX Edite plutot le main.org patate ! " >  $(MAIN)-html.org
+	echo "# XXX Edite plutot le main.org ou le (pdf/html-preambule) patate ! " >  $(MAIN)-html.org
 	cat html-preambule.org main.org | sed -e 's/\\pause//g' \
 	| sed -e 's/^html://g'\
 	| sed -e 's/^html\.//g'\
@@ -94,7 +94,8 @@ $(OBJDIR):
 	mkdir -p $(OBJDIR) 
 	make $(OBJDIR)/main.noweb
 	cp -f  *.lut $(OBJDIR)
-	cp -rf crazy-rabbit $(OBJDIR) 
+	cp -rf crazy-rabbit $(OBJDIR)
+	cd $(OBJDIR)
 
 $(OBJDIR)/%.jpg: figs/%.fig
 	fig2dev -L jpeg $< $@ 
@@ -174,6 +175,9 @@ EMACSB=emacs --load=../emacs-org.el --batch
 # XXX with --batch, I loose the htmlize coloring. why ?
 EMACS=emacs  --load=../zenburn-theme.el --load=../emacs-org.el # --batch
 
+#emacs --batch  --eval "(setq org-export-headline-levels 2)" \
+	  --visit=README.org --funcall org-html-export-to-html
+
 #	$(EMACS) --batch \
 
 $(OBJDIR)/%.lut: %.lut

doc/lutin-tuto/emacs-org.el

@@ -5,7 +5,7 @@
 (setq load-path (cons (expand-file-name "~/el_files/") load-path))
 
 
-(setq load-path (cons (expand-file-name "~/.emacs.d/elpa/htmlize-1.39/") load-path))
+(setq load-path (cons (expand-file-name "~/.emacs.d/elpa/htmlize-20171017.141/") load-path))
 ;(setq load-path (cons (expand-file-name "/local/jahier/.emacs.d/elpa/htmlize-20161211.1019") load-path))
 ;(setq load-path (cons (expand-file-name "/local/jahier/.emacs.d/elpa/zenburn-theme-2.1/") load-path))
 
@@ -29,6 +29,8 @@
 (add-to-list 'org-export-latex-packages-alist '("" "color"))
 
 
+(setq org-export-headline-levels 2)
+
 (setq org-src-fontify-natively t)
 
 (org-babel-do-load-languages

doc/lutin-tuto/html-preambule.org

@@ -2,7 +2,7 @@
 #+OPTIONS:toc:2
 #+TODO: todo  cont  | done 
 #+OPTIONS:   \n:nil @:t ::t |:t ^:t -:t f:t *:t <:t
-
+ 
 #+LINK_HOME:http://orgmode.org/worg/org-tutorials/org-beamer/tutorial.html
 #+LINK_HOME:http://www-verimag.imag.fr/Lutin.html
 
@@ -11,19 +11,15 @@
 #+LANGUAGE: en
 
 # INFOJS_OPT: view:nil toc:t ltoc:t mouse:underline buttons:t path:http://orgmode.org/org-info.js
-#+INFOJS_OPT:  buttons:t view:info toc:  path:http://orgmode.org/org-info.js
-
-
+#+INFOJS_OPT: buttons:t view:info toc:  path:http://orgmode.org/org-info.js
 
 #+style: <style type="text/css">pre{background-color: #232323; color: #E6E1DC;}</style>
-
 #+style: <style type="text/css">blockquote{border: 1px solid #CCC; background-color: #E6E1DC; color: #232323;}</style>
-
-
 #+STYLE: <link rel="stylesheet" type="text/css" href="worg-zenburn.css" />
 
-
 #+OPTIONS: html-postamble:nil
+#+BIND: org-export-html-postamble "<div class='footer'> Built with %c. </div>"
+
 
 #+MACRO: runpdf  
 #+MACRO: run #+begin_src sh \\n<prompt> $2 \n#+end_src
@@ -38,8 +34,9 @@
 #+MACRO: onlypdf 
 #+MACRO: pdfonly 
 #+MACRO: pdfhtml $2
-#+BIND: org-export-html-postamble "<div class='footer'> Built with %c. </div>"
- 
+
+
+
 #+AUTHOR: Erwan Jahier
 
 #+TITLE: A Lutin Tutorial

doc/lutin-tuto/lutin-tuto-html.org

-# XXX Edite plutot le main.org patate ! 
+# XXX Edite plutot le main.org ou le (pdf/html-preambule) patate ! 
 
 #+OPTIONS:toc:2
 #+TODO: todo  cont  | done 
 #+OPTIONS:   \n:nil @:t ::t |:t ^:t -:t f:t *:t <:t
-
+ 
 #+LINK_HOME:http://orgmode.org/worg/org-tutorials/org-beamer/tutorial.html
 #+LINK_HOME:http://www-verimag.imag.fr/Lutin.html
 
@@ -12,19 +12,15 @@
 #+LANGUAGE: en
 
 # INFOJS_OPT: view:nil toc:t ltoc:t mouse:underline buttons:t path:http://orgmode.org/org-info.js
-#+INFOJS_OPT:  buttons:t view:info toc:  path:http://orgmode.org/org-info.js
-
-
+#+INFOJS_OPT: buttons:t view:info toc:  path:http://orgmode.org/org-info.js
 
 #+style: <style type="text/css">pre{background-color: #232323; color: #E6E1DC;}</style>
-
 #+style: <style type="text/css">blockquote{border: 1px solid #CCC; background-color: #E6E1DC; color: #232323;}</style>
-
-
 #+STYLE: <link rel="stylesheet" type="text/css" href="worg-zenburn.css" />
 
-
 #+OPTIONS: html-postamble:nil
+#+BIND: org-export-html-postamble "<div class='footer'> Built with %c. </div>"
+
 
 #+MACRO: runpdf  
 #+MACRO: run #+begin_src sh \\n<prompt> $2 \n#+end_src
@@ -39,8 +35,9 @@
 #+MACRO: onlypdf 
 #+MACRO: pdfonly 
 #+MACRO: pdfhtml $2
-#+BIND: org-export-html-postamble "<div class='footer'> Built with %c. </div>"
- 
+
+
+
 #+AUTHOR: Erwan Jahier
 
 #+TITLE: A Lutin Tutorial
@@ -603,6 +600,7 @@ the same.
 #+END_QUOTE
 
 
+{{{onlyhtml([[file:range2.lut][Answer]])}}}
 
 ** Non deterministic programs (cont)
 
@@ -613,7 +611,7 @@ the same.
 #+INCLUDE: "./polyhedron.lut" src lutin
 
 #+begin_src sh :tangle sh/poly-demo.sh :exports none :noweb yes
-#  xterm  -e "lutin polyhedron.lut -l 1000 -quiet > poly.data";
+  xterm  -e "lutin polyhedron.lut -l 1000 -quiet > poly.data";
   echo 'set pointsize 0.2 ; splot "poly.data" using 1:2:3;pause mouse close'| gnuplot
 #+end_src
 
@@ -633,12 +631,12 @@ plotting facilities of gnuplot like that:
 
 
 #+begin_src sh :tangle sh/poly-se-demo.sh :exports none :noweb yes
-#  xterm -e "lutin polyhedron.lut -se -l 1000 -quiet > poly-se.data" &&
+  xterm -e "lutin polyhedron.lut -se -l 1000 -quiet > poly-se.data" &&
   echo 'set point 0.2 ; splot "poly-se.data" using 1:2:3; pause mouse close'| gnuplot
 #+end_src
 
 #+begin_src sh :tangle sh/poly-sv-demo.sh :exports none :noweb yes
-#  xterm -e "lutin polyhedron.lut -sv -l 1000 -quiet > poly-sv.data" &&
+  xterm -e "lutin polyhedron.lut -sv -l 1000 -quiet > poly-sv.data" &&
   echo 'set point 0.8; splot "poly-sv.data" using 1:2:3; pause mouse close'| gnuplot
 #+end_src
 
@@ -692,6 +690,7 @@ returns -1.
 
 #+END_QUOTE
 
+[[file:answer1.lut][Answer]]
 
 
 ** Controlled non-determinism: the choice operator
@@ -911,6 +910,7 @@ file:png/Screenshot-Gnuplot-localbis.png
 
 #+END_QUOTE
 
+[[file:local-bis.lut][Answer]]
 
 ** Distribute a constraint into a scope: =assert=
 
@@ -956,6 +956,7 @@ expression  ~<te>~  by substituting  all  the constraint  expressions
    ~assert/in~ construct and avoid code duplication.
 #+END_QUOTE
   
+ [[file:true_since_n_instants3.lut][Answer]]
 
 ** External code
 

doc/lutin-tuto/lutin-tuto-pdf.org

@@ -330,7 +330,7 @@ as done in [[file:trivial2.lut][trivial2.lut]]:
 #+INCLUDE: "./polyhedron.lut" src lutin
 
 #+begin_src sh :tangle sh/poly-demo.sh :exports none :noweb yes
-#  xterm  -e "lutin polyhedron.lut -l 1000 -quiet > poly.data";
+  xterm  -e "lutin polyhedron.lut -l 1000 -quiet > poly.data";
   echo 'set pointsize 0.2 ; splot "poly.data" using 1:2:3;pause mouse close'| gnuplot
 #+end_src
 
@@ -340,12 +340,12 @@ echo 'set point 0.2; splot "poly.data" using 1:2:3;pause mouse close'| gnuplot)}
 
 
 #+begin_src sh :tangle sh/poly-se-demo.sh :exports none :noweb yes
-#  xterm -e "lutin polyhedron.lut -se -l 1000 -quiet > poly-se.data" &&
+  xterm -e "lutin polyhedron.lut -se -l 1000 -quiet > poly-se.data" &&
   echo 'set point 0.2 ; splot "poly-se.data" using 1:2:3; pause mouse close'| gnuplot
 #+end_src
 
 #+begin_src sh :tangle sh/poly-sv-demo.sh :exports none :noweb yes
-#  xterm -e "lutin polyhedron.lut -sv -l 1000 -quiet > poly-sv.data" &&
+  xterm -e "lutin polyhedron.lut -sv -l 1000 -quiet > poly-sv.data" &&
   echo 'set point 0.8; splot "poly-sv.data" using 1:2:3; pause mouse close'| gnuplot
 #+end_src
 

doc/lutin-tuto/main.org

@@ -567,7 +567,7 @@ html.
 #+INCLUDE: "./polyhedron.lut" src lutin
 
 #+begin_src sh :tangle sh/poly-demo.sh :exports none :noweb yes
-#  xterm  -e "lutin polyhedron.lut -l 1000 -quiet > poly.data";
+  xterm  -e "lutin polyhedron.lut -l 1000 -quiet > poly.data";
   echo 'set pointsize 0.2 ; splot "poly.data" using 1:2:3;pause mouse close'| gnuplot
 #+end_src
 
@@ -587,12 +587,12 @@ html.
 
 
 #+begin_src sh :tangle sh/poly-se-demo.sh :exports none :noweb yes
-#  xterm -e "lutin polyhedron.lut -se -l 1000 -quiet > poly-se.data" &&
+  xterm -e "lutin polyhedron.lut -se -l 1000 -quiet > poly-se.data" &&
   echo 'set point 0.2 ; splot "poly-se.data" using 1:2:3; pause mouse close'| gnuplot
 #+end_src
 
 #+begin_src sh :tangle sh/poly-sv-demo.sh :exports none :noweb yes
-#  xterm -e "lutin polyhedron.lut -sv -l 1000 -quiet > poly-sv.data" &&
+  xterm -e "lutin polyhedron.lut -sv -l 1000 -quiet > poly-sv.data" &&
   echo 'set point 0.8; splot "poly-sv.data" using 1:2:3; pause mouse close'| gnuplot
 #+end_src
 

lutin/src/version.ml

-let str="2.44"
-let sha="c3dd3b8"
+let str="2.45"
+let sha="c903e6e"

utils/read-rif.sh

@@ -10,5 +10,7 @@ cat  $riffile | \
     sed -e 's/[ \t]True/ 1 /g'   -e 's/[ \t]true/ 1/g'   -e 's/[ \t]t/ 1/g'  -e 's/[ \t]T/ 1/g' | \
     sed -e 's/False[ \t$]/0 /g' -e 's/false[ \t$]/0 /g' -e 's/f[ \t$]/0 /g' -e 's/F[ \t$]/0 /g' | \
     sed -e 's/[ \t]False/ 0/g'  -e 's/[ \t]false/ 0/g'  -e 's/[ \t]f/ 0/g'  -e 's/[ \t]F/ 0/g' | \
-    sed -e 'N; s/#step \([0-9]*\)\([^0-9]*\)\(.*\)#outs \(.*\)/\1 \3 \4/g' 
+    sed -e 'N; s/#step \([0-9]*\)\(.*\)\(^.*\)#outs \(.*\)/\1  \3 \4/g' 
+
+#    sed -e 'N; s/#step \([0-9]*\)\([^0-9\-]*\)\(.*\)#outs \(.*\)/\1  \3 \4/g'