extern/boxes
1
0
Fork 0
mirror of https://github.com/ascii-boxes/boxes.git synced 2024-12-12 18:01:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compensate for default padding when mending

Browse Source
This commit is contained in:
Thomas Jensen 2023-12-16 21:07:57 +01:00
parent 70344a7324
commit 5c615a3ada
No known key found for this signature in database
GPG Key ID: A4ACEE270D0FB7DB
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/remove.c
View File

@ -895,17 +895,28 @@ static void free_line(line_t *line)
static void killblank(remove_ctx_t *ctx) static void killblank(remove_ctx_t *ctx)
{ {
while (ctx->top_end_idx < ctx->bottom_start_idx && empty_line(input.lines + ctx->top_end_idx)) { size_t lines_removed = 0;
size_t max_lines_removable = opt.mend && !opt.killblank ? (size_t) BMAX(opt.design->padding[BTOP], 0) : SIZE_MAX;
while (ctx->top_end_idx < ctx->bottom_start_idx && lines_removed < max_lines_removable
&& empty_line(input.lines + ctx->top_end_idx))
{
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "Killing leading blank line in box body.\n"); fprintf(stderr, "Killing leading blank line in box body.\n");
#endif #endif
++(ctx->top_end_idx); ++(ctx->top_end_idx);
++lines_removed;
} }
while (ctx->bottom_start_idx > ctx->top_end_idx && empty_line(input.lines + ctx->bottom_start_idx - 1)) {
lines_removed = 0;
max_lines_removable = opt.mend && !opt.killblank ? (size_t) BMAX(opt.design->padding[BBOT], 0) : SIZE_MAX;
while (ctx->bottom_start_idx > ctx->top_end_idx && lines_removed < max_lines_removable
&& empty_line(input.lines + ctx->bottom_start_idx - 1))
{
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "Killing trailing blank line in box body.\n"); fprintf(stderr, "Killing trailing blank line in box body.\n");
#endif #endif
--(ctx->bottom_start_idx); --(ctx->bottom_start_idx);
++lines_removed;
} }
} }
@ -1046,7 +1057,7 @@ static void apply_results_to_input(remove_ctx_t *ctx)
{ {
remove_vertical_from_input(ctx); remove_vertical_from_input(ctx);
if (opt.killblank) { if (opt.killblank || opt.mend) {
killblank(ctx); killblank(ctx);
} }
remove_bottom_from_input(ctx); remove_bottom_from_input(ctx);