alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

org: uses nice dot arrows

Browse source 
Suggested by Akim Demaille.  Fixes #69.

* doc/org/.dir-locals.el, doc/org/init.el.in,
wrap/python/tests/automata.ipynb: Set arrowhead and arrowsize.
* doc/org/autfilt.org, doc/org/dstar2tgba.org,
doc/org/ltl2tgba.org, doc/org/oaut.org: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-03-26 09:26:25 +01:00
parent 30b8788676
commit 8e6b35e5e3
7 changed files with 352 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/org/.dir-locals.el
View file

@ -9,7 +9,7 @@
path-separator path-separator
"$PATH sh")) "$PATH sh"))
(setenv "SPOT_DOTDEFAULT" "brf(Lato)") (setenv "SPOT_DOTDEFAULT" "brf(Lato)")
(setenv "SPOT_DOTEXTRA" "node[style=filled, fillcolor=\"#ffffa0\"]") (setenv "SPOT_DOTEXTRA" "node[style=filled, fillcolor=\"#ffffa0\"] edge[arrowhead=vee, arrowsize=.7]")
(org-babel-do-load-languages 'org-babel-load-languages (org-babel-do-load-languages 'org-babel-load-languages
'((sh . t) '((sh . t)
(python . t) (python . t)

16
doc/org/autfilt.org
View file

@ -320,7 +320,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]
@ -361,7 +361,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label=<0<br/><font color="#B276B2">❸</font>>] 0 [label=<0<br/><font color="#B276B2">❸</font>>]
@ -422,7 +422,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]
@ -466,7 +466,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]
@ -512,7 +512,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]
@ -558,7 +558,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]
@ -597,7 +597,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]
@ -630,7 +630,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]

10
doc/org/dstar2tgba.org
View file

@ -108,16 +108,16 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 1 I -> 1
0 [label="0", peripheries=2] 0 [label=<0<br/><font color="#5DA5DA">⓿</font>>]
0 -> 0 [label=<b>] 0 -> 0 [label=<b>]
0 -> 2 [label=<!b>] 0 -> 2 [label=<!b>]
1 [label="1"] 1 [label=<1>]
1 -> 0 [label=<a>] 1 -> 0 [label=<a>]
1 -> 1 [label=<!a>] 1 -> 1 [label=<!a>]
2 [label="2"] 2 [label=<2>]
2 -> 0 [label=<b>] 2 -> 0 [label=<b>]
2 -> 2 [label=<!b>] 2 -> 2 [label=<!b>]
} }
@ -216,7 +216,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]

3
doc/org/init.el.in
View file

@ -25,7 +25,8 @@
(concat "PATH=@abs_top_builddir@/src/bin" path-separator "$PATH sh")) (concat "PATH=@abs_top_builddir@/src/bin" path-separator "$PATH sh"))
(setenv "SPOT_DOTDEFAULT" "brf(Lato)") (setenv "SPOT_DOTDEFAULT" "brf(Lato)")
(setenv "SPOT_DOTEXTRA" "node[style=filled, fillcolor=\"#ffffa0\"]") (setenv "SPOT_DOTEXTRA"
"node[style=filled, fillcolor=\"#ffffa0\"] edge[arrowhead=vee, arrowsize=.7]")
(setq org-export-html-home/up-format (setq org-export-html-home/up-format
"<div id=\"org-div-home-and-up\" style=\"text-align:center;white-space:nowrap;\"> "<div id=\"org-div-home-and-up\" style=\"text-align:center;white-space:nowrap;\">

70
doc/org/ltl2tgba.org
View file

@ -64,7 +64,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 1 I -> 1
0 [label="0"] 0 [label="0"]
@ -108,7 +108,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]
@ -143,18 +143,18 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0", peripheries=2] 0 [label=<0<br/><font color="#5DA5DA">⓿</font>>]
0 -> 0 [label=<a &amp; b>] 0 -> 0 [label=<a &amp; b>]
0 -> 1 [label=<!b>] 0 -> 1 [label=<!b>]
0 -> 2 [label=<!a &amp; b>] 0 -> 2 [label=<!a &amp; b>]
1 [label="1"] 1 [label=<1>]
1 -> 0 [label=<a &amp; b>] 1 -> 0 [label=<a &amp; b>]
1 -> 1 [label=<!b>] 1 -> 1 [label=<!b>]
1 -> 2 [label=<!a &amp; b>] 1 -> 2 [label=<!a &amp; b>]
2 [label="2"] 2 [label=<2>]
2 -> 0 [label=<a>] 2 -> 0 [label=<a>]
2 -> 2 [label=<!a>] 2 -> 2 [label=<!a>]
} }
@ -190,7 +190,7 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label="0"]
@ -266,18 +266,18 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0", peripheries=2] 0 [label=<0<br/><font color="#5DA5DA">⓿</font>>]
0 -> 0 [label=<a∧b>] 0 -> 0 [label=<a∧b>]
0 -> 1 [label=<b̅>] 0 -> 1 [label=<b̅>]
0 -> 2 [label=<a̅∧b>] 0 -> 2 [label=<a̅∧b>]
1 [label="1"] 1 [label=<1>]
1 -> 0 [label=<a∧b>] 1 -> 0 [label=<a∧b>]
1 -> 1 [label=<b̅>] 1 -> 1 [label=<b̅>]
1 -> 2 [label=<a̅∧b>] 1 -> 2 [label=<a̅∧b>]
2 [label="2"] 2 [label=<2>]
2 -> 0 [label=<a>] 2 -> 0 [label=<a>]
2 -> 2 [label=<a̅>] 2 -> 2 [label=<a̅>]
} }
@ -386,18 +386,18 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label=<0>]
0 -> 1 [label=<a>] 0 -> 1 [label=<a>]
0 -> 2 [label=<b>] 0 -> 2 [label=<b>]
0 -> 3 [label=<c>] 0 -> 3 [label=<c>]
1 [label="1"] 1 [label=<1>]
1 -> 1 [label=<a>] 1 -> 1 [label=<a>]
2 [label="2"] 2 [label=<2>]
2 -> 2 [label=<b>] 2 -> 2 [label=<b>]
3 [label="3"] 3 [label=<3>]
3 -> 3 [label=<c>] 3 -> 3 [label=<c>]
} }
#+end_example #+end_example
@ -419,28 +419,28 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 6 I -> 6
0 [label="0", peripheries=2] 0 [label=<0<br/><font color="#5DA5DA">⓿</font>>]
0 -> 0 [label=<c>] 0 -> 0 [label=<c>]
1 [label="1", peripheries=2] 1 [label=<1<br/><font color="#5DA5DA">⓿</font>>]
1 -> 0 [label=<!b &amp; c>] 1 -> 0 [label=<!b &amp; c>]
1 -> 1 [label=<b &amp; c>] 1 -> 1 [label=<b &amp; c>]
1 -> 2 [label=<b &amp; !c>] 1 -> 2 [label=<b &amp; !c>]
2 [label="2", peripheries=2] 2 [label=<2<br/><font color="#5DA5DA">⓿</font>>]
2 -> 2 [label=<b>] 2 -> 2 [label=<b>]
3 [label="3", peripheries=2] 3 [label=<3<br/><font color="#5DA5DA">⓿</font>>]
3 -> 2 [label=<!a &amp; b>] 3 -> 2 [label=<!a &amp; b>]
3 -> 3 [label=<a &amp; b>] 3 -> 3 [label=<a &amp; b>]
3 -> 5 [label=<a &amp; !b>] 3 -> 5 [label=<a &amp; !b>]
4 [label="4", peripheries=2] 4 [label=<4<br/><font color="#5DA5DA">⓿</font>>]
4 -> 0 [label=<!a &amp; c>] 4 -> 0 [label=<!a &amp; c>]
4 -> 4 [label=<a &amp; c>] 4 -> 4 [label=<a &amp; c>]
4 -> 5 [label=<a &amp; !c>] 4 -> 5 [label=<a &amp; !c>]
5 [label="5", peripheries=2] 5 [label=<5<br/><font color="#5DA5DA">⓿</font>>]
5 -> 5 [label=<a>] 5 -> 5 [label=<a>]
6 [label="6", peripheries=2] 6 [label=<6<br/><font color="#5DA5DA">⓿</font>>]
6 -> 0 [label=<!a &amp; !b &amp; c>] 6 -> 0 [label=<!a &amp; !b &amp; c>]
6 -> 1 [label=<!a &amp; b &amp; c>] 6 -> 1 [label=<!a &amp; b &amp; c>]
6 -> 2 [label=<!a &amp; b &amp; !c>] 6 -> 2 [label=<!a &amp; b &amp; !c>]
@ -613,17 +613,17 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
0 [label="0"] 0 [label=<0>]
0 -> 1 [label=<1>] 0 -> 1 [label=<1>]
0 -> 3 [label=<c>] 0 -> 3 [label=<c>]
1 [label="1"] 1 [label=<1>]
1 -> 2 [label=<a>] 1 -> 2 [label=<a>]
2 [label="2"] 2 [label=<2>]
2 -> 2 [label=<1>] 2 -> 2 [label=<1>]
3 [label="3"] 3 [label=<3>]
3 -> 3 [label=<c>] 3 -> 3 [label=<c>]
} }
#+end_example #+end_example
@ -647,19 +647,19 @@ digraph G {
fontname="Lato" fontname="Lato"
node [fontname="Lato"] node [fontname="Lato"]
edge [fontname="Lato"] edge [fontname="Lato"]
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 3 I -> 3
0 [label="0"] 0 [label=<0>]
0 -> 0 [label=<1>] 0 -> 0 [label=<1>]
1 [label="1"] 1 [label=<1>]
1 -> 0 [label=<a>] 1 -> 0 [label=<a>]
2 [label="2"] 2 [label=<2>]
2 -> 2 [label=<c>] 2 -> 2 [label=<c>]
3 [label="3"] 3 [label=<3>]
3 -> 1 [label=<!c>] 3 -> 1 [label=<!c>]
3 -> 4 [label=<c>] 3 -> 4 [label=<c>]
4 [label="4"] 4 [label=<4>]
4 -> 0 [label=<a>] 4 -> 0 [label=<a>]
4 -> 2 [label=<!a &amp; c>] 4 -> 2 [label=<!a &amp; c>]
} }

4
doc/org/oaut.org
View file

@ -823,7 +823,7 @@ The dot output can also be customized via two environment variables:
#+BEGIN_SRC sh :results verbatim :exports code #+BEGIN_SRC sh :results verbatim :exports code
export SPOT_DOTDEFAULT='brf(Lato)' export SPOT_DOTDEFAULT='brf(Lato)'
export SPOT_DOTEXTRA='node[style=filled, fillcolor="#ffffa0"]' export SPOT_DOTEXTRA='node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]'
#+END_SRC #+END_SRC
* Statistics * Statistics
@ -911,7 +911,7 @@ digraph G {
rankdir=LR rankdir=LR
label="TGBA for a U b" label="TGBA for a U b"
labelloc="t" labelloc="t"
node[style=filled, fillcolor="#ffffa0"] node[style=filled, fillcolor="#ffffa0"] edge[arrowhead=vee, arrowsize=.7]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 1 I -> 1
0 [label="0", peripheries=2] 0 [label="0", peripheries=2]

597
wrap/python/tests/automata.ipynb
View file

File diff suppressed because it is too large Load diff