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/o3Jml24f-lm-lo | |
| 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/o3Jml24f-lm-lo')
| -rw-r--r-- | tests/pr/o3Jml24f-lm-lo | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/tests/pr/o3Jml24f-lm-lo b/tests/pr/o3Jml24f-lm-lo new file mode 100644 index 000000000..a14183566 --- /dev/null +++ b/tests/pr/o3Jml24f-lm-lo @@ -0,0 +1,136 @@ + + +-- Date/Time -- x Page 1 + + + 1<<< -Test: FF's in Text >>> 1::: Test-INPUT: "Without FF set by Hand" ::: + 2<<< -b -3 / -a -3 / ... >>> 2::: Options -b -3 [+2|+3] [-l 15|8] [-f] ::: + 3<<< >>> 3::: Options -a -3 [+2|+3] [-l 15|8] [-f] ::: + 4<<< 123456789 123456789 123456789 12345678 >>> 4::: Options [+2|+3] [-l 24|17] [-f] ::: + 5::: ::: + 6<<< -Arangements: One Empty Page >>> 6::: -------------------------------------------- ::: + 7<<< \f\f\n; text\f\n\ftext; \f\ftext; >>> 7::: 789 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + 8<<< f\f\n; \f\n\f\n; >>> 8::: 3 Columns downwards, across, ...: ::: + 9<<< >>> 9::: With columns use <= 5 text lines/page, ::: + 10<<< >>> 10::: without -f e.g.: -l 15 = total lines/page, ::: + 1<<< >>> 1::: with -f e.g. : -l 8 -f ::: + 2<<< >>> 2::: ::: + 3<<< truncation before FF; r_r_o_l-test: >>> 3::: line truncation before new page; r_r_o_l-test: ::: + 14<<< 123456789 123456789 123456789 >>> 14::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + + +-- Date/Time -- x Page 2 + + + 15::: xyzxyzxyz XYZXYZXYZ abcabcab ::: + 16::: 456789 123456789 xyzxyzxyz XYZXYZXYZ ::: + 7::: 12345678 ::: + 8::: 12345678 ::: + 9::: 3456789 ab ::: + 20::: DEFGHI 123 ::: + 21::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + 2::: 12345678 ::: + 3::: 12345678 ::: + 4::: 12345678 ::: + 5::: 12345678 ::: + 6::: 12345678 ::: + 27::: no truncation before nwe page; (r_l-test): ::: + 28::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + + +-- Date/Time -- x Page 3 + + + 15<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> 29::: xyzxyzxyz XYZXYZXYZ abcabcab ::: + 16<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> 30::: 456789 123456789 xyzxyzxyz XYZXYZXYZ ::: + 7<<< >>> 1::: 12345678 ::: + 8<<< >>> 2::: 3456789 abcdefghi ::: + 9<<< >>> 3::: 12345678 ::: + 20<<< >>> 4::: 12345678 ::: + 1<<< >>> 35::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + 6::: 12345678 ::: + 7::: 12345678 ::: + 4<<< >>> 8::: 12345678 ::: + 5<<< >>> 9::: 3456789 abcdefghi ::: + 6<<< >>> 40::: DEFGHI 123456789 ::: + 27<<< truncation before FF; (r_l-test): >>> 41::: yzxyzxyz XYZXYZXYZ abcabcab ::: + 28<<< trunc 42::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + + +-- Date/Time -- x Page 4 + + + 43::: xyzxyzxyz XYZXYZXYZ abcabcab ::: + 44::: 456789 123456789 xyzxyzxyz XYZXYZXYZ ::: + 5::: 12345678 ::: + 6::: 12345678 ::: + 7::: 12345678 ::: + 8::: 12345678 ::: + 49::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + 50::: 12345678 ::: + 1::: 12345678 ::: + 2::: 12345678 ::: + 3::: 12345678 ::: + 4::: 12345678 ::: + 55::: yzxyzxyz XYZXYZXYZ abcabcab ::: + 56::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 ::: + + +-- Date/Time -- x Page 5 + + + 29<<<xyzxyzxyz XYZXYZXYZ abcabcab >>> 57::: xyzxyzxyz XYZXYZXYZ abcabcab ::: + 30<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> 58::: 456789 123456789 xyzxyzxyz XYZXYZXYZ ::: + 1<<< >>> 9::: 12345678 ::: + 2<<< abcdefghi >>> 60::: DEFGHI 123456789 ::: + 3<<< >>> 1::: ::: + 4<<< >>> 2::: ::: + 5<<< >>> 3::: ------- EOF -------- EOF -------- EOF ------- EOF ------- EOF ------- EOF ::: + 6<<< >>> + 7<<< >>> + 8<<< >>> + 9<<< abcdefghi >>> + 40<<< 123456789 >>> + 41<<< XYZXYZXYZ abcabcab >>> + 42<<< 123456789 abcdefghi ABCDEDFHI >>> + + +-- Date/Time -- x Page 6 + + + + + +-- Date/Time -- x Page 7 + + + + + +-- Date/Time -- x Page 8 + + + 43<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> + 44<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> + 5<<< >>> + 6<<< >>> + 7<<< >>> + 8<<< >>> + 9<<< >>> + 50<<< >>> + 1<<< >>> + 2<<< >>> + 3<<< >>> + 4<<< >>> + 55<<< XYZXYZXYZ abcabcab >>> + 56<<< 123456789 abcdefghi ABCDEDFHI >>> + + +-- Date/Time -- x Page 9 + + + 57<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> + 58<<< 123456789 xyzxyzxyz XYZXYZXYZ >>> + 9<<< >>> + 60<<< 123456789 >>> +
\ No newline at end of file |