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

Conflicts:
	lib/Text/Tradition/Parser/CTE.pm

diff --cc lib/Text/Tradition/Collation.pm
Simple merge

diff --cc lib/Text/Tradition/Parser/CTE.pm
index af989c7,fe6ed69..49bcfe2
--- 1/lib/Text/Tradition/Parser/CTE.pm
--- 2/lib/Text/Tradition/Parser/CTE.pm
+++ b/lib/Text/Tradition/Parser/CTE.pm
@@@ -48,13 -58,12 +48,13 @@@ sub parse 
        foreach my $wit_el ( $xpc->findnodes( '//sourceDesc/listWit/witness' ) ) {
                # The witness xml:id is used internally, and is *not* the sigil name.
                my $id= $wit_el->getAttribute( 'xml:id' );
 -              my @sig_parts = $xpc->findnodes( './abbr/descendant::text()', $wit_el );
 +              my @sig_parts = $xpc->findnodes( 'descendant::text()', $wit_el );
                my $sig = _stringify_sigil( @sig_parts );
 +              print STDERR "Adding witness $sig\n";
-               $tradition->add_witness( sigil => $sig, source => $wit_el->toString() );
+               $tradition->add_witness( sigil => $sig, sourcetype => 'collation' );
                $sigil_for{'#'.$id} = $sig;  # Make life easy by keying on the ID ref syntax
        }
 -
 +      
        # Now go through the text and find the base tokens, apparatus tags, and
        # anchors.  Make a giant array of all of these things in sequence.
        # TODO consider combining this with creation of graph below