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/b3f-FF | |
| 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/b3f-FF')
| -rw-r--r-- | tests/pr/b3f-FF | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/tests/pr/b3f-FF b/tests/pr/b3f-FF index 70629f2a7..b2afdb0ad 100644 --- a/tests/pr/b3f-FF +++ b/tests/pr/b3f-FF @@ -1,3 +1,5 @@ + + -- Date/Time -- x Page 1 @@ -6,11 +8,15 @@ 3 ------------------- 8 \f\f\n; \f\n\f\n; 3 line truncation befor 4 3456789 123456789 123 9 14 456789 123456789 123 5 3 Columns downwards 10 zzzzzzzzzzzzzzzzzzz - -- Date/Time -- x Page 2 + + +-- Date/Time -- x Page 2 - -- Date/Time -- x Page 3 + + +-- Date/Time -- x Page 3 15 xyzxyzxyz XYZXYZXYZ 20 DEFGHI 123 5 @@ -18,11 +24,15 @@ 7 2 27 no truncation before 8 3 28 no trunc 9 3456789 ab 4 - -- Date/Time -- x Page 4 + + +-- Date/Time -- x Page 4 - -- Date/Time -- x Page 5 + + +-- Date/Time -- x Page 5 29 xyzxyzxyz XYZXYZXYZ 4 9 3456789 abcdefghi @@ -30,15 +40,21 @@ 1 6 41 yzxyzxyz XYZXYZXYZ a 2 3456789 abcdefghi 7 42 456789 123456789 abc 3 8 - -- Date/Time -- x Page 6 + + +-- Date/Time -- x Page 6 + + - -- Date/Time -- x Page 7 +-- Date/Time -- x Page 7 - -- Date/Time -- x Page 8 + + +-- Date/Time -- x Page 8 43 xyzxyzxyz XYZXYZXYZ 8 3 @@ -46,7 +62,9 @@ 5 50 55 yzxyzxyz XYZXYZXYZ a 6 1 56 456789 123456789 abc 7 2 - -- Date/Time -- x Page 9 + + +-- Date/Time -- x Page 9 57 xyzxyzxyz XYZXYZXYZ 9 60 DEFGHI 123456789 |