fixed final verse & chapter closers

git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@151 07627401-56e2-0310-80f4-f8cd0041bdcd

1 files changed, 9 insertions, 0 deletions

diff --git a/modules/perlconverters/usfm2osis.pl b/modules/perlconverters/usfm2osis.pl
index 5cdb375..2e651f2 100644
--- a/modules/perlconverters/usfm2osis.pl
+++ b/modules/perlconverters/usfm2osis.pl
@@ -736,6 +736,14 @@ foreach $file (@files) {
     }
 }
 
+if ($versClose =~ /<verse/) {
+    push (@outdata, $versClose); # close verse
+    $versClose = "";
+}
+if ($chapClose =~ /<chapter/) {
+    push (@outdata, $chapClose); # close chapter
+    $chapClose = "";
+}
 push (@outdata, closeTag("<\/osis>"));
 
 for ($i = 0; $i < scalar(@outdata); $i++) {
@@ -772,6 +780,7 @@ for ($i = 0; $i < scalar(@filedata); $i++) {
 for ($i = 0; $i < scalar(@filedata); $i++) {
     $fullfile .= @filedata[$i];
 }
+$fullfile =~ s/<\/osisText>\n<\/osis>\n(<chapter eID[^>]+>)/$1\n<\/osisText>\n<\/osis>/mg; #swap the chapter back up one before the osisText closer
 $fullfile =~ s/<\/div>\n(<chapter eID[^>]+>)/$1\n<\/div>/mg; #swap the chapter back up one before the book closer
 
 print "Tagging quotations.\n";