mirror of
https://github.com/coreutils/coreutils.git
synced 2024-11-28 12:35:36 +08: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>
127 lines
2.9 KiB
Plaintext
127 lines
2.9 KiB
Plaintext
|
||
|
||
-- Date/Time -- x Page 3
|
||
|
||
|
||
|
||
|
||
|
||
-- Date/Time -- x Page 4
|
||
|
||
|
||
15.15 xyzxyzxyz XYZXYZXYZ abcabcab 15 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
16.16 456789 123456789 xyzxyzxyz XYZ 16 456789 123456789 xyzxyzxyz XYZ
|
||
17.7 7
|
||
18.8 8
|
||
19.9 3456789 ab 9 3456789 ab
|
||
20.20 DEFGHI 123 20 DEFGHI 123
|
||
21.1 1
|
||
22. 2
|
||
23. 3
|
||
24.4 4
|
||
|
||
|
||
-- Date/Time -- x Page 5
|
||
|
||
|
||
25.5 5
|
||
26.6 6
|
||
27.27 no truncation before FF; (r_l- 27 no truncation before FF; (r_l-
|
||
28. 28 no trunc
|
||
|
||
|
||
-- Date/Time -- x Page 6
|
||
|
||
|
||
|
||
|
||
|
||
-- Date/Time -- x Page 7
|
||
|
||
|
||
29.29 xyzxyzxyz XYZXYZXYZ abcabcab 29 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
30.30 456789 123456789 xyzxyzxyz XYZ 30 456789 123456789 xyzxyzxyz XYZ
|
||
31.1 1
|
||
32.2 3456789 abcdefghi 2 3456789 abcdefghi
|
||
33.3 3
|
||
34.4 4
|
||
35. 5
|
||
36.6 6
|
||
37.7 7
|
||
38.8 8
|
||
|
||
|
||
-- Date/Time -- x Page 8
|
||
|
||
|
||
39.9 3456789 abcdefghi 9 3456789 abcdefghi
|
||
40.40 DEFGHI 123456789 40 DEFGHI 123456789
|
||
41.41 yzxyzxyz XYZXYZXYZ abcabcab 41 yzxyzxyz XYZXYZXYZ abcabcab
|
||
42.42 456789 123456789 abcdefghi ABC 42 456789 123456789 abcdefghi ABC
|
||
|
||
|
||
-- Date/Time -- x Page 9
|
||
|
||
|
||
|
||
|
||
|
||
-- Date/Time -- x Page 10
|
||
|
||
|
||
|
||
|
||
|
||
-- Date/Time -- x Page 11
|
||
|
||
|
||
43.43 xyzxyzxyz XYZXYZXYZ abcabcab 43 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
44.44 456789 123456789 xyzxyzxyz XYZ 44 456789 123456789 xyzxyzxyz XYZ
|
||
45.5 5
|
||
46.6 6
|
||
47.7 7
|
||
48.8 8
|
||
49.9 9
|
||
50.50 50
|
||
51.1 1
|
||
52. 2
|
||
|
||
|
||
-- Date/Time -- x Page 12
|
||
|
||
|
||
53. 3
|
||
54. 4
|
||
55.55 yzxyzxyz XYZXYZXYZ abcabcab 55 yzxyzxyz XYZXYZXYZ abcabcab
|
||
56.56 456789 123456789 abcdefghi ABC 56 456789 123456789 abcdefghi ABC
|
||
|
||
|
||
-- Date/Time -- x Page 13
|
||
|
||
|
||
57. 57 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
58.58 456789 123456789 xyzxyzxyz XYZ 58 456789 123456789 xyzxyzxyz XYZ
|
||
59.9 9
|
||
60.60 DEFGHI 123456789 60 DEFGHI 123456789
|
||
61.61 yzxyzxyz XYZXYZXYZ abcabcab
|
||
62.62 456789 123456789 abcdefghi ABC
|
||
63.63 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
64.64 456789 123456789 xyzxyzxyz XYZ
|
||
65.5
|
||
66.6
|
||
|
||
|
||
-- Date/Time -- x Page 14
|
||
|
||
|
||
67.7
|
||
68.8
|
||
69.9
|
||
70.70 456789 123456789 abcdefghi AB
|
||
71.1
|
||
72.
|
||
73.
|
||
74.
|
||
75.74 yzxyzxyz XYZXYZXYZ abcabcab
|
||
76.75 456789 123456789 abcdefghi ABC
|
||
|