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/o3b3Snl24f-tn | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 tests/pr/o3b3Snl24f-tn (limited to 'tests/pr/o3b3Snl24f-tn') diff --git a/tests/pr/o3b3Snl24f-tn b/tests/pr/o3b3Snl24f-tn new file mode 100644 index 000000000..200b78092 --- /dev/null +++ b/tests/pr/o3b3Snl24f-tn @@ -0,0 +1,32 @@ + + +-- Date/Time -- x Page 1 + + + 1.1 Test-INPUT::--: 15.15 xyzxyzxyz XY:--: 29.29 xyzxyzxyz XY + 2.2 Options -b :--: 16.16 456789 12345:--: 30.30 456789 12345 + 3.3 Options -a :--: 17.7 :--: 31.1 + 4.4 Options :--: 18.8 :--: 32.2 3456789 abcde + 5.5 :--: 19.9 3456789 ab :--: 33.3 + 6.6 -----------:--: 20.20 DEFGHI 123 :--: 34.4 + 7.7 3456789 12345:--: 21.1 :--: 35.5 + 8.8 3 Columns d:--: 22.2 :--: 36.6 + 9.9 With column:--: 23.3 :--: 37.7 + 10.10 without -f :--: 24.4 :--: 38.8 + 11.1 with -f e.g:--: 25.5 :--: 39.9 3456789 abcde + 12.2 :--: 26.6 :--: 40.40 DEFGHI 12345 + 13.3 line truncati:--: 27.27 no truncatio:--: 41.41 yzxyzxyz XYZ + 14.14 456789 12345:--: 28.28 no trunc :--: 42.42 456789 12345 + + +-- Date/Time -- x Page 2 + + + 43.43 xyzxyzxyz XY:--: 50.50 :--: 57.57 xyzxyzxyz XY + 44.44 456789 12345:--: 51.1 :--: 58.58 456789 12345 + 45.5 :--: 52.2 :--: 59.9 + 46.6 :--: 53.3 :--: 60.60 DEFGHI 12345 + 47.7 :--: 54.4 :--: 61.1 + 48.8 :--: 55.55 yzxyzxyz XYZ:--: 62.2 + 49.9 :--: 56.56 456789 12345:--: 63.3 ------- EOF + \ No newline at end of file -- cgit v1.2.3-54-g00ecf