summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2019-01-01 05:56:27 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2019-01-01 05:56:27 +0000
commitbf89cfe840c14023ebf04e949966d7f0491c3d35 (patch)
treeb27178a110aa9a34a471788f57274e6b83c180d0
parente5660e9417f902b976e17aba0c099f05a0aa5226 (diff)
display the NODE_NOFILL flag indicating no-fill mode
-rw-r--r--usr.bin/mandoc/tree.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/usr.bin/mandoc/tree.c b/usr.bin/mandoc/tree.c
index a4051d33494..c7f7d6e85ac 100644
--- a/usr.bin/mandoc/tree.c
+++ b/usr.bin/mandoc/tree.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: tree.c,v 1.50 2018/12/30 00:48:48 schwarze Exp $ */
+/* $OpenBSD: tree.c,v 1.51 2019/01/01 05:56:26 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -187,20 +187,22 @@ print_mdoc(const struct roff_node *n, int indent)
}
putchar(' ');
- if (NODE_DELIMO & n->flags)
+ if (n->flags & NODE_DELIMO)
putchar('(');
- if (NODE_LINE & n->flags)
+ if (n->flags & NODE_LINE)
putchar('*');
printf("%d:%d", n->line, n->pos + 1);
- if (NODE_DELIMC & n->flags)
+ if (n->flags & NODE_DELIMC)
putchar(')');
- if (NODE_EOS & n->flags)
+ if (n->flags & NODE_EOS)
putchar('.');
- if (NODE_BROKEN & n->flags)
+ if (n->flags & NODE_BROKEN)
printf(" BROKEN");
- if (NODE_NOSRC & n->flags)
+ if (n->flags & NODE_NOFILL)
+ printf(" NOFILL");
+ if (n->flags & NODE_NOSRC)
printf(" NOSRC");
- if (NODE_NOPRT & n->flags)
+ if (n->flags & NODE_NOPRT)
printf(" NOPRT");
putchar('\n');
}
@@ -286,13 +288,15 @@ print_man(const struct roff_node *n, int indent)
for (i = 0; i < indent; i++)
putchar(' ');
printf("%s (%s) ", p, t);
- if (NODE_LINE & n->flags)
+ if (n->flags & NODE_LINE)
putchar('*');
printf("%d:%d", n->line, n->pos + 1);
- if (NODE_DELIMC & n->flags)
+ if (n->flags & NODE_DELIMC)
putchar(')');
- if (NODE_EOS & n->flags)
+ if (n->flags & NODE_EOS)
putchar('.');
+ if (n->flags & NODE_NOFILL)
+ printf(" NOFILL");
putchar('\n');
}