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

[refdoc at crosswire.org]

Author: refdoc
Date: 2011-08-17 01:40:46 -0700 (Wed, 17 Aug 2011)
New Revision: 337

Modified:
   trunk/modules/perlconverters/usfm2osis.pl
Log:
\sls \fe added, \d corrected


Modified: trunk/modules/perlconverters/usfm2osis.pl
===================================================================
--- trunk/modules/perlconverters/usfm2osis.pl	2011-07-22 23:59:47 UTC (rev 336)
+++ trunk/modules/perlconverters/usfm2osis.pl	2011-08-17 08:40:46 UTC (rev 337)
@@ -433,9 +433,9 @@
 	    $line =~ s/\\ms\b\s*(.+)/<title>$1<\/title>/;
 	}
 	# \d canonical title
-	if ($line =~ /^\\(ms|d)\b\s*(.+)/) {
+	if ($line =~ /^\\d\b\s*(.+)?(\\d\*)?/) {
 	    push (@outdata, closeTag("<\/p>"));
-	    $line =~ s/\\d\b\s*(.+)/<title type=\"canonical\">$1<\/title>/;
+	    $line =~ s/\\d\b\s*(.+)/<title type=\"psalm\">$1<\/title>/;
 	}
 
 	# \s \s1 section (From Chapters and Verses)
@@ -824,7 +824,7 @@
 	    $note =~ s/\s*\\f\*//;
 
 	    # \f Footnote opener
-	    $note =~ s/\\f\b\s*([^\s]\s*)?//;
+	    $note =~ s/\\fe?\b\s*([^\s]\s*)?//;
 
 	    # \fX was inserted above to mark former locations of various already-handled markers, which can now be removed
 	    $note =~ s/\\fX//g;
@@ -891,7 +891,7 @@
 	$line =~ s/<reference osisRef="([^\"\.]+)\.(\d+)"/<reference osisRef="$1\.1\.$2"/g; # Jude 1
 
 	### Special Text and Character Styles--Markers Supported: \it...\it*, \nd...\nd*, \pn...\pn*, \tl...\tl*, \qt...\qt*, \add...\add*, \pb, \bk...\bk*, \sc..\sc*, \bd...\bd*
-	#### Markers Not Yet Supported: Special Text:  \k...\k*, \lit, \ord...\ord*, \sig...\sig*, \sls...\sls*, \wj...\wj*; Character Styling: \em...\em*,  \bdit...\bdit*, \no...\no*; Spacing and Breaks: !$, //; Special Features: \fig...\fig*, \ndx...\ndx*, \pro...\pro*, \w...\w*, \wg...\wg*, \wh...\wh*
+	#### Markers Not Yet Supported: Special Text:  \k...\k*, \lit, \ord...\ord*, \sig...\sig*, \wj...\wj*; Character Styling: \em...\em*,  \bdit...\bdit*, \no...\no*; Spacing and Breaks: !$, //; Special Features: \fig...\fig*, \ndx...\ndx*, \pro...\pro*, \w...\w*, \wg...\wg*, \wh...\wh*
 
 	# \dc...\dc*, inserted deuterocanonical text
 	$line =~ s/\\dc\b\s*(.*?)\\dc\*/<transChange type=\"added\" editions=\"dc\">$1<\/transChange>/g;
@@ -917,6 +917,9 @@
 	# \tl...\tl*, Foreign Langauge (treated here merely as transliterated text)
 	$line =~ s/\\tl\b\s*(.*?)\\tl\*/<hi type="italic">$1<\/hi>/g;
 
+	# \sls...\sls*, Text from alternative text source
+	$line =~ s/\\sls\b\s*(.*?)\\sls\*/<hi type="italic">$1<\/hi>/g;
+
 	# \add...\add*, text added for translation purposes
 	$line =~ s/\\add\b\s*(.*?)\\add\*/<transChange type=\"added\">$1<\/transChange>/g;