From 36ce675bb4224a41adafd448f39020e70db14094 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 3 Jul 2007 11:36:43 -0700 Subject: pr -F no longer suppresses the footer or the first two blank header lines Here's a patch along the lines of . It's a bit large since it changes the test cases to match the behavior, and the test cases' file names depend on the behavior! * NEWS: pr -F no longer suppresses the footer or the first two blank lines in the header. * doc/coreutils.texi (pr invocation): Likewise. Also, a too-short page length implies -t, not -T. * src/pr.c (lines_per_header, lines_per_footer): Now constants. (init_parameters): Don't try to change them. (print_header): Use the same header and footer format regardless of wither form feeds are being used. (usage): Adjust to above change when describing too-short page length. Too-short page length impliesy -t, not -T. * tests/pr/2-S_f-t_notab: Adjust to the fact that -F now affects only formfeed handling; it does not change the header. * tests/pr/2-Sf-t_notab: Likewise. ... * tests/pr/3-5l17f-t: Remove, since it's been renamed to another file whose name has a line count 7 larger, reflecting the new line count needed for this behavior. * tests/pr/3a3l8f-t: Likewise. ... * tests/pr/w72l24f-ll: Likewise. Signed-off-by: Jim Meyering --- tests/pr/a3f-0FF | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'tests/pr/a3f-0FF') diff --git a/tests/pr/a3f-0FF b/tests/pr/a3f-0FF index ec257d6e5..4f4ed40ac 100644 --- a/tests/pr/a3f-0FF +++ b/tests/pr/a3f-0FF @@ -1,12 +1,18 @@ + + -- Date/Time -- x Page 1 - -- Date/Time -- x Page 2 + + +-- Date/Time -- x Page 2 + + - -- Date/Time -- x Page 3 +-- Date/Time -- x Page 3 1 FF-Test: FF's at St 2 Options -b -3 / -a 3 ------------------- @@ -14,11 +20,15 @@ 7 \ftext; \f\ntext; 8 \f\ftext; \f\f\ntex 9 3456789 123456789 123 10 zzzzzzzzzzzzzzzzzzz 1 2 3 line truncation befor 14 456789 123456789 123 - -- Date/Time -- x Page 4 + +-- Date/Time -- x Page 4 - -- Date/Time -- x Page 5 + + + +-- Date/Time -- x Page 5 15 xyzxyzxyz XYZXYZXYZ 16 456789 123456789 xyz 7 @@ -26,7 +36,9 @@ 1 2 3 4 5 6 27 no truncation before 28 no trunc - -- Date/Time -- x Page 6 + + +-- Date/Time -- x Page 6 29 xyzxyzxyz XYZXYZXYZ 30 456789 123456789 xyz 1 -- cgit v1.2.3-54-g00ecf