diff options
| -rw-r--r-- | action.c | 8 | ||||
| -rw-r--r-- | mdoc.c | 7 | ||||
| -rw-r--r-- | term.c | 7 |
3 files changed, 10 insertions, 12 deletions
@@ -395,13 +395,9 @@ post_bl_width(struct mdoc *mdoc) * the macro's width as set in share/tmac/mdoc/doc-common. */ - if (xstrcmp(*p, "Ds")) { - if ( ! mdoc_warn(mdoc, WARN_COMPAT, - "%s argument deprecated", - mdoc_argnames[MDOC_Width])) - return(0); + if (xstrcmp(*p, "Ds")) width = 8; - } else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p))) + else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p))) return(1); else if (0 == (width = mdoc_macro2len(tok))) return(mdoc_warn(mdoc, WARN_SYNTAX, @@ -191,9 +191,14 @@ mdoc_parseln(struct mdoc *mdoc, int line, char *buf) mdoc->linetok = 0; + /* + * FIXME: should puke on whitespace in non-literal displays. + */ + if ('.' != *buf) { if (SEC_PROLOGUE == mdoc->lastnamed) - return(mdoc_perr(mdoc, line, 0, "text disallowed in document prologue")); + return(mdoc_perr(mdoc, line, 0, + "no text in document prologue")); if ( ! mdoc_word_alloc(mdoc, line, 0, buf)) return(0); mdoc->next = MDOC_NEXT_SIBLING; @@ -1065,20 +1065,17 @@ termp_bd_pre(DECL_ARGS) bl = &node->parent->data.block; - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); if (-1 != i) { assert(1 == bl->argv[i].sz); p->offset += arg_offset(&bl->argv[i]); } - 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 (MDOC_TEXT != n->type) + errx(1, "non-text displays unsupported"); if ((*n->data.text.string)) { word(p, n->data.text.string); flushln(p); |