-m4_define([RENDER_WEAVE_6X6],
- [AT_DATA([input], [6 6 $1
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
+# +-+---+-+-+-+
+# |a|bcd|e|f|i|
+# +-+-+-+-+g+-+
+# |j|m|nop|h|q|
+# |k+-+-+-+-+r|
+# |l|t|w|xyz|s|
+# +-+u+-+-+-+-+
+# |A|v|B|E|FGH|
+# +-+-+C+-+-+-+
+# |IJK|D|L|O|P|
+# +-+-+-+M+-+-+
+# |Q|RST|N|U|V|
+# +-+---+-+-+-+
+m4_define([WEAVE_6X6],
+ [6 6 $1
@a
1*2 @bcd
@e
1*2 @RST
@U
@V
-])])
+])
-m4_define([RENDER_8X8],
- [AT_DATA([input], [8 8 $1
+# +-+-+-+-+-+-+-+-+
+# |a|b|c|d|e|f|g|h|
+# +-+-+-+-+-+-+-+-+
+# |i|jkl|m|nop|q|t|
+# +-+-+-+-+-+-+r+-+
+# |u|v|wxy|z|A|s|D|
+# +-+-+-+-+-+B+-+-+
+# |E|F|I|JKL|C|M|P|
+# +-+G+-+---+-+N+-+
+# |Q|H|R|UVW|X|O|Y|
+# +-+-+S+-+-+-+-+-+
+# |Z|0|T|3|456|7|8|
+# +-+1+-+-+-+-+-+-+
+# |9|2|abc|d|efg|h|
+# +-+-+-+-+-+-+-+-+
+# |i|j|k|l|m|n|o|p|
+# +-+-+-+-+-+-+-+-+
+m4_define([WEAVE_8X8],
+ [8 8 $1
@a
@b
@c
@n
@o
@p
-])])
+])
# This input is something of a counterexample, in that it could render
# compactly as this if the algorithm for choosing cell widths and
# +---+-+RSTUV|456|
# |abcde|WXYZ0|789|
# +-----+-----+---+
-m4_define([RENDER_8X8_2],
- [AT_DATA([input], [8 8 $1
+m4_define([WEAVE_8X8_2],
+ [8 8 $1
2*2 @abc\ndef\nghi
1*2 @jkl
2*2 @mno\npqr\nstu
2*3 @MNOPQ\nRSTUV\nWXYZ0
2*2 @123\n456\n789
1*3 @abcde
-])])
+])
\f
AT_BANNER([output rendering -- no page breaking])
])
AT_CLEANUP
+AT_SETUP([joined rows and columns (with footnotes)])
+AT_KEYWORDS([render rendering footnote])
+AT_DATA([input], [3 3
+1*2 @abc#Approximation.
+2*1 @d\ne\nf#This is a very long footnote that will have to wrap from one line to the next. Let's see if the rendering engine does it acceptably.
+2*1 @g\nh\ni#One#Two#Three
+@j
+1*2 @klm
+])
+AT_CHECK([render-test --csv input], [0],
+[[+------------+----+
+| abc[a]| d|
++----------+-+ e|
+| g|j|f[b]|
+| h+-+----+
+|i[c][d][e]| klm|
++----------+------+
+a. Approximation.
+b. This is a very long footnote that will have to wrap from one line to the
+next. Let's see if the rendering engine does it acceptably.
+c. One
+d. Two
+e. Three
+]])
+AT_CHECK([cat render.csv], [0],
+[[abc[a],,"d
+e
+f[b]"
+"g
+h
+i[c][d][e]",j,
+,klm,
+
+Footnotes:
+a,Approximation.
+b,This is a very long footnote that will have to wrap from one line to the next. Let's see if the rendering engine does it acceptably.
+c,One
+d,Two
+e,Three
+]])
+AT_CLEANUP
+
AT_SETUP([6x6, joined rows and columns])
AT_KEYWORDS([render rendering])
-RENDER_WEAVE_6X6
+AT_DATA([input], [WEAVE_6X6])
AT_CHECK([render-test input], [0], [dnl
+-+---+-+-+-+
|a|bcd|e|f|i|
AT_SETUP([3 columns with many joined cells])
AT_KEYWORDS([render rendering])
AT_CAPTURE_FILE([input])
-AT_DATA([input], [3 19
-m4_foreach([x], [a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s], [x
-])@1
-m4_for([x], [2], [19], [1], [1*2 @x\nab\ncd
-])@20
+AT_DATA([input], [19 3
+a
+@1
+2*1 @11\nab\ncd
+b
+2*1 @2\nab\ncd
+c
+2*1 @12\nab\ncd
+d
+2*1 @3\nab\ncd
+e
+2*1 @13\nab\ncd
+f
+2*1 @4\nab\ncd
+g
+2*1 @14\nab\ncd
+h
+2*1 @5\nab\ncd
+i
+2*1 @15\nab\ncd
+j
+2*1 @6\nab\ncd
+k
+2*1 @16\nab\ncd
+l
+2*1 @7\nab\ncd
+m
+2*1 @17\nab\ncd
+n
+2*1 @8\nab\ncd
+o
+2*1 @18\nab\ncd
+p
+2*1 @9\nab\ncd
+q
+2*1 @19\nab\ncd
+r
+2*1 @10\nab\ncd
+s
+@20
])
-AT_CHECK([render-test --transpose input], [0], [dnl
+AT_CHECK([render-test input], [0], [dnl
+--+--+
a| 1|11|
+--+ab|
1*2 hij\nklm\nnop
])
AT_CHECK([render-test input], [0], [dnl
-abc
-def
-hij
-klm
-nop
+ abc
+ def
+ hij
+ klm
+ nop
])
AT_CLEANUP
AT_SETUP([8x8 with many 2x2 joins])
AT_KEYWORDS([render rendering])
-RENDER_8X8_2
+AT_DATA([input], [WEAVE_8X8_2])
AT_CHECK([render-test input], [0],[dnl
+---+---+----+----+
|abc|jkl| mno| vwx|
|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|
+-+-+-+-+-+-+-+-+-+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+])
+AT_CHECK([render-test input -o mb0 --min-break=0], [0], [dnl
++-+-+-+-+-+-+-+-+-+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|
++-+-+-+-+-+-+-+-+-+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|ha|hb|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|hc|hd|
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
++--+--+--+--+--+--+--+
+|ha|hb|48|49|50|hc|hd|
++--+--+--+--+--+--+--+
+])
+AT_CHECK([render-test -o mb0 --min-break=0 input], [0], [dnl
++--+--+-+-+-+-+-+-+-+-+-+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+|ha|hb|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|hc|hd|
++--+--+-+-+-+-+-+-+-+-+-+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+|ha|hb|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|hc|hd|
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+
+--+--+--+--+--+--+--+
|ha|hb|48|49|50|hc|hd|
+--+--+--+--+--+--+--+
| 46| 47| 48| 49| 50|
+----+----+----+----+----+
])
+AT_CHECK([render-test -o mb0 --min-break=0 input], [0], [dnl
++----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
+|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cel
+| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| 11| 12| 13| 14| 15| 1
++----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
+
+-+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+--
+l|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|ce
+6| 17| 18| 19| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 30| 31|
+-+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+--
+
+--+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+-
+ll|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|c
+32| 33| 34| 35| 36| 37| 38| 39| 40| 41| 42| 43| 44| 45| 46| 47|
+--+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+-
+
+---+----+----+
+ell|cell|cell|
+ 48| 49| 50|
+---+----+----+
+])
AT_CLEANUP
AT_SETUP([breaking row of many medium-size cells, with headers])
| 49| 50|
+----+----+
])
+AT_CHECK([render-test -o mb0 --min-break=0 input], [0], [dnl
+ +----+----+----+----+----+----+----+----+----+----+----+----+--+
+header1|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|ce|header2
+ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| 11| 12| |
+ +----+----+----+----+----+----+----+----+----+----+----+----+--+
+
+ +--+----+----+----+----+----+----+----+----+----+----+----+----+
+header1|ll|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|header2
+ |13| 14| 15| 16| 17| 18| 19| 20| 21| 22| 23| 24| 25|
+ +--+----+----+----+----+----+----+----+----+----+----+----+----+
+
+ +----+----+----+----+----+----+----+----+----+----+----+----+--+
+header1|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|ce|header2
+ | 26| 27| 28| 29| 30| 31| 32| 33| 34| 35| 36| 37| |
+ +----+----+----+----+----+----+----+----+----+----+----+----+--+
+
+ +--+----+----+----+----+----+----+----+----+----+----+----+----+
+header1|ll|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|cell|header2
+ |38| 39| 40| 41| 42| 43| 44| 45| 46| 47| 48| 49| 50|
+ +--+----+----+----+----+----+----+----+----+----+----+----+----+
+])
AT_CLEANUP
AT_SETUP([breaking row of many big narrow cells])
|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|
+------+------+------+------+------+------+
])
+AT_CHECK([render-test -o mb0 --min-break=0 input], [0], [dnl
++------+------+------+------+------+------+------+------+------+------+------+-
+| This| This| This| This| This| This| This| This| This| This| This|
+| is| is| is| is| is| is| is| is| is| is| is|
+|cell 1|cell 2|cell 3|cell 4|cell 5|cell 6|cell 7|cell 8|cell 9| cell| cell|
+| in a| in a| in a| in a| in a| in a| in a| in a| in a| 10 in| 11 in|
+|series|series|series|series|series|series|series|series|series| a| a|
+|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|series|series|s
+| | | | | | | | | |of 50.|of 50.|o
++------+------+------+------+------+------+------+------+------+------+------+-
+
+-----+------+------+------+------+------+------+------+------+------+------+---
+ This| This| This| This| This| This| This| This| This| This| This| T
+ is| is| is| is| is| is| is| is| is| is| is|
+ cell| cell| cell| cell| cell| cell| cell| cell| cell| cell| cell| c
+12 in| 13 in| 14 in| 15 in| 16 in| 17 in| 18 in| 19 in| 20 in| 21 in| 22 in| 23
+ a| a| a| a| a| a| a| a| a| a| a|
+eries|series|series|series|series|series|series|series|series|series|series|ser
+f 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of
+-----+------+------+------+------+------+------+------+------+------+------+---
+
+---+------+------+------+------+------+------+------+------+------+------+-----
+his| This| This| This| This| This| This| This| This| This| This| Thi
+ is| is| is| is| is| is| is| is| is| is| is| i
+ell| cell| cell| cell| cell| cell| cell| cell| cell| cell| cell| cel
+ in| 24 in| 25 in| 26 in| 27 in| 28 in| 29 in| 30 in| 31 in| 32 in| 33 in| 34 i
+ a| a| a| a| a| a| a| a| a| a| a|
+ies|series|series|series|series|series|series|series|series|series|series|serie
+50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50
+---+------+------+------+------+------+------+------+------+------+------+-----
+
+-+------+------+------+------+------+------+------+------+------+------+------+
+s| This| This| This| This| This| This| This| This| This| This| This|
+s| is| is| is| is| is| is| is| is| is| is| is|
+l| cell| cell| cell| cell| cell| cell| cell| cell| cell| cell| cell|
+n| 35 in| 36 in| 37 in| 38 in| 39 in| 40 in| 41 in| 42 in| 43 in| 44 in| 45 in|
+a| a| a| a| a| a| a| a| a| a| a| a|
+s|series|series|series|series|series|series|series|series|series|series|series|
+.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|of 50.|
+-+------+------+------+------+------+------+------+------+------+------+------+
+
++------+------+------+------+------+
+| This| This| This| This| This|
+| is| is| is| is| is|
+| cell| cell| cell| cell| cell|
+| 46 in| 47 in| 48 in| 49 in| 50 in|
+| a| a| a| a| a|
+|series|series|series|series|series|
+|of 50.|of 50.|of 50.|of 50.|of 50.|
++------+------+------+------+------+
+])
AT_CLEANUP
AT_SETUP([breaking 2 rows of many small cells])
|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+---+
+|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49| 50|
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+---+
+|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+---+
+])
+AT_CHECK([render-test -o mb0 --min-break=0 input], [0], [dnl
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+| 1| 2| 3| 4| 5| 6| 7| 8| 9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|
++--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+---+
|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49| 50|
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+---+
45| 46| 47| 48| 49|50|
--+---+---+---+---+--+
])
+AT_CHECK([render-test -o mb0 --min-break=0 input], [0], [dnl
+ a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M
++-+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+|1| 2| 3| 4| 5| 6| 7| 8| 9| 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 20|
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+| 26| 27| 28| 29| 30| 31| 32| 33| 34| 35| 36| 37| 38| 39| 40| 41| 42| 43| 44| 4
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+--
+
+ N O P Q R S T U V W
++---+---+---+---+----+
+| 21| 22| 23| 24| 25|
++-+-+-+-+-+-+-+-+-+--+
+45| 46| 47| 48| 49|50|
+--+---+---+---+---+--+
+])
AT_CLEANUP
AT_SETUP([horz break 6x6, joined rows and columns])
AT_KEYWORDS([render rendering])
-RENDER_WEAVE_6X6
-AT_CHECK([render-test --width=6 input], [0], [dnl
+AT_DATA([input], [WEAVE_6X6])
+AT_DATA([expout], [dnl
+-+--
|a|bc
+-+-+
|U|V|
+-+-+
])
+AT_CHECK([render-test --width=6 input], [0], [expout])
+AT_CHECK([render-test -o mb0 --min-break=0 --width=6 input], [0], [expout])
AT_CLEANUP
AT_SETUP([horz break 6x6, joined rows and columns, left header])
AT_KEYWORDS([render rendering])
-RENDER_WEAVE_6X6([1 0 0 0])
-AT_CHECK([render-test --width=10 input], [0], [dnl
+AT_DATA([input], [WEAVE_6X6([1 0 0 0])])
+AT_DATA([expout], [dnl
+-+---+-+
|a|bcd|e|
+-+-+-+-+
|Q|U|V|
+-+-+-+
])
+AT_CHECK([render-test --width=10 input], [0], [expout])
+AT_CHECK([render-test -o mb0 --min-break=0 --width=10 input], [0], [expout])
AT_CLEANUP
AT_SETUP([horz break 6x6, joined rows and columns, right header])
AT_KEYWORDS([render rendering])
-RENDER_WEAVE_6X6([0 1 0 0])
-AT_CHECK([render-test --width=10 input], [0], [dnl
+AT_DATA([input], [WEAVE_6X6([0 1 0 0])])
+AT_DATA([expout], [dnl
+-+---+-+
|a|bcd|i|
+-+-+-+-+
+-+-+r|
|xyz|s|
+-+-+-+
-|E|F H|
+|E|H H|
+-+-+-+
|L|O|P|
|M+-+-+
|N|U|V|
+-+-+-+
])
+AT_CHECK([render-test --width=10 input], [0], [expout])
+AT_CHECK([render-test -o mb0 --min-break=0 --width=10 input], [0], [expout])
AT_CLEANUP
AT_SETUP([breaking joined cells too wide for page])
|H|I|J|K|
+-+-+-+-+
+----+
+ ghi|
+ jkl|
+----+
+ stu|
+ vwx|
++---+
+|EFG|
++-+-+
+|L|M|
++-+-+
+])
+AT_CHECK([render-test -o mb0 --min-break=0 --width=10 input], [0], [dnl
++--------
+|abc def
+|
++-----+--
+| mno|
+| pqr|
++---+-+-+
+|yzA|BCD|
++-+-+-+-+
+|H|I|J|K|
++-+-+-+-+
+
----+
ghi|
jkl|
|J|K|
+-+-+
+----+
+ ghi|
+ jkl|
+----+
+ stu|
+ vwx|
++---+
+|EFG|
++-+-+
+|L|M|
++-+-+
+])
+AT_CHECK([render-test -o mb0 --min-break=0 --width=6 input], [0], [dnl
++----
+|abc
+|
++----
+| mn
+| pq
++---+
+|yzA|
++-+-+
+|H|I|
++-+-+
+
+-----
+ def
+
+--+--
+no|
+qr|
++-+-+
+|BCD|
++-+-+
+|J|K|
++-+-+
+
----+
ghi|
jkl|
stuvwx
+yz
+])
+AT_CHECK([render-test -o mb0 --min-break=0 --width=6 input], [0], [dnl
+abcdef
+
+ghijkl
+
+mnopqr
+
+stuvwx
+
yz
])
AT_CLEANUP
AT_DATA([input], [1 1
@abcdefghijklmnopqrstuvwxyz
])
-AT_CHECK([render-test --width=6 input], [0], [dnl
+AT_DATA([expout], [dnl
+-----
|abcde
+-----
------
-defghi
-------
-
-------
-hijklm
+fghijk
------
------
------
------
-pqrstu
-------
-
-------
-tuvwxy
+rstuvw
------
---+
xyz|
---+
])
+AT_CHECK([render-test --width=6 input], [0], [expout])
+AT_CHECK([render-test -o mb0 --min-break=0 --width=6 input], [0], [expout])
AT_CLEANUP
AT_SETUP([horz break 8x8 with many 2x2 joins])
AT_KEYWORDS([render rendering])
-RENDER_8X8_2
+AT_DATA([input], [WEAVE_8X8_2])
AT_CHECK([render-test --width=8 input], [0],[dnl
+---+--
|abc|jk
| |
+-+--+
| 123|
-| 456|
-
| 456|
| 789|
| |
+----+
])
-AT_CLEANUP
-\f
-AT_BANNER([output rendering -- vertical page breaks])
-
-AT_SETUP([breaking column of many small cells])
-AT_KEYWORDS([render rendering])
-AT_CAPTURE_FILE([input])
-AT_DATA([input], [20 1
-m4_for([x], [1], [20], [1], [@x
-])])
-AT_CHECK([render-test --length=10 input], [0], [dnl
-+--+
-| 1|
-+--+
-| 2|
-+--+
-| 3|
-+--+
-| 4|
-+--+
-
-+--+
-| 5|
-+--+
-| 6|
-+--+
-| 7|
-+--+
-| 8|
-+--+
-
-+--+
-| 9|
-+--+
-|10|
-+--+
-|11|
-+--+
-|12|
-+--+
-
-+--+
-|13|
-+--+
-|14|
-+--+
-|15|
-+--+
-|16|
-+--+
-
-+--+
-|17|
-+--+
-|18|
-+--+
-|19|
-+--+
-|20|
-+--+
-])
-AT_CLEANUP
-
-AT_SETUP([breaking column of many small cells, with headers])
-AT_KEYWORDS([render rendering])
-AT_CAPTURE_FILE([input])
-AT_DATA([input], [17 1 0 0 1 1
-@a
-m4_for([x], [1], [15], [1], [@x
-])@b
-])
-AT_CHECK([render-test --length=13 input], [0], [dnl
-+--+
-| a|
-+--+
-| 1|
-+--+
-| 2|
-+--+
-| 3|
-+--+
-| 4|
-+--+
-| b|
-+--+
-
-+--+
-| a|
-+--+
-| 5|
-+--+
-| 6|
-+--+
-| 7|
-+--+
-| 8|
-+--+
-| b|
-+--+
-
-+--+
-| a|
-+--+
-| 9|
-+--+
-|10|
-+--+
-|11|
-+--+
-|12|
-+--+
-| b|
-+--+
-
-+--+
-| a|
-+--+
-|13|
-+--+
-|14|
-+--+
-|15|
-+--+
-| b|
-+--+
-])
-AT_CLEANUP
-
-AT_SETUP([disabling too-big headers])
-AT_KEYWORDS([render rendering])
-AT_CAPTURE_FILE([input])
-AT_DATA([input], [17 1 0 0 1 1
-@a
-m4_for([x], [1], [15], [1], [@x
-])@b
-])
-AT_CHECK([render-test --length=10 input], [0], [dnl
-+--+
-| a|
-+--+
-| 1|
-+--+
-| 2|
-+--+
-| 3|
-+--+
-
-+--+
-| 4|
-+--+
-| 5|
-+--+
-| 6|
-+--+
-| 7|
-+--+
-
-+--+
-| 8|
-+--+
-| 9|
-+--+
-|10|
-+--+
-|11|
-+--+
-
-+--+
-|12|
-+--+
-|13|
-+--+
-|14|
-+--+
-|15|
-+--+
-
-+--+
-| b|
-+--+
-])
-AT_CLEANUP
-
-AT_SETUP([breaking column of many medium-size cells])
-AT_KEYWORDS([render rendering])
-AT_CAPTURE_FILE([input])
-AT_DATA([input], [20 1
-m4_for([x], [1], [20], [1], [@top x\ncell x\nbottom x
-])])
-AT_CHECK([render-test --length 10 input], [0], [dnl
-+---------+
-| top 1|
-| cell 1|
-| bottom 1|
-+---------+
-| top 2|
-| cell 2|
-| bottom 2|
-+---------+
-
-+---------+
-| top 3|
-| cell 3|
-| bottom 3|
-+---------+
-| top 4|
-| cell 4|
-| bottom 4|
-+---------+
-
-+---------+
-| top 5|
-| cell 5|
-| bottom 5|
-+---------+
-| top 6|
-| cell 6|
-| bottom 6|
-+---------+
-
-+---------+
-| top 7|
-| cell 7|
-| bottom 7|
-+---------+
-| top 8|
-| cell 8|
-| bottom 8|
-+---------+
-
-+---------+
-| top 9|
-| cell 9|
-| bottom 9|
-+---------+
-| top 10|
-| cell 10|
-|bottom 10|
-+---------+
-
-+---------+
-| top 11|
-| cell 11|
-|bottom 11|
-+---------+
-| top 12|
-| cell 12|
-|bottom 12|
-+---------+
-
-+---------+
-| top 13|
-| cell 13|
-|bottom 13|
-+---------+
-| top 14|
-| cell 14|
-|bottom 14|
-+---------+
-
-+---------+
-| top 15|
-| cell 15|
-|bottom 15|
-+---------+
-| top 16|
-| cell 16|
-|bottom 16|
-+---------+
-
-+---------+
-| top 17|
-| cell 17|
-|bottom 17|
-+---------+
-| top 18|
-| cell 18|
-|bottom 18|
-+---------+
-
-+---------+
-| top 19|
-| cell 19|
-|bottom 19|
-+---------+
-| top 20|
-| cell 20|
-|bottom 20|
-+---------+
-])
-AT_CLEANUP
-
-AT_SETUP([breaking 3 columns with many joined cells])
-AT_KEYWORDS([render rendering])
-AT_CAPTURE_FILE([input])
-AT_DATA([input], [3 19
-m4_foreach([x], [a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s], [x
-])@1
-m4_for([x], [2], [19], [1], [1*2 @x\nab\ncd
-])@20
-])
-AT_CHECK([render-test --length=6 --transpose input], [0], [dnl
- +--+--+
-a| 1|11|
- +--+ab|
-b| 2|cd|
- |ab+--+
-
- |ab+--+
-c|cd|12|
- +--+ab|
-d| 3|cd|
- |ab+--+
-
- |ab+--+
-e|cd|13|
- +--+ab|
-f| 4|cd|
- |ab+--+
-
- |ab+--+
-g|cd|14|
- +--+ab|
-h| 5|cd|
- |ab+--+
-
- |ab+--+
-i|cd|15|
- +--+ab|
-j| 6|cd|
- |ab+--+
-
- |ab+--+
-k|cd|16|
- +--+ab|
-l| 7|cd|
- |ab+--+
-
- |ab+--+
-m|cd|17|
- +--+ab|
-n| 8|cd|
- |ab+--+
-
- |ab+--+
-o|cd|18|
- +--+ab|
-p| 9|cd|
- |ab+--+
-
- |ab+--+
-q|cd|19|
- +--+ab|
-r|10|cd|
- |ab+--+
-
- |ab+--+
-s|cd|20|
- +--+--+
-])
-AT_CLEANUP
-
-AT_SETUP([vert break 6x6, joined rows and columns])
-AT_KEYWORDS([render rendering])
-RENDER_WEAVE_6X6
-AT_CHECK([render-test --length=6 input], [0], [dnl
-+-+---+-+-+-+
-|a|bcd|e|f|i|
-+-+-+-+-+g+-+
-|j|m|nop|h|q|
-|k+-+---+-+r|
-
-|k+-+-+---+r|
-|l|t|w|xyz|s|
-+-+u+-+-+-+-+
-|A|v|B|E|FGH|
-+-+-+C+-+---+
-
-+---+C+-+-+-+
-|IJK|D|L|O|P|
-+-+-+-+M+-+-+
-|Q|RST|N|U|V|
-+-+---+-+-+-+
-])
-AT_CLEANUP
-
-AT_SETUP([breaking joined cells too tall for page])
-AT_KEYWORDS([render rendering])
-AT_DATA([input], [4 6
-1*6 @abc\ndef\nghi\njkl\nmno\npqr\nstu\nvwx\nyzA\nBCD\nEFG
-1*3 @HIJ\nKLM\nOPQ\nRST\nUVW
-1*3 @XYZ\n012\n345\n678\n90a
-1*2 @bcd\nefg\nhij
-1*2 @klm\nnop\nqrs
-1*2 @tuv\nwxy\nzAB
-@C
-@D
-@E
-@F
-@G
-@H
-])
-AT_CHECK([render-test --transpose --length=6 input], [0], [dnl
-+---+---+---+-+
-|abc|HIJ|bcd|C|
-|def|KLM|efg+-+
-|ghi|OPQ|hij|D|
-|jkl|RST+---+-+
-
-|jkl|RST+---+-+
-|mno|UVW|klm|E|
-|pqr+---+nop+-+
-|stu|XYZ|qrs|F|
-|vwx|012+---+-+
-
-|vwx|012+---+-+
-|yzA|345|tuv|G|
-|BCD|678|wxy+-+
-|EFG|90a|zAB|H|
-+---+---+---+-+
-])
-AT_CLEANUP
-
-AT_SETUP([breaking cell too tall for page, no border])
-AT_KEYWORDS([render rendering])
-AT_CAPTURE_FILE([input])
-AT_DATA([input], [1 1
-abc defg hij klmn opq rstu vwx yz ABCDE FGH I JK LMNOP QR STU VWXYZ
-])
-AT_CHECK([render-test --width=6 --length=6 input], [0], [dnl
- abc
- defg
- hij
- klmn
- opq
- rstu
-
-vwx yz
- ABCDE
- FGH I
- JK
- LMNOP
-QR STU
-
- VWXYZ
-])
-AT_CLEANUP
-
-AT_SETUP([breaking cell too tall for page, with border])
-AT_KEYWORDS([render rendering])
-AT_CAPTURE_FILE([input])
-AT_DATA([input], [1 1
-@abc defg hij klmn opq rstu vwx yz ABCDE FGH I JK LMNOP QR STU VWXYZ
-])
-AT_CHECK([render-test --width=7 --length=6 input], [0], [dnl
-+-----+
-| abc|
-| defg|
-| hij|
-| klmn|
-| opq|
-
-| klmn|
-| opq|
-| rstu|
-| vwx|
-| yz|
-|ABCDE|
-
-| yz|
-|ABCDE|
-|FGH I|
-| JK|
-|LMNOP|
-| QR|
-
-|LMNOP|
-| QR|
-| STU|
-|VWXYZ|
+AT_CHECK([render-test -o mb0 --min-break=0 --width=8 input], [0],[dnl
++---+--
+|abc|jk
+|def|
+|ghi+--
+| |yz
++-+-+BC
+|Q|V|EF
+|R| |
+|S+-+-+
+|T|012|
+|U|345|
+| |678|
+| | |
++-+-+-+
+|xyz|G|
+|ABC|H|
+|DEF|I|
+| | |
++---+-+
+|abcde|
+| |
+-----+
-])
-AT_CLEANUP
-\f
-AT_BANNER([output rendering -- double page breaks])
-
-AT_SETUP([double break 6x6, joined rows and columns])
-AT_KEYWORDS([render rendering])
-RENDER_WEAVE_6X6
-AT_CHECK([render-test --width=6 --length=6 input], [0], [dnl
-+-+--
-|a|bc
-+-+-+
-|j|m|
-|k+-+
-
-|k+-+
-|l|t|
-+-+u|
-|A|v|
-+-+-+
-
-+---+
-|IJK|
-+-+-+
-|Q|RS
-+-+--
-
---+-+
-cd|e|
-+-+-+
-|nop|
-+---+
-+-+--
-|w|xy
-+-+-+
-|B|E|
-|C+-+
-
-|C+-+
-|D|L|
-+-+M|
-ST|N|
---+-+
-
-+-+-+
-|f|i|
-|g+-+
-|h|q|
-+-+r|
-
---+r|
-yz|s|
-+-+-+
-|FGH|
-+---+
-
-+-+-+
-|O|P|
-+-+-+
-|U|V|
-+-+-+
-])
-AT_CLEANUP
+--+----+
+kl| mno|
+ | pqr|
+--+ stu|
+zA| |
+CD+-+--+
+FG|W| Z|
+ |X| |
++-+Y+--+
+|9| | ab
+| | | de
++-+-+ gh
+|opq|
+|rst+---
+|uvw| JK
+| |
++---+--+
+| MNOPQ|
+| RSTUV|
+| WXYZ0|
+| |
++------+
-AT_SETUP([double break 8x8, with joins, left and right headers])
-AT_KEYWORDS([render rendering])
-RENDER_8X8([1 1 0 0])
-AT_CHECK([render-test input --width=14 --length=14], [0], [dnl
-+-+-+-+-+-+-+
-|a|b|c|d|e|h|
-+-+-+-+-+-+-+
-|i|jkl|m|n|t|
-+-+-+-+-+-+-+
-|u|v|wxy|z|D|
-+-+-+-+-+-+-+
-|E|F|I|JKL|P|
-+-+G+-+---+-+
-|Q|H|R|UVW|Y|
-+-+-+S+-+-+-+
-|Z|0|T|3|4|8|
-+-+1+-+-+-+-+
-
-+-+1+---+-+-+
-|9|2|abc|d|h|
-+-+-+-+-+-+-+
-|i|j|k|l|m|p|
-+-+-+-+-+-+-+
-
-+-+--+-+-+
-|a| f|g|h|
-+-+--+-+-+
-|i|op|q|t|
-+-+--+r+-+
-|u| A|s|D|
-+-+ B+-+-+
-
-+-+ B+-+-+
-|E| C|M|P|
-+-+--+N+-+
-|Q| X|O|Y|
-+-+--+-+-+
-|Z|56|7|8|
-+-+--+-+-+
-|9| efg|h|
-+-+--+-+-+
-|i| n|o|p|
-+-+--+-+-+
++----+
+| vwx|
+| |
++----+
+| HIJ|
+| KLM|
+| NOP|
+| |
++-+--+
+bc| j|
+ef| k|
+hi| l|
+ | m|
+--+ n|
+KL| |
+ | |
++-+--+
+| 123|
+| 456|
+| 789|
+| |
++----+
])
AT_CLEANUP
+\f
+AT_BANNER([output rendering -- problematic procedures])
-AT_SETUP([double break 8x8, with joins, top and bottom headers])
+dnl LIST used to put columns right up next to each other without any
+dnl intervening space, so this checks for regression.
+AT_SETUP([LIST puts space between columns])
AT_KEYWORDS([render rendering])
-RENDER_8X8([0 0 1 1])
-AT_CHECK([render-test input --width=14 --length=14], [0], [dnl
-+-+-+-+-+-+-+
-|a|b|c|d|e|f|
-+-+-+-+-+-+-+
-|i|jkl|m|nop|
-+-+-+-+-+-+-+
-|u|v|wxy|z|A|
-+-+-+-+-+-+B|
-|E|F|I|JKL|C|
-+-+G+-+---+-+
-|Q|H|R|UVW|X|
-+-+-+-+-+-+-+
-|i|j|k|l|m|n|
-+-+-+-+-+-+-+
-
-+-+-+-+-+-+-+
-|a|b|c|d|e|f|
-+-+-+-+-+-+-+
-|Z|0|S|3|456|
-| |1|T| | |
-+-+2+-+-+-+-+
-|9| |abc|d|ef
-+-+-+-+-+-+-+
-|i|j|k|l|m|n|
-+-+-+-+-+-+-+
-
-+-+-+
-|g|h|
-+-+-+
-|q|t|
-|r+-+
-|s|D|
-+-+-+
-|M|P|
-|N+-+
-|O|Y|
-+-+-+
-|o|p|
-+-+-+
-
-+-+-+
-|g|h|
-+-+-+
-|7|8|
-| | |
-+-+-+
-fg|h|
-+-+-+
-|o|p|
-+-+-+
+AT_DATA([list.sps], [dnl
+DATA LIST LIST NOTABLE /x y z (F1.0).
+BEGIN DATA.
+1 2 3
+4 5 6
+7 8 9
+END DATA.
+LIST.
])
-AT_CLEANUP
-
-AT_SETUP([double break 8x8, with joins, all headers])
-AT_KEYWORDS([render rendering])
-RENDER_8X8([1 1 1 1])
-AT_CHECK([render-test input --width=14 --length=14], [0], [dnl
-+-+-+-+-+-+-+
-|a|b|c|d|e|h|
-+-+-+-+-+-+-+
-|i|jkl|m|n|t|
-+-+-+-+-+-+-+
-|u|v|wxy|z|D|
-+-+-+-+-+-+-+
-|E|F|I|JKL|P|
-+-+G+-+---+-+
-|Q|H|R|UVW|Y|
-+-+-+-+-+-+-+
-|i|j|k|l|m|p|
-+-+-+-+-+-+-+
-
-+-+-+-+-+-+-+
-|a|b|c|d|e|h|
-+-+-+-+-+-+-+
-|Z|0|S|3|4|8|
-| |1|T| | | |
-+-+2+-+-+-+-+
-|9| |abc|d|h|
-+-+-+-+-+-+-+
-|i|j|k|l|m|p|
-+-+-+-+-+-+-+
-
-+-+--+-+-+
-|a| f|g|h|
-+-+--+-+-+
-|i|op|q|t|
-+-+--+r+-+
-|u| A|s|D|
-+-+ B+-+-+
-|E| C|M|P|
-+-+--+N+-+
-|Q| X|O|Y|
-+-+--+-+-+
-|i| n|o|p|
-+-+--+-+-+
-
-+-+--+-+-+
-|a| f|g|h|
-+-+--+-+-+
-|Z|56|7|8|
-| | | | |
-+-+--+-+-+
-|9| efg|h|
-+-+--+-+-+
-|i| n|o|p|
-+-+--+-+-+
+AT_CHECK([pspp list.sps], [0], [dnl
+Data List
++-+-+-+
+|x|y|z|
++-+-+-+
+|1|2|3|
+|4|5|6|
+|7|8|9|
++-+-+-+
])
AT_CLEANUP
-AT_SETUP([double break joined cells too big for page])
+# Long string variables tend to end in lots of spaces. The ASCII
+# driver didn't handle this very well: it would essentially produce
+# one blank line in a cell for each trailing space. This test
+# checks for regression. See bug #38672.
+AT_SETUP([ASCII driver renders end of line spaces reasonably])
AT_KEYWORDS([render rendering])
-AT_DATA([input], [7 7
+AT_DATA([input], [dnl
+3 3
@a
@b
-@c
+@xyzzy @&t@
@d
@e
@f
@g
@h
-6*6 @The MISSING subcommand determines the handling of missing variables. If INCLUDE is set, then user‑missing values are included in the calculations. If NOINCLUDE is set, which is the default, user‑missing values are excluded.
@i
-@j
-@k
-@l
-@m
])
AT_CHECK([render-test --width=15 --length=15 input], [0], [dnl
-+-+--+--+---+
-|a| b| c| d|
-+-+--+--+---+
-|h| The
-| | su
-| | determ
-+-+ han
-|i|missing va
-| | If IN
-| | s
-+-+ user
-|j| va
-| | include
-| | calculati
-+-+ NOINCLUDE
-
-+-+ NOINCLUDE
-|k| whic
-| |
-+-+ user
-|l| va
-| | e
-| |
-+-+
-|m|
-| |
-| |
-+-+----------
-
-+--+--+--+
-| e| f| g|
-+--+--+--+
-e MISSING|
-ubcommand|
-mines the|
-ndling of|
-ariables.|
-NCLUDE is|
-set, then|
-r‑missing|
-alues are|
-ed in the|
-ions. If|
-E is set,|
-
-E is set,|
-ch is the|
- default,|
-r‑missing|
-alues are|
-excluded.|
- |
- |
- |
- |
- |
----------+
++-+-+-----+
+|a|b|xyzzy|
++-+-+-----+
+|d|e| f|
++-+-+-----+
+|g|h| i|
++-+-+-----+
])
AT_CLEANUP
-\f
-AT_BANNER([output rendering -- problematic procedures])
-dnl LIST used to put columns right up next to each other without any
-dnl intervening space, so this checks for regression.
-AT_SETUP([LIST puts space between columns])
+# There was a bug that, when multiple cells spanned a single column
+# (or row), only the dimensions of the cell nearest the bottom of the
+# table were actually considered. This checks for regression. (This
+# problem was most easily observed with SYSFILE INFO, which uses lots
+# of spanned cells).
+#
+# Without the fix, the output looks like this:
+# +-------+
+# | A long|
+# | text|
+# |string.|
+# +-------+
+# |shorter|
+AT_SETUP([multiple spanned cells all contribute to dimensions])
AT_KEYWORDS([render rendering])
-AT_DATA([list.sps], [dnl
-DATA LIST LIST NOTABLE /x y z (F1.0).
-BEGIN DATA.
-1 2 3
-4 5 6
-7 8 9
-END DATA.
-LIST.
-])
-AT_CHECK([pspp list.sps], [0], [dnl
-Data List
-x y z
------
-1 2 3
-4 5 6
-7 8 9
+AT_DATA([input], [dnl
+2 2
+1*2 @A long text string.
+1*2 @shorter
+])
+AT_CHECK([render-test --width=30 --length=15 input], [0], [dnl
++--------------------+
+| A long text string.|
++--------------------+
+| shorter|
++--------------------+
])
AT_CLEANUP
projects / pspp / blobdiff