-/* $Id: term.c,v 1.142 2010/06/07 20:57:09 kristaps Exp $ */
+/* $Id: term.c,v 1.279 2019/01/04 03:21:02 schwarze Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>
*
* 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.
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * 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 AUTHOR BE LIABLE FOR
+ * 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.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include "mandoc.h"
-#include "chars.h"
+#include "mandoc_aux.h"
#include "out.h"
#include "term.h"
-#include "man.h"
-#include "mdoc.h"
#include "main.h"
-#define PS_CHAR_WIDTH 6
-#define PS_CHAR_HEIGHT 12
-#define PS_CHAR_TOPMARG (792 - 24)
-#define PS_CHAR_TOP (PS_CHAR_TOPMARG - 36)
-#define PS_CHAR_LEFT 36
-#define PS_CHAR_BOTMARG 24
-#define PS_CHAR_BOT (PS_CHAR_BOTMARG + 36)
-
-static struct termp *alloc(char *, enum termenc, enum termtype);
-static void term_free(struct termp *);
-static void spec(struct termp *, const char *, size_t);
-static void res(struct termp *, const char *, size_t);
-static void buffera(struct termp *, const char *, size_t);
-static void bufferc(struct termp *, char);
-static void adjbuf(struct termp *p, size_t);
-static void encode(struct termp *, const char *, size_t);
-static void advance(struct termp *, size_t);
-static void endline(struct termp *);
-static void letter(struct termp *, char);
-static void pageopen(struct termp *);
-
-
-void *
-ascii_alloc(char *outopts)
-{
-
- return(alloc(outopts, TERMENC_ASCII, TERMTYPE_CHAR));
-}
-
-
-void *
-ps_alloc(void)
-{
-
- return(alloc(NULL, TERMENC_ASCII, TERMTYPE_PS));
-}
+static size_t cond_width(const struct termp *, int, int *);
+static void adjbuf(struct termp_col *, 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 *);
+static void term_field(struct termp *, size_t, size_t,
+ size_t, size_t);
+static void term_fill(struct termp *, size_t *, size_t *,
+ size_t);
void
-terminal_free(void *arg)
+term_setcol(struct termp *p, size_t maxtcol)
{
-
- term_free((struct termp *)arg);
+ if (maxtcol > p->maxtcol) {
+ p->tcols = mandoc_recallocarray(p->tcols,
+ p->maxtcol, maxtcol, sizeof(*p->tcols));
+ p->maxtcol = maxtcol;
+ }
+ p->lasttcol = maxtcol - 1;
+ p->tcol = p->tcols;
}
-
-static void
+void
term_free(struct termp *p)
{
-
- if (p->buf)
- free(p->buf);
- if (p->symtab)
- chars_free(p->symtab);
+ for (p->tcol = p->tcols; p->tcol < p->tcols + p->maxtcol; p->tcol++)
+ free(p->tcol->buf);
+ free(p->tcols);
+ free(p->fontq);
free(p);
}
-
-/*
- * Push a single letter into our output engine.
- */
-static void
-letter(struct termp *p, char c)
+void
+term_begin(struct termp *p, term_margin head,
+ term_margin foot, const struct roff_meta *arg)
{
-
- if (TERMTYPE_CHAR == p->type) {
- /*
- * If using the terminal device, just push the letter
- * out into the screen.
- */
- putchar(c);
- return;
- }
-
- if ( ! (PS_INLINE & p->psstate)) {
- /*
- * If we're not in a PostScript "word" context, then
- * open one now at the current cursor.
- */
- printf("%zu %zu moveto\n", p->pscol, p->psrow);
- putchar('(');
- p->psstate |= PS_INLINE;
- }
- /*
- * We need to escape these characters as per the PostScript
- * specification. We would also escape non-graphable characters
- * (like tabs), but none of them would get to this point and
- * it's superfluous to abort() on them.
- */
+ p->headf = head;
+ p->footf = foot;
+ p->argf = arg;
+ (*p->begin)(p);
+}
- switch (c) {
- case ('('):
- /* FALLTHROUGH */
- case (')'):
- /* FALLTHROUGH */
- case ('\\'):
- putchar('\\');
- break;
- default:
- break;
- }
+void
+term_end(struct termp *p)
+{
- /* Write the character and adjust where we are on the page. */
- putchar(c);
- p->pscol += PS_CHAR_WIDTH;
+ (*p->end)(p);
}
-
/*
- * Begin a "terminal" context. Since terminal encompasses PostScript,
- * the actual terminal, etc., there are a few things we can do here.
+ * 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. There are many flags modifying
+ * this behaviour, see the comments in the body of the function.
*/
void
-term_begin(struct termp *p, term_margin head,
- term_margin foot, const void *arg)
+term_flushln(struct termp *p)
{
+ size_t vbl; /* Number of blanks to prepend to the output. */
+ size_t vbr; /* Actual visual position of the end of field. */
+ size_t vfield; /* Desired visual field width. */
+ size_t vtarget; /* Desired visual position of the right margin. */
+ size_t ic; /* Character position in the input buffer. */
+ size_t nbr; /* Number of characters to print in this field. */
- p->headf = head;
- p->footf = foot;
- p->argf = arg;
-
- if (TERMTYPE_CHAR == p->type) {
- /* Emit the header and be done. */
- (*p->headf)(p, p->argf);
- return;
- }
-
/*
- * Emit the standard PostScript prologue, set our initial page
- * position, then run pageopen() on the initial page.
+ * Normally, start writing at the left margin, but with the
+ * NOPAD flag, start writing at the current position instead.
*/
- printf("%s\n", "%!PS");
- printf("%s\n", "/Courier");
- printf("%s\n", "10 selectfont");
+ vbl = (p->flags & TERMP_NOPAD) || p->tcol->offset < p->viscol ?
+ 0 : p->tcol->offset - p->viscol;
+ if (p->minbl && vbl < p->minbl)
+ vbl = p->minbl;
- p->pspage = 1;
- p->psstate = 0;
- pageopen(p);
-}
+ if ((p->flags & TERMP_MULTICOL) == 0)
+ p->tcol->col = 0;
+ /* Loop over output lines. */
-/*
- * Open a page. This is only used for -Tps at the moment. It opens a
- * page context, printing the header and the footer. THE OUTPUT BUFFER
- * MUST BE EMPTY. If it is not, output will ghost on the next line and
- * we'll be all gross and out of state.
- */
-static void
-pageopen(struct termp *p)
-{
-
- assert(TERMTYPE_PS == p->type);
- assert(0 == p->psstate);
+ for (;;) {
+ vfield = p->tcol->rmargin > p->viscol + vbl ?
+ p->tcol->rmargin - p->viscol - vbl : 0;
- p->pscol = PS_CHAR_LEFT;
- p->psrow = PS_CHAR_TOPMARG;
- p->psstate |= PS_MARGINS;
+ /*
+ * Normally, break the line at the the right margin
+ * of the field, but with the NOBREAK flag, only
+ * break it at the max right margin of the screen,
+ * and with the BRNEVER flag, never break it at all.
+ */
- (*p->headf)(p, p->argf);
- endline(p);
+ vtarget = p->flags & TERMP_BRNEVER ? SIZE_MAX :
+ (p->flags & TERMP_NOBREAK) == 0 ? vfield :
+ p->maxrmargin > p->viscol + vbl ?
+ p->maxrmargin - p->viscol - vbl : 0;
- p->psstate &= ~PS_MARGINS;
- assert(0 == p->psstate);
+ /*
+ * Figure out how much text will fit in the field.
+ * If there is whitespace only, print nothing.
+ */
- p->pscol = PS_CHAR_LEFT;
- p->psrow = PS_CHAR_BOTMARG;
- p->psstate |= PS_MARGINS;
+ term_fill(p, &nbr, &vbr, vtarget);
+ if (nbr == 0)
+ break;
- (*p->footf)(p, p->argf);
- endline(p);
+ /*
+ * With the CENTER or RIGHT flag, increase the indentation
+ * to center the text between the left and right margins
+ * or to adjust it to the right margin, respectively.
+ */
- p->psstate &= ~PS_MARGINS;
- assert(0 == p->psstate);
+ if (vbr < vtarget) {
+ if (p->flags & TERMP_CENTER)
+ vbl += (vtarget - vbr) / 2;
+ else if (p->flags & TERMP_RIGHT)
+ vbl += vtarget - vbr;
+ }
- p->pscol = PS_CHAR_LEFT;
- p->psrow = PS_CHAR_TOP;
+ /* Finally, print the field content. */
-}
+ term_field(p, vbl, nbr, vbr, vtarget);
+ /*
+ * If there is no text left in the field, exit the loop.
+ * If the BRTRSP flag is set, consider trailing
+ * whitespace significant when deciding whether
+ * the field fits or not.
+ */
-void
-term_end(struct termp *p)
-{
+ for (ic = p->tcol->col; ic < p->tcol->lastcol; ic++) {
+ switch (p->tcol->buf[ic]) {
+ case '\t':
+ if (p->flags & TERMP_BRTRSP)
+ vbr = term_tab_next(vbr);
+ continue;
+ case ' ':
+ if (p->flags & TERMP_BRTRSP)
+ vbr += (*p->width)(p, ' ');
+ continue;
+ case '\n':
+ case ASCII_BREAK:
+ continue;
+ default:
+ break;
+ }
+ break;
+ }
+ if (ic == p->tcol->lastcol)
+ break;
- if (TERMTYPE_CHAR == p->type) {
- (*p->footf)(p, p->argf);
- return;
- }
+ /*
+ * At the location of an automtic line break, input
+ * space characters are consumed by the line break.
+ */
- printf("%s\n", "%%END");
-}
+ while (p->tcol->col < p->tcol->lastcol &&
+ p->tcol->buf[p->tcol->col] == ' ')
+ p->tcol->col++;
+ /*
+ * In multi-column mode, leave the rest of the text
+ * in the buffer to be handled by a subsequent
+ * invocation, such that the other columns of the
+ * table can be handled first.
+ * In single-column mode, simply break the line.
+ */
-static void
-endline(struct termp *p)
-{
+ if (p->flags & TERMP_MULTICOL)
+ return;
- if (TERMTYPE_CHAR == p->type) {
- putchar('\n');
- return;
+ endline(p);
+ p->viscol = 0;
+
+ /*
+ * Normally, start the next line at the same indentation
+ * as this one, but with the BRIND flag, start it at the
+ * right margin instead. This is used together with
+ * NOBREAK for the tags in various kinds of tagged lists.
+ */
+
+ vbl = p->flags & TERMP_BRIND ?
+ p->tcol->rmargin : p->tcol->offset;
}
- if (PS_INLINE & p->psstate) {
- printf(") show\n");
- p->psstate &= ~PS_INLINE;
- }
+ /* Reset output state in preparation for the next field. */
- if (PS_MARGINS & p->psstate)
- return;
+ p->col = p->tcol->col = p->tcol->lastcol = 0;
+ p->minbl = p->trailspace;
+ p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD);
- p->pscol = PS_CHAR_LEFT;
- if (p->psrow >= PS_CHAR_HEIGHT + PS_CHAR_BOT) {
- p->psrow -= PS_CHAR_HEIGHT;
+ if (p->flags & TERMP_MULTICOL)
return;
- }
- /*
- * XXX: can't run pageopen() until we're certain a flushln() has
- * occured, else the buf will reopen in an awkward state on the
- * next line.
+ /*
+ * The HANG flag means that the next field
+ * always follows on the same line.
+ * The NOBREAK flag means that the next field
+ * follows on the same line unless the field was overrun.
+ * Normally, break the line at the end of each field.
*/
- printf("showpage\n");
- p->psrow = PS_CHAR_TOP;
-}
+ if ((p->flags & TERMP_HANG) == 0 &&
+ ((p->flags & TERMP_NOBREAK) == 0 ||
+ vbr + term_len(p, p->trailspace) > vfield))
+ endline(p);
+}
/*
- * Advance the output engine by a certain amount of whitespace.
+ * Store the number of input characters to print in this field in *nbr
+ * and their total visual width to print in *vbr.
+ * If there is only whitespace in the field, both remain zero.
+ * The desired visual width of the field is provided by vtarget.
+ * If the first word is longer, the field will be overrun.
*/
static void
-advance(struct termp *p, size_t len)
+term_fill(struct termp *p, size_t *nbr, size_t *vbr, size_t vtarget)
{
- size_t i;
-
- if (TERMTYPE_CHAR == p->type) {
- /* Just print whitespace on the terminal. */
- for (i = 0; i < len; i++)
- putchar(' ');
- return;
- }
+ size_t ic; /* Character position in the input buffer. */
+ size_t vis; /* Visual position of the current character. */
+ size_t vn; /* Visual position of the next character. */
+ int breakline; /* Break at the end of this word. */
+ int graph; /* Last character was non-blank. */
+
+ *nbr = *vbr = vis = 0;
+ breakline = graph = 0;
+ for (ic = p->tcol->col; ic < p->tcol->lastcol; ic++) {
+ switch (p->tcol->buf[ic]) {
+ case '\b': /* Escape \o (overstrike) or backspace markup. */
+ assert(ic > 0);
+ vis -= (*p->width)(p, p->tcol->buf[ic - 1]);
+ continue;
- if (PS_INLINE & p->psstate) {
- /* Dump out any existing line scope. */
- printf(") show\n");
- p->psstate &= ~PS_INLINE;
- }
+ case '\t': /* Normal ASCII whitespace. */
+ case ' ':
+ case ASCII_BREAK: /* Escape \: (breakpoint). */
+ switch (p->tcol->buf[ic]) {
+ case '\t':
+ vn = term_tab_next(vis);
+ break;
+ case ' ':
+ vn = vis + (*p->width)(p, ' ');
+ break;
+ case ASCII_BREAK:
+ vn = vis;
+ break;
+ }
+ /* Can break at the end of a word. */
+ if (breakline || vn > vtarget)
+ break;
+ if (graph) {
+ *nbr = ic;
+ *vbr = vis;
+ graph = 0;
+ }
+ vis = vn;
+ continue;
- p->pscol += len ? len * PS_CHAR_WIDTH : 0;
-}
+ case '\n': /* Escape \p (break at the end of the word). */
+ breakline = 1;
+ continue;
+ case ASCII_HYPH: /* Breakable hyphen. */
+ graph = 1;
+ /*
+ * We are about to decide whether to break the
+ * line or not, so we no longer need this hyphen
+ * to be marked as breakable. Put back a real
+ * hyphen such that we get the correct width.
+ */
+ p->tcol->buf[ic] = '-';
+ vis += (*p->width)(p, '-');
+ if (vis > vtarget) {
+ ic++;
+ break;
+ }
+ *nbr = ic + 1;
+ *vbr = vis;
+ continue;
-static struct termp *
-alloc(char *outopts, enum termenc enc, enum termtype type)
-{
- struct termp *p;
- const char *toks[2];
- char *v;
- size_t width;
-
- toks[0] = "width";
- toks[1] = NULL;
-
- p = calloc(1, sizeof(struct termp));
- if (NULL == p) {
- perror(NULL);
- exit(EXIT_FAILURE);
+ case ASCII_NBRSP: /* Non-breakable space. */
+ p->tcol->buf[ic] = ' ';
+ /* FALLTHROUGH */
+ default: /* Printable character. */
+ graph = 1;
+ vis += (*p->width)(p, p->tcol->buf[ic]);
+ if (vis > vtarget && *nbr > 0)
+ return;
+ continue;
+ }
+ break;
}
- p->type = type;
- p->tabwidth = 5;
- p->enc = enc;
-
- width = 80;
-
- while (outopts && *outopts)
- switch (getsubopt(&outopts, UNCONST(toks), &v)) {
- case (0):
- width = atoi(v);
- break;
- default:
- break;
- }
+ /*
+ * If the last word extends to the end of the field without any
+ * trailing whitespace, the loop could not check yet whether it
+ * can remain on this line. So do the check now.
+ */
- /* Enforce some lower boundary. */
- if (width < 60)
- width = 60;
- p->defrmargin = width - 2;
- return(p);
+ if (graph && (vis <= vtarget || *nbr == 0)) {
+ *nbr = ic;
+ *vbr = vis;
+ }
}
-
/*
- * Flush a line of text. A "line" is loosely defined as being something
- * that should be followed by a newline, regardless of whether it's
- * broken apart by newlines getting there. A line can also be a
- * fragment of a columnar list (`Bl -tag' or `Bl -column'), which does
- * not have a trailing newline.
- *
- * The following flags may be specified:
- *
- * - TERMP_NOLPAD: when beginning to write the line, don't left-pad the
- * offset value. This is useful when doing columnar lists where the
- * prior column has right-padded.
- *
- * - TERMP_NOBREAK: this is the most important and is used when making
- * columns. In short: don't print a newline and instead pad to the
- * right margin. Used in conjunction with TERMP_NOLPAD.
- *
- * - TERMP_TWOSPACE: when padding, make sure there are at least two
- * space characters of padding. Otherwise, rather break the line.
- *
- * - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and
- * the line is overrun, and don't pad-right if it's underrun.
- *
- * - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when
- * overruning, instead save the position and continue at that point
- * when the next invocation.
- *
- * In-line line breaking:
- *
- * If TERMP_NOBREAK is specified and the line overruns the right
- * margin, it will break and pad-right to the right margin after
- * writing. If maxrmargin is violated, it will break and continue
- * writing from the right-margin, which will lead to the above scenario
- * upon exit. Otherwise, the line will break at the right margin.
+ * Print the contents of one field
+ * with an indentation of vbl visual columns,
+ * an input string length of nbr characters,
+ * an output width of vbr visual columns,
+ * and a desired field width of vtarget visual columns.
*/
-void
-term_flushln(struct termp *p)
+static void
+term_field(struct termp *p, size_t vbl, size_t nbr, size_t vbr, size_t vtarget)
{
- int i; /* current input position in p->buf */
- 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 */
- int j; /* temporary loop index */
- int jhy; /* last hyphen before line overflow */
- size_t maxvis, mmax;
-
- /*
- * 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.
- */
-
- assert(p->offset < p->rmargin);
+ size_t ic; /* Character position in the input buffer. */
+ size_t vis; /* Visual position of the current character. */
+ size_t dv; /* Visual width of the current character. */
+ size_t vn; /* Visual position of the next character. */
- maxvis = (int)(p->rmargin - p->offset) - p->overstep < 0 ?
- /* LINTED */
- 0 : p->rmargin - p->offset - p->overstep;
- mmax = (int)(p->maxrmargin - p->offset) - p->overstep < 0 ?
- /* LINTED */
- 0 : p->maxrmargin - p->offset - p->overstep;
-
- bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
-
- /*
- * Indent the first line of a paragraph.
- */
- vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset;
-
- /*
- * FIXME: if bp is zero, we still output the first word before
- * breaking the line.
- */
-
- vis = vend = i = 0;
- while (i < (int)p->col) {
+ vis = 0;
+ for (ic = p->tcol->col; ic < nbr; ic++) {
/*
- * Handle literal tab characters.
- */
- for (j = i; j < (int)p->col; j++) {
- if ('\t' != p->buf[j])
- break;
- vend = (vis/p->tabwidth+1)*p->tabwidth;
- vbl += vend - vis;
- vis = vend;
- }
-
- /*
- * 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).
+ * To avoid the printing of trailing whitespace,
+ * do not print whitespace right away, only count it.
*/
- /* LINTED */
- for (jhy = 0; j < (int)p->col; j++) {
- if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
- break;
- if (8 != p->buf[j]) {
- if (vend > vis && vend < bp &&
- ASCII_HYPH == p->buf[j])
- jhy = j;
- vend++;
- } else
- vend--;
+ switch (p->tcol->buf[ic]) {
+ case '\n':
+ case ASCII_BREAK:
+ continue;
+ case '\t':
+ vn = term_tab_next(vis);
+ vbl += vn - vis;
+ vis = vn;
+ continue;
+ case ' ':
+ case ASCII_NBRSP:
+ vbl++;
+ vis++;
+ continue;
+ default:
+ break;
}
/*
- * Find out whether we would exceed the right margin.
- * If so, break to the next line.
+ * We found a non-blank character to print,
+ * so write preceding white space now.
*/
- if (vend > bp && 0 == jhy && vis > 0) {
- vend -= vis;
- endline(p);
- if (TERMP_NOBREAK & p->flags) {
- p->viscol = p->rmargin;
- advance(p, p->rmargin);
- vend += p->rmargin - p->offset;
- } else {
- p->viscol = 0;
- vbl = p->offset;
- }
-
- /* Remove the p->overstep width. */
- bp += (int)/* LINTED */
- p->overstep;
- p->overstep = 0;
+ if (vbl > 0) {
+ (*p->advance)(p, vbl);
+ p->viscol += vbl;
+ vbl = 0;
}
- /*
- * Skip leading tabs, they were handled above.
- */
- while (i < (int)p->col && '\t' == p->buf[i])
- i++;
-
- /* Write out the [remaining] word. */
- for ( ; i < (int)p->col; i++) {
- if (vend > bp && jhy > 0 && i > jhy)
- break;
- if ('\t' == p->buf[i])
- break;
- if (' ' == p->buf[i]) {
- while (' ' == p->buf[i]) {
- vbl++;
- i++;
- }
- break;
- }
- if (ASCII_NBRSP == p->buf[i]) {
- vbl++;
- continue;
- }
-
- /*
- * Now we definitely know there will be
- * printable characters to output,
- * so write preceding white space now.
- */
- if (vbl) {
- advance(p, vbl);
- p->viscol += vbl;
- vbl = 0;
- }
-
- if (ASCII_HYPH == p->buf[i])
- letter(p, '-');
- else
- letter(p, p->buf[i]);
-
- p->viscol += 1;
+ /* Print the character and adjust the visual position. */
+
+ (*p->letter)(p, p->tcol->buf[ic]);
+ if (p->tcol->buf[ic] == '\b') {
+ dv = (*p->width)(p, p->tcol->buf[ic - 1]);
+ p->viscol -= dv;
+ vis -= dv;
+ } else {
+ dv = (*p->width)(p, p->tcol->buf[ic]);
+ p->viscol += dv;
+ vis += dv;
}
- vend += vbl;
- vis = vend;
}
+ p->tcol->col = nbr;
+}
- p->col = 0;
- p->overstep = 0;
-
- if ( ! (TERMP_NOBREAK & p->flags)) {
- p->viscol = 0;
- endline(p);
- return;
+static void
+endline(struct termp *p)
+{
+ if ((p->flags & (TERMP_NEWMC | TERMP_ENDMC)) == TERMP_ENDMC) {
+ p->mc = NULL;
+ p->flags &= ~TERMP_ENDMC;
}
-
- if (TERMP_HANG & p->flags) {
- /* We need one blank after the tag. */
- p->overstep = /* LINTED */
- vis - maxvis + 1;
-
- /*
- * Behave exactly the same way as groff:
- * If we have overstepped the margin, temporarily move
- * it to the right and flag the rest of the line to be
- * shorter.
- * If we landed right at the margin, be happy.
- * If we are one step before the margin, temporarily
- * move it one step LEFT and flag the rest of the line
- * to be longer.
- */
- if (p->overstep >= -1) {
- assert((int)maxvis + p->overstep >= 0);
- /* LINTED */
- maxvis += p->overstep;
- } else
- p->overstep = 0;
-
- } else if (TERMP_DANGLE & p->flags)
- return;
-
- /* Right-pad. */
- if (maxvis > vis + /* LINTED */
- ((TERMP_TWOSPACE & p->flags) ? 1 : 0)) {
- p->viscol += maxvis - vis;
- advance(p, maxvis - vis);
- vis += (maxvis - vis);
- } else { /* ...or newline break. */
- endline(p);
- p->viscol = p->rmargin;
- advance(p, p->rmargin);
+ 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);
}
-
-/*
+/*
* 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.
{
p->flags |= TERMP_NOSPACE;
- if (0 == p->col && 0 == p->viscol) {
- p->flags &= ~TERMP_NOLPAD;
- return;
- }
- term_flushln(p);
- p->flags &= ~TERMP_NOLPAD;
+ if (p->tcol->lastcol || p->viscol)
+ term_flushln(p);
}
-
/*
* 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.
term_newln(p);
p->viscol = 0;
- endline(p);
-}
-
-
-static void
-spec(struct termp *p, const char *word, size_t len)
-{
- const char *rhs;
- size_t sz;
-
- rhs = chars_a2ascii(p->symtab, word, len, &sz);
- if (rhs)
- encode(p, rhs, sz);
+ p->minbl = 0;
+ if (0 < p->skipvsp)
+ p->skipvsp--;
+ else
+ (*p->endline)(p);
}
-
-static void
-res(struct termp *p, const char *word, size_t len)
-{
- const char *rhs;
- size_t sz;
-
- rhs = chars_a2res(p->symtab, word, len, &sz);
- if (rhs)
- encode(p, rhs, sz);
-}
-
-
+/* Swap current and previous font; for \fP and .ft P */
void
term_fontlast(struct termp *p)
{
p->fontq[p->fonti] = f;
}
-
+/* Set font, save current, discard previous; for \f, .ft, .B etc. */
void
term_fontrepl(struct termp *p, enum termfont f)
{
p->fontq[p->fonti] = f;
}
-
+/* Set font, save previous. */
void
term_fontpush(struct termp *p, enum termfont f)
{
- assert(p->fonti + 1 < 10);
p->fontl = p->fontq[p->fonti];
- p->fontq[++p->fonti] = f;
-}
-
-
-const void *
-term_fontq(struct termp *p)
-{
-
- return(&p->fontq[p->fonti]);
-}
-
-
-enum termfont
-term_fonttop(struct termp *p)
-{
-
- return(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;
}
-
+/* Flush to make the saved pointer current again. */
void
-term_fontpopq(struct termp *p, const void *key)
+term_fontpopq(struct termp *p, int i)
{
- while (p->fonti >= 0 && key != &p->fontq[p->fonti])
- p->fonti--;
- assert(p->fonti >= 0);
+ assert(i >= 0);
+ if (p->fonti > i)
+ p->fonti = i;
}
-
+/* Pop one font off the stack. */
void
term_fontpop(struct termp *p)
{
p->fonti--;
}
-
/*
* 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
void
term_word(struct termp *p, const char *word)
{
- const char *sv, *seq;
- int sz;
- size_t ssz;
- enum roffdeco deco;
-
- sv = word;
-
- if (word[0] && '\0' == word[1])
- switch (word[0]) {
- case('.'):
- /* FALLTHROUGH */
- case(','):
- /* FALLTHROUGH */
- case(';'):
- /* FALLTHROUGH */
- case(':'):
- /* FALLTHROUGH */
- case('?'):
- /* FALLTHROUGH */
- case('!'):
- /* FALLTHROUGH */
- case(')'):
- /* FALLTHROUGH */
- case(']'):
- if ( ! (TERMP_IGNDELIM & p->flags))
- p->flags |= TERMP_NOSPACE;
- break;
- default:
- break;
+ 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 ((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 ( ! (TERMP_NOSPACE & p->flags)) {
- bufferc(p, ' ');
- if (TERMP_SENTENCE & p->flags)
- bufferc(p, ' ');
+ 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;
}
- if ( ! (p->flags & TERMP_NONOSPACE))
- p->flags &= ~TERMP_NOSPACE;
-
- p->flags &= ~TERMP_SENTENCE;
-
- /* FIXME: use strcspn. */
-
- while (*word) {
+ while ('\0' != *word) {
if ('\\' != *word) {
- encode(p, word, 1);
- 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;
}
- seq = ++word;
- sz = a2roffdeco(&deco, &seq, &ssz);
-
- switch (deco) {
- case (DECO_RESERVED):
- res(p, seq, ssz);
+ word++;
+ esc = mandoc_escape(&word, &seq, &sz);
+ switch (esc) {
+ case ESCAPE_UNICODE:
+ uc = mchars_num2uc(seq + 1, sz - 1);
break;
- case (DECO_SPECIAL):
- spec(p, seq, ssz);
+ case ESCAPE_NUMBERED:
+ uc = mchars_num2char(seq, sz);
+ if (uc < 0)
+ continue;
break;
- case (DECO_BOLD):
- term_fontrepl(p, TERMFONT_BOLD);
+ 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_UNDEF:
+ uc = *seq;
break;
- case (DECO_ITALIC):
+ case ESCAPE_FONTBOLD:
+ term_fontrepl(p, TERMFONT_BOLD);
+ continue;
+ case ESCAPE_FONTITALIC:
term_fontrepl(p, TERMFONT_UNDER);
- break;
- case (DECO_ROMAN):
+ continue;
+ case ESCAPE_FONTBI:
+ term_fontrepl(p, TERMFONT_BI);
+ continue;
+ case ESCAPE_FONT:
+ case ESCAPE_FONTCW:
+ case ESCAPE_FONTROMAN:
term_fontrepl(p, TERMFONT_NONE);
- break;
- case (DECO_PREVIOUS):
+ continue;
+ case ESCAPE_FONTPREV:
term_fontlast(p);
- break;
+ continue;
+ case ESCAPE_BREAK:
+ bufferc(p, '\n');
+ 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_DEVICE:
+ if (p->type == TERMTYPE_PDF)
+ encode(p, "pdf", 3);
+ else if (p->type == TERMTYPE_PS)
+ encode(p, "ps", 2);
+ else if (p->enc == TERMENC_ASCII)
+ encode(p, "ascii", 5);
+ else
+ encode(p, "utf8", 4);
+ continue;
+ case ESCAPE_HORIZ:
+ if (*seq == '|') {
+ seq++;
+ uc = -p->col;
+ } else
+ uc = 0;
+ if (a2roffsu(seq, &su, SCALE_EM) == NULL)
+ continue;
+ uc += term_hen(p, &su);
+ 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->tcol->offset > (size_t)(-uc)) {
+ p->ti += uc;
+ p->tcol->offset += uc;
+ } else {
+ p->ti -= p->tcol->offset;
+ p->tcol->offset = 0;
+ }
+ }
+ continue;
+ case ESCAPE_HLINE:
+ if ((cp = a2roffsu(seq, &su, SCALE_EM)) == NULL)
+ continue;
+ uc = term_hen(p, &su);
+ if (uc <= 0) {
+ if (p->tcol->rmargin <= p->tcol->offset)
+ continue;
+ lsz = p->tcol->rmargin - p->tcol->offset;
+ } else
+ lsz = uc;
+ if (*cp == seq[-1])
+ uc = -1;
+ else if (*cp == '\\') {
+ seq = cp + 1;
+ 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;
+ case ESCAPE_UNDEF:
+ uc = *seq;
+ break;
+ default:
+ uc = -1;
+ break;
+ }
+ } else
+ uc = *cp;
+ 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->tcol->lastcol > 2 &&
+ (p->tcol->buf[p->tcol->lastcol - 1] == ' ' ||
+ p->tcol->buf[p->tcol->lastcol - 1] == '\t'))
+ p->tcol->lastcol -= 2;
+ if (p->col > p->tcol->lastcol)
+ p->col = p->tcol->lastcol;
+ continue;
default:
- break;
+ continue;
}
- word += sz;
- if (DECO_NOSPACE == deco && '\0' == *word)
- p->flags |= TERMP_NOSPACE;
- }
+ /*
+ * Common handling for Unicode and numbered
+ * character escape sequences.
+ */
- /*
- * Note that we don't process the pipe: the parser sees it as
- * punctuation, but we don't in terms of typography.
- */
- if (sv[0] && 0 == sv[1])
- switch (sv[0]) {
- case('('):
- /* FALLTHROUGH */
- case('['):
- p->flags |= TERMP_NOSPACE;
- 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;
}
-
static void
-adjbuf(struct termp *p, size_t sz)
+adjbuf(struct termp_col *c, size_t sz)
{
-
- if (0 == p->maxcols)
- p->maxcols = 1024;
- while (sz >= p->maxcols)
- p->maxcols <<= 2;
-
- p->buf = realloc(p->buf, p->maxcols);
- if (NULL == p->buf) {
- perror(NULL);
- exit(EXIT_FAILURE);
- }
+ if (c->maxcols == 0)
+ c->maxcols = 1024;
+ while (c->maxcols <= sz)
+ c->maxcols <<= 2;
+ c->buf = mandoc_reallocarray(c->buf, c->maxcols, sizeof(*c->buf));
}
-
static void
-buffera(struct termp *p, const char *word, size_t sz)
+bufferc(struct termp *p, char c)
{
-
- if (p->col + sz >= p->maxcols)
- adjbuf(p, p->col + sz);
-
- memcpy(&p->buf[(int)p->col], word, sz);
- p->col += sz;
+ if (p->flags & TERMP_NOBUF) {
+ (*p->letter)(p, c);
+ return;
+ }
+ if (p->col + 1 >= p->tcol->maxcols)
+ adjbuf(p->tcol, p->col + 1);
+ if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP))
+ p->tcol->buf[p->col] = c;
+ if (p->tcol->lastcol < ++p->col)
+ p->tcol->lastcol = p->col;
}
-
+/*
+ * See encode().
+ * Do this for a single (probably unicode) value.
+ * Does not check for non-decorated glyphs.
+ */
static void
-bufferc(struct termp *p, char c)
+encode1(struct termp *p, int c)
{
+ enum termfont f;
- if (p->col + 1 >= p->maxcols)
- adjbuf(p, p->col + 1);
+ if (p->flags & TERMP_NOBUF) {
+ (*p->letter)(p, c);
+ return;
+ }
- p->buf[(int)p->col++] = c;
-}
+ if (p->col + 7 >= p->tcol->maxcols)
+ adjbuf(p->tcol, p->col + 7);
+
+ f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ?
+ p->fontq[p->fonti] : TERMFONT_NONE;
+ if (p->flags & TERMP_BACKBEFORE) {
+ if (p->tcol->buf[p->col - 1] == ' ' ||
+ p->tcol->buf[p->col - 1] == '\t')
+ p->col--;
+ else
+ p->tcol->buf[p->col++] = '\b';
+ p->flags &= ~TERMP_BACKBEFORE;
+ }
+ if (f == TERMFONT_UNDER || f == TERMFONT_BI) {
+ p->tcol->buf[p->col++] = '_';
+ p->tcol->buf[p->col++] = '\b';
+ }
+ if (f == TERMFONT_BOLD || f == TERMFONT_BI) {
+ if (c == ASCII_HYPH)
+ p->tcol->buf[p->col++] = '-';
+ else
+ p->tcol->buf[p->col++] = c;
+ p->tcol->buf[p->col++] = '\b';
+ }
+ if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP))
+ p->tcol->buf[p->col] = c;
+ if (p->tcol->lastcol < ++p->col)
+ p->tcol->lastcol = p->col;
+ if (p->flags & TERMP_BACKAFTER) {
+ p->flags |= TERMP_BACKBEFORE;
+ p->flags &= ~TERMP_BACKAFTER;
+ }
+}
static void
encode(struct termp *p, const char *word, size_t sz)
{
- enum termfont f;
- int i;
+ size_t i;
- /*
- * Encode and buffer a string of characters. If the current
- * font mode is unset, buffer directly, else encode then buffer
- * character by character.
- */
-
- if (TERMTYPE_PS == p->type) {
- buffera(p, word, sz);
- return;
- } else if (TERMFONT_NONE == (f = term_fonttop(p))) {
- buffera(p, word, sz);
+ if (p->flags & TERMP_NOBUF) {
+ for (i = 0; i < sz; i++)
+ (*p->letter)(p, word[i]);
return;
}
- for (i = 0; i < (int)sz; i++) {
- if ( ! isgraph((u_char)word[i])) {
- bufferc(p, word[i]);
- continue;
+ if (p->col + 2 + (sz * 5) >= p->tcol->maxcols)
+ adjbuf(p->tcol, p->col + 2 + (sz * 5));
+
+ for (i = 0; i < sz; i++) {
+ if (ASCII_HYPH == word[i] ||
+ isgraph((unsigned char)word[i]))
+ encode1(p, word[i]);
+ else {
+ if (p->tcol->lastcol <= p->col ||
+ (word[i] != ' ' && word[i] != ASCII_NBRSP))
+ p->tcol->buf[p->col] = word[i];
+ p->col++;
+
+ /*
+ * Postpone the effect of \z while handling
+ * an overstrike sequence from ascii_uc2str().
+ */
+
+ if (word[i] == '\b' &&
+ (p->flags & TERMP_BACKBEFORE)) {
+ p->flags &= ~TERMP_BACKBEFORE;
+ p->flags |= TERMP_BACKAFTER;
+ }
}
+ }
+ if (p->tcol->lastcol < p->col)
+ p->tcol->lastcol = p->col;
+}
- if (TERMFONT_UNDER == f)
- bufferc(p, '_');
+void
+term_setwidth(struct termp *p, const char *wstr)
+{
+ struct roffsu su;
+ int iop, width;
+
+ 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) != NULL)
+ width = term_hspan(p, &su);
else
- bufferc(p, word[i]);
-
- bufferc(p, 8);
- bufferc(p, word[i]);
+ iop = 0;
}
+ (*p->setwidth)(p, iop, width);
+}
+
+size_t
+term_len(const struct termp *p, size_t sz)
+{
+
+ return (*p->width)(p, ' ') * sz;
}
+static size_t
+cond_width(const struct termp *p, int c, int *skip)
+{
+
+ if (*skip) {
+ (*skip) = 0;
+ return 0;
+ } else
+ return (*p->width)(p, c);
+}
size_t
-term_vspan(const struct roffsu *su)
+term_strlen(const struct termp *p, const char *cp)
{
- double r;
+ 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' };
- switch (su->unit) {
- case (SCALE_CM):
- r = su->scale * 2;
- break;
- case (SCALE_IN):
- r = su->scale * 6;
- break;
- case (SCALE_PC):
- r = su->scale;
- break;
- case (SCALE_PT):
- r = su->scale / 8;
- break;
- case (SCALE_MM):
- r = su->scale / 1000;
- break;
- case (SCALE_VS):
- r = su->scale;
- break;
- default:
- r = su->scale - 1;
- break;
+ /*
+ * 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);
+
+ switch (*cp) {
+ case '\\':
+ cp++;
+ rhs = NULL;
+ esc = mandoc_escape(&cp, &seq, &ssz);
+ 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_UNDEF:
+ uc = *seq;
+ break;
+ case ESCAPE_DEVICE:
+ if (p->type == TERMTYPE_PDF) {
+ rhs = "pdf";
+ rsz = 3;
+ } else if (p->type == TERMTYPE_PS) {
+ rhs = "ps";
+ rsz = 2;
+ } else if (p->enc == TERMENC_ASCII) {
+ rhs = "ascii";
+ rsz = 5;
+ } else {
+ rhs = "utf8";
+ rsz = 4;
+ }
+ break;
+ 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;
+ }
+
+ /*
+ * Common handling for Unicode and numbered
+ * character escape sequences.
+ */
+
+ 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;
+ }
+
+ /*
+ * Common handling for all escape sequences
+ * printing more than one character.
+ */
+
+ 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;
+ }
}
- if (r < 0.0)
- r = 0.0;
- return(/* LINTED */(size_t)
- r);
+ return sz;
}
-
-size_t
-term_hspan(const struct roffsu *su)
+int
+term_vspan(const struct termp *p, const struct roffsu *su)
{
double r;
-
- /* XXX: CM, IN, and PT are approximations. */
+ int ri;
switch (su->unit) {
- case (SCALE_CM):
- r = 4 * su->scale;
+ case SCALE_BU:
+ r = su->scale / 40.0;
+ break;
+ case SCALE_CM:
+ r = su->scale * 6.0 / 2.54;
break;
- case (SCALE_IN):
- /* XXX: this is an approximation. */
- r = 10 * su->scale;
+ case SCALE_FS:
+ r = su->scale * 65536.0 / 40.0;
break;
- case (SCALE_PC):
- r = (10 * su->scale) / 6;
+ case SCALE_IN:
+ r = su->scale * 6.0;
break;
- case (SCALE_PT):
- r = (10 * su->scale) / 72;
+ case SCALE_MM:
+ r = su->scale * 0.006;
break;
- case (SCALE_MM):
- r = su->scale / 1000; /* FIXME: double-check. */
+ case SCALE_PC:
+ r = su->scale;
break;
- case (SCALE_VS):
- r = su->scale * 2 - 1; /* FIXME: double-check. */
+ case SCALE_PT:
+ r = su->scale / 12.0;
break;
- default:
+ 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;
+}
- if (r < 0.0)
- r = 0.0;
- return((size_t)/* LINTED */
- r);
+/*
+ * Convert a scaling width to basic units, rounding towards 0.
+ */
+int
+term_hspan(const struct termp *p, const struct roffsu *su)
+{
+
+ return (*p->hspan)(p, su);
}
+/*
+ * Convert a scaling width to basic units, rounding to closest.
+ */
+int
+term_hen(const struct termp *p, const struct roffsu *su)
+{
+ int bu;
+ if ((bu = (*p->hspan)(p, su)) >= 0)
+ return (bu + 11) / 24;
+ else
+ return -((-bu + 11) / 24);
+}
git.ckatri.com / mandoc.git / blobdiff