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 | 26798ad14e1297dd3dc14623f25c0e7af232cdc6 (patch) | |
| tree | 6480d4e8259af8be89b87de29ce3723a583ceda1 /term.c | |
| parent | 9b18a57c3cc7977337c12b16a5db9455225ad88f (diff) | |
| download | mandoc-26798ad14e1297dd3dc14623f25c0e7af232cdc6.tar.gz | |
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.
Diffstat (limited to 'term.c')
| -rw-r--r-- | term.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1,6 +1,6 @@ /* $Id$ */ /* - * 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)) { |