From 4ed1fb98a08fde2605fdf2b82c057d300f52d683 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 25 Oct 2020 18:28:23 +0000 Subject: The GNU tbl(1) program contained in the groff package internally uses roff(7) tabulator settings to implement tables, and it used to leak the changed tabulator settings from tables to the subsequent roff(7) code. In mandoc/tbl_term.c rev. 1.54 (June 17, 2017), code was added to be bug-compatible with groff. In commit d0e03cf6 (Oct 20, 2020), GNU tbl(1) changed behaviour to save the tabulator settings before starting a table and restore them afterwards. Adjust mandoc for compatibility. Since mandoc implements tables without using roff(7) tabulator settings, saving and restoring tabulator settings is not needed in mandoc. Simply deleting the code that changed tabulator settings by reverting tbl_term.c rev. 1.54 is sufficient in mandoc. Also adjust the desired output of the regression tests to match the new behaviour of both groff and mandoc. --- regress/tbl/layout/center.out_ascii | 2 +- regress/tbl/layout/spacing.out_ascii | 2 +- regress/tbl/layout/span.out_ascii | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'regress/tbl/layout') diff --git a/regress/tbl/layout/center.out_ascii b/regress/tbl/layout/center.out_ascii index 3196fff6..80e48d54 100644 --- a/regress/tbl/layout/center.out_ascii +++ b/regress/tbl/layout/center.out_ascii @@ -18,7 +18,7 @@ DDEESSCCRRIIPPTTIIOONN ***** ***** ***** leaked tab settings: - a b c de + a b c de diff --git a/regress/tbl/layout/spacing.out_ascii b/regress/tbl/layout/spacing.out_ascii index 3d51d7d5..5eba1d80 100644 --- a/regress/tbl/layout/spacing.out_ascii +++ b/regress/tbl/layout/spacing.out_ascii @@ -32,7 +32,7 @@ DDEESSCCRRIIPPTTIIOONN |a || b | +---++---+ leaked tab settings: - a b cdef + a b c d e f diff --git a/regress/tbl/layout/span.out_ascii b/regress/tbl/layout/span.out_ascii index bc4badca..83d163f2 100644 --- a/regress/tbl/layout/span.out_ascii +++ b/regress/tbl/layout/span.out_ascii @@ -37,7 +37,7 @@ DDEESSCCRRIIPPTTIIOONN |a | b | c | d | e | +--+---+---+---+---+ leaked tab settings: - a b c d e f + a b c d e f -- cgit