Skip to content

display: fix Hebrew morphology code overlap #1294

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 1 commit into from
Mar 15, 2026
Merged

display: fix Hebrew morphology code overlap #1294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 35 additions & 3 deletions src/main/display.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,19 @@ h3 { font-style: %s } --> \
#define CSS_BLOCK_BOTH \
" * { line-height: 3.5em; }" \
" .word { position: relative; top: 0.0em; left: 0; }" \
" .strongs { position: absolute; top: 0.2em; left: 0; white-space: nowrap; z-index: 2 }" \
" .morph { position: absolute; top: 0.9em; left: 0; white-space: nowrap; z-index: 1 }"
" .strongs { position: absolute; top: 0.4em; left: 0; white-space: nowrap; z-index: 2 }" \
" .morph { position: absolute; top: 0.9em; left: 0; white-space: nowrap; z-index: 1 }" \
" *[dir=rtl] .word { padding-left: 0.8em; }" \
" *[dir=rtl] .strongs { top: 0.4em; left: auto; right: 0; }" \
" *[dir=rtl] .morph { left: auto; right: 0; }"
#define CSS_BLOCK_ONE \
" * { line-height: 2.7em; }" \
" .word { position: relative; top: 0.0em; left: 0; }" \
" .strongs { position: absolute; top: 0.4em; left: 0; white-space: nowrap; }" \
" .morph { position: absolute; top: 0.4em; left: 0; white-space: nowrap; }"
" .morph { position: absolute; top: 0.4em; left: 0; white-space: nowrap; }" \
" *[dir=rtl] .word { padding-left: 0.8em; }" \
" *[dir=rtl] .strongs { left: auto; right: 0; }" \
" *[dir=rtl] .morph { left: auto; right: 0; }"

#define DOUBLE_SPACE " * { line-height: 2em ! important; }"

Expand Down Expand Up @@ -482,6 +488,32 @@ block_dump(SWBuf &rendered,
g_free((char *)*strongs);
*strongs = NULL;

/* truncate long Hebrew morph codes: remove pronominal suffix segment */
if (*morph) {
char *anchor_start = (char *)g_strrstr(*morph, "\">") + 2;
char *anchor_end = (char *)strstr(anchor_start, "</a>");
if (anchor_start && anchor_end) {
/* count slashes */
char *first_slash = strchr(anchor_start, '/');
if (first_slash && first_slash < anchor_end) {
char *second_slash = strchr(first_slash + 1, '/');
if (second_slash && second_slash < anchor_end) {
/* 2 segments: hr/ncmsc/sp2mp → truncate at second slash */
memmove(second_slash, anchor_end,
strlen(anchor_end) + 1);
} else {
/* 1 segment: check if suffix is pronominal (sp/sd) */
char *seg = first_slash + 1;
if ((seg[0] == 's' && (seg[1] == 'p' || seg[1] == 'd'))
|| (seg[0] == 'S' && (seg[1] == 'p' || seg[1] == 'd'))) {
memmove(first_slash, anchor_end,
strlen(anchor_end) + 1);
}
}
}
}
}

rendered += "<span class=\"morph\"><sup>";
rendered += (*morph ? *morph : "&nbsp;");
rendered += "</sup></span>";
Expand Down
Loading