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>
157 lines
4.2 KiB
Plaintext
157 lines
4.2 KiB
Plaintext
|
||
|
||
-- Date/Time -- x Page 1
|
||
|
||
|
||
1 FF-Test: FF's in Text :--:1 Test-INPUT: "Without FF set by
|
||
2 Options -n; :--:2 Options -b -3 [+2|+3] [-l 15|8
|
||
3 numbering lines with skiped pa:--:3 Options -a -3 [+2|+3] [-l 15|8
|
||
4 numbering blanc lines (no. 5,1:--:4 Options [+2|+3] [-l 24|1
|
||
:--:5
|
||
6 3456789 123456789 123456789 1234:--:6 ------------------------------
|
||
7 3 Columns downwards ..., <= 5 :--:7 3456789 123456789 123456789 1234
|
||
8 :--:8 3 Columns downwards, across, .
|
||
9 :--:9 With columns use <= 5 text li
|
||
10 zzzzzzzzzzzzzzzzzzzzzzzzzz1234:--:10 without -f e.g.: -l 15 = tota
|
||
1 :--:1 with -f e.g. : -l 8 -f
|
||
:--:2
|
||
:--:3 line truncation before new page;
|
||
14 456789 123456789 123456789 1234:--:14 456789 123456789 123456789 1234
|
||
|
||
|
||
-- Date/Time -- x Page 2
|
||
|
||
|
||
:--:15 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
:--:16 456789 123456789 xyzxyzxyz XYZX
|
||
:--:7
|
||
:--:8
|
||
:--:9 3456789 ab
|
||
:--:20 DEFGHI 123
|
||
:--:1
|
||
:--:2
|
||
:--:3
|
||
:--:4
|
||
:--:5
|
||
:--:6
|
||
:--:27 no truncation before nwe page;
|
||
:--:28 no trunc
|
||
|
||
|
||
-- Date/Time -- x Page 3
|
||
|
||
|
||
15 xyzxyzxyz XYZXYZXYZ abcabcab :--:29 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
16 456789 123456789 xyzxyzxyz XYZX:--:30 456789 123456789 xyzxyzxyz XYZX
|
||
7 :--:1
|
||
8 :--:2 3456789 abcdefghi
|
||
9 3456789 ab :--:3
|
||
20 DEFGHI 123 :--:4
|
||
1 :--:5
|
||
:--:6
|
||
:--:7
|
||
4 :--:8
|
||
5 :--:9 3456789 abcdefghi
|
||
6 :--:40 DEFGHI 123456789
|
||
27 no truncation before FF; (r_l-t:--:41 yzxyzxyz XYZXYZXYZ abcabcab
|
||
:--:42 456789 123456789 abcdefghi ABCD
|
||
|
||
|
||
-- Date/Time -- x Page 4
|
||
|
||
|
||
:--:43 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
:--:44 456789 123456789 xyzxyzxyz XYZX
|
||
:--:5
|
||
:--:6
|
||
:--:7
|
||
:--:8
|
||
:--:9
|
||
:--:50
|
||
:--:1
|
||
:--:2
|
||
:--:3
|
||
:--:4
|
||
:--:55 yzxyzxyz XYZXYZXYZ abcabcab
|
||
:--:56 456789 123456789 abcdefghi ABCD
|
||
|
||
|
||
-- Date/Time -- x Page 5
|
||
|
||
|
||
29 xyzxyzxyz XYZXYZXYZ abcabcab :--:57 xyzxyzxyz XYZXYZXYZ abcabcab
|
||
30 456789 123456789 xyzxyzxyz XYZX:--:58 456789 123456789 xyzxyzxyz XYZX
|
||
1 :--:9
|
||
2 3456789 abcdefghi :--:60 DEFGHI 123456789
|
||
3 :--:1
|
||
4 :--:2
|
||
:--:3 ------- EOF -------- EOF ------
|
||
6 :--:
|
||
7 :--:
|
||
8 :--:
|
||
9 3456789 abcdefghi :--:
|
||
40 DEFGHI 123456789 :--:
|
||
41 yzxyzxyz XYZXYZXYZ abcabcab :--:
|
||
42 456789 123456789 abcdefghi ABCD
|
||
|
||
|
||
-- Date/Time -- x Page 6
|
||
|
||
|
||
|
||
|
||
|
||
-- Date/Time -- x Page 7
|
||
|
||
|
||
|
||
|
||
|
||
-- Date/Time -- x Page 8
|
||
|
||
|
||
43 xyzxyzxyz XYZXYZXYZ abcabcab :--:
|
||
44 456789 123456789 xyzxyzxyz XYZX:--:
|
||
5 :--:
|
||
6 :--:
|
||
7 :--:
|
||
8 :--:
|
||
9 :--:
|
||
50 :--:
|
||
1 :--:
|
||
:--:
|
||
:--:
|
||
:--:
|
||
55 yzxyzxyz XYZXYZXYZ abcabcab :--:
|
||
56 456789 123456789 abcdefghi ABCD
|
||
|
||
|
||
-- Date/Time -- x Page 9
|
||
|
||
|
||
:--:
|
||
58 456789 123456789 xyzxyzxyz XYZX:--:
|
||
9 :--:
|
||
60 DEFGHI 123456789 :--:
|
||
61 yzxyzxyz XYZXYZXYZ abcabcab :--:
|
||
62 456789 123456789 abcdefghi ABCD:--:
|
||
63 xyzxyzxyz XYZXYZXYZ abcabcab :--:
|
||
64 456789 123456789 xyzxyzxyz XYZX:--:
|
||
5 :--:
|
||
6 :--:
|
||
7 :--:
|
||
8 :--:
|
||
9 :--:
|
||
70 456789 123456789 abcdefghi ABC:--:
|
||
|
||
|
||
-- Date/Time -- x Page 10
|
||
|
||
|
||
1 :--:
|
||
:--:
|
||
:--:
|
||
:--:
|
||
74 yzxyzxyz XYZXYZXYZ abcabcab :--:
|
||
75 456789 123456789 abcdefghi ABCD
|
||
|