minor changes to output formatting for drop-in to Sword's include path

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

2 files changed, 7 insertions, 7 deletions

diff --git a/versification/makeabbrevs.pl b/versification/makeabbrevs.pl
index 7789ce7..99c627d 100644
--- a/versification/makeabbrevs.pl
+++ b/versification/makeabbrevs.pl
@@ -56,17 +56,17 @@ foreach $mapfile (@canons) {
     close (MAP);

 }

 

-$abbrevs = "/******************************************************************************\n *	Abbreviations - MUST be in alphabetical order & by PRIORITY\n *		RULE: first match of entire key\n *			(e.g. key: \"1CH\"; match: \"1CHRONICLES\")\n */\n\nconst struct abbrev builtin_abbrevs\[\] = {\n";

+$abbrevs = "/******************************************************************************\n * canon_abbrevs.h - Canonical text information to be included by VerseKey.cpp\n *\n * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)\n *	CrossWire Bible Society\n *	P. O. Box 2528\n *	Tempe, AZ  85280-2528\n *\n * This program is free software; you can redistribute it and/or modify it\n * under the terms of the GNU General Public License as published by the\n * Free Software Foundation version 2.\n *\n * This program is distributed in the hope that it will be useful, but\n * WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n * General Public License for more details.\n *\n */\n\n#ifndef CANON_ABBREVS_H\n#define CANON_ABBREVS_H\n\nSWORD_NAMESPACE_START\n\n\n/******************************************************************************\n *	Abbreviations - MUST be in alphabetical order & by PRIORITY\n *		RULE: first match of entire key\n *			(e.g. key: \"1CH\"; match: \"1CHRONICLES\")\n */\n\nconst struct abbrev builtin_abbrevs\[\] = {\n";

 

 @abbrevsQueue = sort @abbrevsQueue;

 foreach $a (@abbrevsQueue) {

     if ($a =~ /^.+\d/) {

 	$abbrevs .= "//";

     }

-    $abbrevs .= "  {\"" . uc($a) . "\", \"" . $osis{lc($a)} . "\"},\t\t//" . $idmap{$osis{lc($a)}} . "\n";

+    $abbrevs .= "  {\"" . uc($a) . "\", \"" . $osis{lc($a)} . "\"},\t\t// " . $idmap{$osis{lc($a)}} . "\n";

 }

-$abbrevs .= "  {\"\", \"\"}\n};\n\n\n";

+$abbrevs .= "  {\"\", \"\"}\n};\n\n\nSWORD_NAMESPACE_END\n\n\n#endif\n";

 

-open OUTF, ">builtin_abbrevs.h";

+open OUTF, ">canon_abbrevs.h";

 print OUTF $abbrevs;

 close OUTF;

diff --git a/versification/v11nsys.pl b/versification/v11nsys.pl
index 3ca396b..61bfbe0 100644
--- a/versification/v11nsys.pl
+++ b/versification/v11nsys.pl
@@ -185,13 +185,13 @@ foreach $infile (@srcfiles) {
 	if ($v11n eq "") {

 	    $v11n = "NRSVA";

 	}

-	$outfile = lc("v11n$2.h");

+	$outfile = lc("canon_$2.h");

     }

     else {

 	$v11n = $infile;

 	$v11n =~ s/\.[^\.]*$//;

 	$v11n =~ s/^.+\///;

-	$outfile = lc("v11n$v11n.h");

+	$outfile = lc("canon_$v11n.h");

     }

 

     print "Processing $infile --> $outfile (v11n: $v11n).\n";

@@ -331,7 +331,7 @@ foreach $infile (@srcfiles) {
     }

     @abbrevsQueue = sort @abbrevsQueue;

     foreach $a (@abbrevsQueue) {

-	$abbrevs .= "  {\"" . uc($a) . "\", \"" . $osis{lc($a)} . "\"},\t\t//" . $idmap{$osis{lc($a)}} . "\n";

+	$abbrevs .= "  {\"" . uc($a) . "\", \"" . $osis{lc($a)} . "\"},\t\t// " . $idmap{$osis{lc($a)}} . "\n";

     }

     $abbrevs .= $abbrevsCloser;