X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2Fstemmatology.git;a=blobdiff_plain;f=lib%2FText%2FTradition%2FCollation.pm;h=ef0594dd14968cb0250810bfd3d7a89b0cf8b44f;hp=3c65b4ce3f372acc2e57a2cb6447b642712de93c;hb=3765080b7e9b86e2a4660d8707a10a36541661e1;hpb=10943ab0b79fbd489f6beb3b81a13ed8cbcfafcf

diff --git a/lib/Text/Tradition/Collation.pm b/lib/Text/Tradition/Collation.pm
index 3c65b4c..ef0594d 100644
--- a/lib/Text/Tradition/Collation.pm
+++ b/lib/Text/Tradition/Collation.pm
@@ -560,7 +560,8 @@ sub as_svg {
     throw( "Need GraphViz installed to output SVG" )
     	unless File::Which::which( 'dot' );
     my $want_subgraph = exists $opts->{'from'} || exists $opts->{'to'};
-    $self->calculate_ranks() unless( $self->_graphcalc_done || $opts->{'nocalc'} );
+    $self->calculate_ranks() 
+    	unless( $self->_graphcalc_done || $opts->{'nocalc'} || !$self->linear );
     if( !$self->has_cached_svg || $opts->{'recalc'}	|| $want_subgraph ) {        
 		my @cmd = qw/dot -Tsvg/;
 		my( $svg, $err );
@@ -817,6 +818,7 @@ sub _path_display_label {
 	
 	# See if we are in a majority situation.
 	my $maj = scalar( $self->tradition->witnesses ) * 0.6;
+	$maj = $maj > 5 ? $maj : 5;
 	if( scalar keys %wits > $maj ) {
 		unshift( @disp_ac, 'majority' );
 		return join( ', ', @disp_ac );