diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-05-17 22:11:42 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-05-17 22:11:42 +0000 |
commit | 95356d6189f5e5d41011a7cb60176f147e1fff7d (patch) | |
tree | c923ce026d6b8f420d203f151868c8b858e4501d /mdoc_term.c | |
parent | 114426748445942cb51394e59f2c62ad79bd974c (diff) | |
download | mandoc-95356d6189f5e5d41011a7cb60176f147e1fff7d.tar.gz mandoc-95356d6189f5e5d41011a7cb60176f147e1fff7d.tar.zst mandoc-95356d6189f5e5d41011a7cb60176f147e1fff7d.zip |
Enable the unified error/warning enumeration in mandoc.h that's
stringified in main.c.
Allow `An' to handle an argument and child (with a warning).
Allow `Rv' and `Ex' to work without a prior `Nm' as groff does (with a
warning).
Allow inconsistent column syntax to only raise a warning.
Diffstat (limited to 'mdoc_term.c')
-rw-r--r-- | mdoc_term.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mdoc_term.c b/mdoc_term.c index b0e3a68f..51144380 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.124 2010/05/15 16:24:38 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.125 2010/05/17 22:11:42 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -27,6 +27,7 @@ #include <stdlib.h> #include <string.h> +#include "mandoc.h" #include "out.h" #include "term.h" #include "mdoc.h" @@ -1085,6 +1086,8 @@ static int termp_nm_pre(DECL_ARGS) { + if (NULL == n->child && NULL == m->name) + if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) term_newln(p); @@ -1092,6 +1095,7 @@ termp_nm_pre(DECL_ARGS) if (NULL == n->child) term_word(p, m->name); + return(1); } @@ -1216,7 +1220,7 @@ termp_rv_pre(DECL_ARGS) term_word(p, "()"); } - if (n->child->next) + if (n->child && n->child->next) term_word(p, "functions return"); else term_word(p, "function returns"); @@ -1255,7 +1259,7 @@ termp_ex_pre(DECL_ARGS) p->flags &= ~TERMP_NOSPACE; } - if (n->child->next) + if (n->child && n->child->next) term_word(p, "utilities exit"); else term_word(p, "utility exits"); |