fix #739 click verse text before/after to cross chapters.

crosswire · Sep 3, 2017 · 4388cd8 · 4388cd8
1 parent c8d2b16
commit 4388cd8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,9 @@
-2017-08-23  karl <charcoal@users.sf.net>
+2017-09/03  karl <charcoal@users.sf.net>
 
 	* #524 fix use of fonts whose names end in digits.
 	  (ex. Goudy Bookletter 1911.)
 	* #788 use saved status of detached sidebar.
+	* #739 click verse text before/after to cross chapters.
 
 2017-08-23  karl <charcoal@users.sf.net>
 

diff --git a/src/main/display.cc b/src/main/display.cc
@@ -1132,10 +1132,9 @@ GTKChapDisp::getVerseBefore(SWModule &imodule)
 		num = main_format_number(key->getVerse());
 		buf = g_strdup_printf(
 		    (settings.showversenum
-			 ? "&nbsp; <a name=\"%d\" href=\"sword:///%s\">"
-			   "<font size=\"%+d\" color=\"%s\">%s%s%s%s%s%s%s</font></a>&nbsp;"
-			 : "&nbsp; <a name=\"%d\"> </a>"),
-		    0,
+			 ? "&nbsp; <a name=\"0\" href=\"sword:///%s\">"
+			   "<font size=\"%+d\" color=\"%s\">%s%s%s%s%s%s%s</font>&nbsp;"
+			 : "&nbsp; <a name=\"0\"> </a>"),
 		    (char *)key->getText(),
 		    (settings.versestyle
 			 ? settings.verse_num_font_size + settings.base_font_size
@@ -1148,10 +1147,12 @@ GTKChapDisp::getVerseBefore(SWModule &imodule)
 
 		num = main_format_number(chapter);
 		buf = g_strdup_printf(
-		    "%s%s<br/><a name=\"TOP\"></a><hr/><div style=\"text-align: center\"><b>%s %s</b></div>",
+		    "<font color=\"%s\">%s%s</font>%s<br/><a name=\"TOP\"></a><hr/><div style=\"text-align: center\"><b>%s %s</b></div>",
+		    settings.bible_text_color,
 		    (strongs_or_morph
 			 ? block_render(imodule.renderText().c_str())
 			 : imodule.renderText().c_str()),
+		    (settings.showversenum ? "</a>" : ""),
 		    // extra break when excess strongs/morph space.
 		    (strongs_or_morph ? "<br/>" : ""),
 		    _("Chapter"), num);
@@ -1251,10 +1252,9 @@ GTKChapDisp::getVerseAfter(SWModule &imodule)
 		num = main_format_number(key->getVerse());
 		buf = g_strdup_printf(
 		    (settings.showversenum
-			 ? "&nbsp; <a name=\"%d\" href=\"sword:///%s\">"
-			   "<font size=\"%+d\" color=\"%s\">%s%s%s%s%s%s%s</font></a>&nbsp;"
-			 : "&nbsp; <a name=\"%d\"> </a>"),
-		    0,
+			 ? "&nbsp; <a name=\"0\" href=\"sword:///%s\">"
+			   "<font size=\"%+d\" color=\"%s\">%s%s%s%s%s%s%s</font>&nbsp;"
+			 : "&nbsp; <a name=\"0\"> </a>"),
 		    (char *)key->getText(),
 		    (settings.versestyle
 			 ? settings.verse_num_font_size + settings.base_font_size
@@ -1269,10 +1269,14 @@ GTKChapDisp::getVerseAfter(SWModule &imodule)
 			set_morph_order(imodule);
 		set_render_numbers(imodule, ops);
 
-		swbuf.append((strongs_or_morph
-				  ? block_render(imodule.renderText().c_str())
-				  : imodule.renderText().c_str()));
-		swbuf.append("</div>");
+		buf = g_strdup_printf("<font color=\"%s\">%s</a>%s</div>",
+				      settings.bible_text_color,
+				      (strongs_or_morph
+				       ? block_render(imodule.renderText().c_str())
+				       : imodule.renderText().c_str()),
+				      (settings.showversenum ? "</a>" : ""));
+		swbuf.append(buf);
+		g_free(buf);
 	}
 }