diff options
| author | Chris Little <chrislit@crosswire.org> | 2013-06-10 03:56:49 +0000 |
|---|---|---|
| committer | Chris Little <chrislit@crosswire.org> | 2013-06-10 03:56:49 +0000 |
| commit | d6aa13f44678295d31deeabd7a1a7a26321ed6a2 (patch) | |
| tree | 2e1ca9726324bfa7c963091245bcc953d7c18659 | |
| parent | f9b21645d0eade5b3cda3062a395f5cb44a3a956 (diff) | |
| download | sword-tools-d6aa13f44678295d31deeabd7a1a7a26321ed6a2.tar.gz | |
corrected ampersand (&) handling (without mangling pre-escaped sequences) for MODTOOLS-37
git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@423 07627401-56e2-0310-80f4-f8cd0041bdcd
| -rwxr-xr-x | modules/perlconverters/usfm2osis.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/perlconverters/usfm2osis.pl b/modules/perlconverters/usfm2osis.pl index 86f328c..539e5a7 100755 --- a/modules/perlconverters/usfm2osis.pl +++ b/modules/perlconverters/usfm2osis.pl @@ -4,7 +4,7 @@ ## Licensed under the standard BSD license: -# Copyright (c) 2002-2012 CrossWire Bible Society <http://www.crosswire.org/> +# Copyright (c) 2002-2013 CrossWire Bible Society <http://www.crosswire.org/> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -242,7 +242,7 @@ foreach $file (@files) { $line = @filedata[$i]; ### Basic XML entity encoding - $line =~ s/&(?![a-zA-Z0-9])/&/g; + $line =~ s/&(?![a-zA-Z0-9]+;)/&/g; # $line =~ s/<< ?/\@/g; # $line =~ s/>>/\#/g; # $line =~ s/</\$/g; |