diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-07-26 23:39:55 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-07-26 23:39:55 +0000 |
| commit | f8d5dddb1165b2cc85f11de322d2375adc22b4ac (patch) | |
| tree | 0bee4d9ef6f47b0584929302d4658a875f57d9fd | |
| parent | 506d084898e3bd3d2d30533c7ac61d8e8d0dee89 (diff) | |
sync to 1.8.1: remove superfluous NOSPACE in bd post,
and remove unused TERMP_LITERAL
| -rw-r--r-- | usr.bin/mandoc/mdoc_term.c | 6 | ||||
| -rw-r--r-- | usr.bin/mandoc/term.h | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c index 2bbd0d0e2c8..2b25ad15c29 100644 --- a/usr.bin/mandoc/mdoc_term.c +++ b/usr.bin/mandoc/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.39 2009/07/26 23:32:26 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.40 2009/07/26 23:39:54 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -1564,7 +1564,6 @@ termp_bd_pre(DECL_ARGS) * Ew. */ - p->flags |= TERMP_LITERAL; ln = node->child ? node->child->line : 0; for (node = node->child; node; node = node->next) { @@ -1587,10 +1586,7 @@ termp_bd_post(DECL_ARGS) if (MDOC_BODY != node->type) return; - term_flushln(p); - p->flags &= ~TERMP_LITERAL; - p->flags |= TERMP_NOSPACE; } diff --git a/usr.bin/mandoc/term.h b/usr.bin/mandoc/term.h index ed2002838ea..6eed1c8fb1b 100644 --- a/usr.bin/mandoc/term.h +++ b/usr.bin/mandoc/term.h @@ -1,4 +1,4 @@ -/* $Id: term.h,v 1.4 2009/07/18 20:50:38 schwarze Exp $ */ +/* $Id: term.h,v 1.5 2009/07/26 23:39:54 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -41,13 +41,12 @@ struct termp { #define TERMP_BOLD (1 << 0) /* Styles... */ #define TERMP_UNDER (1 << 1) #define TERMP_NOSPACE (1 << 2) /* No space before words. */ -#define TERMP_NOLPAD (1 << 3) /* See termp_newline(). */ -#define TERMP_NOBREAK (1 << 4) /* See termp_newline(). */ -#define TERMP_LITERAL (1 << 5) /* Literal words. */ +#define TERMP_NOLPAD (1 << 3) /* See term_flushln(). */ +#define TERMP_NOBREAK (1 << 4) /* See term_flushln(). */ #define TERMP_IGNDELIM (1 << 6) /* Delims like regulars. */ #define TERMP_NONOSPACE (1 << 7) /* No space (no autounset). */ -#define TERMP_DANGLE (1 << 8) /* See termp_newline(). */ -#define TERMP_HANG (1 << 9) /* See termp_newline(). */ +#define TERMP_DANGLE (1 << 8) /* See term_flushln(). */ +#define TERMP_HANG (1 << 9) /* See term_flushln(). */ char *buf; /* Output buffer. */ enum termenc enc; /* Type of encoding. */ void *symtab; /* Encoded-symbol table. */ |