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/W35ml24f-lm-lo | 136 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 tests/pr/W35ml24f-lm-lo (limited to 'tests/pr/W35ml24f-lm-lo') diff --git a/tests/pr/W35ml24f-lm-lo b/tests/pr/W35ml24f-lm-lo new file mode 100644 index 000000000..8b4e7017d --- /dev/null +++ b/tests/pr/W35ml24f-lm-lo @@ -0,0 +1,136 @@ + + +-- Date/Time -- x Page 1 + + +1<<< -Test: FF's 1::: Test-INPUT: +2<<< -b -3 / -a 2::: Options -b +3<<< >>> 3::: Options -a +4<<< 123456789 1 4::: Options + 5::: ::: +6<<< -Arangement 6::: ----------- +7<<< \f\f\n; tex 7::: 789 1234567 +8<<< f\f\n; \f\n 8::: 3 Columns d +9<<< >>> 9::: With column +10<<< >>> 10::: without -f +1<<< >>> 1::: with -f e.g +2<<< >>> 2::: ::: +3<<< truncation 3::: line trunca +14<<< 123456789 14::: 89 1234567 + + +-- Date/Time -- x Page 2 + + + 15::: xyzxyzxyz + 16::: 456789 123 + 7::: 12345678 : + 8::: 12345678 : + 9::: 3456789 ab + 20::: DEFGHI 123 + 21::: 89 1234567 + 2::: 12345678 : + 3::: 12345678 : + 4::: 12345678 : + 5::: 12345678 : + 6::: 12345678 : + 27::: no truncat + 28::: 89 1234567 + + +-- Date/Time -- x Page 3 + + +15<<< xyzxyzxyz 29::: xyzxyzxyz +16<<< 123456789 30::: 456789 123 +7<<< >>> 1::: 12345678 : +8<<< >>> 2::: 3456789 abc +9<<< >>> 3::: 12345678 : +20<<< >>> 4::: 12345678 : +1<<< >>> 35::: 89 1234567 + 6::: 12345678 : + 7::: 12345678 : +4<<< >>> 8::: 12345678 : +5<<< >>> 9::: 3456789 abc +6<<< >>> 40::: DEFGHI 123 +27<<< truncation 41::: yzxyzxyz X +28<<< trunc 42::: 89 1234567 + + +-- Date/Time -- x Page 4 + + + 43::: xyzxyzxyz + 44::: 456789 123 + 5::: 12345678 : + 6::: 12345678 : + 7::: 12345678 : + 8::: 12345678 : + 49::: 89 1234567 + 50::: 12345678 + 1::: 12345678 : + 2::: 12345678 : + 3::: 12345678 : + 4::: 12345678 : + 55::: yzxyzxyz X + 56::: 89 1234567 + + +-- Date/Time -- x Page 5 + + +29<<>> 9::: 12345678 : +2<<< abcdefghi 60::: DEFGHI 123 +3<<< >>> 1::: ::: +4<<< >>> 2::: ::: +5<<< >>> 3::: ------- EOF +6<<< >>> +7<<< >>> +8<<< >>> +9<<< abcdefghi +40<<< 123456789 +41<<< XYZXYZXYZ +42<<< 123456789 + + +-- Date/Time -- x Page 6 + + + + + +-- Date/Time -- x Page 7 + + + + + +-- Date/Time -- x Page 8 + + +43<<< xyzxyzxyz +44<<< 123456789 +5<<< >>> +6<<< >>> +7<<< >>> +8<<< >>> +9<<< >>> +50<<< >>> +1<<< >>> +2<<< >>> +3<<< >>> +4<<< >>> +55<<< XYZXYZXYZ +56<<< 123456789 + + +-- Date/Time -- x Page 9 + + +57<<< xyzxyzxyz +58<<< 123456789 +9<<< >>> +60<<< 123456789 + \ No newline at end of file -- cgit v1.2.3-70-g09d2