diff options
| author | Peter von Kaehne <refdoc@gmx.net> | 2011-08-17 08:40:46 +0000 |
|---|---|---|
| committer | Peter von Kaehne <refdoc@gmx.net> | 2011-08-17 08:40:46 +0000 |
| commit | 74d70192c9a8b216c4d0f5c5854d2dab1d8bd12f (patch) | |
| tree | eb1eaf56d5b1378bdb86ff40469ea3f9ed958142 /modules/perlconverters | |
| parent | 85c7a0fce33f59e9e81d41af5772790f0aaf0960 (diff) | |
| download | sword-tools-74d70192c9a8b216c4d0f5c5854d2dab1d8bd12f.tar.gz | |
\sls \fe added, \d corrected
git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@337 07627401-56e2-0310-80f4-f8cd0041bdcd
Diffstat (limited to 'modules/perlconverters')
| -rw-r--r-- | modules/perlconverters/usfm2osis.pl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/perlconverters/usfm2osis.pl b/modules/perlconverters/usfm2osis.pl index 845ee9b..279f2f0 100644 --- a/modules/perlconverters/usfm2osis.pl +++ b/modules/perlconverters/usfm2osis.pl @@ -433,9 +433,9 @@ foreach $file (@files) { $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 @@ foreach $file (@files) { $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 @@ foreach $file (@files) { $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 @@ foreach $file (@files) { # \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; |