mirror of
https://github.com/coreutils/coreutils.git
synced 2024-11-30 13:33:59 +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>
51 lines
1.4 KiB
Plaintext
51 lines
1.4 KiB
Plaintext
|
||
|
||
-- Date/Time -- x Page 3
|
||
|
||
|
||
29 xyzxyzxyz XYZXYZXYZ abcabcab 29 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
30 456789 123456789 xyzxyzxyz XYZXY 30 456789 123456789 xyzxyzxyz XYZXY
|
||
1 1
|
||
2 3456789 abcdefghi 2 3456789 abcdefghi
|
||
3 3
|
||
4 4
|
||
5 5
|
||
6 6
|
||
7 7
|
||
8 8
|
||
9 3456789 abcdefghi 9 3456789 abcdefghi
|
||
40 DEFGHI 123456789 40 DEFGHI 123456789
|
||
41 yzxyzxyz XYZXYZXYZ abcabcab 41 yzxyzxyz XYZXYZXYZ abcabcab
|
||
42 456789 123456789 abcdefghi ABCDE 42 456789 123456789 abcdefghi ABCDE
|
||
|
||
|
||
-- Date/Time -- x Page 4
|
||
|
||
|
||
43 xyzxyzxyz XYZXYZXYZ abcabcab 43 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
44 456789 123456789 xyzxyzxyz XYZXY 44 456789 123456789 xyzxyzxyz XYZXY
|
||
5 5
|
||
6 6
|
||
7 7
|
||
8 8
|
||
9 9
|
||
50 50
|
||
1 1
|
||
2 2
|
||
3 3
|
||
4 4
|
||
55 yzxyzxyz XYZXYZXYZ abcabcab 55 yzxyzxyz XYZXYZXYZ abcabcab
|
||
56 456789 123456789 abcdefghi ABCDE 56 456789 123456789 abcdefghi ABCDE
|
||
|
||
|
||
-- Date/Time -- x Page 5
|
||
|
||
|
||
57 xyzxyzxyz XYZXYZXYZ abcabcab 57 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
58 456789 123456789 xyzxyzxyz XYZXY 58 456789 123456789 xyzxyzxyz XYZXY
|
||
9 9
|
||
60 DEFGHI 123456789 60 DEFGHI 123456789
|
||
1 1
|
||
2 2
|
||
3 ------- EOF -------- EOF ------- 3 ------- EOF -------- EOF -------
|
||
|