OSIS completed. USFM completed

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

1 files changed, 11 insertions, 3 deletions

diff --git a/modules/crossreferences/xrefmake.pl b/modules/crossreferences/xrefmake.pl
index 81ed654..3427767 100755
--- a/modules/crossreferences/xrefmake.pl
+++ b/modules/crossreferences/xrefmake.pl
@@ -47,7 +47,15 @@
         my $return = `parsekey "$_[0]" "$_[1]"`;
         $return =~ s/\n$//;
         $return;
-        } 
+    } 
+
+    sub vs2osis {
+
+        my $return = `vs2osisref "$_[0]" "$_[1]" $_[2]`;
+        $return =~ s/\n$//;
+        $return;
+    }
+                        
     
     my @bookname = ("GEN","EXO","LEV","NUM","DEU",
             "JOS","JDG","RUT","1SA","2SA","1KI",
@@ -128,10 +136,10 @@ if (scalar(@ARGV) < 3) {
                 $ref = "$OSISbook{ $bookname[ $columns[0] -1 ] }.$columns[1].$columns[2]";
                 $xref = &parsekey( "$OSISbook{ $bookname[ $columns[3] -1 ] }.$columns[4].$columns[5]", $locale );
                 if ($ref eq $o_ref) {
-                    print "$xref; "
+                    print &vs2osis($xref,$o_ref,$locale); 
                 }
                 else { 
-                    print "\n".$ref."\t".$xref."; ";
+                    print "</note>\n".$ref."\t <note type=\"crossreference\">".&vs2osis($xref,$o_ref,$locale)."; ";
                     $o_ref = $ref;
                 }