diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2022-01-10 18:01:35 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2022-01-10 18:01:35 +0000 |
| commit | fee24325c5f7e1f82d52991384a142d1c4fcb63b (patch) | |
| tree | ea0aa1082bf2f3bb6f1d05df46ef0009c39b6d0b | |
| parent | f55d9bcb0329b39d14efff2365a86e1a70441085 (diff) | |
| download | mandoc-fee24325c5f7e1f82d52991384a142d1c4fcb63b.tar.gz mandoc-fee24325c5f7e1f82d52991384a142d1c4fcb63b.tar.zst mandoc-fee24325c5f7e1f82d52991384a142d1c4fcb63b.zip | |
When rendering the \h (horizontal motion) low-level roff(7) escape
sequence in -T ps and -T pdf output mode, use an appropriate
horizontal distance by correctly using the term_len() utility
function. Output from the -T ascii, -T utf8, and -T html modes
was already correct and remains unchanged.
Lennart Jablonka <hummsmith42 at gmail dot com> found and reported
this unit conversion bug (misinterpreting AFM units as if they were
en units) when rendering scdoc-generated manuals (which is a low
quality generator, but that's no excuse for mandoc misformatting \h)
on Alpine Linux. Lennart also tested this patch.
| -rw-r--r-- | term.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -1,6 +1,6 @@ -/* $Id: term.c,v 1.284 2021/10/04 18:56:31 schwarze Exp $ */ +/* $Id: term.c,v 1.285 2022/01/10 18:01:35 schwarze Exp $ */ /* - * Copyright (c) 2010-2021 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010-2022 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * * Permission to use, copy, modify, and distribute this software for any @@ -636,12 +636,14 @@ term_word(struct termp *p, const char *word) if (a2roffsu(seq, &su, SCALE_EM) == NULL) continue; uc += term_hen(p, &su); - if (uc > 0) - while (uc-- > 0) + if (uc > 0) { + while (uc > 0) { bufferc(p, ASCII_NBRSP); - else if (p->col > (size_t)(-uc)) + uc -= term_len(p, 1); + } + } else if (p->col > (size_t)(-uc)) { p->col += uc; - else { + } else { uc += p->col; p->col = 0; if (p->tcol->offset > (size_t)(-uc)) { |