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/ml24f-0F | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 tests/pr/ml24f-0F (limited to 'tests/pr/ml24f-0F') diff --git a/tests/pr/ml24f-0F b/tests/pr/ml24f-0F new file mode 100644 index 000000000..18b576016 --- /dev/null +++ b/tests/pr/ml24f-0F @@ -0,0 +1,61 @@ + + +-- Date/Time -- x Page 1 + + + + + +-- Date/Time -- x Page 2 + + +1 FF-Test: FF's at Start of File 1 FF-Test: FF's at Start of File +2 Options -b -3 / -a -3 / ... 2 Options -b -3 / -a -3 / ... +3 ------------------------------- 3 ------------------------------- +4 3456789 123456789 123456789 12345 4 3456789 123456789 123456789 12345 +5 3 Columns downwards ..., <= 5 l 5 3 Columns downwards ..., <= 5 l +6 FF-Arangements: Empty Pages at 6 FF-Arangements: Empty Pages at +7 \ftext; \f\ntext; 7 \ftext; \f\ntext; +8 \f\ftext; \f\f\ntext; \f\n\ftex 8 \f\ftext; \f\f\ntext; \f\n\ftex +9 3456789 123456789 123456789 9 3456789 123456789 123456789 +10 zzzzzzzzzzzzzzzzzzzzzzzzzz12345 10 zzzzzzzzzzzzzzzzzzzzzzzzzz12345 +1 1 +2 2 +3 line truncation before FF; r_r_o_ 3 line truncation before FF; r_r_o_ +14 456789 123456789 123456789 12345 14 456789 123456789 123456789 12345 + + +-- Date/Time -- x Page 3 + + + + + +-- Date/Time -- x Page 4 + + +15 xyzxyzxyz XYZXYZXYZ abcabcab 15 xyzxyzxyz XYZXYZXYZ abcabcab +16 456789 123456789 xyzxyzxyz XYZXY 16 456789 123456789 xyzxyzxyz XYZXY +7 7 +8 8 +9 3456789 ab 9 3456789 ab +20 DEFGHI 123 20 DEFGHI 123 +1 1 +2 2 +3 3 +4 4 +5 5 +6 6 +27 no truncation before FF; (r_l-te 27 no truncation before FF; (r_l-te +28 no trunc 28 no trunc + + +-- Date/Time -- x Page 5 + + +29 xyzxyzxyz XYZXYZXYZ abcabcab 29 xyzxyzxyz XYZXYZXYZ abcabcab +30 456789 123456789 xyzxyzxyz XYZXY 30 456789 123456789 xyzxyzxyz XYZXY +1 1 +2 3456789 abcdefghi 2 3456789 abcdefghi +3 3 + \ No newline at end of file -- cgit v1.2.3-54-g00ecf