version bump to 2.5.1.

Fix for bug where Jesus words were not displayed in red.
Other minor improvements.

Eloquent.xcodeproj/project.pbxproj

@@ -782,8 +782,8 @@
 				A918BA4211C67AF700024D84 /* SwordModule+SearchKitIndex.mm */,
 				A9802A7412182E4A00F4EF70 /* NSArray+TextEntryDuplicateRemove.h */,
 				A9802A7512182E4A00F4EF70 /* NSArray+TextEntryDuplicateRemove.m */,
-				8C92C5FF138B87CC5DB94C51 /* EloquentFilterProvider.mm */,
 				8C92C1D5D7545986F2AFCEE1 /* EloquentFilterProvider.h */,
+				8C92C5FF138B87CC5DB94C51 /* EloquentFilterProvider.mm */,
 			);
 			name = Sword;
 			path = src/Sword;
@@ -1173,7 +1173,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastTestingUpgradeCheck = 0630;
+				LastTestingUpgradeCheck = 0720;
 				LastUpgradeCheck = 0640;
 				ORGANIZATIONNAME = Crosswire;
 				TargetAttributes = {

Info.plist

@@ -30,7 +30,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -45,7 +45,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2479</string>
+	<string>2483</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.education</string>
 	<key>NSMainNibFile</key>

buildnumber

@@ -1 +1 @@
-2479
+2483

src/Sword/EloquentFilterProvider.mm

@@ -10,7 +10,8 @@
 @implementation EloquentFilterProvider
 
 - (SwordFilter *)newOsisRenderFilter {
-    return [SwordOsisXHtmlFilter filter];
+    return [SwordOsisHtmlRefFilter filter];
+//    return [SwordOsisXHtmlFilter filter];
 }
 
 @end

src/UserInterface/BibleCombiViewController+ViewSynchronisation.m

@@ -145,7 +145,18 @@ - (void)synchronizedViewContentBoundsDidChange:(NSNotification *)aNotification {
     }        
 }
 
-- (NSRange)rangeFromViewableFirstLineInTextView:(NSTextView *)theTextView lineRect:(NSRect *)lineRect {    
+- (NSString *)verseMarkerOfFirstLineOfTextView:(ScrollSynchronizableView *)syncView {
+    // all bible views display all verse keys whether they are empty or not. But we can search for the verse location
+    NSRect lineRect;
+    NSRange lineRange = [self rangeFromViewableFirstLineInTextView:[syncView textView] lineRect:&lineRect];
+    // try to get characters of textStorage
+    NSAttributedString *attrString = [[[syncView textView] textStorage] attributedSubstringFromRange:NSMakeRange(lineRange.location, lineRange.length)];
+
+    // now, that we have the first line, extract the verse Marker
+    return [self verseMarkerInTextLine:attrString];
+}
+
+- (NSRange)rangeFromViewableFirstLineInTextView:(NSTextView *)theTextView lineRect:(NSRect *)lineRect {
     if([theTextView enclosingScrollView]) {
         NSLayoutManager *layoutManager = [theTextView layoutManager];
         NSRect visibleRect = [theTextView visibleRect];
@@ -224,15 +235,4 @@ - (NSRect)rectForAttributeName:(NSString *)attrName attributeValue:(id)attrValue
     return ret;
 }
 
-- (NSString *)verseMarkerOfFirstLineOfTextView:(ScrollSynchronizableView *)syncView {
-    // all bible views display all verse keys whether they are empty or not. But we can search for the verse location
-    NSRect lineRect;
-    NSRange lineRange = [self rangeFromViewableFirstLineInTextView:[syncView textView] lineRect:&lineRect];
-    // try to get characters of textStorage
-    NSAttributedString *attrString = [[[syncView textView] textStorage] attributedSubstringFromRange:NSMakeRange(lineRange.location, lineRange.length)];
-
-    // now, that we have the first line, extract the verse Marker
-    return [self verseMarkerInTextLine:attrString];    
-}
-
 @end

src/UserInterface/BibleViewController+TextDisplayGeneration.m

@@ -104,7 +104,7 @@ - (NSAttributedString *)displayableHTMLForReferenceLookup {
     htmlString = [htmlString stringByReplacingOccurrencesOfString:@"\u200B" withString:@""];
 
     CocoLog(LEVEL_DEBUG, @"start generating attr string...");
-    [self applyString:htmlString];
+    [self applyString:htmlString];  // this will set tempDisplayString which will be used by the resulting methods
     CocoLog(LEVEL_DEBUG, @"start generating attr string...done");
 
     CocoLog(LEVEL_DEBUG, @"setting pointing hand cursor...");
@@ -280,7 +280,7 @@ - (void)appendHTMLFromTextEntry:(SwordBibleTextEntry *)anEntry atHTMLString:(NSM
             if([[modDisplayOptions objectForKey:SW_OPTION_HEADINGS] isEqualToString:SW_ON]) {
                 NSString *chapIntro = [(SwordBible *)module chapterIntroductionIn:bibleBook forChapter:chapter];
                 if(chapIntro && [chapIntro length] > 0) {
-                    [aString appendFormat:@"<p><i><span style=\"%@\">%@</span></i></p>", headingsFGColorStyle, chapIntro];                    
+                    [aString appendFormat:@"<br /><p><i><span style=\"%@\">%@</span></i></p>", headingsFGColorStyle, chapIntro];
                 }
             }
             if(!hideVerseNumbering) {
@@ -294,7 +294,7 @@ - (void)appendHTMLFromTextEntry:(SwordBibleTextEntry *)anEntry atHTMLString:(NSM
             if([[modDisplayOptions objectForKey:SW_OPTION_HEADINGS] isEqualToString:SW_ON]) {
                 NSString *chapIntro = [(SwordBible *)module chapterIntroductionIn:bibleBook forChapter:chapter];
                 if(chapIntro && [chapIntro length] > 0) {
-                    [aString appendFormat:@"<p><i><span style=\"%@\">%@</span></i></p>", headingsFGColorStyle, chapIntro];                    
+                    [aString appendFormat:@"<br /><p><i><span style=\"%@\">%@</span></i></p>", headingsFGColorStyle, chapIntro];
                 }
             }
             if(isShowVerseNumbersOnly && !hideVerseNumbering) {
@@ -322,11 +322,11 @@ - (void)applyString:(NSString *)aString {
     [options setObject:[NSNumber numberWithInt:NSUTF8StringEncoding] forKey:NSCharacterEncodingDocumentOption];
     WebPreferences *webPrefs = [[MBPreferenceController defaultPrefsController] defaultWebPreferencesForModuleName:[[self module] name]];
     [webPrefs setDefaultFontSize:[self customFontSize]];
+
     [options setObject:webPrefs forKey:NSWebPreferencesDocumentOption];
 
     NSFont *normalDisplayFont = [[MBPreferenceController defaultPrefsController] normalDisplayFontForModuleName:[[self module] name]];
-    NSFont *font = [NSFont fontWithName:[normalDisplayFont familyName] 
-                                   size:[self customFontSize]];
+    NSFont *font = [NSFont fontWithName:[normalDisplayFont familyName] size:[self customFontSize]];
 
     NSData *data = [aString dataUsingEncoding:NSUTF8StringEncoding];
     tempDisplayString = [[NSMutableAttributedString alloc] initWithHTML:data 

src/UserInterface/ModuleViewController.m

@@ -232,6 +232,7 @@ - (void)displayTextForReference:(NSString *)aReference searchType:(SearchType)aT
             [self setProgressActionType:ReferenceLookupAction];
             [self setGlobalOptionsFromModOptions];
             [self handleDisplayForReference];
+
         } else if(searchType == IndexSearchType) {
             [searchContentCache setReference:searchString];
             if(![module hasSKSearchIndex]) {