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/a3l24f-lm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 tests/pr/a3l24f-lm (limited to 'tests/pr/a3l24f-lm') diff --git a/tests/pr/a3l24f-lm b/tests/pr/a3l24f-lm new file mode 100644 index 000000000..0fdbfa38e --- /dev/null +++ b/tests/pr/a3l24f-lm @@ -0,0 +1,72 @@ + + +-- Date/Time -- x Page 1 + + +1<<< -Test: FF's in Te 2<<< -b -3 / -a -3 / . 3<<< >>> +4<<< 123456789 1234567 6<<< -Arangements: One +7<<< \f\f\n; text\f\n\ 8<<< f\f\n; \f\n\f\n; 9<<< >>> +10<<< >>> 1<<< >>> 2<<< >>> +3<<< truncation before 14<<< 123456789 123456 + + +-- Date/Time -- x Page 2 + + + + + +-- Date/Time -- x Page 3 + + +15<<< xyzxyzxyz XYZXYZ 16<<< 123456789 xyzxyz 7<<< >>> +8<<< >>> 9<<< >>> 20<<< >>> +1<<< >>> +4<<< >>> 5<<< >>> 6<<< >>> +27<<< truncation befor 28<<< trunc + + +-- Date/Time -- x Page 4 + + + + + +-- Date/Time -- x Page 5 + + +29<<>> +2<<< abcdefghi >>> 3<<< >>> 4<<< >>> +5<<< >>> 6<<< >>> 7<<< >>> +8<<< >>> 9<<< abcdefghi >>> 40<<< 123456789 >>> +41<<< XYZXYZXYZ abcabc 42<<< 123456789 abcdef + + +-- Date/Time -- x Page 6 + + + + + +-- Date/Time -- x Page 7 + + + + + +-- Date/Time -- x Page 8 + + +43<<< xyzxyzxyz XYZXYZ 44<<< 123456789 xyzxyz 5<<< >>> +6<<< >>> 7<<< >>> 8<<< >>> +9<<< >>> 50<<< >>> 1<<< >>> +2<<< >>> 3<<< >>> 4<<< >>> +55<<< XYZXYZXYZ abcabc 56<<< 123456789 abcdef + + +-- Date/Time -- x Page 9 + + +57<<< xyzxyzxyz XYZXYZ 58<<< 123456789 xyzxyz 9<<< >>> +60<<< 123456789 >>> + \ No newline at end of file -- cgit v1.2.3-54-g00ecf