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/o3mSnl24fbltn | 157 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 tests/pr/o3mSnl24fbltn (limited to 'tests/pr/o3mSnl24fbltn') diff --git a/tests/pr/o3mSnl24fbltn b/tests/pr/o3mSnl24fbltn new file mode 100644 index 000000000..7243641b1 --- /dev/null +++ b/tests/pr/o3mSnl24fbltn @@ -0,0 +1,157 @@ + + +-- Date/Time -- x Page 1 + + + 1.1 FF-Test: FF's in Text :--:1 Test-INPUT: "Without FF set + 2.2 Options -n; :--:2 Options -b -3 [+2|+3] [-l 1 + 3.3 numbering lines with skiped:--:3 Options -a -3 [+2|+3] [-l 1 + 4.4 numbering blanc lines (no. :--:4 Options [+2|+3] [-l 2 + 5. :--:5 + 6.6 3456789 123456789 123456789 1:--:6 --------------------------- + 7.7 3 Columns downwards ..., <=:--:7 3456789 123456789 123456789 1 + 8.8 :--:8 3 Columns downwards, across + 9.9 :--:9 With columns use <= 5 text + 10.10 zzzzzzzzzzzzzzzzzzzzzzzzzz1:--:10 without -f e.g.: -l 15 = t + 11.1 :--:1 with -f e.g. : -l 8 -f + 12. :--:2 + 13. :--:3 line truncation before new pa + 14.14 456789 123456789 123456789 1:--:14 456789 123456789 123456789 1 + + +-- Date/Time -- x Page 2 + + + 15. :--:15 xyzxyzxyz XYZXYZXYZ abcabcab + 16. :--:16 456789 123456789 xyzxyzxyz X + 17. :--:7 + 18. :--:8 + 19. :--:9 3456789 ab + 20. :--:20 DEFGHI 123 + 21. :--:1 + 22. :--:2 + 23. :--:3 + 24. :--:4 + 25. :--:5 + 26. :--:6 + 27. :--:27 no truncation before nwe pag + 28. :--:28 no trunc + + +-- Date/Time -- x Page 3 + + + 29.15 xyzxyzxyz XYZXYZXYZ abcabcab:--:29 xyzxyzxyz XYZXYZXYZ abcabcab + 30.16 456789 123456789 xyzxyzxyz X:--:30 456789 123456789 xyzxyzxyz X + 31.7 :--:1 + 32.8 :--:2 3456789 abcdefghi + 33.9 3456789 ab :--:3 + 34.20 DEFGHI 123 :--:4 + 35.1 :--:5 + 36. :--:6 + 37. :--:7 + 38.4 :--:8 + 39.5 :--:9 3456789 abcdefghi + 40.6 :--:40 DEFGHI 123456789 + 41.27 no truncation before FF; (r_:--:41 yzxyzxyz XYZXYZXYZ abcabcab + 42. :--:42 456789 123456789 abcdefghi A + + +-- Date/Time -- x Page 4 + + + 43. :--:43 xyzxyzxyz XYZXYZXYZ abcabcab + 44. :--:44 456789 123456789 xyzxyzxyz X + 45. :--:5 + 46. :--:6 + 47. :--:7 + 48. :--:8 + 49. :--:9 + 50. :--:50 + 51. :--:1 + 52. :--:2 + 53. :--:3 + 54. :--:4 + 55. :--:55 yzxyzxyz XYZXYZXYZ abcabcab + 56. :--:56 456789 123456789 abcdefghi A + + +-- Date/Time -- x Page 5 + + + 57.29 xyzxyzxyz XYZXYZXYZ abcabcab:--:57 xyzxyzxyz XYZXYZXYZ abcabcab + 58.30 456789 123456789 xyzxyzxyz X:--:58 456789 123456789 xyzxyzxyz X + 59.1 :--:9 + 60.2 3456789 abcdefghi :--:60 DEFGHI 123456789 + 61.3 :--:1 + 62.4 :--:2 + 63. :--:3 ------- EOF -------- EOF --- + 64.6 :--: + 65.7 :--: + 66.8 :--: + 67.9 3456789 abcdefghi :--: + 68.40 DEFGHI 123456789 :--: + 69.41 yzxyzxyz XYZXYZXYZ abcabcab :--: + 70.42 456789 123456789 abcdefghi A + + +-- Date/Time -- x Page 6 + + + + + +-- Date/Time -- x Page 7 + + + + + +-- Date/Time -- x Page 8 + + + 71.43 xyzxyzxyz XYZXYZXYZ abcabcab:--: + 72.44 456789 123456789 xyzxyzxyz X:--: + 73.5 :--: + 74.6 :--: + 75.7 :--: + 76.8 :--: + 77.9 :--: + 78.50 :--: + 79.1 :--: + 80. :--: + 81. :--: + 82. :--: + 83.55 yzxyzxyz XYZXYZXYZ abcabcab :--: + 84.56 456789 123456789 abcdefghi A + + +-- Date/Time -- x Page 9 + + + 85. :--: + 86.58 456789 123456789 xyzxyzxyz X:--: + 87.9 :--: + 88.60 DEFGHI 123456789 :--: + 89.61 yzxyzxyz XYZXYZXYZ abcabcab :--: + 90.62 456789 123456789 abcdefghi A:--: + 91.63 xyzxyzxyz XYZXYZXYZ abcabcab:--: + 92.64 456789 123456789 xyzxyzxyz X:--: + 93.5 :--: + 94.6 :--: + 95.7 :--: + 96.8 :--: + 97.9 :--: + 98.70 456789 123456789 abcdefghi :--: + + +-- Date/Time -- x Page 10 + + + 99.1 :--: + 100. :--: + 101. :--: + 102. :--: + 103.74 yzxyzxyz XYZXYZXYZ abcabcab :--: + 104.75 456789 123456789 abcdefghi A + \ No newline at end of file -- cgit v1.2.3-54-g00ecf