mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-04-20 10:51:48 +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>
32 lines
1.3 KiB
Plaintext
32 lines
1.3 KiB
Plaintext
|
||
|
||
-- Date/Time -- x Page 1
|
||
|
||
|
||
1.1 Test-INPUT::--: 2.2 Options -b :--: 3.3 Options -a
|
||
4.4 Options :--: 5.5 :--: 6.6 -----------
|
||
7.7 3456789 12345:--: 8.8 3 Columns d:--: 9.9 With column
|
||
10.10 without -f :--: 11.1 with -f e.g:--: 12.2
|
||
13.3 line truncati:--: 14.14 456789 12345:--: 15.15 xyzxyzxyz XY
|
||
16.16 456789 12345:--: 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 truncatio
|
||
28.28 no trunc :--: 29.29 xyzxyzxyz XY:--: 30.30 456789 12345
|
||
31.1 :--: 32.2 3456789 abcde:--: 33.3
|
||
34.4 :--: 35.5 :--: 36.6
|
||
37.7 :--: 38.8 :--: 39.9 3456789 abcde
|
||
40.40 DEFGHI 12345:--: 41.41 yzxyzxyz XYZ:--: 42.42 456789 12345
|
||
|
||
|
||
-- Date/Time -- x Page 2
|
||
|
||
|
||
43.43 xyzxyzxyz XY:--: 44.44 456789 12345:--: 45.5
|
||
46.6 :--: 47.7 :--: 48.8
|
||
49.9 :--: 50.50 :--: 51.1
|
||
52.2 :--: 53.3 :--: 54.4
|
||
55.55 yzxyzxyz XYZ:--: 56.56 456789 12345:--: 57.57 xyzxyzxyz XY
|
||
58.58 456789 12345:--: 59.9 :--: 60.60 DEFGHI 12345
|
||
61.1 :--: 62.2 :--: 63.3 ------- EOF
|
||
|