[sword-svn] r311 - trunk/modules/perlconverters

[chrislit at crosswire.org]

Author: chrislit
Date: 2010-11-05 15:27:45 -0700 (Fri, 05 Nov 2010)
New Revision: 311

Modified:
   trunk/modules/perlconverters/usfm2osis.pl
Log:
move spaces at the end of a <catchWord/> element to follow the element

Modified: trunk/modules/perlconverters/usfm2osis.pl
===================================================================
--- trunk/modules/perlconverters/usfm2osis.pl	2010-10-08 08:45:47 UTC (rev 310)
+++ trunk/modules/perlconverters/usfm2osis.pl	2010-11-05 22:27:45 UTC (rev 311)
@@ -780,14 +780,14 @@
 	    $note = "<note>$note</note>";
 
 	    # \fk Catch Words
-	    $note =~ s/\\fk\s(.+?)\\fk\*/\\fX<catchWord>$1<\/catchWord>\\fX/g;
-	    $note =~ s/\\fk\s(.+?)(?=\\f)/\\fX<catchWord>$1<\/catchWord>\\fX/g;
+	    $note =~ s/\\fk\s(.+?)(\s*)\\fk\*/\\fX<catchWord>$1<\/catchWord>\\fX$2/g;
+	    $note =~ s/\\fk\s(.+?)(\s*)(?=\\f)/\\fX<catchWord>$1<\/catchWord>$2\\fX/g;
 	    $note =~ s/\\fk\*/\\fX/g;
 
 	    # \fq Quotations in Footnotes
 	    # CCL--I don't know the difference, aside from length, between catch words and quotations in footnotes. It may vary by document.
-	    $note =~ s/\\fq\s(.+?)\\fq\*/\\fX<catchWord>$1<\/catchWord>\\fX/g;
-	    $note =~ s/\\fq\s(.+?)(?=\\f)/\\fX<catchWord>$1<\/catchWord>\\fX/g;
+	    $note =~ s/\\fq\s(.+?)(\s*)\\fq\*/\\fX<catchWord>$1<\/catchWord>\\fX$2/g;
+	    $note =~ s/\\fq\s(.+?)(\s*)(?=\\f)/\\fX<catchWord>$1<\/catchWord>$2\\fX/g;
 	    $note =~ s/\\fq\*/\\fX/g;
 
 	    # \fqa Alternate translations in Footnotes
@@ -834,14 +834,14 @@
 	    $xref = "<note type=\"crossReference\">$xref</note>";
 
 	    # \xk Catch Words
-	    $xref =~ s/\\xk\s(.+?)\\xk\*/<catchWord>$1<\/catchWord>/g;
-	    $xref =~ s/\\xk\s(.+?)(?=\\x)/<catchWord>$1<\/catchWord>/g;
+	    $xref =~ s/\\xk\s(.+?)(\s*)\\xk\*/<catchWord>$1<\/catchWord>$2/g;
+	    $xref =~ s/\\xk\s(.+?)(\s*)(?=\\x)/<catchWord>$1<\/catchWord>$2/g;
 	    $xref =~ s/\\xk\*//g;
 
 	    # \xq Quotations in Footnotes
 	    # CCL--I don't know the difference, aside from length, between catch words and quotations in footnotes. It may vary by document.
-	    $xref =~ s/\\xq\s(.+?)\\xq\*/<catchWord>$1<\/catchWord>/g;
-	    $xref =~ s/\\xq\s(.+?)(?=\\x)/<catchWord>$1<\/catchWord>/g;
+	    $xref =~ s/\\xq\s(.+?)(\s*)\\xq\*/<catchWord>$1<\/catchWord>$2/g;
+	    $xref =~ s/\\xq\s(.+?)(\s*)(?=\\x)/<catchWord>$1<\/catchWord>$2/g;
 	    $xref =~ s/\\xq\*//g;
 
 	    # \xo Footnote origin reference (the verse where the fn appears)