layout name fixed from circle to circo; osage layout name added

docs/configfile.md

@@ -51,7 +51,7 @@ title: Tabnetviz configuration options
       Save the modified edge table, i.e. after new columns from network analysis, rankings,  Boolean columns defining edge groups, and calculated non-Graphviz attributes have been added. The format can be csv, tsv, xlsx, or xls; the program will use the filename extension to decide the format. Optional; by default no file will be saved. Cannot be the same as the original edge table file name. Can be overridden on the command line using the `--edgetableout` option.
     * **colorbars:** _filename_\
       Save an SVG file named _filename_ containing color bars for the colormaps used in the node style and edge style mappings. These can then be used to create a legend for your visualization. Optional; if not specified then no such file will be created.
-* **layout:** **`neato`**|`dot`|`twopi`|`circle`|`fdp`|`sfdp`|`patchwork`| **_dotfilename_**\
+* **layout:** **`neato`**|`dot`|`twopi`|`circo`|`fdp`|`sfdp`|`patchwork`|`osage`| **_dotfilename_**\
   Specify a layout algorithm or a dot file to take a pre-generated layout from. If a dot file is specified, it must contain the same network as the current network, and must contain position coordinates for all nodes and edges.
 * **graphattrs:**\
   Optional additional Graphviz graph attributes. By default, `outputorder: edgesfirst`,  and `overlap: false`, will be set for nicer visual appearance of the graph.

docs/userguide.md

@@ -238,7 +238,7 @@ to create a legend for your visualization.
 
 The `/layout` keyword can be used to set the graph layout algorithm.
 Any algorithm known to Graphviz can be used, i.e. `neato`, `dot`,
-`twopi`, `circle`, `fdp`, `sfdp`, and `patchwork`. The default is
+`twopi`, `circo`, `fdp`, `sfdp`, `osage`, and `patchwork`. The default is
 `neato`. Alternatively, a **.dot** file name can be specified; this
 must contain position information, and the layout will be directly
 loaded from it. This file usually comes from an earlier run of the

tabnetviz/__main__.py

@@ -313,8 +313,8 @@ def table2net(args):
         else:
             raise ValueError('graph in the input dot file %s differs from the graph specified '
                              'in the tables' % (conf['layout']))
-    elif conf.get('layout', 'neato') not in ['neato', 'dot', 'twopi', 'circle', 'fdp', 'sfdp',
-                  'patchwork']:
+    elif conf.get('layout', 'neato') not in ['neato', 'dot', 'twopi', 'circo', 'fdp', 'sfdp',
+                  'patchwork', 'osage']:
         raise ValueError('layout should be one of neato, dot, twopi, circle, fdp, sfdp, '
                          'patchwork, or a .dot file name')
 

tabnetviz/configtemplate.py

@@ -45,7 +45,7 @@
 #
 # Define layout
 #
-layout: neato              # neato|dot|twopi|circle|fdp|sfdp|patchwork (see graphviz docs)
+layout: neato              # neato|dot|twopi|circo|fdp|sfdp|patchwork|osage (see graphviz docs)
 #
 # Graph attributes (note: "outputorder: edgesfirst" and "overlap: false" are set by default)
 #