Changeset 27990 for other-projects/nightly-tasks/diffcol/trunk
- Timestamp:
- 2013-08-06T22:20:41+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl
r27971 r27990 654 654 655 655 my $win_contents = $testIsWin ? \$test_contents : \$model_contents; 656 656 my $lin_contents = $testIsWin ? \$model_contents : \$test_contents; 657 657 658 # remove all carriage returns \r - introduced into doc.xml by multiread after pdf converted to html 658 659 $$win_contents =~ s@[\r]@@g; … … 665 666 #FOR MAC: old macs use CR carriage return (see http://www.perlmonks.org/?node_id=745018), so replace with \n?) 666 667 # $$win_contents =~ s@\r@\n@mg; 668 669 # remove solitary, stray carriage returns \r in the linux doc.xml, as occurs in the tudor collection owing to the source material 670 # containing solitary carriage returns instead of linefeed 671 $$lin_contents =~ s@[\r]@@g; #$$lin_contents =~ s@[\r][^\n]@@g; 667 672 } 668 673 … … 862 867 863 868 # make sure there are no stray ampersands/partial ampersands that need to be completed as < or > 864 if($strOutput =~ m/&(.{1,2})?$/ ) { # < => < or &g => >869 if($strOutput =~ m/&(.{1,2})?$/ || $strOutput =~ m/&$/) { # < => < or &g => > or &a(m)=> & or & => & 865 870 if(defined $1 && $1) { 866 871 my $rest = $1; 867 if($rest eq "g" || $rest eq "l") { 872 if($rest =~ m/^a/) { 873 $strOutput =~ s@am?p?$@amp;@; 874 } 875 elsif($rest eq "g" || $rest eq "l") { 868 876 $strOutput .= "t;"; # close the known tag 869 877 } 870 elsif($ 1 eq "gt" || $1eq "lt") {878 elsif($rest eq "gt" || $rest eq "lt") { 871 879 $strOutput .= ";"; 872 } 880 } 873 881 } else { # & on its own 874 882 #$strOutput = substr( $strOutput, 0, 977); # lop off the &
Note:
See TracChangeset
for help on using the changeset viewer.