Skip to content

Fix column regression #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karlkleinpaste merged 2 commits into from
Aug 22, 2026
Merged

Fix column regression #1387

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18cd0af
Revert introMaterial() div-balancing: fix column layout regression
Aug 22, 2026
7629064
FIX for italics spilling over into the verse text - Multi-match versi…
Aug 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 19 additions & 26 deletions src/main/display.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,33 +1222,18 @@ GTKChapDisp::introMaterial(SWModule &imodule, int thisChapter)
}
}

if (started_intro) {
/* Issue #921: SWORD's OSIS filter can emit an opening
* <div type="subSection" ...> for a section heading
* without a matching closing </div> anywhere in the
* fetched "verse 0" text (the section's eID/closing tag
* apparently falls elsewhere, outside what we retrieve
* here). Left unbalanced, our own closing </div> below
* only closes the innermost open <div>, leaving
* class="introMaterial" (and its CSS font-style: italic)
* open around the rest of the chapter. Force-balance
* before closing our own wrapper. */
gint div_opens = 0, div_closes = 0;
const gchar *scan = intro->str;
while ((scan = strstr(scan, "<div"))) {
div_opens++;
scan += 4;
}
scan = intro->str;
while ((scan = strstr(scan, "</div>"))) {
div_closes++;
scan += 6;
}
for (; div_closes < div_opens; div_closes++)
g_string_append(intro, "</div>");

/* Issue #921: an earlier attempt balanced unclosed <div> tags
* here by force-closing them before our own wrapper. That fixed
* italics leaking past chapter intro material, but shifting
* block-level closing boundaries at this exact spot was found to
* break WebKit's column-break and anchor-scroll positioning in
* multi-column layouts + whole-book rendering (reported by Karl,
* reproducible with 4 columns). Reverted; italics leaking onto
* verse text is instead handled defensively at the verse-text
* level in RenderOneChapter(), which doesn't touch block
* boundaries at all. */
if (started_intro)
g_string_append(intro, "</div>"); // finish what we started.
}

key->setAutoNormalize(oldAutoNorm);

Expand Down Expand Up @@ -1740,10 +1725,14 @@ GTKChapDisp::RenderOneChapter(SWModule &imodule,
swbuf.appendFormatted("<font color=\"%s\">", color_chosen_fg);
}

/* Issue #921: defensively reset font-style to normal around
* each verse's own text. Applied via script. */
swbuf.append("<span style=\"font-style: normal;\">");
swbuf.append(settings.imageresize
? AnalyzeForImageSize(rework->str, CURRENT_COLUMNS,
GDK_WINDOW(gtk_widget_get_window(gtkText)))
: rework->str /* left as-is */);
swbuf.append("</span>");

if (color_choices != COLOR_NONE) {
swbuf.append("</font>");
Expand Down Expand Up @@ -2344,10 +2333,14 @@ DialogChapDisp::display(SWModule &imodule)
swbuf.appendFormatted("<font color=\"%s\">", color_chosen_fg);
}

/* Issue #921: defensively reset font-style to normal around
* each verse's own text. Applied via script. */
swbuf.append("<span style=\"font-style: normal;\">");
swbuf.append(settings.imageresize
? AnalyzeForImageSize(rework->str, CURRENT_COLUMNS,
GDK_WINDOW(gtk_widget_get_window(gtkText)))
: rework->str /* left as-is */);
swbuf.append("</span>");

if (color_choices != COLOR_NONE) {
swbuf.append("</font>");
Expand Down