=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.10 retrieving revision 1.265 diff -u -p -r1.10 -r1.265 --- mandoc/term.c 2009/02/23 09:33:34 1.10 +++ mandoc/term.c 2017/06/07 02:14:09 1.265 @@ -1,1103 +1,921 @@ -/* $Id: term.c,v 1.10 2009/02/23 09:33:34 kristaps Exp $ */ +/* $Id: term.c,v 1.265 2017/06/07 02:14:09 schwarze Exp $ */ /* - * Copyright (c) 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2010-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 copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" + +#include + #include +#include +#include #include #include +#include "mandoc.h" +#include "mandoc_aux.h" +#include "out.h" #include "term.h" +#include "main.h" -#define INDENT 4 +static size_t cond_width(const struct termp *, int, int *); +static void adjbuf(struct termp *p, size_t); +static void bufferc(struct termp *, char); +static void encode(struct termp *, const char *, size_t); +static void encode1(struct termp *, int); +static void endline(struct termp *); -/* - * Performs actions on nodes of the abstract syntax tree. Both pre- and - * post-fix operations are defined here. - */ -/* FIXME: indent/tab. */ - -#define TTYPE_PROG 0 -#define TTYPE_CMD_FLAG 1 -#define TTYPE_CMD_ARG 2 -#define TTYPE_SECTION 3 -#define TTYPE_FUNC_DECL 4 -#define TTYPE_VAR_DECL 5 -#define TTYPE_FUNC_TYPE 6 -#define TTYPE_FUNC_NAME 7 -#define TTYPE_FUNC_ARG 8 -#define TTYPE_LINK 9 -#define TTYPE_SSECTION 10 -#define TTYPE_FILE 11 -#define TTYPE_NMAX 12 - -/* - * These define "styles" for element types, like command arguments or - * executable names. This is useful when multiple macros must decorate - * the same thing (like .Ex -std cmd and .Nm cmd). - */ - -const int ttypes[TTYPE_NMAX] = { - TERMP_BOLD, /* TTYPE_PROG */ - TERMP_BOLD, /* TTYPE_CMD_FLAG */ - TERMP_UNDERLINE, /* TTYPE_CMD_ARG */ - TERMP_BOLD, /* TTYPE_SECTION */ - TERMP_BOLD, /* TTYPE_FUNC_DECL */ - TERMP_UNDERLINE, /* TTYPE_VAR_DECL */ - TERMP_UNDERLINE, /* TTYPE_FUNC_TYPE */ - TERMP_BOLD, /* TTYPE_FUNC_NAME */ - TERMP_UNDERLINE, /* TTYPE_FUNC_ARG */ - TERMP_UNDERLINE, /* TTYPE_LINK */ - TERMP_BOLD, /* TTYPE_SSECTION */ - TERMP_UNDERLINE /* TTYPE_FILE */ -}; - -static int arg_hasattr(int, size_t, - const struct mdoc_arg *); -static int arg_getattr(int, size_t, - const struct mdoc_arg *); -static size_t arg_offset(const char *); - -/* - * What follows describes prefix and postfix operations for the abstract - * syntax tree descent. - */ - -#define DECL_ARGS \ - struct termp *p, \ - const struct mdoc_meta *meta, \ - const struct mdoc_node *node - -#define DECL_PRE(name) \ -static int name##_pre(DECL_ARGS) -#define DECL_POST(name) \ -static void name##_post(DECL_ARGS) -#define DECL_PREPOST(name) \ -DECL_PRE(name); \ -DECL_POST(name); - -DECL_PREPOST(termp_aq); -DECL_PREPOST(termp_ar); -DECL_PREPOST(termp_d1); -DECL_PREPOST(termp_dq); -DECL_PREPOST(termp_fa); -DECL_PREPOST(termp_fd); -DECL_PREPOST(termp_fl); -DECL_PREPOST(termp_fn); -DECL_PREPOST(termp_ft); -DECL_PREPOST(termp_it); -DECL_PREPOST(termp_nm); -DECL_PREPOST(termp_op); -DECL_PREPOST(termp_pa); -DECL_PREPOST(termp_pf); -DECL_PREPOST(termp_qq); -DECL_PREPOST(termp_sh); -DECL_PREPOST(termp_ss); -DECL_PREPOST(termp_sq); -DECL_PREPOST(termp_sx); -DECL_PREPOST(termp_va); -DECL_PREPOST(termp_vt); - -DECL_PRE(termp_bd); -DECL_PRE(termp_bx); -DECL_PRE(termp_ex); -DECL_PRE(termp_nd); -DECL_PRE(termp_ns); -DECL_PRE(termp_nx); -DECL_PRE(termp_ox); -DECL_PRE(termp_pp); -DECL_PRE(termp_ud); -DECL_PRE(termp_xr); - -DECL_POST(termp_bl); - -const struct termact __termacts[MDOC_MAX] = { - { NULL, NULL }, /* \" */ - { NULL, NULL }, /* Dd */ - { NULL, NULL }, /* Dt */ - { NULL, NULL }, /* Os */ - { termp_sh_pre, termp_sh_post }, /* Sh */ - { termp_ss_pre, termp_ss_post }, /* Ss */ - { termp_pp_pre, NULL }, /* Pp */ - { termp_d1_pre, termp_d1_post }, /* D1 */ - { NULL, NULL }, /* Dl */ - { termp_bd_pre, NULL }, /* Bd */ - { NULL, NULL }, /* Ed */ - { NULL, termp_bl_post }, /* Bl */ - { NULL, NULL }, /* El */ - { termp_it_pre, termp_it_post }, /* It */ - { NULL, NULL }, /* Ad */ - { NULL, NULL }, /* An */ - { termp_ar_pre, termp_ar_post }, /* Ar */ - { NULL, NULL }, /* Cd */ - { NULL, NULL }, /* Cm */ - { NULL, NULL }, /* Dv */ - { NULL, NULL }, /* Er */ - { NULL, NULL }, /* Ev */ - { termp_ex_pre, NULL }, /* Ex */ - { termp_fa_pre, termp_fa_post }, /* Fa */ - { termp_fd_pre, termp_fd_post }, /* Fd */ - { termp_fl_pre, termp_fl_post }, /* Fl */ - { termp_fn_pre, termp_fn_post }, /* Fn */ - { termp_ft_pre, termp_ft_post }, /* Ft */ - { NULL, NULL }, /* Ic */ - { NULL, NULL }, /* In */ - { NULL, NULL }, /* Li */ - { termp_nd_pre, NULL }, /* Nd */ - { termp_nm_pre, termp_nm_post }, /* Nm */ - { termp_op_pre, termp_op_post }, /* Op */ - { NULL, NULL }, /* Ot */ - { termp_pa_pre, termp_pa_post }, /* Pa */ - { NULL, NULL }, /* Rv */ - { NULL, NULL }, /* St */ - { termp_va_pre, termp_va_post }, /* Va */ - { termp_vt_pre, termp_vt_post }, /* Vt */ - { termp_xr_pre, NULL }, /* Xr */ - { NULL, NULL }, /* %A */ - { NULL, NULL }, /* %B */ - { NULL, NULL }, /* %D */ - { NULL, NULL }, /* %I */ - { NULL, NULL }, /* %J */ - { NULL, NULL }, /* %N */ - { NULL, NULL }, /* %O */ - { NULL, NULL }, /* %P */ - { NULL, NULL }, /* %R */ - { NULL, NULL }, /* %T */ - { NULL, NULL }, /* %V */ - { NULL, NULL }, /* Ac */ - { NULL, NULL }, /* Ao */ - { termp_aq_pre, termp_aq_post }, /* Aq */ - { NULL, NULL }, /* At */ - { NULL, NULL }, /* Bc */ - { NULL, NULL }, /* Bf */ - { NULL, NULL }, /* Bo */ - { NULL, NULL }, /* Bq */ - { NULL, NULL }, /* Bsx */ - { termp_bx_pre, NULL }, /* Bx */ - { NULL, NULL }, /* Db */ - { NULL, NULL }, /* Dc */ - { NULL, NULL }, /* Do */ - { termp_dq_pre, termp_dq_post }, /* Dq */ - { NULL, NULL }, /* Ec */ - { NULL, NULL }, /* Ef */ - { NULL, NULL }, /* Em */ - { NULL, NULL }, /* Eo */ - { NULL, NULL }, /* Fx */ - { NULL, NULL }, /* Ms */ - { NULL, NULL }, /* No */ - { termp_ns_pre, NULL }, /* Ns */ - { termp_nx_pre, NULL }, /* Nx */ - { termp_ox_pre, NULL }, /* Ox */ - { NULL, NULL }, /* Pc */ - { termp_pf_pre, termp_pf_post }, /* Pf */ - { NULL, NULL }, /* Po */ - { NULL, NULL }, /* Pq */ - { NULL, NULL }, /* Qc */ - { NULL, NULL }, /* Ql */ - { NULL, NULL }, /* Qo */ - { termp_qq_pre, termp_qq_post }, /* Qq */ - { NULL, NULL }, /* Re */ - { NULL, NULL }, /* Rs */ - { NULL, NULL }, /* Sc */ - { NULL, NULL }, /* So */ - { termp_sq_pre, termp_sq_post }, /* Sq */ - { NULL, NULL }, /* Sm */ - { termp_sx_pre, termp_sx_post }, /* Sx */ - { NULL, NULL }, /* Sy */ - { NULL, NULL }, /* Tn */ - { NULL, NULL }, /* Ux */ - { NULL, NULL }, /* Xc */ - { NULL, NULL }, /* Xo */ - { NULL, NULL }, /* Fo */ - { NULL, NULL }, /* Fc */ - { NULL, NULL }, /* Oo */ - { NULL, NULL }, /* Oc */ - { NULL, NULL }, /* Bk */ - { NULL, NULL }, /* Ek */ - { NULL, NULL }, /* Bt */ - { NULL, NULL }, /* Hf */ - { NULL, NULL }, /* Fr */ - { termp_ud_pre, NULL }, /* Ud */ -}; - -const struct termact *termacts = __termacts; - - -static size_t -arg_offset(const char *v) +void +term_free(struct termp *p) { - if (0 == strcmp(v, "indent")) - return(INDENT); - if (0 == strcmp(v, "indent-two")) - return(INDENT * 2); - /* TODO */ - return(0); + free(p->buf); + free(p->fontq); + free(p); } - -static int -arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv) +void +term_begin(struct termp *p, term_margin head, + term_margin foot, const struct roff_meta *arg) { - return(-1 != arg_getattr(arg, argc, argv)); + p->headf = head; + p->footf = foot; + p->argf = arg; + (*p->begin)(p); } - -static int -arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv) +void +term_end(struct termp *p) { - int i; - for (i = 0; i < (int)argc; i++) - if (argv[i].arg == arg) - return(i); - return(-1); + (*p->end)(p); } - -/* ARGSUSED */ -static int -termp_dq_pre(DECL_ARGS) +/* + * Flush a chunk of text. By default, break the output line each time + * the right margin is reached, and continue output on the next line + * at the same offset as the chunk itself. By default, also break the + * output line at the end of the chunk. + * The following flags may be specified: + * + * - TERMP_NOBREAK: Do not break the output line at the right margin, + * but only at the max right margin. Also, do not break the output + * line at the end of the chunk, such that the next call can pad to + * the next column. However, if less than p->trailspace blanks, + * which can be 0, 1, or 2, remain to the right margin, the line + * will be broken. + * - TERMP_BRTRSP: Consider trailing whitespace significant + * when deciding whether the chunk fits or not. + * - TERMP_BRIND: If the chunk does not fit and the output line has + * to be broken, start the next line at the right margin instead + * of at the offset. Used together with TERMP_NOBREAK for the tags + * in various kinds of tagged lists. + * - TERMP_HANG: Do not break the output line at the right margin, + * append the next chunk after it even if this one is too long. + * To be used together with TERMP_NOBREAK. + * - TERMP_NOPAD: Start writing at the current position, + * do not pad with blank characters up to the offset. + */ +void +term_flushln(struct termp *p) { + size_t i; /* current input position in p->buf */ + int ntab; /* number of tabs to prepend */ + size_t vis; /* current visual position on output */ + size_t vbl; /* number of blanks to prepend to output */ + size_t vend; /* end of word visual position on output */ + size_t bp; /* visual right border position */ + size_t dv; /* temporary for visual pos calculations */ + size_t j; /* temporary loop index for p->buf */ + size_t jhy; /* last hyph before overflow w/r/t j */ + size_t maxvis; /* output position of visible boundary */ - if (MDOC_BODY != node->type) - return(1); + vbl = (p->flags & TERMP_NOPAD) || p->offset < p->viscol ? 0 : + p->offset - p->viscol; + if (p->minbl && vbl < p->minbl) + vbl = p->minbl; + maxvis = p->rmargin > p->viscol + vbl ? + p->rmargin - p->viscol - vbl : 0; + bp = !(p->flags & TERMP_NOBREAK) ? maxvis : + p->maxrmargin > p->viscol + vbl ? + p->maxrmargin - p->viscol - vbl : 0; + vis = vend = 0; + i = 0; - word(p, "``"); - p->flags |= TERMP_NOSPACE; - return(1); -} + while (i < p->lastcol) { + /* + * Handle literal tab characters: collapse all + * subsequent tabs into a single huge set of spaces. + */ + ntab = 0; + while (i < p->lastcol && p->buf[i] == '\t') { + vend = term_tab_next(vis); + vbl += vend - vis; + vis = vend; + ntab++; + i++; + } + /* + * Count up visible word characters. Control sequences + * (starting with the CSI) aren't counted. A space + * generates a non-printing word, which is valid (the + * space is printed according to regular spacing rules). + */ -/* ARGSUSED */ -static void -termp_dq_post(DECL_ARGS) -{ + for (j = i, jhy = 0; j < p->lastcol; j++) { + if (' ' == p->buf[j] || '\t' == p->buf[j]) + break; - if (MDOC_BODY != node->type) - return; + /* Back over the last printed character. */ + if (8 == p->buf[j]) { + assert(j); + vend -= (*p->width)(p, p->buf[j - 1]); + continue; + } - p->flags |= TERMP_NOSPACE; - word(p, "''"); -} + /* Regular word. */ + /* Break at the hyphen point if we overrun. */ + if (vend > vis && vend < bp && + (ASCII_HYPH == p->buf[j] || + ASCII_BREAK == p->buf[j])) + jhy = j; + /* + * Hyphenation now decided, put back a real + * hyphen such that we get the correct width. + */ + if (ASCII_HYPH == p->buf[j]) + p->buf[j] = '-'; -/* ARGSUSED */ -static void -termp_it_post(DECL_ARGS) -{ - const struct mdoc_node *n, *it; - const struct mdoc_block *bl; - int i; - size_t width; + vend += (*p->width)(p, p->buf[j]); + } - /* - * This (and termp_it_pre()) are the most complicated functions - * here. They must account for a considerable number of - * switches that completely change the output behaviour, like - * -tag versus -column. Yech. - */ + /* + * Find out whether we would exceed the right margin. + * If so, break to the next line. + */ + if (vend > bp && 0 == jhy && vis > 0 && + (p->flags & TERMP_BRNEVER) == 0) { + vend -= vis; + endline(p); - switch (node->type) { - case (MDOC_BODY): - /* FALLTHROUGH */ - case (MDOC_HEAD): - break; - default: - return; - } + /* Use pending tabs on the new line. */ - it = node->parent; - assert(MDOC_BLOCK == it->type); - assert(MDOC_It == it->tok); + vbl = 0; + while (ntab--) + vbl = term_tab_next(vbl); - n = it->parent; - assert(MDOC_BODY == n->type); - assert(MDOC_Bl == n->tok); - n = n->parent; - bl = &n->data.block; + /* Re-establish indentation. */ - /* If `-tag', adjust our margins accordingly. */ + if (p->flags & TERMP_BRIND) + vbl += p->rmargin; + else + vbl += p->offset; + maxvis = p->rmargin > vbl ? p->rmargin - vbl : 0; + bp = !(p->flags & TERMP_NOBREAK) ? maxvis : + p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; + } - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - assert(i >= 0); - assert(1 == bl->argv[i].sz); - width = strlen(*bl->argv[i].value); /* XXX */ + /* Write out the [remaining] word. */ + for ( ; i < p->lastcol; i++) { + if (vend > bp && jhy > 0 && i > jhy) + break; + if ('\t' == p->buf[i]) + break; + if (' ' == p->buf[i]) { + j = i; + while (i < p->lastcol && ' ' == p->buf[i]) + i++; + dv = (i - j) * (*p->width)(p, ' '); + vbl += dv; + vend += dv; + break; + } + if (ASCII_NBRSP == p->buf[i]) { + vbl += (*p->width)(p, ' '); + continue; + } + if (ASCII_BREAK == p->buf[i]) + continue; - if (MDOC_HEAD == node->type) { - flushln(p); - /* FIXME: nested lists. */ - p->rmargin = p->maxrmargin; - p->flags &= ~TERMP_NOBREAK; - } else { - flushln(p); - p->offset -= width + 1; - p->flags &= ~TERMP_NOLPAD; - } - return; - } + /* + * Now we definitely know there will be + * printable characters to output, + * so write preceding white space now. + */ + if (vbl) { + (*p->advance)(p, vbl); + p->viscol += vbl; + vbl = 0; + } - if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) { - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); - width = 0; - if (i >= 0) { - assert(1 == bl->argv[i].sz); - width = arg_offset(*bl->argv[i].value); + (*p->letter)(p, p->buf[i]); + if (8 == p->buf[i]) + p->viscol -= (*p->width)(p, p->buf[i-1]); + else + p->viscol += (*p->width)(p, p->buf[i]); } - - flushln(p); - p->offset -= width; - return; + vis = vend; } -} - -/* ARGSUSED */ -static int -termp_it_pre(DECL_ARGS) -{ - const struct mdoc_node *n, *it; - const struct mdoc_block *bl; - int i; - size_t width; - /* - * Also see termp_it_post() for general comments. + * If there was trailing white space, it was not printed; + * so reset the cursor position accordingly. */ + if (vis > vbl) + vis -= vbl; + else + vis = 0; - switch (node->type) { - case (MDOC_BODY): - /* FALLTHROUGH */ - case (MDOC_HEAD): - it = node->parent; - break; - case (MDOC_BLOCK): - it = node; - break; - default: - return(1); - } + p->col = p->lastcol = 0; + p->minbl = p->trailspace; + p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); - assert(MDOC_BLOCK == it->type); - assert(MDOC_It == it->tok); + /* Trailing whitespace is significant in some columns. */ + if (vis && vbl && (TERMP_BRTRSP & p->flags)) + vis += vbl; - n = it->parent; - assert(MDOC_BODY == n->type); - assert(MDOC_Bl == n->tok); - n = n->parent; - bl = &n->data.block; - - /* If `-compact', don't assert vertical space. */ - - if (MDOC_BLOCK == node->type) { - if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv)) - newln(p); - else - vspace(p); - return(1); - } - - assert(MDOC_HEAD == node->type - || MDOC_BODY == node->type); - - /* If `-tag', adjust our margins accordingly. */ - - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - assert(i >= 0); /* XXX */ - assert(1 == bl->argv[i].sz); - width = strlen(*bl->argv[i].value); /* XXX */ - - /* FIXME: nested lists. */ - - if (MDOC_HEAD == node->type) { - p->flags |= TERMP_NOBREAK; - p->flags |= TERMP_NOSPACE; - p->rmargin = p->offset + width; - } else { - p->flags |= TERMP_NOSPACE; - p->flags |= TERMP_NOLPAD; - p->offset += width + 1; - } - return(1); - } - - /* If `-ohang', adjust left-margin. */ - - if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) { - width = 0; - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); - if (i >= 0) { - assert(1 == bl->argv[i].sz); - width = arg_offset(*bl->argv[i].value); - } - - p->flags |= TERMP_NOSPACE; - p->offset += width; - return(1); - } - - return(1); + /* If the column was overrun, break the line. */ + if ((p->flags & TERMP_NOBREAK) == 0 || + ((p->flags & TERMP_HANG) == 0 && + vis + p->trailspace * (*p->width)(p, ' ') > maxvis)) + endline(p); } - -/* ARGSUSED */ static void -termp_nm_post(DECL_ARGS) +endline(struct termp *p) { - - p->flags &= ~ttypes[TTYPE_PROG]; + if ((p->flags & (TERMP_NEWMC | TERMP_ENDMC)) == TERMP_ENDMC) { + p->mc = NULL; + p->flags &= ~TERMP_ENDMC; + } + if (p->mc != NULL) { + if (p->viscol && p->maxrmargin >= p->viscol) + (*p->advance)(p, p->maxrmargin - p->viscol + 1); + p->flags |= TERMP_NOBUF | TERMP_NOSPACE; + term_word(p, p->mc); + p->flags &= ~(TERMP_NOBUF | TERMP_NEWMC); + } + p->viscol = 0; + p->minbl = 0; + (*p->endline)(p); } - -/* ARGSUSED */ -static void -termp_fl_post(DECL_ARGS) +/* + * A newline only breaks an existing line; it won't assert vertical + * space. All data in the output buffer is flushed prior to the newline + * assertion. + */ +void +term_newln(struct termp *p) { - p->flags &= ~ttypes[TTYPE_CMD_FLAG]; + p->flags |= TERMP_NOSPACE; + if (p->lastcol || p->viscol) + term_flushln(p); } - -/* ARGSUSED */ -static int -termp_ar_pre(DECL_ARGS) +/* + * Asserts a vertical space (a full, empty line-break between lines). + * Note that if used twice, this will cause two blank spaces and so on. + * All data in the output buffer is flushed prior to the newline + * assertion. + */ +void +term_vspace(struct termp *p) { - p->flags |= ttypes[TTYPE_CMD_ARG]; - if (NULL == node->child) - word(p, "..."); - return(1); + term_newln(p); + p->viscol = 0; + p->minbl = 0; + if (0 < p->skipvsp) + p->skipvsp--; + else + (*p->endline)(p); } - -/* ARGSUSED */ -static int -termp_nm_pre(DECL_ARGS) +/* Swap current and previous font; for \fP and .ft P */ +void +term_fontlast(struct termp *p) { + enum termfont f; - p->flags |= ttypes[TTYPE_PROG]; - if (NULL == node->child) - word(p, meta->name); - return(1); + f = p->fontl; + p->fontl = p->fontq[p->fonti]; + p->fontq[p->fonti] = f; } - -/* ARGSUSED */ -static int -termp_ns_pre(DECL_ARGS) +/* Set font, save current, discard previous; for \f, .ft, .B etc. */ +void +term_fontrepl(struct termp *p, enum termfont f) { - p->flags |= TERMP_NOSPACE; - return(1); + p->fontl = p->fontq[p->fonti]; + p->fontq[p->fonti] = f; } - -/* ARGSUSED */ -static int -termp_pp_pre(DECL_ARGS) +/* Set font, save previous. */ +void +term_fontpush(struct termp *p, enum termfont f) { - vspace(p); - return(1); + p->fontl = p->fontq[p->fonti]; + if (++p->fonti == p->fontsz) { + p->fontsz += 8; + p->fontq = mandoc_reallocarray(p->fontq, + p->fontsz, sizeof(*p->fontq)); + } + p->fontq[p->fonti] = f; } - -/* ARGSUSED */ -static void -termp_ar_post(DECL_ARGS) +/* Flush to make the saved pointer current again. */ +void +term_fontpopq(struct termp *p, int i) { - p->flags &= ~ttypes[TTYPE_CMD_ARG]; -} - - -/* ARGSUSED */ -static int -termp_ex_pre(DECL_ARGS) -{ - int i; - - i = arg_getattr(MDOC_Std, node->data.elem.argc, - node->data.elem.argv); assert(i >= 0); - - word(p, "The"); - p->flags |= ttypes[TTYPE_PROG]; - word(p, *node->data.elem.argv[i].value); - p->flags &= ~ttypes[TTYPE_PROG]; - word(p, "utility exits 0 on success, and >0 if an error occurs."); - - return(1); + if (p->fonti > i) + p->fonti = i; } - -/* ARGSUSED */ -static int -termp_nd_pre(DECL_ARGS) +/* Pop one font off the stack. */ +void +term_fontpop(struct termp *p) { - word(p, "\\-"); - return(1); + assert(p->fonti); + p->fonti--; } - -/* ARGSUSED */ -static void -termp_bl_post(DECL_ARGS) +/* + * Handle pwords, partial words, which may be either a single word or a + * phrase that cannot be broken down (such as a literal string). This + * handles word styling. + */ +void +term_word(struct termp *p, const char *word) { + struct roffsu su; + const char nbrsp[2] = { ASCII_NBRSP, 0 }; + const char *seq, *cp; + int sz, uc; + size_t csz, lsz, ssz; + enum mandoc_esc esc; - if (MDOC_BLOCK == node->type) - newln(p); -} + if ((p->flags & TERMP_NOBUF) == 0) { + if ((p->flags & TERMP_NOSPACE) == 0) { + if ((p->flags & TERMP_KEEP) == 0) { + bufferc(p, ' '); + if (p->flags & TERMP_SENTENCE) + bufferc(p, ' '); + } else + bufferc(p, ASCII_NBRSP); + } + if (p->flags & TERMP_PREKEEP) + p->flags |= TERMP_KEEP; + if (p->flags & TERMP_NONOSPACE) + p->flags |= TERMP_NOSPACE; + else + p->flags &= ~TERMP_NOSPACE; + p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE); + p->skipvsp = 0; + } + while ('\0' != *word) { + if ('\\' != *word) { + if (TERMP_NBRWORD & p->flags) { + if (' ' == *word) { + encode(p, nbrsp, 1); + word++; + continue; + } + ssz = strcspn(word, "\\ "); + } else + ssz = strcspn(word, "\\"); + encode(p, word, ssz); + word += (int)ssz; + continue; + } -/* ARGSUSED */ -static void -termp_op_post(DECL_ARGS) -{ + word++; + esc = mandoc_escape(&word, &seq, &sz); + if (ESCAPE_ERROR == esc) + continue; - if (MDOC_BODY != node->type) - return; - p->flags |= TERMP_NOSPACE; - word(p, "\\(rB"); -} + switch (esc) { + case ESCAPE_UNICODE: + uc = mchars_num2uc(seq + 1, sz - 1); + break; + case ESCAPE_NUMBERED: + uc = mchars_num2char(seq, sz); + if (uc < 0) + continue; + break; + case ESCAPE_SPECIAL: + if (p->enc == TERMENC_ASCII) { + cp = mchars_spec2str(seq, sz, &ssz); + if (cp != NULL) + encode(p, cp, ssz); + } else { + uc = mchars_spec2cp(seq, sz); + if (uc > 0) + encode1(p, uc); + } + continue; + case ESCAPE_FONTBOLD: + term_fontrepl(p, TERMFONT_BOLD); + continue; + case ESCAPE_FONTITALIC: + term_fontrepl(p, TERMFONT_UNDER); + continue; + case ESCAPE_FONTBI: + term_fontrepl(p, TERMFONT_BI); + continue; + case ESCAPE_FONT: + case ESCAPE_FONTROMAN: + term_fontrepl(p, TERMFONT_NONE); + continue; + case ESCAPE_FONTPREV: + term_fontlast(p); + continue; + case ESCAPE_NOSPACE: + if (p->flags & TERMP_BACKAFTER) + p->flags &= ~TERMP_BACKAFTER; + else if (*word == '\0') + p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); + continue; + case ESCAPE_HORIZ: + if (a2roffsu(seq, &su, SCALE_EM) == 0) + continue; + uc = term_hspan(p, &su) / 24; + if (uc > 0) + while (uc-- > 0) + bufferc(p, ASCII_NBRSP); + else if (p->col > (size_t)(-uc)) + p->col += uc; + else { + uc += p->col; + p->col = 0; + if (p->offset > (size_t)(-uc)) { + p->ti += uc; + p->offset += uc; + } else { + p->ti -= p->offset; + p->offset = 0; + } + } + continue; + case ESCAPE_HLINE: + if (a2roffsu(seq, &su, SCALE_EM) == 0) + continue; + uc = term_hspan(p, &su) / 24; + if (uc <= 0) { + if (p->rmargin <= p->offset) + continue; + lsz = p->rmargin - p->offset; + } else + lsz = uc; + while (sz && + strchr(" %&()*+-./0123456789:<=>", *seq)) { + seq++; + sz--; + } + if (sz && strchr("cifMmnPpuv", *seq)) { + seq++; + sz--; + } + if (sz == 0) + uc = -1; + else if (*seq == '\\') { + seq++; + esc = mandoc_escape(&seq, &cp, &sz); + switch (esc) { + case ESCAPE_UNICODE: + uc = mchars_num2uc(cp + 1, sz - 1); + break; + case ESCAPE_NUMBERED: + uc = mchars_num2char(cp, sz); + break; + case ESCAPE_SPECIAL: + uc = mchars_spec2cp(cp, sz); + break; + default: + uc = -1; + break; + } + } else + uc = *seq; + if (uc < 0x20 || (uc > 0x7E && uc < 0xA0)) + uc = '_'; + if (p->enc == TERMENC_ASCII) { + cp = ascii_uc2str(uc); + csz = term_strlen(p, cp); + ssz = strlen(cp); + } else + csz = (*p->width)(p, uc); + while (lsz >= csz) { + if (p->enc == TERMENC_ASCII) + encode(p, cp, ssz); + else + encode1(p, uc); + lsz -= csz; + } + continue; + case ESCAPE_SKIPCHAR: + p->flags |= TERMP_BACKAFTER; + continue; + case ESCAPE_OVERSTRIKE: + cp = seq + sz; + while (seq < cp) { + if (*seq == '\\') { + mandoc_escape(&seq, NULL, NULL); + continue; + } + encode1(p, *seq++); + if (seq < cp) { + if (p->flags & TERMP_BACKBEFORE) + p->flags |= TERMP_BACKAFTER; + else + p->flags |= TERMP_BACKBEFORE; + } + } + /* Trim trailing backspace/blank pair. */ + if (p->lastcol > 2 && + (p->buf[p->lastcol - 1] == ' ' || + p->buf[p->lastcol - 1] == '\t')) + p->lastcol -= 2; + if (p->col > p->lastcol) + p->col = p->lastcol; + continue; + default: + continue; + } + /* + * Common handling for Unicode and numbered + * character escape sequences. + */ -/* ARGSUSED */ -static void -termp_sh_post(DECL_ARGS) -{ - - switch (node->type) { - case (MDOC_HEAD): - p->flags &= ~ttypes[TTYPE_SECTION]; - newln(p); - break; - case (MDOC_BODY): - newln(p); - p->offset = 0; - break; - default: - break; + if (p->enc == TERMENC_ASCII) { + cp = ascii_uc2str(uc); + encode(p, cp, strlen(cp)); + } else { + if ((uc < 0x20 && uc != 0x09) || + (uc > 0x7E && uc < 0xA0)) + uc = 0xFFFD; + encode1(p, uc); + } } + p->flags &= ~TERMP_NBRWORD; } - -/* ARGSUSED */ -static int -termp_xr_pre(DECL_ARGS) -{ - const struct mdoc_node *n; - - n = node->child; - assert(n); - - assert(MDOC_TEXT == n->type); - word(p, n->data.text.string); - - if (NULL == (n = n->next)) - return(0); - - assert(MDOC_TEXT == n->type); - p->flags |= TERMP_NOSPACE; - word(p, "("); - p->flags |= TERMP_NOSPACE; - word(p, n->data.text.string); - p->flags |= TERMP_NOSPACE; - word(p, ")"); - - return(0); -} - - -/* ARGSUSED */ -static int -termp_vt_pre(DECL_ARGS) -{ - - /* FIXME: this can be "type name". */ - p->flags |= ttypes[TTYPE_VAR_DECL]; - return(1); -} - - -/* ARGSUSED */ static void -termp_vt_post(DECL_ARGS) +adjbuf(struct termp *p, size_t sz) { - p->flags &= ~ttypes[TTYPE_VAR_DECL]; - if (node->sec == SEC_SYNOPSIS) - vspace(p); -} + if (0 == p->maxcols) + p->maxcols = 1024; + while (sz >= p->maxcols) + p->maxcols <<= 2; - -/* ARGSUSED */ -static int -termp_fd_pre(DECL_ARGS) -{ - - /* - * FIXME: this naming is bad. This value is used, in general, - * for the #include header or other preprocessor statement. - */ - p->flags |= ttypes[TTYPE_FUNC_DECL]; - return(1); + p->buf = mandoc_reallocarray(p->buf, p->maxcols, sizeof(int)); } - -/* ARGSUSED */ static void -termp_fd_post(DECL_ARGS) +bufferc(struct termp *p, char c) { - - p->flags &= ~ttypes[TTYPE_FUNC_DECL]; - if (node->sec == SEC_SYNOPSIS) - vspace(p); - -} - - -/* ARGSUSED */ -static int -termp_sh_pre(DECL_ARGS) -{ - - switch (node->type) { - case (MDOC_HEAD): - vspace(p); - p->flags |= ttypes[TTYPE_SECTION]; - break; - case (MDOC_BODY): - p->offset = INDENT; - break; - default: - break; + if (p->flags & TERMP_NOBUF) { + (*p->letter)(p, c); + return; } - return(1); + if (p->col + 1 >= p->maxcols) + adjbuf(p, p->col + 1); + if (p->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) + p->buf[p->col] = c; + if (p->lastcol < ++p->col) + p->lastcol = p->col; } - -/* ARGSUSED */ -static int -termp_op_pre(DECL_ARGS) -{ - - switch (node->type) { - case (MDOC_BODY): - word(p, "\\(lB"); - p->flags |= TERMP_NOSPACE; - break; - default: - break; - } - return(1); -} - - -/* ARGSUSED */ -static int -termp_ud_pre(DECL_ARGS) -{ - - word(p, "currently under development."); - return(1); -} - - -/* ARGSUSED */ -static int -termp_fl_pre(DECL_ARGS) -{ - - p->flags |= ttypes[TTYPE_CMD_FLAG]; - word(p, "\\-"); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static int -termp_d1_pre(DECL_ARGS) -{ - - if (MDOC_BODY != node->type) - return(1); - newln(p); - p->offset += INDENT; - return(1); -} - - -/* ARGSUSED */ +/* + * See encode(). + * Do this for a single (probably unicode) value. + * Does not check for non-decorated glyphs. + */ static void -termp_d1_post(DECL_ARGS) +encode1(struct termp *p, int c) { + enum termfont f; - if (MDOC_BODY != node->type) + if (p->flags & TERMP_NOBUF) { + (*p->letter)(p, c); return; - newln(p); - p->offset -= INDENT; -} + } + if (p->col + 7 >= p->maxcols) + adjbuf(p, p->col + 7); -/* ARGSUSED */ -static int -termp_aq_pre(DECL_ARGS) -{ + f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ? + p->fontq[p->fonti] : TERMFONT_NONE; - if (MDOC_BODY != node->type) - return(1); - word(p, "<"); - p->flags |= TERMP_NOSPACE; - return(1); + if (p->flags & TERMP_BACKBEFORE) { + if (p->buf[p->col - 1] == ' ' || p->buf[p->col - 1] == '\t') + p->col--; + else + p->buf[p->col++] = 8; + p->flags &= ~TERMP_BACKBEFORE; + } + if (TERMFONT_UNDER == f || TERMFONT_BI == f) { + p->buf[p->col++] = '_'; + p->buf[p->col++] = 8; + } + if (TERMFONT_BOLD == f || TERMFONT_BI == f) { + if (ASCII_HYPH == c) + p->buf[p->col++] = '-'; + else + p->buf[p->col++] = c; + p->buf[p->col++] = 8; + } + if (p->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) + p->buf[p->col] = c; + if (p->lastcol < ++p->col) + p->lastcol = p->col; + if (p->flags & TERMP_BACKAFTER) { + p->flags |= TERMP_BACKBEFORE; + p->flags &= ~TERMP_BACKAFTER; + } } - -/* ARGSUSED */ static void -termp_aq_post(DECL_ARGS) +encode(struct termp *p, const char *word, size_t sz) { + size_t i; - if (MDOC_BODY != node->type) + if (p->flags & TERMP_NOBUF) { + for (i = 0; i < sz; i++) + (*p->letter)(p, word[i]); return; - p->flags |= TERMP_NOSPACE; - word(p, ">"); -} + } + if (p->col + 2 + (sz * 5) >= p->maxcols) + adjbuf(p, p->col + 2 + (sz * 5)); -/* ARGSUSED */ -static int -termp_ft_pre(DECL_ARGS) -{ + for (i = 0; i < sz; i++) { + if (ASCII_HYPH == word[i] || + isgraph((unsigned char)word[i])) + encode1(p, word[i]); + else { + if (p->lastcol <= p->col || + (word[i] != ' ' && word[i] != ASCII_NBRSP)) + p->buf[p->col] = word[i]; + p->col++; - p->flags |= ttypes[TTYPE_FUNC_TYPE]; - return(1); -} + /* + * Postpone the effect of \z while handling + * an overstrike sequence from ascii_uc2str(). + */ - -/* ARGSUSED */ -static void -termp_ft_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_FUNC_TYPE]; - if (node->sec == SEC_SYNOPSIS) - newln(p); - + if (word[i] == '\b' && + (p->flags & TERMP_BACKBEFORE)) { + p->flags &= ~TERMP_BACKBEFORE; + p->flags |= TERMP_BACKAFTER; + } + } + } + if (p->lastcol < p->col) + p->lastcol = p->col; } - -/* ARGSUSED */ -static int -termp_fn_pre(DECL_ARGS) +void +term_setwidth(struct termp *p, const char *wstr) { - const struct mdoc_node *n; + struct roffsu su; + int iop, width; - assert(node->child); - assert(MDOC_TEXT == node->child->type); - - /* FIXME: can be "type funcname" "type varname"... */ - - p->flags |= ttypes[TTYPE_FUNC_NAME]; - word(p, node->child->data.text.string); - p->flags &= ~ttypes[TTYPE_FUNC_NAME]; - - p->flags |= TERMP_NOSPACE; - word(p, "("); - - p->flags |= TERMP_NOSPACE; - for (n = node->child->next; n; n = n->next) { - assert(MDOC_TEXT == n->type); - p->flags |= ttypes[TTYPE_FUNC_ARG]; - word(p, n->data.text.string); - p->flags &= ~ttypes[TTYPE_FUNC_ARG]; - if ((n->next)) - word(p, ","); + iop = 0; + width = 0; + if (NULL != wstr) { + switch (*wstr) { + case '+': + iop = 1; + wstr++; + break; + case '-': + iop = -1; + wstr++; + break; + default: + break; + } + if (a2roffsu(wstr, &su, SCALE_MAX)) + width = term_hspan(p, &su); + else + iop = 0; } - - p->flags |= TERMP_NOSPACE; - word(p, ")"); - - if (SEC_SYNOPSIS == node->sec) - word(p, ";"); - - return(0); + (*p->setwidth)(p, iop, width); } - -/* ARGSUSED */ -static void -termp_fn_post(DECL_ARGS) +size_t +term_len(const struct termp *p, size_t sz) { - if (node->sec == SEC_SYNOPSIS) - vspace(p); - + return (*p->width)(p, ' ') * sz; } - -/* ARGSUSED */ -static int -termp_sx_pre(DECL_ARGS) +static size_t +cond_width(const struct termp *p, int c, int *skip) { - p->flags |= ttypes[TTYPE_LINK]; - return(1); + if (*skip) { + (*skip) = 0; + return 0; + } else + return (*p->width)(p, c); } - -/* ARGSUSED */ -static void -termp_sx_post(DECL_ARGS) +size_t +term_strlen(const struct termp *p, const char *cp) { + size_t sz, rsz, i; + int ssz, skip, uc; + const char *seq, *rhs; + enum mandoc_esc esc; + static const char rej[] = { '\\', ASCII_NBRSP, ASCII_HYPH, + ASCII_BREAK, '\0' }; - p->flags &= ~ttypes[TTYPE_LINK]; -} + /* + * Account for escaped sequences within string length + * calculations. This follows the logic in term_word() as we + * must calculate the width of produced strings. + */ + sz = 0; + skip = 0; + while ('\0' != *cp) { + rsz = strcspn(cp, rej); + for (i = 0; i < rsz; i++) + sz += cond_width(p, *cp++, &skip); -/* ARGSUSED */ -static int -termp_fa_pre(DECL_ARGS) -{ + switch (*cp) { + case '\\': + cp++; + esc = mandoc_escape(&cp, &seq, &ssz); + if (ESCAPE_ERROR == esc) + continue; - p->flags |= ttypes[TTYPE_FUNC_ARG]; - return(1); -} + rhs = NULL; + switch (esc) { + case ESCAPE_UNICODE: + uc = mchars_num2uc(seq + 1, ssz - 1); + break; + case ESCAPE_NUMBERED: + uc = mchars_num2char(seq, ssz); + if (uc < 0) + continue; + break; + case ESCAPE_SPECIAL: + if (p->enc == TERMENC_ASCII) { + rhs = mchars_spec2str(seq, ssz, &rsz); + if (rhs != NULL) + break; + } else { + uc = mchars_spec2cp(seq, ssz); + if (uc > 0) + sz += cond_width(p, uc, &skip); + } + continue; + case ESCAPE_SKIPCHAR: + skip = 1; + continue; + case ESCAPE_OVERSTRIKE: + rsz = 0; + rhs = seq + ssz; + while (seq < rhs) { + if (*seq == '\\') { + mandoc_escape(&seq, NULL, NULL); + continue; + } + i = (*p->width)(p, *seq++); + if (rsz < i) + rsz = i; + } + sz += rsz; + continue; + default: + continue; + } -/* ARGSUSED */ -static void -termp_fa_post(DECL_ARGS) -{ + /* + * Common handling for Unicode and numbered + * character escape sequences. + */ - p->flags &= ~ttypes[TTYPE_FUNC_ARG]; -} + if (rhs == NULL) { + if (p->enc == TERMENC_ASCII) { + rhs = ascii_uc2str(uc); + rsz = strlen(rhs); + } else { + if ((uc < 0x20 && uc != 0x09) || + (uc > 0x7E && uc < 0xA0)) + uc = 0xFFFD; + sz += cond_width(p, uc, &skip); + continue; + } + } + if (skip) { + skip = 0; + break; + } -/* ARGSUSED */ -static int -termp_va_pre(DECL_ARGS) -{ + /* + * Common handling for all escape sequences + * printing more than one character. + */ - p->flags |= ttypes[TTYPE_VAR_DECL]; - return(1); -} - - -/* ARGSUSED */ -static void -termp_va_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_VAR_DECL]; -} - - -/* ARGSUSED */ -static int -termp_bd_pre(DECL_ARGS) -{ - const struct mdoc_block *bl; - const struct mdoc_node *n; - - if (MDOC_BLOCK == node->type) { - vspace(p); - return(1); - } else if (MDOC_BODY != node->type) - return(1); - - assert(MDOC_BLOCK == node->parent->type); - - bl = &node->parent->data.block; - if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv)) - return(1); - - p->flags |= TERMP_LITERAL; - - for (n = node->child; n; n = n->next) { - assert(MDOC_TEXT == n->type); /* FIXME */ - if ((*n->data.text.string)) { - word(p, n->data.text.string); - flushln(p); - } else - vspace(p); - + for (i = 0; i < rsz; i++) + sz += (*p->width)(p, *rhs++); + break; + case ASCII_NBRSP: + sz += cond_width(p, ' ', &skip); + cp++; + break; + case ASCII_HYPH: + sz += cond_width(p, '-', &skip); + cp++; + break; + default: + break; + } } - p->flags &= ~TERMP_LITERAL; - return(0); + return sz; } - -/* ARGSUSED */ -static int -termp_qq_pre(DECL_ARGS) +int +term_vspan(const struct termp *p, const struct roffsu *su) { + double r; + int ri; - if (MDOC_BODY != node->type) - return(1); - word(p, "\""); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -termp_qq_post(DECL_ARGS) -{ - - if (MDOC_BODY != node->type) - return; - p->flags |= TERMP_NOSPACE; - word(p, "\""); -} - - -/* ARGSUSED */ -static int -termp_bx_pre(DECL_ARGS) -{ - - word(p, "BSD"); - return(1); -} - - -/* ARGSUSED */ -static int -termp_ox_pre(DECL_ARGS) -{ - - word(p, "OpenBSD"); - return(1); -} - - -/* ARGSUSED */ -static int -termp_nx_pre(DECL_ARGS) -{ - - word(p, "NetBSD"); - return(1); -} - - -/* ARGSUSED */ -static int -termp_sq_pre(DECL_ARGS) -{ - - if (MDOC_BODY != node->type) - return(1); - word(p, "`"); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -termp_sq_post(DECL_ARGS) -{ - - if (MDOC_BODY != node->type) - return; - p->flags |= TERMP_NOSPACE; - word(p, "\'"); -} - - -/* ARGSUSED */ -static int -termp_pf_pre(DECL_ARGS) -{ - - p->flags |= TERMP_IGNDELIM; - return(1); -} - - -/* ARGSUSED */ -static void -termp_pf_post(DECL_ARGS) -{ - - p->flags &= ~TERMP_IGNDELIM; - p->flags |= TERMP_NOSPACE; -} - - -/* ARGSUSED */ -static int -termp_ss_pre(DECL_ARGS) -{ - - switch (node->type) { - case (MDOC_HEAD): - vspace(p); - p->flags |= ttypes[TTYPE_SSECTION]; - p->offset = INDENT / 2; + switch (su->unit) { + case SCALE_BU: + r = su->scale / 40.0; break; - default: + case SCALE_CM: + r = su->scale * 6.0 / 2.54; break; - } - - return(1); -} - - -/* ARGSUSED */ -static void -termp_ss_post(DECL_ARGS) -{ - - switch (node->type) { - case (MDOC_HEAD): - p->flags &= ~ttypes[TTYPE_SSECTION]; - newln(p); - p->offset = INDENT; + case SCALE_FS: + r = su->scale * 65536.0 / 40.0; break; - default: + case SCALE_IN: + r = su->scale * 6.0; break; + case SCALE_MM: + r = su->scale * 0.006; + break; + case SCALE_PC: + r = su->scale; + break; + case SCALE_PT: + r = su->scale / 12.0; + break; + case SCALE_EN: + case SCALE_EM: + r = su->scale * 0.6; + break; + case SCALE_VS: + r = su->scale; + break; + default: + abort(); } + ri = r > 0.0 ? r + 0.4995 : r - 0.4995; + return ri < 66 ? ri : 1; } - -/* ARGSUSED */ -static int -termp_pa_pre(DECL_ARGS) +/* + * Convert a scaling width to basic units, rounding down. + */ +int +term_hspan(const struct termp *p, const struct roffsu *su) { - p->flags |= ttypes[TTYPE_FILE]; - return(1); -} - - -/* ARGSUSED */ -static void -termp_pa_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_FILE]; + return (*p->hspan)(p, su); }