<style>
/* Changing the layout to use less space for mobiles */
@media screen and (max-device-width: 480px), screen and (-webkit-min-device-pixel-ratio: 2) {
#email-body { min-width: 30em !important; }
#email-page { padding: 8px !important; }
#email-banner { padding: 8px 8px 0 8px !important; }
#email-avatar { margin: 1px 8px 8px 0 !important; padding: 0 !important; }
#email-fields { padding: 0 8px 8px 8px !important; }
#email-gutter { width: 0 !important; }
}
</style>
<div id="email-body">
<table id="email-wrap" align="center" border="0" cellpadding="0" cellspacing="0" style="background-color:#f0f0f0;color:#000000;width:100%;">
<tr valign="top">
<td id="email-page" style="padding:16px !important;">
<table align="center" border="0" cellpadding="0" cellspacing="0" style="background-color:#ffffff;border:1px solid #bbbbbb;color:#000000;width:100%;">
<tr valign="top">
<td bgcolor="#4d5c47" style="background-color:#4d5c47;color:#ffffcc;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;line-height:1;"><img src="http://www.crosswire.org/bugs/s/en_US-l73y3/783/14/_/jira-logo-scaled.png" alt="" style="vertical-align:top;" /></td>
</tr><tr valign="top">
<td id="email-banner" style="padding:32px 32px 0 32px;">
<table align="left" border="0" cellpadding="0" cellspacing="0" width="100%" style="width:100%;">
<tr valign="top">
<td style="color:#505050;font-family:Arial,FreeSans,Helvetica,sans-serif;padding:0;">
<img id="email-avatar" src="http://www.crosswire.org/bugs/secure/useravatar?avatarId=10062" alt="" height="48" width="48" border="0" align="left" style="padding:0;margin: 0 16px 16px 0;" />
<div id="email-action" style="padding: 0 0 8px 0;font-size:12px;line-height:18px;">
<a class="user-hover" rel="mjdenham" id="email_mjdenham" href="http://www.crosswire.org/bugs/secure/ViewProfile.jspa?name=mjdenham" style="color:#000000;">Martin Denham</a>
commented on <img src="http://www.crosswire.org/bugs/images/icons/bug.gif" height="16" width="16" border="0" align="absmiddle" alt="Bug"> <a style='color:#000000;text-decoration:none;' href='http://www.crosswire.org/bugs/browse/JS-224'>JS-224</a>
</div>
<div id="email-summary" style="font-size:16px;line-height:20px;padding:2px 0 16px 0;">
<a style='color:#000000;text-decoration:none;' href='http://www.crosswire.org/bugs/browse/JS-224'><strong>Merged verses are repeated</strong></a>
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr valign="top">
<td id="email-fields" style="padding:0 32px 32px 32px;">
<table border="0" cellpadding="0" cellspacing="0" style="padding:0;text-align:left;width:100%;" width="100%">
<tr valign="top">
<td id="email-gutter" style="width:64px;white-space:nowrap;"></td>
<td>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr valign="top">
<td colspan="2" style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 0 16px 0;width:100%;">
<div class="comment-block" style="background-color:#edf5ff;border:1px solid #dddddd;color:#000000;padding:12px;"><p>I have been looking at this again and come up with another possible solution if you didn't like the previous - this is slightly less 'hacky'. It was tricky to find a place that would affect all bibles. I thought of creating a DeDupeVersesFilter but the Filters (like OSISFilter, GBFFiltr,..) don't seem to allow embedded re-use i.e. Filters on Filters. If filters could be embedded then that might possibly be more elegant. The following suggestion is at a slightly higher level than before and I have to add similar code to And Bible for the optimised Bible loading process but it will fall back to this for badly formatted Bibles and I think this code is used by most other front ends. It just checks to see if the verse text is the same as the previous verse:</p>
<p>diff --git a/src/main/java/org/crosswire/jsword/book/basic/AbstractPassageBook.java b/src/main/java/org/crosswire/jsword/book/basic/AbstractPassageBook.java<br/>
index c4341be..bfaa4f2 100644<br/>
— a/src/main/java/org/crosswire/jsword/book/basic/AbstractPassageBook.java<br/>
+++ b/src/main/java/org/crosswire/jsword/book/basic/AbstractPassageBook.java<br/>
@@ -71,6 +71,9 @@<br/>
final boolean showTitles = ref.hasRanges(RestrictionType.CHAPTER) || !allowEmpty;</p>
<p> RawTextToXmlProcessor processor = new RawTextToXmlProcessor() {<br/>
+ // track previous text to exclude duplicates caused by merged verses<br/>
+ private String previousVerseText = "";<br/>
+ <br/>
public void preRange(VerseRange range, List<Content> partialDom) {<br/>
if (showTitles) {<br/>
Element title = OSISUtil.factory().createGeneratedTitle();<br/>
@@ -81,10 +84,11 @@</p>
<p> public void postVerse(Key verse, List<Content> partialDom, String rawText) {<br/>
// If the verse is empty then we shouldn't add the verse tag</p>
<ul class="alternate" type="square">
<li>if (allowEmpty || rawText.length() > 0) <div class="error"><span class="error">Unknown macro: {+ if ((allowEmpty || rawText.length() > 0 ) && !previousVerseText.equals(rawText)) {
List<Content> osisContent = filter.toOSIS(AbstractPassageBook.this, verse, rawText);
addOSIS(verse, partialDom, osisContent);
}+ previousVerseText = rawText; }</span> </div></li>
</ul>
<p> public void init(List<Content> partialDom) {</p></div>
<div style="color:#505050;padding:4px 0 0 0;"> </div>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td><!-- End #email-page -->
</tr>
<tr valign="top">
<td style="color:#505050;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:10px;line-height:14px;padding: 0 16px 16px 16px;text-align:center;">
This message is automatically generated by JIRA.<br />
If you think it was sent incorrectly, please contact your JIRA administrators<br />
For more information on JIRA, see: <a style='color:#000000;' href='http://www.atlassian.com/software/jira'>http://www.atlassian.com/software/jira</a>
</td>
</tr>
</table><!-- End #email-wrap -->
</div><!-- End #email-body -->