diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2013-12-24 19:10:35 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2013-12-24 19:10:35 +0000 |
| commit | 3043e4d18d3f19a38b74cbce28987b0e5218d43a (patch) | |
| tree | b1f31bc1e515eb02c3fed99281265babdc0d543b /regress | |
| parent | cd429ee8cd9d937595d233fa7eb6aa5c6828878d (diff) | |
When deciding whether two consecutive macros are on the same input line,
we have to compare the line where the first one *ends* (not where it begins)
to the line where the second one starts.
This fixes the bug that .Bk allowed output line breaks right after block
macros spanning more than one input line, even when the next macro follows
on the same line.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bk/inputlines.in | 3 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/inputlines.in b/regress/usr.bin/mandoc/mdoc/Bk/inputlines.in index 6d9f4272a4f..50db65fb1ee 100644 --- a/regress/usr.bin/mandoc/mdoc/Bk/inputlines.in +++ b/regress/usr.bin/mandoc/mdoc/Bk/inputlines.in @@ -18,8 +18,6 @@ .Oo No a Oc Oo No b Oc Oc Pq "break after first Oo" .Ek .Pp -.\" XXX does not work yet -.ig .Nm .Ar x x x x x x x x x x x x x x x x x x x x x x x x x x x .Bk -words @@ -34,7 +32,6 @@ .Oc Oo No b Oc Oc Pq "break before first Oc" .Ek .Pp -.. .Nm .Ar x x x x x x x x x x x x x x x x x x x x x x x x x x x .Bk -words diff --git a/regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii index c6c1deba57a..52da2ec6e77 100644 --- a/regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii @@ -10,6 +10,12 @@ SSYYNNOOPPSSIISS BBkk--iinnppuuttlliinneess _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x [[a] [b]] (break after first Oo) + BBkk--iinnppuuttlliinneess _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x + [[a] [b]] (break after second Oo) + + BBkk--iinnppuuttlliinneess _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x + [[a] [b]] (break before first Oc) + BBkk--iinnppuuttlliinneess _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x [[a] [b]] (break after first Oc) |