diff options
author | 2020-08-03 11:02:57 +0000 | |
---|---|---|
committer | 2020-08-03 11:02:57 +0000 | |
commit | 16d4788cef7bb58fdc8820bdd5ecb511933f0d15 (patch) | |
tree | bf3311df1f25ef3a44bb86fa7d6dfb9b27370aba /regress/roff/cond/close.out_ascii | |
parent | 53d5687049e8bdb3b568febbdf4ed19da4e1a95f (diff) | |
download | mandoc-16d4788cef7bb58fdc8820bdd5ecb511933f0d15.tar.gz mandoc-16d4788cef7bb58fdc8820bdd5ecb511933f0d15.tar.zst mandoc-16d4788cef7bb58fdc8820bdd5ecb511933f0d15.zip |
Put the code handling \} into a new function roff_cond_checkend()
and call that function not only from both places where copies
existed - when processing text lines and when processing request/macro
lines in conditional block scope - but also when closing a macro
definition request, such that this construction works:
.if n \{.de macroname
macro content
.. \} ignored arguments
.macroname
This fixes a bug reported by John Gardner <gardnerjohng at gmail dot com>.
While here, avoid a confusing decrement of the line scope counter
in roffnode_cleanscope() for conditional blocks that do not have
line scope in the first place (no functional change for this part).
Also improve validation of an internal invariant in roff_cblock()
and polish some comments.
Diffstat (limited to 'regress/roff/cond/close.out_ascii')
-rw-r--r-- | regress/roff/cond/close.out_ascii | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/regress/roff/cond/close.out_ascii b/regress/roff/cond/close.out_ascii index d049154d..63484540 100644 --- a/regress/roff/cond/close.out_ascii +++ b/regress/roff/cond/close.out_ascii @@ -12,6 +12,14 @@ DDEESSCCRRIIPPTTIIOONN closing after plain text + text line contains closing brace only + + text line contains closing brace and additional words + + request line contains closing brace only + + request line contains closing brace and additional args + conditional content following words with whitespace conditional contentfollowing words without whitespace @@ -22,6 +30,15 @@ DDEESSCCRRIIPPTTIIOONN non-standard multi-line style following words + preceding words text line block end with additional words following + words + + two closes on the same text line + + preceding words close on request line following words + + preceding words two closes oonntthheesame macro line + still open at the end of the file |