From: Tara L Andrews <tla\@mit.edu>
Date: Fri, 13 Jan 2012 22:03:36 +0000 (+0100)
Subject: Merge branch 'master' into relationships
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ae2975c88b6d7d3ee02a030a846e44a23bc3d24f;hp=-c;p=scpubgit%2Fstemmatology.git

Merge branch 'master' into relationships
---

ae2975c88b6d7d3ee02a030a846e44a23bc3d24f
diff --combined lib/Text/Tradition/Collation.pm
index 4b15dd1,f0c7025..a95f938
--- a/lib/Text/Tradition/Collation.pm
+++ b/lib/Text/Tradition/Collation.pm
@@@ -419,7 -419,7 +419,7 @@@ sub as_dot 
      $graph_name = join( '_', split( /\s+/, $graph_name ) );
      my $dot = sprintf( "digraph %s {\n", $graph_name );
      $dot .= "\tedge [ arrowhead=open ];\n";
-     $dot .= "\tgraph [ rankdir=LR ];\n";
+     $dot .= "\tgraph [ rankdir=LR,bgcolor=none ];\n";
      $dot .= sprintf( "\tnode [ fontsize=%d, fillcolor=%s, style=%s, shape=%s ];\n",
                       11, "white", "filled", "ellipse" );
  
@@@ -719,7 -719,7 +719,7 @@@ sub make_alignment_table 
      }
      my $table = { 'alignment' => [], 'length' => $self->end->rank - 1 };
      my @all_pos = ( 1 .. $self->end->rank - 1 );
 -    foreach my $wit ( $self->tradition->witnesses ) {
 +    foreach my $wit ( sort { $a->sigil cmp $b->sigil } $self->tradition->witnesses ) {
      	if( $include ) {
      		next unless $include->{$wit->sigil};
      	}