diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-02-12 13:00:28 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-02-12 13:00:28 +0000 |
| commit | 47f62b8db5df6c72c4d691f157a6053c41177512 (patch) | |
| tree | 1acc700ed73cb42d0a2f113d2bf23847afb6c120 /regress | |
| parent | 47e09eae357b2e21b53af1df064746c9bc48e18a (diff) | |
Do not confuse .Bl -column lists that just broken another block
with newly opened .Bl -column lists;
fixing an assertion failure jsg@ found with afl:
test case #481, Bl It Bl -column It Bd El text text El
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/break.in | 12 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii | 8 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/break.out_lint | 17 |
3 files changed, 30 insertions, 7 deletions
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/break.in b/regress/usr.bin/mandoc/mdoc/Bl/break.in index 9df11449d4f..03a85364bc4 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/break.in +++ b/regress/usr.bin/mandoc/mdoc/Bl/break.in @@ -43,6 +43,18 @@ inside both stray item .Ed after both +.Bl -enum -offset indent +.It +before table +.Bl -column column +.It column +.Bd -ragged -offset indent +inside display +.El +first line after table +second line after table +.El +after list .Sh CAVEATS .Bl -hang .It before broken block Bo inside both diff --git a/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii index db2c47a1405..30a6888b559 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii @@ -25,6 +25,14 @@ EEXXAAMMPPLLEESS stray item after both + 1. before table + + column + + inside display first line after table second line after + table after list + + CCAAVVEEAATTSS before broken block [inside both after list] diff --git a/regress/usr.bin/mandoc/mdoc/Bl/break.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/break.out_lint index cb20bc25513..934b4c1dc11 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/break.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Bl/break.out_lint @@ -4,10 +4,13 @@ mandoc: break.in:22:2: ERROR: skipping item outside list: It mandoc: break.in:32:2: WARNING: blocks badly nested: Bl breaks Bd mandoc: break.in:41:2: WARNING: blocks badly nested: Bl breaks Bd mandoc: break.in:42:2: ERROR: skipping item outside list: It -mandoc: break.in:49:2: WARNING: blocks badly nested: Bl breaks Bo -mandoc: break.in:51:2: ERROR: inserting missing end of block: Sh breaks Bo -mandoc: break.in:54:2: WARNING: blocks badly nested: Bl breaks Bo -mandoc: break.in:53:25: ERROR: appending missing end of block: Bo -mandoc: break.in:52:2: ERROR: appending missing end of block: Bl -mandoc: break.in:53:2: WARNING: empty list item: Bl -enum It -mandoc: break.in:53:2: ERROR: skipping all arguments: It before broken block +mandoc: break.in:53:2: WARNING: blocks badly nested: Bl breaks Bd +mandoc: break.in:56:2: WARNING: blocks badly nested: Bl breaks Bd +mandoc: break.in:58:2: ERROR: inserting missing end of block: Sh breaks Bd +mandoc: break.in:61:2: WARNING: blocks badly nested: Bl breaks Bo +mandoc: break.in:63:2: ERROR: inserting missing end of block: Sh breaks Bo +mandoc: break.in:66:2: WARNING: blocks badly nested: Bl breaks Bo +mandoc: break.in:65:25: ERROR: appending missing end of block: Bo +mandoc: break.in:64:2: ERROR: appending missing end of block: Bl +mandoc: break.in:65:2: WARNING: empty list item: Bl -enum It +mandoc: break.in:65:2: ERROR: skipping all arguments: It before broken block |