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+3l24f-bl | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 tests/pr/n+3l24f-bl (limited to 'tests/pr/n+3l24f-bl') diff --git a/tests/pr/n+3l24f-bl b/tests/pr/n+3l24f-bl new file mode 100644 index 000000000..0675c5aa9 --- /dev/null +++ b/tests/pr/n+3l24f-bl @@ -0,0 +1,106 @@ + + +-- Date/Time -- x Page 3 + + + 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. + 23. + 24.4 12345678 + 25.5 12345678 + 26.6 12345678 + 27.27 no truncation before FF; (r_l-test): + 28. + + +-- Date/Time -- x Page 4 + + + + + +-- Date/Time -- x Page 5 + + + 29.29 xyzxyzxyz XYZXYZXYZ abcabcab + 30.30 456789 123456789 xyzxyzxyz XYZXYZXYZ + 31.1 12345678 + 32.2 3456789 abcdefghi + 33.3 12345678 + 34.4 12345678 + 35. + 36.6 12345678 + 37.7 12345678 + 38.8 12345678 + 39.9 3456789 abcdefghi + 40.40 DEFGHI 123456789 + 41.41 yzxyzxyz XYZXYZXYZ abcabcab + 42.42 456789 123456789 abcdefghi ABCDEDFHI + + +-- Date/Time -- x Page 6 + + + + + +-- Date/Time -- x Page 7 + + + + + +-- Date/Time -- x Page 8 + + + 43.43 xyzxyzxyz XYZXYZXYZ abcabcab + 44.44 456789 123456789 xyzxyzxyz XYZXYZXYZ + 45.5 12345678 + 46.6 12345678 + 47.7 12345678 + 48.8 12345678 + 49.9 12345678 + 50.50 12345678 + 51.1 12345678 + 52. + 53. + 54. + 55.55 yzxyzxyz XYZXYZXYZ abcabcab + 56.56 456789 123456789 abcdefghi ABCDEDFHI + + +-- Date/Time -- x Page 9 + + + 57. + 58.58 456789 123456789 xyzxyzxyz XYZXYZXYZ + 59.9 12345678 + 60.60 DEFGHI 123456789 + 61.61 yzxyzxyz XYZXYZXYZ abcabcab + 62.62 456789 123456789 abcdefghi ABCDEDFHI + 63.63 xyzxyzxyz XYZXYZXYZ abcabcab + 64.64 456789 123456789 xyzxyzxyz XYZXYZXYZ + 65.5 12345678 + 66.6 12345678 + 67.7 12345678 + 68.8 12345678 + 69.9 12345678 + 70.70 456789 123456789 abcdefghi ABCDEDFHI + + +-- Date/Time -- x Page 10 + + + 71.1 12345678 + 72. + 73. + 74. + 75.74 yzxyzxyz XYZXYZXYZ abcabcab + 76.75 456789 123456789 abcdefghi ABCDEDFHI + \ No newline at end of file -- cgit v1.2.3-54-g00ecf