aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2018-12-31 08:03:46 +0000
committerIngo Schwarze <schwarze@openbsd.org>2018-12-31 08:03:46 +0000
commit8027bf3a863c4dd65487affc9c5299479fb0d20f (patch)
tree6336d946e630b63e9cb5dfb1ddc2dd2aac65e9a1
parent288ba2a3bff8e3088cb3d7234b0e92fa6d0bcd35 (diff)
downloadmandoc-8027bf3a863c4dd65487affc9c5299479fb0d20f.tar.gz
mandoc-8027bf3a863c4dd65487affc9c5299479fb0d20f.tar.zst
mandoc-8027bf3a863c4dd65487affc9c5299479fb0d20f.zip
For .EX and .EE, set the fill mode parser state directly in the
macro parsing function, in the same way as the roff parser already does it for the .nf and .fi requests. This is a preparation for getting rid of the ugly function man_state() later on.
-rw-r--r--man_macro.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/man_macro.c b/man_macro.c
index 48b9858a..b0c8e0d1 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.140 2018/12/31 07:08:12 schwarze Exp $ */
+/* $Id: man_macro.c,v 1.141 2018/12/31 08:03:46 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -381,6 +381,11 @@ in_line_eoln(MACRO_PROT_ARGS)
roff_elem_alloc(man, line, ppos, tok);
n = man->last;
+ if (tok == MAN_EX)
+ man->flags |= ROFF_NOFILL;
+ else if (tok == MAN_EE)
+ man->flags &= ~ROFF_NOFILL;
+
for (;;) {
if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) {
mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,