Merge branch 'master' of https://github.com/tla/stemmatology

diff --git a/base/lib/Text/Tradition/Collation.pm b/base/lib/Text/Tradition/Collation.pm
index 41cace4..84ed439 100644 (file)
--- a/base/lib/Text/Tradition/Collation.pm
+++ b/base/lib/Text/Tradition/Collation.pm
@@ -457,6 +457,8 @@ warnings_exist {
        "Got expected relationship drop warning on parse";
 
 my $c = $t->collation;
+# Force the transitive propagation of all existing relationships.
+$c->relations->propagate_all_relationships();
 
 my %rdg_ids;
 map { $rdg_ids{$_} = 1 } $c->readings;

diff --git a/base/script/make_tradition.pl b/base/script/make_tradition.pl
index a393660..4ebfa39 100755 (executable)
--- a/base/script/make_tradition.pl
+++ b/base/script/make_tradition.pl
@@ -55,13 +55,14 @@ $informat = 'Tabular' if $informat =~ /^tab$/i;
 $informat = 'CollateText' if $informat =~ /^stone$/i;
 $informat = 'Tabular' if $informat =~ /^xls/i;
 
-unless( $outformat =~ /^(graphml|svg|dot|stemma(svg)?|(c|t)sv|db)$/ ) {
-    help( "Output format must be one of db, graphml, svg, csv, tsv, stemma, or dot" );
+unless( $outformat =~ /^(graphml|svg|dot|adj(acency)?|stemma(svg)?|(c|t)sv|db)$/i ) {
+    help( "Output format must be one of db, graphml, svg, csv, tsv, stemma, adjacency, or dot" );
 }
+$outformat = 'adjacency_list' if $outformat =~ /^adj/i;
 
 if( $from || $to ) {
-       help( "Subgraphs only supported in GraphML, dot, or SVG format" ) 
-               unless $outformat =~ /^(graphml|dot|svg)$/;
+       help( "Subgraphs only supported in GraphML, dot, adjacency, or SVG format" ) 
+               unless $outformat =~ /^(graphml|dot|svg|adjacency_list)$/;
 }
 
 # Do we have a base if we need it?

diff --git a/base/t/text_tradition_collation.t b/base/t/text_tradition_collation.t
index ff73da2..edced1b 100644 (file)
--- a/base/t/text_tradition_collation.t
+++ b/base/t/text_tradition_collation.t
@@ -77,6 +77,8 @@ warnings_exist {
        "Got expected relationship drop warning on parse";
 
 my $c = $t->collation;
+# Force the transitive propagation of all existing relationships.
+$c->relations->propagate_all_relationships();
 
 my %rdg_ids;
 map { $rdg_ids{$_} = 1 } $c->readings;