[sword-svn] r2571 - in trunk: . src/keys

[scribe at crosswire.org]

Author: scribe
Date: 2010-10-14 08:51:46 -0700 (Thu, 14 Oct 2010)
New Revision: 2571

Modified:
   trunk/ChangeLog
   trunk/src/keys/versekey.cpp
Log:
Added support for hyphenated book names


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-14 15:38:46 UTC (rev 2570)
+++ trunk/ChangeLog	2010-10-14 15:51:46 UTC (rev 2571)
@@ -1,6 +1,10 @@
 API ChangeLog 
 
 
+14-Oct-2010	Troy A. Griffitts <scribe at crosswire.org>
+	Allow <hi> to be nested in any order in OSIS markup
+	Updates to allow hyphenated book names
+
 25-Jun-2010	Troy A. Griffitts <scribe at crosswire.org>
 	Added CMake build system, contributed by GHellings
 

Modified: trunk/src/keys/versekey.cpp
===================================================================
--- trunk/src/keys/versekey.cpp	2010-10-14 15:38:46 UTC (rev 2570)
+++ trunk/src/keys/versekey.cpp	2010-10-14 15:51:46 UTC (rev 2571)
@@ -563,6 +563,17 @@
 			}
 
 		case '-':
+			if (chap == -1) {
+				book[tobook] = *buf;
+				book[tobook+1] = *(buf+1);
+				book[tobook+2] = 0;
+				int bookno = getBookAbbrev(book);
+				if (bookno > -1) {
+					tobook++;
+					buf++;
+					break;
+				}
+			}
 		case ',': // on number new verse
 		case ';': // on number new chapter
 			number[tonumber] = 0;