[GnomeSword-cvs] SF.net SVN: gnomesword:[4344] branches/webkit

[<cha...@us...>]

Revision: 4344
          http://gnomesword.svn.sourceforge.net/gnomesword/?rev=4344&view=rev
Author:   charcoal
Date:     2012-01-11 03:02:39 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
comm.by.chap: anchors for missing verse; add horiz.rule to identify where we are in the chapter.

Modified Paths:
--------------
    branches/webkit/ChangeLog
    branches/webkit/src/main/display.cc

Modified: branches/webkit/ChangeLog
===================================================================
--- branches/webkit/ChangeLog	2012-01-08 14:33:37 UTC (rev 4343)
+++ branches/webkit/ChangeLog	2012-01-11 03:02:39 UTC (rev 4344)
@@ -1,3 +1,7 @@
+2012-01-10  karl <cha...@us...>
+
+	* missing verse anchor + current verse <hr> to commentary by chapter.
+
 2011-12-19  karl <cha...@us...>
 
 	* added Ctrl-[1-9] to select Nth tab.

Modified: branches/webkit/src/main/display.cc
===================================================================
--- branches/webkit/src/main/display.cc	2012-01-08 14:33:37 UTC (rev 4343)
+++ branches/webkit/src/main/display.cc	2012-01-11 03:02:39 UTC (rev 4344)
@@ -753,6 +753,7 @@
 	imodule.setSkipConsecutiveLinks(true);
 
 	VerseKey *key = (VerseKey *)(SWKey *)imodule;
+	bool before_curVerse(true);
 	int curVerse = key->Verse();
 	int curChapter = key->Chapter();
 	int curBook = key->Book();
@@ -813,6 +814,26 @@
 			else
 				rework = g_string_new(cVerse.GetText());
 		}
+
+		// add an indicator for where in the chapter we are.
+		// (commentaries can have big sections on 1 verse.)
+		if (curVerse != 1) {			// not at the top of the pane
+			buf = NULL;
+			if ((curVerse == key->Verse()) ||
+			    (before_curVerse && (key->Verse() > curVerse))) {
+				vbuf = g_strdup_printf("<tr><td>%s<hr/></td><td><hr/></td></tr>",
+						       // repeated conditional check here
+						       ((before_curVerse &&
+							 (key->Verse() > curVerse))
+							? (buf = g_strdup_printf(
+							       "<a name=\"%d\"> </a>", curVerse))
+							: ""));
+				swbuf.append(vbuf);
+				g_free(vbuf);
+			}
+			g_free(buf);
+		}
+
 		swbuf.append("<tr>");
 
 		// insert verse numbers
@@ -853,6 +874,7 @@
 		g_free(vbuf);
 
 		swbuf.append("</tr>");
+		before_curVerse = (key->Verse() < curVerse);
 	}
 
 	// close the table.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.