diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-30 18:51:36 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-30 18:51:36 +0000 |
| commit | 9aa6ef8197493fef732a3c196a9405dac78ef349 (patch) | |
| tree | 709d709b80e078ae5cca7a600e77225e8106ccc9 /regress/tbl/macro/Makefile | |
| parent | 556f141936dddcdc663288d71ccf7b1a85ec1afe (diff) | |
| download | mandoc-9aa6ef8197493fef732a3c196a9405dac78ef349.tar.gz | |
Provide a new function roff_req_or_macro() to parse and handle a request
or macro, including context-dependent error handling inside tbl(7) code
and inside .ce/.rj blocks. Use it both in the top level roff(7) parser
and inside conditional blocks.
This fixes an assertion failure triggered by ".if 1 .ce" inside tbl(7)
code, found by tb@ using afl(1).
As a side benefit for readability, only one place remains in the
code that calls the main handler functions for the various roff(7)
requests. This patch also improves column numbers in some error
messages and various comments.
Diffstat (limited to 'regress/tbl/macro/Makefile')
| -rw-r--r-- | regress/tbl/macro/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/regress/tbl/macro/Makefile b/regress/tbl/macro/Makefile index 70ec1b33..8ea4a0d6 100644 --- a/regress/tbl/macro/Makefile +++ b/regress/tbl/macro/Makefile @@ -1,12 +1,15 @@ -# $OpenBSD: Makefile,v 1.2 2016/08/20 14:43:40 schwarze Exp $ +# $OpenBSD: Makefile,v 1.3 2022/04/30 18:46:16 schwarze Exp $ -REGRESS_TARGETS = man nested column -LINT_TARGETS = man nested +REGRESS_TARGETS = column man nested req +LINT_TARGETS = man nested req -# trivial differences to groff-1.22.3: +# mandoc defect: +# mandoc(1) ignores .br inside tbl(7) code. + +# trivial differences to groff-1.23.0: # .TS in a table causes a blank table line in GNU tbl(1), but not in mandoc. # .TS in a column list causes a blank line in mandoc, but not in GNU tbl(1). -SKIP_GROFF = nested column +SKIP_GROFF = column nested req .include <bsd.regress.mk> |