new file mode 100644

@@ -0,0 +1,14 @@

+digraph draworder {

+	outputorder=nodesfirst;

+	size ="8.5, 11";

+	0 [shape = circle, style = filled, color = lightgrey ];

+	2 [ shape = trapezium, style = filled, color = lightgrey, label = <

+	     <table border='0' cellborder='0'>

+	            <tr><td port='a'>A</td><td port='b'>B</td></tr>

+		    <tr><td colspan='2'>Some label goes here</td></tr>

+	     </table>

+	>];

+

+	0 -> 2:a [ label = "a" ];

+	0 -> 2:b [ label = "b" ];

+}

@@ -437,6 +437,7 @@ class XDotParser(DotParser):

         self.top_graph = True

         self.width = 0

         self.height = 0

+        self.outputorder = 'breadthfirst'

     def handle_graph(self, attrs):

         if self.top_graph:

@@ -450,6 +451,12 @@ class XDotParser(DotParser):

                     sys.stderr.write('warning: xdot version %s, but supported is %s\n' %

                                      (xdotversion, self.XDOTVERSION))

+            # Parse output order

+            try:

+                self.outputorder = attrs['outputorder'].decode('utf-8')

+            except KeyError:

+                pass

+

             # Parse bounding box

             try:

                 bb = attrs['bb']

@@ -526,7 +533,7 @@ class XDotParser(DotParser):

     def parse(self):

         DotParser.parse(self)

         return elements.Graph(self.width, self.height, self.shapes,

-                              self.nodes, self.edges)

+                              self.nodes, self.edges, self.outputorder)

     def parse_node_pos(self, pos):

         x, y = pos.split(b",")

@@ -544,7 +544,7 @@ class Edge(Element):

 class Graph(Shape):

-    def __init__(self, width=1, height=1, shapes=(), nodes=(), edges=()):

+    def __init__(self, width=1, height=1, shapes=(), nodes=(), edges=(), outputorder='breadthfirst'):

         Shape.__init__(self)

         self.width = width

@@ -552,6 +552,7 @@ class Graph(Shape):

         self.shapes = shapes

         self.nodes = nodes

         self.edges = edges

+        self.outputorder = outputorder

         self.bounding = Shape._envelope_bounds(

             map(_get_bounding, self.shapes),

@@ -561,6 +562,23 @@ class Graph(Shape):

     def get_size(self):

         return self.width, self.height

+    def _draw_shapes(self, cr, bounding):

+        for shape in self.shapes:

+            if bounding is None or shape._intersects(bounding):

+                shape._draw(cr, highlight=False, bounding=bounding)

+

+    def _draw_nodes(self, cr, bounding, highlight_items):

+        for node in self.nodes:

+            if bounding is None or node._intersects(bounding):

+                node._draw(cr, highlight=(node in highlight_items), bounding=bounding)

+

+    def _draw_edges(self, cr, bounding, highlight_items):

+        for edge in self.edges:

+            if bounding is None or edge._intersects(bounding):

+                should_highlight = any(e in highlight_items

+                                       for e in (edge, edge.src, edge.dst))

+                edge._draw(cr, highlight=should_highlight, bounding=bounding)

+

     def draw(self, cr, highlight_items=None, bounding=None):

         if bounding is not None:

             if not self._intersects(bounding):

@@ -575,17 +593,13 @@ class Graph(Shape):

         cr.set_line_cap(cairo.LINE_CAP_BUTT)

         cr.set_line_join(cairo.LINE_JOIN_MITER)

-        for shape in self.shapes:

-            if bounding is None or shape._intersects(bounding):

-                shape._draw(cr, highlight=False, bounding=bounding)

-        for edge in self.edges:

-            if bounding is None or edge._intersects(bounding):

-                should_highlight = any(e in highlight_items

-                                       for e in (edge, edge.src, edge.dst))

-                edge._draw(cr, highlight=should_highlight, bounding=bounding)

-        for node in self.nodes:

-            if bounding is None or node._intersects(bounding):

-                node._draw(cr, highlight=(node in highlight_items), bounding=bounding)

+        self._draw_shapes(cr, bounding)

+        if self.outputorder == 'edgesfirst':

+            self._draw_edges(cr, bounding, highlight_items)

+            self._draw_nodes(cr, bounding, highlight_items)

+        else:

+            self._draw_nodes(cr, bounding, highlight_items)

+            self._draw_edges(cr, bounding, highlight_items)

     def get_element(self, x, y):

         for node in self.nodes: