From 582ae9188da4c22c5e5d6fe64db60e946131b3ee Mon Sep 17 00:00:00 2001
From: Yann Esposito <yann.esposito@gmail.com>
Date: Thu, 18 Oct 2012 15:30:51 +0200
Subject: [PATCH] Automata mpost rendering + graph with circle

---
 lib/graph.rb |  2 +-
 lib/mpost.rb | 59 ++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/lib/graph.rb b/lib/graph.rb
index 3eefa1f23..09a41412b 100644
--- a/lib/graph.rb
+++ b/lib/graph.rb
@@ -47,7 +47,7 @@ class Graph < Nanoc3::Filter
                         fontsize=10;
                         rankdir="LR";
                         graph [truecolor bgcolor="#fafafc"];
-                        node [width=0, height=0, fontname="CMU Serif Italic", shape="box", color="#657b83", style="filled" fillcolor="#fafafc", fontcolor="#657b83"] ;
+                        node [width=0, height=0, fontname="CMU Serif Italic", shape="circle", color="#657b83", style="filled" fillcolor="#fafafc", fontcolor="#657b83"] ;
                         edge [fontname="CMU Serif Italic", arrowsize=.5, color="#657b83",fontcolor="#657b83"] ; ]
             f.write solarized(str)
             f.write %[}]
diff --git a/lib/mpost.rb b/lib/mpost.rb
index 47ce522c6..498e09386 100644
--- a/lib/mpost.rb
+++ b/lib/mpost.rb
@@ -24,7 +24,7 @@ class MPost < Nanoc3::Filter
             code=%{
              color   baseZeroThree, baseZeroTwo, baseZeroOne, baseZeroZero
                    , baseZero, baseOne, baseTwo, baseThree, yellow, orange
-                   , s_red, magenta, violet, s_blue, cyan, s_green;
+                   , red, magenta, violet, blue, cyan, green;
 
              baseZeroThree  :=(0.0               ,0.168627450980392,0.211764705882353);
              baseZeroTwo    :=(0.0274509803921569,0.211764705882353,0.258823529411765);
@@ -36,16 +36,63 @@ class MPost < Nanoc3::Filter
              baseThree      :=(0.992156862745098 ,0.964705882352941,0.890196078431372);
              yellow         :=(0.709803921568627 ,0.537254901960784,0.0);
              orange         :=(0.796078431372549 ,0.294117647058824,0.0862745098039216);
-             s_red          :=(0.862745098039216 ,0.196078431372549,0.184313725490196);
+             red          :=(0.862745098039216 ,0.196078431372549,0.184313725490196);
              magenta        :=(0.827450980392157 ,0.211764705882353,0.509803921568627);
              violet         :=(0.423529411764706 ,0.443137254901961,0.768627450980392);
-             s_blue         :=(0.149019607843137 ,0.545098039215686,0.823529411764706);
+             blue         :=(0.149019607843137 ,0.545098039215686,0.823529411764706);
              cyan           :=(0.164705882352941 ,0.631372549019608,0.596078431372549);
-             s_green        :=(0.52156862745098  ,0.6              ,0.0);
+             green        :=(0.52156862745098  ,0.6              ,0.0);
+
+
+                u:=.5cm;
+                gu:=5u;
+
+                def drawloop(expr a,b,l) =
+                    pair ba,ea;
+                    path circ,p,s;
+                    p:=a{1,1}..b..{1,-1}cycle;
+                    circ:= fullcircle scaled 6 shifted a;
+                    ba = circ intersectionpoint (subpath (0,1) of p);
+                    ea = circ intersectionpoint (subpath (1,2) of p);
+                    s:= ba{1,1}..b..{1,-1}ea;
+                    drawarrow s;
+                    label.top(l,b);
+                enddef;
+
+                def drawLoop(expr a,l) =
+                    pair b; b:=a shifted (0,u);
+                    pair ba,ea;
+                    path circ,p,s;
+                    p:=a{1,1}..b..{1,-1}cycle;
+                    circ:= fullcircle scaled 1.2u shifted a;
+                    ba = circ intersectionpoint (subpath (0,1) of p);
+                    ea = circ intersectionpoint (subpath (1,2) of p);
+                    s:= ba{1,1}..b..{1,-1}ea;
+                    drawarrow s;
+                    label.top(l,b);
+                enddef;
+                def drawState(expr pos,l) =
+                    label(l,pos);
+                    draw fullcircle scaled u shifted pos;
+                enddef;
+
+                def drawEdgeWithAngle(expr posA,posB,l,an) =
+                    path s; s := posA {dir an} .. posB {dir -an};
+                    pair bA;
+                    pair bA; bA = (fullcircle scaled 1.2u shifted posA) intersectionpoint s;
+                    pair eB; eB = (fullcircle scaled 1.2u shifted posB) intersectionpoint s;
+                    path sub; sub := bA {dir an} .. eB {dir -an};
+                    drawarrow sub;
+                    pair mid; mid = point 1/2length(sub) of sub;
+                    label.top(l,mid);
+                enddef;
+                def drawEdge(expr posA,posB,l) =
+                    drawEdgeWithAngle(posA,posB,l,0);
+                enddef;
 
              prologues:=3;
-             drawoptions (withcolor base02);
              beginfig(1)
+                drawoptions (withcolor base01);
              }.sub(%r{^\s*},"")
              code <<= str
              code <<= %{\nendfig;\nbye;\n}
@@ -55,7 +102,7 @@ class MPost < Nanoc3::Filter
             FileUtils.mkdir_p('output'+@item.path+'mpost')
             webpath=@item.path + 'mpost/' + filename + '.png'
             path='output'+webpath
-            cmd="cd /tmp && mpost graphtemp.mp >/dev/null 2>&1 && convert -density 300 graphtemp.1 $OLDPWD/#{path} >/dev/null 2>&1"
+            cmd="cd /tmp && mpost graphtemp.mp >/dev/null 2>&1 && convert -density 180 graphtemp.1 $OLDPWD/#{path} >/dev/null 2>&1"
             system(cmd)
             %{<figure><img alt="#{title}" src="#{webpath}"/><figcaption>#{title}</figcaption></figure>}
         end