geekinney/ekp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix bugs of C moudule

Browse Source
This commit is contained in:
Kinneyzhang 2026-01-25 16:53:23 +08:00
parent aaeea099c9
commit 6cf6f75f71
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ekp.el
View File

@ -57,6 +57,9 @@ Set to nil to force pure Elisp implementation.")
;;;; K-P Algorithm Parameters
(defvar ekp-default-cws-stretch-pixel 2
"Max stretched pixel of whitespace between CJK chars.")
(defvar ekp-line-penalty 10
"Penalty for each line break. Higher = fewer lines. Default 10.")
@ -119,7 +122,7 @@ Set to nil to force pure Elisp implementation.")
(mws (- lws 1)))
(ekp-param-set lws (ceiling (/ (float lws) 2)) (ceiling (/ (float lws) 3))
mws (ceiling (/ (float mws) 2)) (ceiling (/ (float mws) 3))
0 3 0)))
0 ekp-default-cws-stretch-pixel 0)))
(defun ekp-param-set (lws-i lws-+ lws-- mws-i mws-+ mws-- cws-i cws-+ cws--)
"Set all spacing parameters.

30
ekp_c/ekp_kp.c
View File

@ -194,6 +194,12 @@ static void process_dp_range(void *arg)
int32_t flexibility = (adjustment > 0) ?
(max_w - ideal) : (ideal - min_w);
/* Single-box line: use minimum flexibility of 1 to avoid infinite badness
* This matches Elisp's behavior for lines containing only one box */
bool is_single_box = (k == i + 1);
if (is_single_box && flexibility <= 0)
flexibility = 1;
double badness;
uint8_t fit;
double dem;
@ -209,6 +215,17 @@ static void process_dp_range(void *arg)
fit = FITNESS_DECENT;
dem = prev_dem + (work->line_penalty + badness) *
(work->line_penalty + badness);
} else if (is_single_box) {
/* Single-box line: use fixed flexibility=1, fitness=decent */
badness = compute_badness(adjustment, 1);
fit = FITNESS_DECENT;
int penalty = end_hyphen ? work->hyphen_penalty : 0;
dem = prev_dem + compute_demerits(badness, penalty,
prev_fit, fit,
end_hyphen, prev_hyph,
work->line_penalty,
work->fitness_penalty);
} else {
badness = compute_badness(adjustment, flexibility);
fit = compute_fitness(adjustment, flexibility);
@ -577,6 +594,12 @@ ekp_result_t *ekp_break_with_prefixes(
int32_t adj = line_width - ideal;
int32_t flex = (adj > 0) ? (max_w - ideal) : (ideal - min_w);
/* Single-box line: use minimum flexibility of 1 to avoid infinite badness
* This matches Elisp's behavior for lines containing only one box */
bool is_single_box = (k == i + 1);
if (is_single_box && flex <= 0)
flex = 1;
double bad;
uint8_t fit;
double dem;
@ -586,6 +609,13 @@ ekp_result_t *ekp_break_with_prefixes(
bad = (fill < last_ratio) ? 50.0 * (1.0 - fill) : 0.0;
fit = FITNESS_DECENT;
dem = demerits[i] + (lp + bad) * (lp + bad);
} else if (is_single_box) {
/* Single-box line: use fixed flexibility=1, fitness=decent */
bad = compute_badness(adj, 1);
fit = FITNESS_DECENT;
int pen = end_hyph ? hp : 0;
dem = demerits[i] + compute_demerits(bad, pen, fitness[i], fit,
end_hyph, hyph_counts[i], lp, fp);
} else {
bad = compute_badness(adj, flex);
fit = compute_fitness(adj, flex);