ruby-graphviz 1.0.0 → 1.0.1

data/.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+.idea
+*.iml
+doc
+pkg
+test/output/

data/AUTHORS

@@ -12,6 +12,9 @@ Nigel Thorne <http://github.com/NigelThorne>
 Rolf Timmermans <http://github.com/rolftimmermans>
 Jonas Elfström <http://github.com/jonelf>
 oupo <http://github.com/oupo>
+Daniel Zollinger <https://github.com/dznz>
+Ronen Barzel <https://github.com/ronen>
+Jamison Dance <https://github.com/jergason>
 
 Thanks to :
 

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in ruby-graphviz.gemspec
+gemspec

data/README.rdoc

@@ -14,21 +14,19 @@ Interface to the GraphViz graphing tool
 
 * New FamilyTree
 
-== WARNING
-
-<b>We are close to the 1.0 version... So if you use one of the following method or attribut, please update your code because they will be remove.</b>
-
-* GraphViz::Node#name must be replaced by GraphViz::Node#id
-* The html attribut must be replaced by a label attribut (<tt>:label => '<<html/>>'</tt>)
-* :output option must be replaced by :<format> => :<file>
-* :file option must be replaced by :<format> => :<file>
-
 == CHANGELOG
 
+=== 1.0.1 : 
+* Add GraphViz::DSL
+* Change project to use Bundler gem tools
+* Fix a few typos in the README
+* Change Config to RbConfig
+* Add possibility to get the x,y coordinates of each of the nodes
+
 === 1.0.0 : 
 * \o/
 * GraphViz::Node#name has been removed - use GraphViz::Node#id
-* The html attribut has been removed - use a label attribut (<tt>:label => '<<html/>>'</tt>)
+* The html attribute has been removed - use a label attribut (<tt>:label => '<<html/>>'</tt>)
 * :output option has been removed - use :<format> => :<file>
 * :file option has been removed - use :<format> => :<file>
 * Add GraphViz#to_s
@@ -37,7 +35,7 @@ Interface to the GraphViz graphing tool
 * Issue #22 : Error when generating a graph with an ID containing a space.
 
 === 0.9.21 :
-* Add attributs "label_scheme" and "rotation"
+* Add attributes "label_scheme" and "rotation"
 * Add missing options :
   * <tt>:scale => v</tt> : Scale input by 'v' (=72)
   * <tt>:inverty => [true|false]</tt> : Invert y coordinate in output
@@ -263,6 +261,15 @@ The same but with a block
     g.world( :label => "World" ) << g.hello( :label => "Hello" )
   }.output( :png => "hello_world.png" )
 
+Or with the DSL
+
+  require 'graphviz/dsl'
+  digraph :G do
+    world[:label => "World"] << hello[:label => "Hello"]
+
+    output :png => "hello_world.png"
+  end
+
 Create a graph from a file 
 
   require 'graphviz'
@@ -286,47 +293,20 @@ GraphML[http://graphml.graphdrawing.org/] support
   g = GraphViz::GraphML.new( "graphml/cluster.graphml" )
   g.graph.output( :path => "/usr/local/bin", :png => "#{$0}.png" )
 
-At last, you can create familly tree with GraphViz::FamilyTree (<b>beta</b>) :
-
-  require 'graphviz/family_tree'
-  
-  tree = GraphViz::FamilyTree.new do
-    generation do
-      benoist.is_a_man( "Benoist" )
-      nathalie.is_a_woman( "Nathalie" )
-      
-      benoist.is_maried_with nathalie
-    end
-  
-    generation do
-      charlotte.is_a_woman( "Charlotte" )
-      amelie.is_a_woman( "Amelie" )
-      clement.is_a_man( "Clement" )
-      gregoire.is_a_man( "Gregoire" )
-      
-      muriel.is_a_woman( "Muriel" )
-  
-      gregoire.is_maried_with muriel
-    end
-  
-    couple( benoist, nathalie ).kids( charlotte, amelie, clement, gregoire )
-  end
-  
-  tree.graph.save( :png => "#{$0}.png" )
 
 == TOOLS
 
-Ruby/GraphViz also include :
+Ruby/GraphViz also includes :
 
-* <tt>ruby2gv</tt>, a simple tool that's allow you to create a dependency graph from a ruby script. Example : http://drp.ly/dShaZ
+* <tt>ruby2gv</tt>, a simple tool that allows you to create a dependency graph from a ruby script. Example : http://drp.ly/dShaZ
 
     ruby2gv -Tpng -oruby2gv.png ruby2gv
 
-* <tt>gem2gv</tt>, a tools that's allow you to create a dependency graph between gems. Example : http://drp.ly/dSj9Y
+* <tt>gem2gv</tt>, a tool that allows you to create a dependency graph between gems. Example : http://drp.ly/dSj9Y
 
     gem2gv -Tpng -oruby-graphviz.png ruby-graphviz
 
-* <tt>dot2ruby</tt>, a tools that's allow you to create a ruby script from a graphviz script
+* <tt>dot2ruby</tt>, a tool that allows you to create a ruby script from a graphviz script
 
     $ cat hello.dot
     digraph G {Hello->World;}
@@ -344,9 +324,9 @@ Ruby/GraphViz also include :
     }
     puts graph_g.output( :canon => String )
 
-* <tt>git2gv</tt>, a tools that's allow you to show your git commits : http://dl.dropbox.com/u/72629/ruby-graphviz-git.svg
+* <tt>git2gv</tt>, a tool that allows you to show your git commits : http://dl.dropbox.com/u/72629/ruby-graphviz-git.svg
 
-* <tt>xml2gv</tt>, a tools that's allow you to show a xml file as graph.
+* <tt>xml2gv</tt>, a tool that allows you to show a xml file as graph.
 
 == GRAPH THEORY
 
@@ -395,7 +375,7 @@ Ruby/GraphViz also include :
 
   sudo gem install ruby-graphviz
 
-You also need to install GraphViz[http://www.graphviz.org] and Treetop[http://treetop.rubyforge.org/]
+You also need to install GraphViz[http://www.graphviz.org] 
 
 On *Windows* you also need to install win32-open3. This is not an absolute requirement.
 

data/Rakefile

@@ -0,0 +1,59 @@
+$:.unshift( "lib" )
+require "graphviz/constants"
+
+require 'rake/clean'
+require 'bundler'
+require 'rubygems/package_task'
+require 'rdoc/task'
+require 'rake/testtask'
+require 'fileutils'
+require 'open-uri'
+include FileUtils
+
+CLEAN.include ['**/.*.sw?', '*.gem', '.config', 'test/test.log']
+RDOC_OPTS = ['--quiet', '--title', "Ruby/GraphViz, the Documentation",
+    "--opname", "index.html",
+    "--line-numbers",
+    "--main", "README.rdoc"]
+
+desc "Packages up Ruby/GraphViz."
+task :default => [:test, :package]
+task :package => [:clean]
+
+task :doc => :rdoc
+
+RDoc::Task.new do |rdoc|
+    rdoc.rdoc_dir = 'doc/rdoc'
+    rdoc.options += RDOC_OPTS
+    rdoc.main = "README.rdoc"
+    rdoc.title = "Ruby/GraphViz, the Documentation"
+    rdoc.rdoc_files.add ['README.rdoc', 'AUTHORS', 'COPYING',
+      'lib/graphviz.rb', 
+      'lib/graphviz/node.rb',
+      'lib/graphviz/edge.rb',
+      'lib/graphviz/constants.rb',
+      'lib/graphviz/xml.rb',
+      'lib/graphviz/graphml.rb',
+      'lib/graphviz/family_tree.rb',
+      'lib/graphviz/family_tree/couple.rb',
+      'lib/graphviz/family_tree/generation.rb',
+      'lib/graphviz/family_tree/person.rb',
+      'lib/graphviz/family_tree/sibling.rb']
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['test/test_*.rb']
+end
+
+Bundler::GemHelper.install_tasks
+
+namespace :gemcutter do
+  desc "check gemcutter status"
+  task :status do
+    if Rubygems.status
+      puts "This gem already existe in version #{PKG_VERS}!"
+    else
+      puts "This gem (#{Constants::RGV_VERSION}) has not been published! Last version at gemcutter is #{Rubygems.version}"
+    end
+  end
+end

data/examples/sample48.rb

@@ -28,7 +28,7 @@
 # 	end [shape=Msquare];
 # }
 
-$:.unshift( "../../lib" );
+$:.unshift( "../lib" );
 require "graphviz"
 
 GraphViz.new( :G, :type => :digraph ) { |g|
@@ -59,4 +59,4 @@ GraphViz.new( :G, :type => :digraph ) { |g|
   g.start[:shape] = :Mdiamond
   g._end[:label] = "end"
   g._end[:shape] = :Mdiamond
-}.output( :png => "#{$0}.png" )
+}.output( :png => "#{$0}.png" )

data/examples/sample62.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+hello_world = GraphViz::new( "" ) 
+
+hello = hello_world.add_node("Hello")
+world = hello_world.add_node("World")
+hello_world.add_edge(hello, world) 
+
+# final_graph = GraphViz.parse_string( hello_world.output( :dot => String ) )
+# final_graph.each_node do |_, node|
+#    puts "Node #{node.id} : position = #{node[:pos]}"
+# end
+
+hello_world = hello_world.complete
+hello_world.each_node do |_, node|
+   puts "Node #{node.id} : position = " ; p node[:pos].point
+end
+
+puts "---------"
+
+puts hello_world.output( :dot => String )

data/examples/sample63.rb

@@ -0,0 +1,32 @@
+$:.unshift( "../lib" )
+require 'graphviz/dsl'
+
+digraph :G do
+   cluster_0 do
+      graph[:style => :filled, :color => :lightgrey]
+      node[:style => :filled, :color => :white]
+      a0 << a1 << a2 << a3
+      graph[:label => "process #1"]
+   end
+
+   cluster_1 do
+      node[:style => :filled]
+      b0 << b1 << b2 << b3
+      graph[:label => "process #2", :color => :blue]
+   end
+
+   start << a0
+   start << b0
+   a1 << b3
+   b2 << a3
+   a3 << a0
+   a3 << _end
+   b3 << _end
+
+   start[:shape] = :Mdiamond
+   _end[:label] = "end"
+   _end[:shape] = :Mdiamond
+
+   output(:png => "#{$0}.png")
+end
+

data/examples/sample64.rb

@@ -0,0 +1,31 @@
+$:.unshift( "../lib" )
+require 'graphviz/dsl'
+
+digraph :G do
+
+   node[:color => :lightblue, :style => :filled, :shape => :egg]
+   edge[:color => :gray, :arrowhead => :vee]
+
+   e "C/C++", "Java"
+
+   java do
+      n("Java") << n("Groovy")
+      n("Java") << n("Clojure")
+      n("Java") << n("JRuby")
+      graph[:label => "Java", :color => :blue]
+   end
+
+   e "C/C++", "Perl"
+   e "Perl", "PHP"
+   e "Perl", "Ruby"
+   e "Ruby", "Rubinius"
+   e "Ruby", "MacRuby"
+   e "Ruby", "JRuby"
+
+   %w{ Ruby JRuby MacRuby Rubinius }.each do |ruby|
+      n(ruby)[:color => :tomato]
+   end
+
+   output :png => "#{$0}.png"
+end
+

data/examples/sample65.rb

@@ -0,0 +1,9 @@
+$:.unshift("../lib")
+
+require 'graphviz/dsl'
+digraph :G do
+   world[:label => "World"] << hello[:label => "Hello"]
+   #world << hello
+
+   output :png => "#{$0}.png"
+end

data/lib/graphviz.rb

@@ -228,31 +228,37 @@ class GraphViz
   # * hOpts : Graph attributs
   #
   def add_graph( xGraphName = nil, hOpts = {}, &block )
-    if xGraphName.kind_of?(Hash)
-      hOpts = xGraphName
-      xGraphName = nil
-    end
+     if xGraphName.kind_of?(GraphViz) 
+        xGraphID = xGraphName.id
+        @hoGraphs[xGraphID] = xGraphName.clone
+        xGraphName = xGraphID 
+     else
+        if xGraphName.kind_of?(Hash)
+           hOpts = xGraphName
+           xGraphName = nil
+        end
 
-    if xGraphName.nil?
-      xGraphID = String.random(11)
-      xGraphName = ""
-    else
-      xGraphID = xGraphName
-    end
-    
-    @hoGraphs[xGraphID] = GraphViz::new( xGraphName, {:parent => self, :type => @oGraphType}, &block )
-   
-    hOpts.each do |xKey, xValue|
-      @hoGraphs[xGraphID][xKey.to_s] = xValue
-    end
-    
-    @elements_order.push( { 
-      "type" => "graph", 
-      "name" => xGraphName,
-      "value" => @hoGraphs[xGraphID] 
-    } )
-    
-    return( @hoGraphs[xGraphID] )
+        if xGraphName.nil?
+           xGraphID = String.random(11)
+           xGraphName = ""
+        else
+           xGraphID = xGraphName
+        end
+
+        @hoGraphs[xGraphID] = GraphViz::new( xGraphName, {:parent => self, :type => @oGraphType}, &block )
+
+        hOpts.each do |xKey, xValue|
+           @hoGraphs[xGraphID][xKey.to_s] = xValue
+        end
+     end
+
+     @elements_order.push( { 
+        "type" => "graph", 
+        "name" => xGraphName,
+        "value" => @hoGraphs[xGraphID] 
+     } )
+
+     return( @hoGraphs[xGraphID] )
   end
   alias :subgraph :add_graph
   #
@@ -719,7 +725,6 @@ class GraphViz
   
 ## ----------------------------------------------------------------------------
 
-  # 
   # Create a new graph from a GraphViz File
   # 
   # Options :
@@ -734,6 +739,31 @@ class GraphViz
     return graph
   end
 
+  # Create a new graph from a GraphViz File
+  # 
+  # Options :
+  # * :output : Output format (Constants::FORMATS) (default : dot)
+  # * :file : Output file name (default : none)
+  # * :use : Program to use (Constants::PROGRAMS) (default : dot)
+  # * :path : Program PATH
+  #
+  def self.parse_string( str, hOpts = {}, &block )
+    graph = Dot2Ruby::new( hOpts[:path], nil, nil ).eval_string( str )
+    yield( graph ) if( block and graph.nil? == false )
+    return graph
+  end
+
+  # Return a new completed graph 
+  def complete
+    GraphViz.parse_string( root_graph.output( :dot => String ) )
+  end
+
+  # Complete the current graph
+  def complete!
+    # TODO: Keep options
+    complete
+  end
+
 ## ----------------------------------------------------------------------------
 
   private 

data/lib/graphviz/constants.rb

@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "1.0.0"
+  RGV_VERSION = "1.0.1"
   
   ## Const: Output formats
   FORMATS = [
@@ -120,156 +120,159 @@ module Constants
     "Damping"             => { :usedBy => "G",    :type => :GvDouble },
     "K"                   => { :usedBy => "GC",   :type => :GvDouble },
     "URL"                 => { :usedBy => "ENGC", :type => :EscString },
-    "arrowhead"           => { :usedBy => "E",    :type => :EscString },
+    "area"                => { :usedBy => "NC",   :type => :GvDouble },
+    "arrowhead"           => { :usedBy => "E",    :type => :ArrowType }, # arrowType
     "arrowsize"           => { :usedBy => "E",    :type => :GvDouble },
-    "arrowtail"           => { :usedBy => "E",    :type => :EscString },
-    "aspect"              => { :usedBy => "G",    :type => :EscString },
-    "bb"                  => { :usedBy => "G",    :type => :EscString },
-    "bgcolor"             => { :usedBy => "GC",   :type => :EscString },
-    "center"              => { :usedBy => "G",    :type => :EscString },
-    "charset"             => { :usedBy => "G",    :type => :EscString },
-    "clusterrank"         => { :usedBy => "G",    :type => :EscString },
-    "color"               => { :usedBy => "ENC",  :type => :EscString },
-    "colorscheme"         => { :usedBy => "ENCG", :type => :EscString },
-    "comment"             => { :usedBy => "ENG",  :type => :EscString },
-    "compound"            => { :usedBy => "G",    :type => :EscString },
-    "concentrate"         => { :usedBy => "G",    :type => :EscString },
-    "constraint"          => { :usedBy => "E",    :type => :EscString },
-    "decorate"            => { :usedBy => "E",    :type => :EscString },
+    "arrowtail"           => { :usedBy => "E",    :type => :ArrowType }, # arrowType
+    "aspect"              => { :usedBy => "G",    :type => :EscString }, # aspectType
+    "bb"                  => { :usedBy => "G",    :type => :Rect }, # rect
+    "bgcolor"             => { :usedBy => "GC",   :type => :Color }, # color
+    "center"              => { :usedBy => "G",    :type => :GvBool },    # bool
+    "charset"             => { :usedBy => "G",    :type => :EscString }, # string
+    "clusterrank"         => { :usedBy => "G",    :type => :EscString }, # clusterMode
+    "color"               => { :usedBy => "ENC",  :type => :ColorList }, # color, colorList
+    "colorscheme"         => { :usedBy => "ENCG", :type => :EscString }, # string
+    "comment"             => { :usedBy => "ENG",  :type => :EscString }, # string
+    "compound"            => { :usedBy => "G",    :type => :GvBool },    # bool
+    "concentrate"         => { :usedBy => "G",    :type => :GvBool },    # bool
+    "constraint"          => { :usedBy => "E",    :type => :GvBool },    # bool
+    "decorate"            => { :usedBy => "E",    :type => :GvBool },    # bool
     "defaultdist"         => { :usedBy => "G",    :type => :GvDouble },
-    "dim"                 => { :usedBy => "G",    :type => :EscString },
-    "dimen"               => { :usedBy => "G",    :type => :EscString },
-    "dir"                 => { :usedBy => "E",    :type => :EscString },
-    "diredgeconstraints"  => { :usedBy => "G",    :type => :EscString },
-    "distortion"          => { :usedBy => "N",    :type => :GvDouble },
-    "dpi"                 => { :usedBy => "G",    :type => :GvDouble },
+    "dim"                 => { :usedBy => "G",    :type => :EscString }, # int
+    "dimen"               => { :usedBy => "G",    :type => :EscString }, # int
+    "dir"                 => { :usedBy => "E",    :type => :EscString }, # dirType
+    "diredgeconstraints"  => { :usedBy => "G",    :type => :EscString }, # string, bool
+    "distortion"          => { :usedBy => "N",    :type => :GvDouble },  
+    "dpi"                 => { :usedBy => "G",    :type => :GvDouble },  
     "edgeURL"             => { :usedBy => "E",    :type => :EscString },
     "edgehref"            => { :usedBy => "E",    :type => :EscString },
     "edgetarget"          => { :usedBy => "E",    :type => :EscString },
     "edgetooltip"         => { :usedBy => "E",    :type => :EscString },
     "epsilon"             => { :usedBy => "G",    :type => :GvDouble },
     "esep"                => { :usedBy => "G",    :type => :EscString }, # GvDouble , pointf
-    "fillcolor"           => { :usedBy => "NC",   :type => :EscString },
-    "fixedsize"           => { :usedBy => "N",    :type => :EscString },
-    "fontcolor"           => { :usedBy => "ENGC", :type => :EscString },
-    "fontname"            => { :usedBy => "ENGC", :type => :EscString },
-    "fontnames"           => { :usedBy => "G",    :type => :EscString },
-    "fontpath"            => { :usedBy => "G",    :type => :EscString },
+    "fillcolor"           => { :usedBy => "NC",   :type => :Color }, # color
+    "fixedsize"           => { :usedBy => "N",    :type => :GvBool }, # bool
+    "fontcolor"           => { :usedBy => "ENGC", :type => :Color }, # color
+    "fontname"            => { :usedBy => "ENGC", :type => :EscString }, # string
+    "fontnames"           => { :usedBy => "G",    :type => :EscString }, # string
+    "fontpath"            => { :usedBy => "G",    :type => :EscString }, # string
     "fontsize"            => { :usedBy => "ENGC", :type => :GvDouble },
-    "group"               => { :usedBy => "N",    :type => :EscString },
+    "group"               => { :usedBy => "N",    :type => :EscString }, # string
     "headURL"             => { :usedBy => "E",    :type => :EscString },
-    "headclip"            => { :usedBy => "E",    :type => :EscString },
+    "headclip"            => { :usedBy => "E",    :type => :GvBool }, # bool
     "headhref"            => { :usedBy => "E",    :type => :EscString },
-    "headlabel"           => { :usedBy => "E",    :type => :EscString },
-    "headport"            => { :usedBy => "E",    :type => :EscString },
+    "headlabel"           => { :usedBy => "E",    :type => :EscString }, # LblString 
+    "headport"            => { :usedBy => "E",    :type => :EscString }, # portPos
     "headtarget"          => { :usedBy => "E",    :type => :EscString },
     "headtooltip"         => { :usedBy => "E",    :type => :EscString },
     "height"              => { :usedBy => "N",    :type => :GvDouble },
     "href"                => { :usedBy => "NE",   :type => :EscString },
     "id"                  => { :usedBy => "ENG",  :type => :EscString },
-    "image"               => { :usedBy => "N",    :type => :EscString },
-    "imagescale"          => { :usedBy => "N",    :type => :EscString },
+    "image"               => { :usedBy => "N",    :type => :EscString }, # string
+    "imagescale"          => { :usedBy => "N",    :type => :EscString }, # bool, string
     "label"               => { :usedBy => "ENGC", :type => :LblString },
     "labelURL"            => { :usedBy => "E",    :type => :EscString },
-    "label_scheme"        => { :usedBy => "G",    :type => :EscString },
+    "label_scheme"        => { :usedBy => "G",    :type => :EscString }, # int
     "labelangle"          => { :usedBy => "E",    :type => :GvDouble },
     "labeldistance"       => { :usedBy => "E",    :type => :GvDouble },
-    "labelfloat"          => { :usedBy => "E",    :type => :EscString },
-    "labelfontcolor"      => { :usedBy => "E",    :type => :EscString },
-    "labelfontname"       => { :usedBy => "E",    :type => :EscString },
+    "labelfloat"          => { :usedBy => "E",    :type => :GvBool }, # bool
+    "labelfontcolor"      => { :usedBy => "E",    :type => :Color }, # color
+    "labelfontname"       => { :usedBy => "E",    :type => :EscString }, # string
     "labelfontsize"       => { :usedBy => "E",    :type => :GvDouble },
     "labelhref"           => { :usedBy => "E",    :type => :EscString },
-    "labeljust"           => { :usedBy => "GC",   :type => :EscString },
-    "labelloc"            => { :usedBy => "GCN",  :type => :EscString },
+    "labeljust"           => { :usedBy => "GC",   :type => :EscString }, # string
+    "labelloc"            => { :usedBy => "GCN",  :type => :EscString }, # string
     "labeltarget"         => { :usedBy => "E",    :type => :EscString },
     "labeltooltip"        => { :usedBy => "E",    :type => :EscString },
-    "landscape"           => { :usedBy => "G",    :type => :EscString },
-    "layer"               => { :usedBy => "EN",   :type => :EscString },
-    "layers"              => { :usedBy => "G",    :type => :EscString },
-    "layersep"            => { :usedBy => "G",    :type => :EscString },
-    "layout"              => { :usedBy => "G",    :type => :EscString },
-    "len"                 => { :usedBy => "E",    :type => :GvDouble },
-    "levels"              => { :usedBy => "G",    :type => :EscString },
+    "landscape"           => { :usedBy => "G",    :type => :GvBool }, # bool
+    "layer"               => { :usedBy => "EN",   :type => :EscString }, # layerRange
+    "layers"              => { :usedBy => "G",    :type => :EscString }, # layerList
+    "layersep"            => { :usedBy => "G",    :type => :EscString }, # string
+    "layout"              => { :usedBy => "G",    :type => :EscString }, # string
+    "len"                 => { :usedBy => "E",    :type => :GvDouble },  
+    "levels"              => { :usedBy => "G",    :type => :EscString }, # int
     "levelsgap"           => { :usedBy => "G",    :type => :GvDouble },
-    "lhead"               => { :usedBy => "E",    :type => :EscString },
+    "lhead"               => { :usedBy => "E",    :type => :EscString }, # string
     "lheight"             => { :usedBy => "GC",   :type => :GvDouble },
-    "lp"                  => { :usedBy => "EGC",  :type => :EscString },
-    "ltail"               => { :usedBy => "E",    :type => :EscString },
-    "lweight"             => { :usedBy => "GC",   :type => :GvDouble },
+    "lp"                  => { :usedBy => "EGC",  :type => :EscString }, # point
+    "ltail"               => { :usedBy => "E",    :type => :EscString }, # string
+    "lwidth"              => { :usedBy => "GC",   :type => :GvDouble },
     "margin"              => { :usedBy => "NG",   :type => :EscString }, # GvDouble , pointf
-    "maxiter"             => { :usedBy => "G",    :type => :EscString },
+    "maxiter"             => { :usedBy => "G",    :type => :EscString }, # int
     "mclimit"             => { :usedBy => "G",    :type => :GvDouble },
     "mindist"             => { :usedBy => "G",    :type => :GvDouble },
-    "minlen"              => { :usedBy => "E",    :type => :EscString },
-    "mode"                => { :usedBy => "G",    :type => :EscString },
-    "model"               => { :usedBy => "G",    :type => :EscString },
-    "mosek"               => { :usedBy => "G",    :type => :EscString },
+    "minlen"              => { :usedBy => "E",    :type => :EscString }, # int
+    "mode"                => { :usedBy => "G",    :type => :EscString }, # string
+    "model"               => { :usedBy => "G",    :type => :EscString }, # string
+    "mosek"               => { :usedBy => "G",    :type => :GvBool }, # bool
     "nodesep"             => { :usedBy => "G",    :type => :GvDouble },
-    "nojustify"           => { :usedBy => "GCNE", :type => :EscString },
-    "normalize"           => { :usedBy => "G",    :type => :EscString },
+    "nojustify"           => { :usedBy => "GCNE", :type => :GvBool }, # bool
+    "normalize"           => { :usedBy => "G",    :type => :GvBool }, # bool
     "nslimit"             => { :usedBy => "G",    :type => :GvDouble },
     "nslimit1"            => { :usedBy => "G",    :type => :GvDouble },
-    "ordering"            => { :usedBy => "G",    :type => :EscString },
-    "orientation"         => { :usedBy => "NG",   :type => :GvDouble },
-    "outputorder"         => { :usedBy => "G",    :type => :EscString },
-    "overlap"             => { :usedBy => "G",    :type => :EscString },
+    "ordering"            => { :usedBy => "G",    :type => :EscString }, # string
+    "orientation"         => { :usedBy => "NG",   :type => :GvDouble },  # N: double, G: string
+    "outputorder"         => { :usedBy => "G",    :type => :EscString }, # outputMode
+    "overlap"             => { :usedBy => "G",    :type => :EscString }, # string, bool
     "overlap_scaling"     => { :usedBy => "G",    :type => :GvDouble },
-    "pack"                => { :usedBy => "G",    :type => :EscString },
-    "packmode"            => { :usedBy => "G",    :type => :EscString },
+    "pack"                => { :usedBy => "G",    :type => :EscString }, # bool, int
+    "packmode"            => { :usedBy => "G",    :type => :EscString }, # packMode
     "pad"                 => { :usedBy => "G",    :type => :EscString }, # GvDouble , pointf
     "page"                => { :usedBy => "G",    :type => :EscString }, # GvDouble , pointf
-    "pagedir"             => { :usedBy => "G",    :type => :EscString },
-    "pencolor"            => { :usedBy => "C",    :type => :EscString },
+    "pagedir"             => { :usedBy => "G",    :type => :EscString }, # pageDir
+    "pencolor"            => { :usedBy => "C",    :type => :Color }, # color
     "penwidth"            => { :usedBy => "CNE",  :type => :GvDouble },
-    "peripheries"         => { :usedBy => "NC",   :type => :EscString },
-    "pin"                 => { :usedBy => "N",    :type => :EscString },
-    "pos"                 => { :usedBy => "EN",   :type => :EscString },
-    "quadtree"            => { :usedBy => "G",    :type => :EscString },
+    "peripheries"         => { :usedBy => "NC",   :type => :EscString }, # int
+    "pin"                 => { :usedBy => "N",    :type => :GvBool }, # bool
+    "pos"                 => { :usedBy => "EN",   :type => :SplineType }, # point, splineTypes
+    "quadtree"            => { :usedBy => "G",    :type => :GvBool }, # bool
     "quantum"             => { :usedBy => "G",    :type => :GvDouble },
-    "rank"                => { :usedBy => "S",    :type => :EscString },
-    "rankdir"             => { :usedBy => "G",    :type => :EscString },
+    "rank"                => { :usedBy => "S",    :type => :EscString }, # rankType
+    "rankdir"             => { :usedBy => "G",    :type => :EscString }, # rankDir
     "ranksep"             => { :usedBy => "G",    :type => :EscString }, # GvDouble, doubleList
     "ratio"               => { :usedBy => "G",    :type => :EscString }, # GvDouble, String
-    "rects"               => { :usedBy => "N",    :type => :EscString },
-    "regular"             => { :usedBy => "N",    :type => :EscString },
-    "remincross"          => { :usedBy => "G",    :type => :EscString },
+    "rects"               => { :usedBy => "N",    :type => :Rect }, # rect
+    "regular"             => { :usedBy => "N",    :type => :GvBool }, # bool
+    "remincross"          => { :usedBy => "G",    :type => :GvBool }, # bool
     "repulsiveforce"      => { :usedBy => "G",    :type => :GvDouble },
     "resolution"          => { :usedBy => "G",    :type => :GvDouble },
-    "root"                => { :usedBy => "GN",   :type => :EscString },
-    "rotate"              => { :usedBy => "G",    :type => :EscString },
+    "root"                => { :usedBy => "GN",   :type => :EscString }, # bool, string
+    "rotate"              => { :usedBy => "G",    :type => :EscString }, # int
     "rotation"            => { :usedBy => "G",    :type => :GvDouble },
-    "samehead"            => { :usedBy => "E",    :type => :EscString },
-    "sametail"            => { :usedBy => "E",    :type => :EscString },
-    "samplepoints"        => { :usedBy => "G",    :type => :EscString },
-    "searchsize"          => { :usedBy => "G",    :type => :EscString },
-    "sep"                 => { :usedBy => "G",    :type => :EscString }, # GvDouble , pointf
-    "shape"               => { :usedBy => "N",    :type => :EscString },
-    "shapefile"           => { :usedBy => "N",    :type => :EscString },
-    "showboxes"           => { :usedBy => "ENG",  :type => :EscString },
-    "sides"               => { :usedBy => "N",    :type => :EscString },
-    "size"                => { :usedBy => "NG",   :type => :EscString }, # GvDouble , pointf
+    "samehead"            => { :usedBy => "E",    :type => :EscString }, # string
+    "sametail"            => { :usedBy => "E",    :type => :EscString }, # string
+    "samplepoints"        => { :usedBy => "G",    :type => :EscString }, # int
+    "scale"               => { :usedBy => "G",    :type => :EscString }, # double, pointf
+    "searchsize"          => { :usedBy => "G",    :type => :EscString }, # int
+    "sep"                 => { :usedBy => "G",    :type => :EscString }, # double , pointf
+    "shape"               => { :usedBy => "N",    :type => :EscString }, # shape
+    "shapefile"           => { :usedBy => "N",    :type => :EscString }, # string
+    "showboxes"           => { :usedBy => "ENG",  :type => :EscString }, # int
+    "sides"               => { :usedBy => "N",    :type => :EscString }, # int
+    "size"                => { :usedBy => "NG",   :type => :EscString }, # double , pointf
     "skew"                => { :usedBy => "N",    :type => :GvDouble },
-    "smoothing"           => { :usedBy => "G",    :type => :EscString },
-    "sortv"               => { :usedBy => "GCN",  :type => :EscString },
-    "splines"             => { :usedBy => "G",    :type => :EscString },
-    "start"               => { :usedBy => "G",    :type => :EscString },
-    "style"               => { :usedBy => "ENC",  :type => :EscString },
-    "stylesheet"          => { :usedBy => "G",    :type => :EscString },
+    "smoothing"           => { :usedBy => "G",    :type => :EscString }, # smoothType
+    "sortv"               => { :usedBy => "GCN",  :type => :EscString }, # int
+    "splines"             => { :usedBy => "G",    :type => :EscString }, # bool, string
+    "start"               => { :usedBy => "G",    :type => :EscString }, # startType
+    "style"               => { :usedBy => "ENC",  :type => :EscString }, # style
+    "stylesheet"          => { :usedBy => "G",    :type => :EscString }, # string
     "tailURL"             => { :usedBy => "E",    :type => :EscString },
-    "tailclip"            => { :usedBy => "E",    :type => :EscString },
+    "tailclip"            => { :usedBy => "E",    :type => :GvBool }, # bool
     "tailhref"            => { :usedBy => "E",    :type => :EscString },
-    "taillabel"           => { :usedBy => "E",    :type => :EscString },
-    "tailport"            => { :usedBy => "E",    :type => :EscString },
+    "taillabel"           => { :usedBy => "E",    :type => :EscString }, # lblString
+    "tailport"            => { :usedBy => "E",    :type => :EscString }, # portPos
     "tailtarget"          => { :usedBy => "E",    :type => :EscString },
     "tailtooltip"         => { :usedBy => "E",    :type => :EscString },
-    "target"              => { :usedBy => "ENGC", :type => :EscString },
+    "target"              => { :usedBy => "ENGC", :type => :EscString }, # escString, string
     "tooltip"             => { :usedBy => "NEC",  :type => :EscString },
-    "truecolor"           => { :usedBy => "G",    :type => :EscString },
-    "vertices"            => { :usedBy => "N",    :type => :EscString },
-    "viewport"            => { :usedBy => "G",    :type => :EscString },
+    "truecolor"           => { :usedBy => "G",    :type => :GvBool }, # bool
+    "vertices"            => { :usedBy => "N",    :type => :EscString }, # pointfList
+    "viewport"            => { :usedBy => "G",    :type => :EscString }, # viewPort
     "voro_margin"         => { :usedBy => "G",    :type => :GvDouble },
     "weight"              => { :usedBy => "E",    :type => :GvDouble },
     "width"               => { :usedBy => "N",    :type => :GvDouble },
+    "xlabel"              => { :usedBy => "EN",   :type => :LblString },
     "z"                   => { :usedBy => "N",    :type => :GvDouble }
   }