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/nJml24f-lmlolm | 136 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 tests/pr/nJml24f-lmlolm (limited to 'tests/pr/nJml24f-lmlolm') diff --git a/tests/pr/nJml24f-lmlolm b/tests/pr/nJml24f-lmlolm new file mode 100644 index 000000000..84dd27c19 --- /dev/null +++ b/tests/pr/nJml24f-lmlolm @@ -0,0 +1,136 @@ + + +-- Date/Time -- x Page 1 + + + 1.1<<< -Test: FF's in Text >>> 1::: Test-INPUT: "Without FF set by Hand" ::: 1<<< -Test: FF's in Text >>> + 2.2<<< -b -3 / -a -3 / ... >>> 2::: Options -b -3 [+2|+3] [-l 15|8] [-f] ::: 2<<< -b -3 / -a -3 / ... >>> + 3.3<<< >>> 3::: Options -a -3 [+2|+3] [-l 15|8] [-f] ::: 3<<< >>> + 4.4<<< 123456789 123456789 123456789 12345678 >>> 4::: Options [+2|+3] [-l 24|17] [-f] ::: 4<<< 123456789 123456789 123456789 12345678 >>> + 5. 5::: ::: + 6.6<<< -Arangements: One Empty Page >>> 6::: -------------------------------------------- ::: 6<<< -Arangements: One Empty Page >>> + 7.7<<< \f\f\n; text\f\n\ftext; \f\ftext; >>> 7::: 789 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: 7<<< \f\f\n; text\f\n\ftext; \f\ftext; >>> + 8.8<<< f\f\n; \f\n\f\n; >>> 8::: 3 Columns downwards, across, ...: ::: 8<<< f\f\n; \f\n\f\n; >>> + 9.9<<< >>> 9::: With columns use <= 5 text lines/page, ::: 9<<< >>> + 10.10<<< >>> 10::: without -f e.g.: -l 15 = total lines/page, ::: 10<<< >>> + 11.1<<< >>> 1::: with -f e.g. : -l 8 -f ::: 1<<< >>> + 12.2<<< >>> 2::: ::: 2<<< >>> + 13.3<<< truncation before FF; r_r_o_l-test: >>> 3::: line truncation before new page; r_r_o_l-test: ::: 3<<< truncation before FF; r_r_o_l-test: >>> + 14.14<<< 123456789 123456789 123456789 >>> 14::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: 14<<< 123456789 123456789 123456789 >>> + + +-- Date/Time -- x Page 2 + + + 15. 15::: xyzxyzxyz XYZXYZXYZ abcabcab ::: + 16. 16::: 456789 123456789 xyzxyzxyz XYZXYZXYZ ::: + 17. 7::: 12345678 ::: + 18. 8::: 12345678 ::: + 19. 9::: 3456789 ab ::: + 20. 20::: DEFGHI 123 ::: + 21. 21::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + 22. 2::: 12345678 ::: + 23. 3::: 12345678 ::: + 24. 4::: 12345678 ::: + 25. 5::: 12345678 ::: + 26. 6::: 12345678 ::: + 27. 27::: no truncation before nwe page; (r_l-test): ::: + 28. 28::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + + +-- Date/Time -- x Page 3 + + + 29.15<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> 29::: xyzxyzxyz XYZXYZXYZ abcabcab ::: 15<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> + 30.16<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> 30::: 456789 123456789 xyzxyzxyz XYZXYZXYZ ::: 16<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> + 31.7<<< >>> 1::: 12345678 ::: 7<<< >>> + 32.8<<< >>> 2::: 3456789 abcdefghi ::: 8<<< >>> + 33.9<<< >>> 3::: 12345678 ::: 9<<< >>> + 34.20<<< >>> 4::: 12345678 ::: 20<<< >>> + 35.1<<< >>> 35::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: 1<<< >>> + 36. 6::: 12345678 ::: + 37. 7::: 12345678 ::: + 38.4<<< >>> 8::: 12345678 ::: 4<<< >>> + 39.5<<< >>> 9::: 3456789 abcdefghi ::: 5<<< >>> + 40.6<<< >>> 40::: DEFGHI 123456789 ::: 6<<< >>> + 41.27<<< truncation before FF; (r_l-test): >>> 41::: yzxyzxyz XYZXYZXYZ abcabcab ::: 27<<< truncation before FF; (r_l-test): >>> + 42.28<<< trunc 42::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: 28<<< trunc + + +-- Date/Time -- x Page 4 + + + 43. 43::: xyzxyzxyz XYZXYZXYZ abcabcab ::: + 44. 44::: 456789 123456789 xyzxyzxyz XYZXYZXYZ ::: + 45. 5::: 12345678 ::: + 46. 6::: 12345678 ::: + 47. 7::: 12345678 ::: + 48. 8::: 12345678 ::: + 49. 49::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + 50. 50::: 12345678 ::: + 51. 1::: 12345678 ::: + 52. 2::: 12345678 ::: + 53. 3::: 12345678 ::: + 54. 4::: 12345678 ::: + 55. 55::: yzxyzxyz XYZXYZXYZ abcabcab ::: + 56. 56::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + + +-- Date/Time -- x Page 5 + + + 57.29<<>> 57::: xyzxyzxyz XYZXYZXYZ abcabcab ::: 29<<>> + 58.30<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> 58::: 456789 123456789 xyzxyzxyz XYZXYZXYZ ::: 30<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> + 59.1<<< >>> 9::: 12345678 ::: 1<<< >>> + 60.2<<< abcdefghi >>> 60::: DEFGHI 123456789 ::: 2<<< abcdefghi >>> + 61.3<<< >>> 1::: ::: 3<<< >>> + 62.4<<< >>> 2::: ::: 4<<< >>> + 63.5<<< >>> 3::: ------- EOF -------- EOF -------- EOF ------- EOF ------- EOF ------- EOF ::: 5<<< >>> + 64.6<<< >>> 6<<< >>> + 65.7<<< >>> 7<<< >>> + 66.8<<< >>> 8<<< >>> + 67.9<<< abcdefghi >>> 9<<< abcdefghi >>> + 68.40<<< 123456789 >>> 40<<< 123456789 >>> + 69.41<<< XYZXYZXYZ abcabcab >>> 41<<< XYZXYZXYZ abcabcab >>> + 70.42<<< 123456789 abcdefghi ABCDEDFHI >>> 42<<< 123456789 abcdefghi ABCDEDFHI >>> + + +-- Date/Time -- x Page 6 + + + + + +-- Date/Time -- x Page 7 + + + + + +-- Date/Time -- x Page 8 + + + 71.43<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> 43<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> + 72.44<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> 44<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> + 73.5<<< >>> 5<<< >>> + 74.6<<< >>> 6<<< >>> + 75.7<<< >>> 7<<< >>> + 76.8<<< >>> 8<<< >>> + 77.9<<< >>> 9<<< >>> + 78.50<<< >>> 50<<< >>> + 79.1<<< >>> 1<<< >>> + 80.2<<< >>> 2<<< >>> + 81.3<<< >>> 3<<< >>> + 82.4<<< >>> 4<<< >>> + 83.55<<< XYZXYZXYZ abcabcab >>> 55<<< XYZXYZXYZ abcabcab >>> + 84.56<<< 123456789 abcdefghi ABCDEDFHI >>> 56<<< 123456789 abcdefghi ABCDEDFHI >>> + + +-- Date/Time -- x Page 9 + + + 85.57<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> 57<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> + 86.58<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> 58<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> + 87.9<<< >>> 9<<< >>> + 88.60<<< 123456789 >>> 60<<< 123456789 >>> + \ No newline at end of file -- cgit v1.2.3-54-g00ecf