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/n+2-5l24f-0FF | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 tests/pr/n+2-5l24f-0FF (limited to 'tests/pr/n+2-5l24f-0FF') diff --git a/tests/pr/n+2-5l24f-0FF b/tests/pr/n+2-5l24f-0FF new file mode 100644 index 000000000..653d57809 --- /dev/null +++ b/tests/pr/n+2-5l24f-0FF @@ -0,0 +1,51 @@ + + +-- Date/Time -- x Page 2 + + + + + +-- Date/Time -- x Page 3 + + + 1.1 FF-Test: FF's at Start of File V + 2.2 Options -b -3 / -a -3 / ... + 3.3 -------------------------------------------- + 4.4 3456789 123456789 123456789 123456789 12345678 + 5.5 3 Columns downwards ..., <= 5 lines per page + 6.6 FF-Arangements: Empty Pages at start + 7.7 \ftext; \f\ntext; + 8.8 \f\ftext; \f\f\ntext; \f\n\ftext; \f\n\f\n; + 9.9 3456789 123456789 123456789 + 10.10 zzzzzzzzzzzzzzzzzzzzzzzzzz123456789 + 11.1 12345678 + 12.2 12345678 + 13.3 line truncation before FF; r_r_o_l-test: + 14.14 456789 123456789 123456789 123456789 + + +-- Date/Time -- x Page 4 + + + + + +-- Date/Time -- x Page 5 + + + 15.15 xyzxyzxyz XYZXYZXYZ abcabcab + 16.16 456789 123456789 xyzxyzxyz XYZXYZXYZ + 17.7 12345678 + 18.8 12345678 + 19.9 3456789 ab + 20.20 DEFGHI 123 + 21.1 12345678 + 22.2 12345678 + 23.3 12345678 + 24.4 12345678 + 25.5 12345678 + 26.6 12345678 + 27.27 no truncation before FF; (r_l-test): + 28.28 no trunc + \ No newline at end of file -- cgit v1.2.3-54-g00ecf