summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2013-12-23 02:20:09 +0000
committerIngo Schwarze <schwarze@openbsd.org>2013-12-23 02:20:09 +0000
commit843cccd2fcf4de8a13a16071c949374ee597d16e (patch)
treedf5783d746553344a4b9e8cc2cdbe3febb68052c
parent3b2ca955f8a2aa20d55aed7f0b8fb63533fddb64 (diff)
downloadmandoc-843cccd2fcf4de8a13a16071c949374ee597d16e.tar.gz
Implement a long-standing desideratum,
hanging indentation for .Fn in SYNOPSIS mode, exploiting the new trailspace feature by deliberately *NOT* using it.
-rw-r--r--mdoc_term.c16
-rw-r--r--term.c17
2 files changed, 30 insertions, 3 deletions
diff --git a/mdoc_term.c b/mdoc_term.c
index e10ded9b..244be965 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1538,6 +1538,7 @@ termp_ft_pre(DECL_ARGS)
static int
termp_fn_pre(DECL_ARGS)
{
+ size_t width, rmargin = 0;
int pretty;
pretty = MDOC_SYNPRETTY & n->flags;
@@ -1547,11 +1548,25 @@ termp_fn_pre(DECL_ARGS)
if (NULL == (n = n->child))
return(0);
+ if (pretty) {
+ width = term_len(p, 4);
+ rmargin = p->rmargin;
+ p->rmargin = p->offset + width;
+ p->flags |= TERMP_NOBREAK | TERMP_HANG;
+ }
+
assert(MDOC_TEXT == n->type);
term_fontpush(p, TERMFONT_BOLD);
term_word(p, n->string);
term_fontpop(p);
+ if (pretty) {
+ term_flushln(p);
+ p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
+ p->offset = p->rmargin;
+ p->rmargin = rmargin;
+ }
+
p->flags |= TERMP_NOSPACE;
term_word(p, "(");
p->flags |= TERMP_NOSPACE;
@@ -1574,6 +1589,7 @@ termp_fn_pre(DECL_ARGS)
if (pretty) {
p->flags |= TERMP_NOSPACE;
term_word(p, ";");
+ term_flushln(p);
}
return(0);
diff --git a/term.c b/term.c
index f5f1882d..31677291 100644
--- a/term.c
+++ b/term.c
@@ -120,7 +120,12 @@ term_flushln(struct termp *p)
* First, establish the maximum columns of "visible" content.
* This is usually the difference between the right-margin and
* an indentation, but can be, for tagged lists or columns, a
- * small set of values.
+ * small set of values.
+ *
+ * The following unsigned-signed subtractions look strange,
+ * but they are actually correct. If the int p->overstep
+ * is negative, it gets sign extended. Subtracting that
+ * very large size_t effectively adds a small number to dv.
*/
assert (p->rmargin >= p->offset);
dv = p->rmargin - p->offset;
@@ -199,7 +204,11 @@ term_flushln(struct termp *p)
if (0 < ntab)
vbl += ntab * p->tabwidth;
- /* Remove the p->overstep width. */
+ /*
+ * Remove the p->overstep width.
+ * Again, if p->overstep is negative,
+ * sign extension does the right thing.
+ */
bp += (size_t)p->overstep;
p->overstep = 0;
@@ -275,8 +284,10 @@ term_flushln(struct termp *p)
* If we have overstepped the margin, temporarily move
* it to the right and flag the rest of the line to be
* shorter.
+ * If there is a request to keep the columns together,
+ * allow negative overstep when the column is not full.
*/
- if (p->overstep < 0)
+ if (p->trailspace && p->overstep < 0)
p->overstep = 0;
return;