summaryrefslogtreecommitdiff
path: root/usr/src/cmd/mandoc/man_macro.c
diff options
context:
space:
mode:
authorYuri Pankov <yuri.pankov@nexenta.com>2017-05-28 20:36:38 +0300
committerRichard Lowe <richlowe@richlowe.net>2017-06-21 16:46:29 -0400
commita40ea1a7d80eee1b409e9dcc2e48c730988147ea (patch)
tree83ffaf56553e3c7cda31f650a37a1e0c7f2b5b90 /usr/src/cmd/mandoc/man_macro.c
parent299c9e70a71f87365f8f88fdea2cccbd0d5b8db6 (diff)
downloadillumos-joyent-a40ea1a7d80eee1b409e9dcc2e48c730988147ea.tar.gz
8297 update mdocml to 1.14.1
Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/cmd/mandoc/man_macro.c')
-rw-r--r--usr/src/cmd/mandoc/man_macro.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/cmd/mandoc/man_macro.c b/usr/src/cmd/mandoc/man_macro.c
index d15335709e..7fd17c5348 100644
--- a/usr/src/cmd/mandoc/man_macro.c
+++ b/usr/src/cmd/mandoc/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.114 2016/01/08 17:48:09 schwarze Exp $ */
+/* $Id: man_macro.c,v 1.115 2017/01/10 13:47:00 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -95,7 +95,7 @@ man_unscope(struct roff_man *man, const struct roff_node *to)
/* Reached the end of the document? */
- if (to == NULL && ! (n->flags & MAN_VALID)) {
+ if (to == NULL && ! (n->flags & NODE_VALID)) {
if (man->flags & (MAN_BLINE | MAN_ELINE) &&
man_macros[n->tok].flags & MAN_SCOPED) {
mandoc_vmsg(MANDOCERR_BLK_LINE,
@@ -130,7 +130,7 @@ man_unscope(struct roff_man *man, const struct roff_node *to)
man->last = n;
n = n->parent;
- man->last->flags |= MAN_VALID;
+ man->last->flags |= NODE_VALID;
}
/*
@@ -164,7 +164,7 @@ rew_scope(struct roff_man *man, int tok)
for (;;) {
if (n->type == ROFFT_ROOT)
return;
- if (n->flags & MAN_VALID) {
+ if (n->flags & NODE_VALID) {
n = n->parent;
continue;
}
@@ -356,13 +356,13 @@ in_line_eoln(MACRO_PROT_ARGS)
}
/*
- * Append MAN_EOS in case the last snipped argument
+ * Append NODE_EOS in case the last snipped argument
* ends with a dot, e.g. `.IR syslog (3).'
*/
if (n != man->last &&
mandoc_eos(man->last->string, strlen(man->last->string)))
- man->last->flags |= MAN_EOS;
+ man->last->flags |= NODE_EOS;
/*
* If no arguments are specified and this is MAN_SCOPED (i.e.,