mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-04-20 18:56:39 +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.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
|
||
|
||
-- Date/Time -- x Page 1
|
||
|
||
|
||
1 Test-INPUT: "With:--:2 Options -b -3 [+2:--:3 Options -a -3 [+2
|
||
4 Options [+2:--:5 :--:6 -----------------
|
||
7 3456789 123456789 1:--:8 3 Columns downwar:--:9 With columns use
|
||
10 without -f e.g.: :--:1 with -f e.g. : :--:2
|
||
3 line truncation bef:--:14 456789 123456789 1:--:15 xyzxyzxyz XYZXYZXY
|
||
16 456789 123456789 x:--:7 :--:8
|
||
9 3456789 ab :--:20 DEFGHI 123 :--:1
|
||
2 :--:3 :--:4
|
||
5 :--:6 :--:27 no truncation befo
|
||
28 no trunc :--:29 xyzxyzxyz XYZXYZXY:--:30 456789 123456789 x
|
||
1 :--:2 3456789 abcdefghi :--:3
|
||
4 :--:5 :--:6
|
||
7 :--:8 :--:9 3456789 abcdefghi
|
||
40 DEFGHI 123456789 :--:41 yzxyzxyz XYZXYZXYZ:--:42 456789 123456789 a
|
||
|
||
|
||
-- Date/Time -- x Page 2
|
||
|
||
|
||
43 xyzxyzxyz XYZXYZXY:--:44 456789 123456789 x:--:5
|
||
6 :--:7 :--:8
|
||
9 :--:50 :--:1
|
||
2 :--:3 :--:4
|
||
55 yzxyzxyz XYZXYZXYZ:--:56 456789 123456789 a:--:57 xyzxyzxyz XYZXYZXY
|
||
58 456789 123456789 x:--:9 :--:60 DEFGHI 123456789
|
||
1 :--:2 :--:3 ------- EOF ------
|
||
|