diff options
| -rw-r--r-- | mdoc.h | 4 | ||||
| -rw-r--r-- | mdoc_term.c | 4 | ||||
| -rw-r--r-- | tbl_term.c | 6 | ||||
| -rw-r--r-- | term.c | 22 | ||||
| -rw-r--r-- | term.h | 5 |
5 files changed, 16 insertions, 25 deletions
@@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.133 2014/12/18 03:10:11 schwarze Exp $ */ +/* $Id: mdoc.h,v 1.134 2015/01/31 00:12:41 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -366,7 +366,7 @@ struct mdoc_node { enum mdoc_type type; /* AST node type */ enum mdoc_sec sec; /* current named section */ union mdoc_data *norm; /* normalised args */ - const void *prev_font; /* before entering this node */ + int prev_font; /* before entering this node */ /* FIXME: these can be union'd to shave a few bytes. */ struct mdoc_arg *args; /* BLOCK/ELEM */ struct mdoc_node *pending; /* BLOCK */ diff --git a/mdoc_term.c b/mdoc_term.c index 3d9b9fea..1fb02aa9 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.304 2015/01/30 22:04:44 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.305 2015/01/31 00:12:41 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -307,7 +307,7 @@ print_mdoc_node(DECL_ARGS) chld = 1; offset = p->offset; rmargin = p->rmargin; - n->prev_font = term_fontq(p); + n->prev_font = p->fonti; memset(&npair, 0, sizeof(struct termpair)); npair.ppair = pair; @@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.37 2015/01/30 17:32:16 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.38 2015/01/31 00:12:41 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -414,9 +414,9 @@ tbl_number(struct termp *tp, const struct tbl_opts *opts, static void tbl_word(struct termp *tp, const struct tbl_dat *dp) { - const void *prev_font; + int prev_font; - prev_font = term_fontq(tp); + prev_font = tp->fonti; if (dp->layout->flags & TBL_CELL_BOLD) term_fontpush(tp, TERMFONT_BOLD); else if (dp->layout->flags & TBL_CELL_ITALIC) @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.243 2015/01/21 20:33:25 schwarze Exp $ */ +/* $Id: term.c,v 1.244 2015/01/31 00:12:41 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -363,22 +363,14 @@ term_fontpush(struct termp *p, enum termfont f) p->fontq[p->fonti] = f; } -/* Retrieve pointer to current font. */ -const enum termfont * -term_fontq(struct termp *p) -{ - - return(&p->fontq[p->fonti]); -} - /* Flush to make the saved pointer current again. */ void -term_fontpopq(struct termp *p, const enum termfont *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. */ @@ -568,7 +560,7 @@ encode1(struct termp *p, int c) if (p->col + 6 >= p->maxcols) adjbuf(p, p->col + 6); - f = *term_fontq(p); + f = p->fontq[p->fonti]; if (TERMFONT_UNDER == f || TERMFONT_BI == f) { p->buf[p->col++] = '_'; @@ -600,7 +592,7 @@ encode(struct termp *p, const char *word, size_t sz) * character by character. */ - if (*term_fontq(p) == TERMFONT_NONE) { + if (p->fontq[p->fonti] == TERMFONT_NONE) { if (p->col + sz >= p->maxcols) adjbuf(p, p->col + sz); for (i = 0; i < sz; i++) @@ -1,4 +1,4 @@ -/* $Id: term.h,v 1.110 2014/12/23 13:48:57 schwarze Exp $ */ +/* $Id: term.h,v 1.111 2015/01/31 00:12:41 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -126,10 +126,9 @@ int term_vspan(const struct termp *, const struct roffsu *); size_t term_strlen(const struct termp *, const char *); size_t term_len(const struct termp *, size_t); -const enum termfont *term_fontq(struct termp *); void term_fontpush(struct termp *, enum termfont); void term_fontpop(struct termp *); -void term_fontpopq(struct termp *, const enum termfont *); +void term_fontpopq(struct termp *, int); void term_fontrepl(struct termp *, enum termfont); void term_fontlast(struct termp *); |