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/nN1+3l24f-bl | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 tests/pr/nN1+3l24f-bl (limited to 'tests/pr/nN1+3l24f-bl') diff --git a/tests/pr/nN1+3l24f-bl b/tests/pr/nN1+3l24f-bl new file mode 100644 index 000000000..38b793ac2 --- /dev/null +++ b/tests/pr/nN1+3l24f-bl @@ -0,0 +1,106 @@ + + +-- Date/Time -- x Page 3 + + + 1.15 xyzxyzxyz XYZXYZXYZ abcabcab + 2.16 456789 123456789 xyzxyzxyz XYZXYZXYZ + 3.7 12345678 + 4.8 12345678 + 5.9 3456789 ab + 6.20 DEFGHI 123 + 7.1 12345678 + 8. + 9. + 10.4 12345678 + 11.5 12345678 + 12.6 12345678 + 13.27 no truncation before FF; (r_l-test): + 14. + + +-- Date/Time -- x Page 4 + + + + + +-- Date/Time -- x Page 5 + + + 15.29 xyzxyzxyz XYZXYZXYZ abcabcab + 16.30 456789 123456789 xyzxyzxyz XYZXYZXYZ + 17.1 12345678 + 18.2 3456789 abcdefghi + 19.3 12345678 + 20.4 12345678 + 21. + 22.6 12345678 + 23.7 12345678 + 24.8 12345678 + 25.9 3456789 abcdefghi + 26.40 DEFGHI 123456789 + 27.41 yzxyzxyz XYZXYZXYZ abcabcab + 28.42 456789 123456789 abcdefghi ABCDEDFHI + + +-- Date/Time -- x Page 6 + + + + + +-- Date/Time -- x Page 7 + + + + + +-- Date/Time -- x Page 8 + + + 29.43 xyzxyzxyz XYZXYZXYZ abcabcab + 30.44 456789 123456789 xyzxyzxyz XYZXYZXYZ + 31.5 12345678 + 32.6 12345678 + 33.7 12345678 + 34.8 12345678 + 35.9 12345678 + 36.50 12345678 + 37.1 12345678 + 38. + 39. + 40. + 41.55 yzxyzxyz XYZXYZXYZ abcabcab + 42.56 456789 123456789 abcdefghi ABCDEDFHI + + +-- Date/Time -- x Page 9 + + + 43. + 44.58 456789 123456789 xyzxyzxyz XYZXYZXYZ + 45.9 12345678 + 46.60 DEFGHI 123456789 + 47.61 yzxyzxyz XYZXYZXYZ abcabcab + 48.62 456789 123456789 abcdefghi ABCDEDFHI + 49.63 xyzxyzxyz XYZXYZXYZ abcabcab + 50.64 456789 123456789 xyzxyzxyz XYZXYZXYZ + 51.5 12345678 + 52.6 12345678 + 53.7 12345678 + 54.8 12345678 + 55.9 12345678 + 56.70 456789 123456789 abcdefghi ABCDEDFHI + + +-- Date/Time -- x Page 10 + + + 57.1 12345678 + 58. + 59. + 60. + 61.74 yzxyzxyz XYZXYZXYZ abcabcab + 62.75 456789 123456789 abcdefghi ABCDEDFHI + \ No newline at end of file -- cgit v1.2.3-54-g00ecf