summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/cals/test
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-25 22:39:44 +0000
committerKarl Berry <karl@freefriends.org>2016-11-25 22:39:44 +0000
commit4a55147e264bbcb051fbb9a51b05b190e52bd6b7 (patch)
tree93f4c55dd1e9badbcc219df8ac9663e5690329ba /Master/texmf-dist/doc/latex/cals/test
parentdc4d59f0c0a68d9586f1d3f32d9f7a3bb32e29d9 (diff)
cals (25nov16)
git-svn-id: svn://tug.org/texlive/trunk@42577 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/cals/test')
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/README1
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.chk6
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_070_clean_backup_row.chk1
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_070_clean_backup_row.tex18
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk14
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex38
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk4
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex46
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/support/LatexTest.py2
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/support/run_tests.py1
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/table/test_40_issuerow.chk1
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/table/test_50_row.chk11
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/table/test_70_lrskip.chk2
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/template.txt1
15 files changed, 137 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/cals/test/README b/Master/texmf-dist/doc/latex/cals/test/README
index e96d61b3f2e..a6c837b7e39 100644
--- a/Master/texmf-dist/doc/latex/cals/test/README
+++ b/Master/texmf-dist/doc/latex/cals/test/README
@@ -9,6 +9,7 @@ $ python support/run_tests.py cell/test_10
Expect that the tests in the directory "visual_tables" fail.
Depending on the OS and TeX distro version, the font drawing
might look different.
+17 Nov 2014: the tests in "visual_tables" are disabled.
Probably I need to package the unit testing code as a separate
package and publish an article about it.
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.chk b/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.chk
index 9d3bd56fc42..7003b6a3460 100644
--- a/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.chk
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.chk
@@ -12,7 +12,6 @@
..\glue 50.0
..\vbox(100.0+0.0)x240.0 []
..\glue 0.0
-.\glue 0.0
.\penalty 10000
.\vbox(0.0+0.0)x290.0
..\hbox(50.0+0.0)x290.0 []
@@ -26,6 +25,7 @@
..\glue 50.0
..\hbox(50.0+0.0)x240.0 []
..\glue 0.0
+.\penalty 10000
.\hbox(0.0+0.0)x290.0
..\glue 50.0
..\glue -0.2
@@ -48,7 +48,6 @@
..\glue 0.0 plus 1.0fil
..\vbox(100.0+0.0)x240.0 []
..\glue 0.0 plus 1.0fil
-.\glue 0.0
.\penalty 10000
.\vbox(0.0+0.0)x400.0
..\hbox(50.0+0.0)x400.0, glue set 80.0fil []
@@ -62,6 +61,7 @@
..\glue 0.0 plus 1.0fil
..\hbox(50.0+0.0)x240.0 []
..\glue 0.0 plus 1.0fil
+.\penalty 10000
.\hbox(0.0+0.0)x400.0, glue set 80.0fil
..\glue 0.0 plus 1.0fil
..\glue -0.2
@@ -84,7 +84,6 @@
..\glue 0.0 plus 1.0fil
..\vbox(100.0+0.0)x240.0 []
..\glue 0.0
-.\glue 0.0
.\penalty 10000
.\vbox(0.0+0.0)x400.0
..\hbox(50.0+0.0)x400.0, glue set 160.0fil []
@@ -98,6 +97,7 @@
..\glue 0.0 plus 1.0fil
..\hbox(50.0+0.0)x240.0 []
..\glue 0.0
+.\penalty 10000
.\hbox(0.0+0.0)x400.0, glue set 160.0fil
..\glue 0.0 plus 1.0fil
..\glue -0.2
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.tex b/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.tex
index 08d5b24b6df..cc649a95b27 100644
--- a/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.tex
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.tex
@@ -1,6 +1,6 @@
\def\w{\ht\cals@current@row=50pt\relax}
\def\mktable{%
-\begin{calstable}
+\begin{calstable}[n]
\colwidths{{70pt}{80pt}{90pt}}
\def\cals@framecs@width{\cals@cs@width}
\def\cals@framers@width{\cals@rs@width}
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_070_clean_backup_row.chk b/Master/texmf-dist/doc/latex/cals/test/regression/test_070_clean_backup_row.chk
new file mode 100644
index 00000000000..e6be40dfbeb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_070_clean_backup_row.chk
@@ -0,0 +1 @@
+> the letter Y.
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_070_clean_backup_row.tex b/Master/texmf-dist/doc/latex/cals/test/regression/test_070_clean_backup_row.tex
new file mode 100644
index 00000000000..8c7e4efa361
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_070_clean_backup_row.tex
@@ -0,0 +1,18 @@
+%
+% Collision of two tables when a table is started in an unexpected moment
+% http://tex.stackexchange.com/questions/167400/fancyhdr-and-cals-vertical-merge-problem
+%
+
+\setbox\cals@backup@row=\hbox{nonsense}
+
+\begin{calstable}
+\colwidths{{90pt}}
+\brow
+\nullcell{ltr}
+\erow
+\brow
+\nullcell{lbr}\spancontent{spanned}
+\erow
+\end{calstable}
+
+\show Y
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk b/Master/texmf-dist/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk
new file mode 100644
index 00000000000..19c748f640a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk
@@ -0,0 +1,14 @@
+%
+% Between the 2&3 rows with a vertically straddled cell
+%
+> \cals@last@rs@below=macro:
+->{{100pt}{0pt}{0pt}{0pt}}{{100pt}{0pt}{0pt}{0pt}}.
+> \cals@current@rs@above=macro:
+->{{100pt}{0pt}{0pt}{0pt}}{{100pt}{0pt}{0pt}{0pt}}.
+%
+% Between the first row and the straddled 2&3
+%
+> \cals@last@rs@below=macro:
+->{{100pt}{0.4pt}{0.4pt}{0.4pt}}{{100pt}{0.4pt}{0.4pt}{0.4pt}}.
+> \cals@current@rs@above=macro:
+->{{100pt}{0pt}{0pt}{0pt}}{{100pt}{0pt}{0pt}{0pt}}.
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex b/Master/texmf-dist/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex
new file mode 100644
index 00000000000..bf880eec22d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex
@@ -0,0 +1,38 @@
+% http://tex.stackexchange.com/questions/159814/miss-the-bottom-line-of-the-frame-header-of-the-cals-table-on-the-first-page
+
+% The first row should be inside a border, because the rules are
+% switched off after the row is made. However, the straddled rows
+% "forget" about the first row decoration. Fix it.
+
+% Mock
+\renewcommand\cals@rs@joinTwo[3]{\show#2\show#3}
+
+\begin{calstable}
+\colwidths{{100pt}{100pt}}
+\def\cals@borderT{0.4pt}
+\def\cals@borderB{0.4pt}
+\def\cals@borderL{0.4pt}
+\def\cals@borderR{0.4pt}
+
+\brow
+\cell{head1}
+\cell{head2}
+\erow
+
+\def\cals@borderT{0pt}
+\def\cals@borderB{0pt}
+\def\cals@borderL{0pt}
+\def\cals@borderR{0pt}
+
+\brow
+\nullcell{ltr}
+\cell{text 2}
+\erow
+
+\brow
+\nullcell{blr}
+\spancontent{2}
+\cell{text 2}
+\erow
+
+\end{calstable}
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk b/Master/texmf-dist/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk
new file mode 100644
index 00000000000..97c52cd2d50
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk
@@ -0,0 +1,4 @@
+> \cals@last@context=the letter n.
+> \cals@last@context=the letter b.
+> \cals@last@context=the letter b.
+> \cals@last@context=the letter b.
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex b/Master/texmf-dist/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex
new file mode 100644
index 00000000000..49cf27fa388
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex
@@ -0,0 +1,46 @@
+% Don't break inside a float
+
+% Mock
+\let\issue@orig=\cals@issue@row
+\renewcommand\cals@issue@row{%
+\show\cals@last@context
+\issue@orig}
+
+% Start float at the end of page, so that the table breaking code
+% think it should split over page.
+Start of text\par
+\dimen0=\pagegoal\relax
+\advance\dimen0 by -5cm\relax
+\vskip\dimen0\relax
+here we are\par
+
+\newcommand\www{\ht\cals@current@row=2.5cm}
+
+\vbox{%
+\begin{calstable}
+\colwidths{{0.25in}{1.5in}{1.5in}{1.5in}}
+%
+\brow \cell{}\cell{C1}\cell{C2}\cell{C3} \www\erow
+%
+\brow
+\cell{R}
+\cell{r1c1}
+\cell{r1c2}
+\cell{r1c3}
+\www\erow
+%
+\brow \nullcell{lrt}
+\cell{r2c1}
+\cell{r2c2}
+\cell{r2c3}
+\www\erow
+%
+\brow
+\nullcell{lrb}\spancontent{S}
+\cell{r3c1}
+\cell{r3c2}
+\cell{r3c3}
+\www\erow
+\end{calstable}
+}% vbox
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/cals/test/support/LatexTest.py b/Master/texmf-dist/doc/latex/cals/test/support/LatexTest.py
index d204f5fad6b..99a695597bf 100644
--- a/Master/texmf-dist/doc/latex/cals/test/support/LatexTest.py
+++ b/Master/texmf-dist/doc/latex/cals/test/support/LatexTest.py
@@ -154,7 +154,7 @@ class LatexTestCase(unittest.TestCase):
expected_png = os.path.join(module, png)
got_png = os.path.join(tmp_dir, png)
diff_png = os.path.join(tmp_dir, 'diff.png')
- cmd = "compare -metric RMSE %s %s %s 2>%s" % (expected_png, got_png, diff_png, os.path.join(tmp_dir, 'compare-stdout'))
+ cmd = "compare compare -metric RMSE %s %s %s 2>%s" % (expected_png, got_png, diff_png, os.path.join(tmp_dir, 'compare-stdout'))
os.system(cmd)
h = open(os.path.join(tmp_dir, 'compare-stdout'))
s = h.read()
diff --git a/Master/texmf-dist/doc/latex/cals/test/support/run_tests.py b/Master/texmf-dist/doc/latex/cals/test/support/run_tests.py
index c4fa70c22e6..07ee27cd502 100644
--- a/Master/texmf-dist/doc/latex/cals/test/support/run_tests.py
+++ b/Master/texmf-dist/doc/latex/cals/test/support/run_tests.py
@@ -23,6 +23,7 @@ filter = None
if len(sys.argv) > 1:
filter = sys.argv[1]
test_files = glob.glob('*/test_*.tex')
+test_files = [x for x in test_files if 'visual_tables' not in x]
modules_and_tests = {}
for fname in test_files:
(dir, basename) = os.path.split(fname)
diff --git a/Master/texmf-dist/doc/latex/cals/test/table/test_40_issuerow.chk b/Master/texmf-dist/doc/latex/cals/test/table/test_40_issuerow.chk
index 5e42a5f3526..470a7f3829a 100644
--- a/Master/texmf-dist/doc/latex/cals/test/table/test_40_issuerow.chk
+++ b/Master/texmf-dist/doc/latex/cals/test/table/test_40_issuerow.chk
@@ -25,3 +25,4 @@
....\rule(20.0+0.0)x200.0
....\glue 0.0 plus 1.0fil
..\glue 0.0
+.\penalty 10000
diff --git a/Master/texmf-dist/doc/latex/cals/test/table/test_50_row.chk b/Master/texmf-dist/doc/latex/cals/test/table/test_50_row.chk
index 8488abb63c6..eb34dae6520 100644
--- a/Master/texmf-dist/doc/latex/cals/test/table/test_50_row.chk
+++ b/Master/texmf-dist/doc/latex/cals/test/table/test_50_row.chk
@@ -47,11 +47,13 @@
....\rule(20.0+0.0)x200.0
....\glue 0.0 plus 1.0fil
..\glue 0.0
-%
-% Output procesure forcing
-%
-.\glue 0.0
.\penalty 10000
+% %
+% % Output procesure forcing
+% % 18.11.2016: conditionally
+% %
+% .\glue 0.0
+% .\penalty 10000
%
% Row 2, colsep
%
@@ -97,3 +99,4 @@
....\rule(40.0+0.0)x200.0
....\glue 0.0 plus 1.0fil
..\glue 0.0
+.\penalty 10000
diff --git a/Master/texmf-dist/doc/latex/cals/test/table/test_70_lrskip.chk b/Master/texmf-dist/doc/latex/cals/test/table/test_70_lrskip.chk
index f2ef8998bf2..6d2b08afe33 100644
--- a/Master/texmf-dist/doc/latex/cals/test/table/test_70_lrskip.chk
+++ b/Master/texmf-dist/doc/latex/cals/test/table/test_70_lrskip.chk
@@ -22,8 +22,6 @@
....\glue 0.0 plus 1.0fil
....\glue 0.0
..\glue 150.0
-% thead+row1 break workaround
-.\glue 0.0
.\penalty 10000
% rowsep
.\hbox(0.0+0.0)x300.0
diff --git a/Master/texmf-dist/doc/latex/cals/test/template.txt b/Master/texmf-dist/doc/latex/cals/test/template.txt
index 5e0b64b7380..0e756514666 100644
--- a/Master/texmf-dist/doc/latex/cals/test/template.txt
+++ b/Master/texmf-dist/doc/latex/cals/test/template.txt
@@ -15,6 +15,7 @@
\input{decor.dtx}
\input{colsep.dtx}
\input{rowsep.dtx}
+\input{rtl.dtx}
\fi
% Variables defined inside calstable environment