Even on macro lines, \} must not cause whitespace.

2 files changed, 17 insertions, 9 deletions

diff --git a/regress/usr.bin/mandoc/roff/cond/if.in b/regress/usr.bin/mandoc/roff/cond/if.in
index c65a1dcb1cc..6d1402a025b 100644
--- a/regress/usr.bin/mandoc/roff/cond/if.in
+++ b/regress/usr.bin/mandoc/roff/cond/if.in
@@ -10,30 +10,31 @@ Next-line empty true condition.
 Next-line empty false condition.
 .br
 False condition with whitespace:
+.br
 .if t 
 True condition with whitespace:
 .if n 
-.if n \{One-line true condition\} with block.
-.if t \{One-line false condition\} with block.
+.if n \{One-line true cond\}ition with block.
+.if t \{One-line false cond\}ition with block.
 .br
 .if n \{Two-line true condition
-without continuation\} and macros.
+without cont\}inuation and macros.
 .if t \{Two-line false condition
-without continuation\} and macros.
+without cont\}inuation and macros.
 .br
 .if n \{Two-line true condition
-.B without continuation\} but with macros.
+.B without cont\}inuation but with macros.
 .if t \{Two-line false condition
-.B without continuation\} but with macros.
+.B without cont\}inuation but with macros.
 .br
 .if n \{\
 Two-line true condition
 with continuation and macros.
-.\}
+.\}This will not be printed.
 .if t \{\
 Two-line false condition
 with continuation and macros.
-.\}
+.\}This will not be printed.
 .br
 .if n \{
 Two-line true condition with blank line.\}
@@ -75,6 +76,11 @@ After conditional.
 After conditional.
 .br
 .if n \{Outer true condition.
+.if n \{Inner true condition.
+.\}middle\}end
+After conditional.
+.br
+.if n \{Outer true condition.
 .if t \{Inner false condition.
 .B\}middle\}end
 After conditional.
diff --git a/regress/usr.bin/mandoc/roff/cond/if.out_ascii b/regress/usr.bin/mandoc/roff/cond/if.out_ascii
index d4e52a569c9..e9ab37b495b 100644
--- a/regress/usr.bin/mandoc/roff/cond/if.out_ascii
+++ b/regress/usr.bin/mandoc/roff/cond/if.out_ascii
@@ -9,7 +9,8 @@ DDEESSCCRRIIPPTTIIOONN
        One-line true condition.
 
        Next-line empty true condition.
-       False condition with whitespace: True condition with whitespace:
+       False condition with whitespace:
+       True condition with whitespace:
 
        One-line true condition with block.
        Two-line true condition without continuation and macros.
@@ -23,6 +24,7 @@ DDEESSCCRRIIPPTTIIOONN
        Back to the outer true condition.
        Outer true condition.  After conditional.
        Outer true condition.  After conditional.
+       Outer true condition.  Inner true condition.  After conditional.
        Outer true condition.  After conditional.