diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-02-06 03:44:58 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-02-06 03:44:58 +0000 |
| commit | fc520e3cedbcdd86eb2b80e94cce78f98af717cf (patch) | |
| tree | d8925b29052be33ff201b5a1d09de0aeba121ed7 /mdoc_man.c | |
| parent | 70f435794e7d1b7082fbf988409e27476dace0bc (diff) | |
| download | mandoc-fc520e3cedbcdd86eb2b80e94cce78f98af717cf.tar.gz mandoc-fc520e3cedbcdd86eb2b80e94cce78f98af717cf.tar.zst mandoc-fc520e3cedbcdd86eb2b80e94cce78f98af717cf.zip | |
The .Nm macro does not only use the default name when it has no
argument, but also when the first argument is a child macro.
Arcane issue found in the FreeBSD cxgbetool(8) manual that Baptiste
Daroussin <bapt at FreeBSD> sent me long ago for a different reason.
While solving this, switch to the new technique of doing text
production in the validator, reducing code duplication in the
formatters, which also makes -Ttree output clearer.
Diffstat (limited to 'mdoc_man.c')
| -rw-r--r-- | mdoc_man.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: mdoc_man.c,v 1.101 2017/01/11 17:39:53 schwarze Exp $ */ +/* $Id: mdoc_man.c,v 1.102 2017/02/06 03:44:58 schwarze Exp $ */ /* * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org> * @@ -1518,7 +1518,7 @@ pre_nm(DECL_ARGS) } if (n->type != ROFFT_ELEM && n->type != ROFFT_HEAD) return 1; - name = n->child ? n->child->string : meta->name; + name = n->child == NULL ? NULL : n->child->string; if (NULL == name) return 0; if (n->type == ROFFT_HEAD) { @@ -1529,8 +1529,6 @@ pre_nm(DECL_ARGS) outflags |= MMAN_nl; } font_push('B'); - if (NULL == n->child) - print_word(meta->name); return 1; } @@ -1544,7 +1542,7 @@ post_nm(DECL_ARGS) break; case ROFFT_HEAD: case ROFFT_ELEM: - if (n->child != NULL || meta->name != NULL) + if (n->child != NULL && n->child->string != NULL) font_pop(); break; default: |