[sword-cvs] sword/include osisbook.h,1.4,1.5 versekey2.h,1.4,1.5

[sword at www.crosswire.org]

Update of /cvs/core/sword/include
In directory www:/tmp/cvs-serv4713

Modified Files:
	osisbook.h versekey2.h 
Log Message:

dglassey: 'module heading' is now a 'book'. Alter offsets and abbrevs accordingly
remove testament and oldindexhack from vk2


Index: osisbook.h
===================================================================
RCS file: /cvs/core/sword/include/osisbook.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- osisbook.h	12 Apr 2004 13:49:12 -0000	1.4
+++ osisbook.h	29 Apr 2004 15:59:54 -0000	1.5
@@ -28,15 +28,17 @@
 #define TESTAMENT_HEADING 255
 #define OTBOOKS 39
 #define NTBOOKS 27
-#define NTOFFSET 24115  //24115 is offset to start of NT
-#define OSISBMAX 67
-#define MAXOSISBOOKS 92
+//#define NTOFFSET 24115  //24115 is offset to start of NT
+#define OSISBMAX 68
+//#define MAXOSISBOOKS 93
 #define NOTINREFSYS -1
 #define BUILTINABBREVCNT 195
[...1553 lines suppressed...]
+{32119, 19}, // Revelation of John:11
+{32139, 17}, // Revelation of John:12
+{32157, 18}, // Revelation of John:13
+{32176, 20}, // Revelation of John:14
+{32197, 8}, // Revelation of John:15
+{32206, 21}, // Revelation of John:16
+{32228, 18}, // Revelation of John:17
+{32247, 24}, // Revelation of John:18
+{32272, 21}, // Revelation of John:19
+{32294, 15}, // Revelation of John:20
+{32310, 27}, // Revelation of John:21
+{32338, 21} // Revelation of John:22
 };
 
 int
   VerseKey2::offsize[2] =
-  { NTBOOKS+OTBOOKS+2, sizeof (VerseKey2::kjvcps) / sizeof(bkref)
+  { NTBOOKS+OTBOOKS+3, sizeof (VerseKey2::kjvcps) / sizeof(bkref)
 };
 

Index: versekey2.h
===================================================================
RCS file: /cvs/core/sword/include/versekey2.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- versekey2.h	12 Apr 2004 13:49:12 -0000	1.4
+++ versekey2.h	29 Apr 2004 15:59:54 -0000	1.5
@@ -122,7 +122,7 @@
 	int abbrevsCnt;
 	/** The Testament: 0 - Old; 1 - New
 	*/
-	signed char testament;
+	//signed char testament;
 	mutable signed char book;
 	mutable signed int chapter;
 	mutable signed int verse;
@@ -134,7 +134,7 @@
 	char headings;
 	/** flag to use old ot/nt indexes for old modules
 	*/
-	bool oldindexhack;
+	//bool oldindexhack;
 
 	int getBookAbbrev(const char *abbr);
 	void initBounds() const;
@@ -285,7 +285,7 @@
 	*
 	* @return value of testament
 	*/
-	virtual char Testament() const;
+	//virtual char Testament() const;
 	
 	/** Gets book
 	*
@@ -312,7 +312,7 @@
 	* @return if unchanged -> value of testament,
 	* if changed -> previous value of testament
 	*/
-	virtual char Testament(char itestament);
+	//virtual char Testament(char itestament);
 	
 	/** Sets/gets book
 	*