diff options
author | Paul Eggert <eggert@CS.UCLA.EDU> | 2007-07-03 11:36:43 -0700 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2007-07-04 12:45:10 +0200 |
commit | 36ce675bb4224a41adafd448f39020e70db14094 (patch) | |
tree | a95e48142c69019cc18183738749bfe6720e31b2 /tests/pr/ml24f-t-0F | |
parent | 519d7a95a3f8103925aa84f9bdef326ce88d37cc (diff) | |
download | coreutils-36ce675bb4224a41adafd448f39020e70db14094.tar.xz |
pr -F no longer suppresses the footer or the first two blank header lines
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>
Diffstat (limited to 'tests/pr/ml24f-t-0F')
-rw-r--r-- | tests/pr/ml24f-t-0F | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/tests/pr/ml24f-t-0F b/tests/pr/ml24f-t-0F new file mode 100644 index 000000000..bd803e2e1 --- /dev/null +++ b/tests/pr/ml24f-t-0F @@ -0,0 +1,89 @@ + + +-- Date/Time -- x Page 1 + + +1 Test-INPUT: "Without FF set by +2 Options -b -3 [+2|+3] [-l 15|8] +3 Options -a -3 [+2|+3] [-l 15|8] +4 Options [+2|+3] [-l 24|17 +5 +6 ------------------------------- +7 3456789 123456789 123456789 12345 +8 3 Columns downwards, across, .. +9 With columns use <= 5 text lin +10 without -f e.g.: -l 15 = total +1 with -f e.g. : -l 8 -f +2 +3 line truncation before new page; +14 456789 123456789 123456789 12345 + + +-- Date/Time -- x Page 2 + + +15 xyzxyzxyz XYZXYZXYZ abcabcab 1 FF-Test: FF's at Start of File +16 456789 123456789 xyzxyzxyz XYZXY 2 Options -b -3 / -a -3 / ... +7 3 ------------------------------- +8 4 3456789 123456789 123456789 12345 +9 3456789 ab 5 3 Columns downwards ..., <= 5 l +20 DEFGHI 123 6 FF-Arangements: Empty Pages at +1 7 \ftext; \f\ntext; +2 8 \f\ftext; \f\f\ntext; \f\n\ftex +3 9 3456789 123456789 123456789 +4 10 zzzzzzzzzzzzzzzzzzzzzzzzzz12345 +5 1 +6 2 +27 no truncation before nwe page; ( 3 line truncation before FF; r_r_o_ +28 no trunc 14 456789 123456789 123456789 12345 + + +-- Date/Time -- x Page 3 + + +29 xyzxyzxyz XYZXYZXYZ abcabcab +30 456789 123456789 xyzxyzxyz XYZXY +1 +2 3456789 abcdefghi +3 +4 +5 +6 +7 +8 +9 3456789 abcdefghi +40 DEFGHI 123456789 +41 yzxyzxyz XYZXYZXYZ abcabcab +42 456789 123456789 abcdefghi ABCDE + + +-- Date/Time -- x Page 4 + + +43 xyzxyzxyz XYZXYZXYZ abcabcab 15 xyzxyzxyz XYZXYZXYZ abcabcab +44 456789 123456789 xyzxyzxyz XYZXY 16 456789 123456789 xyzxyzxyz XYZXY +5 7 +6 8 +7 9 3456789 ab +8 20 DEFGHI 123 +9 1 +50 2 +1 3 +2 4 +3 5 +4 6 +55 yzxyzxyz XYZXYZXYZ abcabcab 27 no truncation before FF; (r_l-te +56 456789 123456789 abcdefghi ABCDE 28 no trunc + + +-- Date/Time -- x Page 5 + + +57 xyzxyzxyz XYZXYZXYZ abcabcab 29 xyzxyzxyz XYZXYZXYZ abcabcab +58 456789 123456789 xyzxyzxyz XYZXY 30 456789 123456789 xyzxyzxyz XYZXY +9 1 +60 DEFGHI 123456789 2 3456789 abcdefghi +1 3 +2 +3 ------- EOF -------- EOF ------- +
\ No newline at end of file |