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=d4395a73492d9865b262e27ae2c22f585269feee;hp=d3a8567cdcd80a3ebcae936b3807bcce26bd6db8;hb=869a1ada82eb48bc46f2298823fa1ef6f417c671;hpb=99ab95354ac3ce1f09b81e2b8a3fcd66fe6e83d9 diff --git a/lib/Text/Tradition/Collation.pm b/lib/Text/Tradition/Collation.pm index d3a8567..d4395a7 100644 --- a/lib/Text/Tradition/Collation.pm +++ b/lib/Text/Tradition/Collation.pm @@ -409,12 +409,19 @@ sub merge_readings { # Do the deletion deed. if( $combine ) { + # Combine the text of the readings my $joinstr = $combine_char; unless( defined $joinstr ) { $joinstr = '' if $kept_obj->join_next || $del_obj->join_prior; $joinstr = $self->wordsep unless defined $joinstr; } $kept_obj->alter_text( join( $joinstr, $kept_obj->text, $del_obj->text ) ); + $kept_obj->normal_form( + join( $joinstr, $kept_obj->normal_form, $del_obj->normal_form ) ); + # Combine the lexemes present in the readings + if( $kept_obj->has_lexemes && $del_obj->has_lexemes ) { + $kept_obj->add_lexeme( $del_obj->lexemes ); + } } $self->del_reading( $deleted ); }