From 4a4657f9f40ea60d08ecfb7c12fc46e29440ff58 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 4 Jun 2017 22:44:15 +0000 Subject: Implement the roff(7) .mc (right margin character) request. The Tcl/Tk manual pages use this extensively. Delete the TERM_MAXMARGIN hack, it breaks .mc inside .nf; instead, implement a proper TERMP_BRNEVER flag. --- tbl_term.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'tbl_term.c') diff --git a/tbl_term.c b/tbl_term.c index eceaa4b6..640eb8f2 100644 --- a/tbl_term.c +++ b/tbl_term.c @@ -1,7 +1,7 @@ -/* $Id: tbl_term.c,v 1.43 2015/10/12 00:08:16 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.44 2017/06/04 22:44:15 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze + * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -63,18 +63,12 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) const struct tbl_cell *cp; const struct tbl_dat *dp; static size_t offset; - size_t rmargin, maxrmargin, tsz; + size_t tsz; int ic, horiz, spans, vert; - rmargin = tp->rmargin; - maxrmargin = tp->maxrmargin; - - tp->rmargin = tp->maxrmargin = TERM_MAXMARGIN; - /* Inhibit printing of spaces: we do padding ourselves. */ - tp->flags |= TERMP_NONOSPACE; - tp->flags |= TERMP_NOSPACE; + tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE | TERMP_BRNEVER; /* * The first time we're invoked for a given table block, @@ -86,7 +80,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) tp->tbl.slen = term_tbl_strlen; tp->tbl.arg = tp; - tblcalc(&tp->tbl, sp, rmargin - tp->offset); + tblcalc(&tp->tbl, sp, tp->rmargin - tp->offset); /* Center the table as a whole. */ @@ -97,10 +91,10 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) for (ic = 0; ic < sp->opts->cols; ic++) tsz += tp->tbl.cols[ic].width + 3; tsz -= 3; - if (offset + tsz > rmargin) + if (offset + tsz > tp->rmargin) tsz -= 1; - tp->offset = (offset + rmargin > tsz) ? - (offset + rmargin - tsz) / 2 : 0; + tp->offset = (offset + tp->rmargin > tsz) ? + (offset + tp->rmargin - tsz) / 2 : 0; } /* Horizontal frame at the start of boxed tables. */ @@ -201,10 +195,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) tp->tbl.cols = NULL; tp->offset = offset; } - - tp->flags &= ~TERMP_NONOSPACE; - tp->rmargin = rmargin; - tp->maxrmargin = maxrmargin; + tp->flags &= ~(TERMP_NONOSPACE | TERMP_BRNEVER); } /* -- cgit v1.2.3