reading IDs must be XML names; now used in SVG node IDs

[scpubgit/stemmatology.git] / lib / Text / Tradition / Collation / Reading.pm

diff --git a/lib/Text/Tradition/Collation/Reading.pm b/lib/Text/Tradition/Collation/Reading.pm
index 5a60823..9d96421 100644 (file)
--- a/lib/Text/Tradition/Collation/Reading.pm
+++ b/lib/Text/Tradition/Collation/Reading.pm
@@ -1,12 +1,21 @@
 package Text::Tradition::Collation::Reading;
 
 use Moose;
+use Moose::Util::TypeConstraints;
 use JSON qw/ from_json /;
 use Module::Load;
 use Text::Tradition::Error;
+use XML::Easy::Syntax qw( $xml10_name_rx $xml10_namestartchar_rx );
 use YAML::XS;
 use overload '""' => \&_stringify, 'fallback' => 1;
 
+subtype 'ReadingID',
+       as 'Str',
+       where { $_ =~ /\A$xml10_name_rx\z/ },
+       message { 'Reading ID must be a valid XML attribute string' };
+       
+no Moose::Util::TypeConstraints;
+
 =head1 NAME
 
 Text::Tradition::Collation::Reading - represents a reading (usually a word)
@@ -79,7 +88,7 @@ has 'collation' => (
 
 has 'id' => (
        is => 'ro',
-       isa => 'Str',
+       isa => 'ReadingID',
        required => 1,
        );
 
@@ -184,16 +193,25 @@ around BUILDARGS => sub {
        if( exists $args->{'is_lacuna'} && !exists $args->{'text'} ) {
                $args->{'text'} = '#LACUNA#';
        } elsif( exists $args->{'is_start'} ) {
-               $args->{'id'} = '#START#';  # Change the ID to ensure we have only one
+               $args->{'id'} = '__START__';  # Change the ID to ensure we have only one
                $args->{'text'} = '#START#';
                $args->{'rank'} = 0;
        } elsif( exists $args->{'is_end'} ) {
-               $args->{'id'} = '#END#';        # Change the ID to ensure we have only one
+               $args->{'id'} = '__END__';      # Change the ID to ensure we have only one
                $args->{'text'} = '#END#';
        } elsif( exists $args->{'is_ph'} ) {
                $args->{'text'} = $args->{'id'};
        }
        
+       # Backwards compatibility for non-XMLname IDs
+       my $rid = $args->{'id'};
+       $rid =~ s/\#/__/g;
+       $rid =~ s/[\/,]/./g;
+    if( $rid !~ /^$xml10_namestartchar_rx/ ) {
+       $rid = 'r'.$rid;
+    }
+       $args->{'id'} = $rid;
+       
        $class->$orig( $args );
 };