mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2025-09-10 07:59:52 +02:00
36ce675bb4
Here's a patch along the lines of <http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/10849/focus=10857>. 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 <jim@meyering.net>
119 lines
2.7 KiB
Plaintext
119 lines
2.7 KiB
Plaintext
|
||
|
||
-- Date/Time -- x Page 3
|
||
|
||
|
||
15.15 xyzxyzxyz XYZXYZXYZ abcabcab 29 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
16.16 456789 123456789 xyzxyzxyz XYZ 30 456789 123456789 xyzxyzxyz XYZ
|
||
17.7 1
|
||
18.8 2 3456789 abcdefghi
|
||
19.9 3456789 ab 3
|
||
20.20 DEFGHI 123 4
|
||
21.1 5
|
||
22. 6
|
||
23. 7
|
||
24.4 8
|
||
25.5 9 3456789 abcdefghi
|
||
26.6 40 DEFGHI 123456789
|
||
27.27 no truncation before FF; (r_l- 41 yzxyzxyz XYZXYZXYZ abcabcab
|
||
28. 42 456789 123456789 abcdefghi ABC
|
||
|
||
|
||
-- Date/Time -- x Page 4
|
||
|
||
|
||
29. 43 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
30. 44 456789 123456789 xyzxyzxyz XYZ
|
||
31. 5
|
||
32. 6
|
||
33. 7
|
||
34. 8
|
||
35. 9
|
||
36. 50
|
||
37. 1
|
||
38. 2
|
||
39. 3
|
||
40. 4
|
||
41. 55 yzxyzxyz XYZXYZXYZ abcabcab
|
||
42. 56 456789 123456789 abcdefghi ABC
|
||
|
||
|
||
-- Date/Time -- x Page 5
|
||
|
||
|
||
43.29 xyzxyzxyz XYZXYZXYZ abcabcab 57 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
44.30 456789 123456789 xyzxyzxyz XYZ 58 456789 123456789 xyzxyzxyz XYZ
|
||
45.1 9
|
||
46.2 3456789 abcdefghi 60 DEFGHI 123456789
|
||
47.3 1
|
||
48.4 2
|
||
49. 3 ------- EOF -------- EOF -----
|
||
50.6
|
||
51.7
|
||
52.8
|
||
53.9 3456789 abcdefghi
|
||
54.40 DEFGHI 123456789
|
||
55.41 yzxyzxyz XYZXYZXYZ abcabcab
|
||
56.42 456789 123456789 abcdefghi ABC
|
||
|
||
|
||
-- Date/Time -- x Page 6
|
||
|
||
|
||
|
||
|
||
|
||
-- Date/Time -- x Page 7
|
||
|
||
|
||
|
||
|
||
|
||
-- Date/Time -- x Page 8
|
||
|
||
|
||
57.43 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
58.44 456789 123456789 xyzxyzxyz XYZ
|
||
59.5
|
||
60.6
|
||
61.7
|
||
62.8
|
||
63.9
|
||
64.50
|
||
65.1
|
||
66.
|
||
67.
|
||
68.
|
||
69.55 yzxyzxyz XYZXYZXYZ abcabcab
|
||
70.56 456789 123456789 abcdefghi ABC
|
||
|
||
|
||
-- Date/Time -- x Page 9
|
||
|
||
|
||
71.
|
||
72.58 456789 123456789 xyzxyzxyz XYZ
|
||
73.9
|
||
74.60 DEFGHI 123456789
|
||
75.61 yzxyzxyz XYZXYZXYZ abcabcab
|
||
76.62 456789 123456789 abcdefghi ABC
|
||
77.63 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
78.64 456789 123456789 xyzxyzxyz XYZ
|
||
79.5
|
||
80.6
|
||
81.7
|
||
82.8
|
||
83.9
|
||
84.70 456789 123456789 abcdefghi AB
|
||
|
||
|
||
-- Date/Time -- x Page 10
|
||
|
||
|
||
85.1
|
||
86.
|
||
87.
|
||
88.
|
||
89.74 yzxyzxyz XYZXYZXYZ abcabcab
|
||
90.75 456789 123456789 abcdefghi ABC
|
||
|