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

[refdoc at crosswire.org]

Author: refdoc
Date: 2011-06-14 14:47:03 -0700 (Tue, 14 Jun 2011)
New Revision: 327

Modified:
   trunk/modules/perlconverters/usfm2osis.pl
Log:
corrected use of \d 


Modified: trunk/modules/perlconverters/usfm2osis.pl
===================================================================
--- trunk/modules/perlconverters/usfm2osis.pl	2011-06-10 05:54:18 UTC (rev 326)
+++ trunk/modules/perlconverters/usfm2osis.pl	2011-06-14 21:47:03 UTC (rev 327)
@@ -424,14 +424,19 @@
 	### Titles, Headings, and Labels (elsewhere?)--Markers Supported: \d, \ms#, \s#, \mt#, \r, \sp
 	#### Markers Not Yet Supported: \mte#, \mr, \sr, \rq...\rq*
 
-	# \d \ms majorSection
-	if ($line =~ /^\\(ms|d)\b\s*(.+)/) {
+	# \ms majorSection
+	if ($line =~ /^\\ms\b\s*(.+)/) {
 	    push (@outdata, closeTag("<\/p>"));
 	    push (@outdata, closeTag("<\/div type=\"majorSection\">"));
 	    push (@outdata, "<div type=\"majorSection\">\n");
 	    openTag("<\/div type=\"majorSection\">");
-	    $line =~ s/\\(ms|d)\b\s*(.+)/<title>$2<\/title>/;
+	    $line =~ s/\\ms\b\s*(.+)/<title>$1<\/title>/;
 	}
+	# \d canonical title
+	if ($line =~ /^\\(ms|d)\b\s*(.+)/) {
+	    push (@outdata, closeTag("<\/p>"));
+	    $line =~ s/\\d\b\s*(.+)/<title type=\"canonical\">$1<\/title>/;
+	}
 
 	# \s \s1 section (From Chapters and Verses)
 	if ($line =~ /^\\s1?\b\s*(.+)/) {