summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc')
-rw-r--r--Master/texmf-dist/doc/latex/cals/cals.pdfbin261090 -> 236426 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cals/examples/demo.pdfbin62193 -> 58125 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cals/examples/demo.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/README3
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.chk106
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.tex37
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_065_alignment.chk45
-rw-r--r--Master/texmf-dist/doc/latex/cals/test/regression/test_065_alignment.tex25
8 files changed, 216 insertions, 2 deletions
diff --git a/Master/texmf-dist/doc/latex/cals/cals.pdf b/Master/texmf-dist/doc/latex/cals/cals.pdf
index 0e9bafd05b3..a87645f1e76 100644
--- a/Master/texmf-dist/doc/latex/cals/cals.pdf
+++ b/Master/texmf-dist/doc/latex/cals/cals.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cals/examples/demo.pdf b/Master/texmf-dist/doc/latex/cals/examples/demo.pdf
index 2428fd5375d..bb83c39ca9b 100644
--- a/Master/texmf-dist/doc/latex/cals/examples/demo.pdf
+++ b/Master/texmf-dist/doc/latex/cals/examples/demo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cals/examples/demo.tex b/Master/texmf-dist/doc/latex/cals/examples/demo.tex
index 2dfe0c03e53..0e165fffa34 100644
--- a/Master/texmf-dist/doc/latex/cals/examples/demo.tex
+++ b/Master/texmf-dist/doc/latex/cals/examples/demo.tex
@@ -36,7 +36,7 @@
by Oleg Parashchenko\par
\textless{}olpa uucode com\textgreater\par
\par
-26 August 2010\par
+24 May 2013\par
\clearpage
\header{Simple table}
diff --git a/Master/texmf-dist/doc/latex/cals/test/README b/Master/texmf-dist/doc/latex/cals/test/README
index 08e9f94dd16..e96d61b3f2e 100644
--- a/Master/texmf-dist/doc/latex/cals/test/README
+++ b/Master/texmf-dist/doc/latex/cals/test/README
@@ -1,6 +1,7 @@
Unit tests for the CALS package. Usage:
-$ export TEXINPUTS=`pwd`/../cals:
+$ export TEXINPUTS=`pwd`/../dev:
+$ mkdir tmp
$ python support/run_tests.py
or, to execute a subset of the tests,
$ python support/run_tests.py cell/test_10
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
new file mode 100644
index 00000000000..9d3bd56fc42
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.chk
@@ -0,0 +1,106 @@
+> \boxXX=
+\vbox(150.0+0.0)x290.0
+.\vbox(0.0+0.0)x290.0
+..\hbox(50.0+0.0)x290.0 []
+.\hbox(0.0+0.0)x290.0
+..\glue 50.0
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0
+.\hbox(100.0+0.0)x290.0
+..\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 []
+.\hbox(0.0+0.0)x290.0
+..\glue 50.0
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0
+.\hbox(50.0+0.0)x290.0
+..\glue 50.0
+..\hbox(50.0+0.0)x240.0 []
+..\glue 0.0
+.\hbox(0.0+0.0)x290.0
+..\glue 50.0
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0
+%
+%
+> \boxXX=
+\vbox(150.0+0.0)x400.0
+.\vbox(0.0+0.0)x400.0
+..\hbox(50.0+0.0)x400.0, glue set 80.0fil []
+.\hbox(0.0+0.0)x400.0, glue set 80.0fil
+..\glue 0.0 plus 1.0fil
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0 plus 1.0fil
+.\hbox(100.0+0.0)x400.0, glue set 80.0fil
+..\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 []
+.\hbox(0.0+0.0)x400.0, glue set 80.0fil
+..\glue 0.0 plus 1.0fil
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0 plus 1.0fil
+.\hbox(50.0+0.0)x400.0, glue set 80.0fil
+..\glue 0.0 plus 1.0fil
+..\hbox(50.0+0.0)x240.0 []
+..\glue 0.0 plus 1.0fil
+.\hbox(0.0+0.0)x400.0, glue set 80.0fil
+..\glue 0.0 plus 1.0fil
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0 plus 1.0fil
+%
+%
+> \boxXX=
+\vbox(150.0+0.0)x400.0
+.\vbox(0.0+0.0)x400.0
+..\hbox(50.0+0.0)x400.0, glue set 160.0fil []
+.\hbox(0.0+0.0)x400.0, glue set 160.0fil
+..\glue 0.0 plus 1.0fil
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0
+.\hbox(100.0+0.0)x400.0, glue set 160.0fil
+..\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 []
+.\hbox(0.0+0.0)x400.0, glue set 160.0fil
+..\glue 0.0 plus 1.0fil
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0
+.\hbox(50.0+0.0)x400.0, glue set 160.0fil
+..\glue 0.0 plus 1.0fil
+..\hbox(50.0+0.0)x240.0 []
+..\glue 0.0
+.\hbox(0.0+0.0)x400.0, glue set 160.0fil
+..\glue 0.0 plus 1.0fil
+..\glue -0.2
+..\rule(0.2+0.2)x240.4
+..\glue -0.2
+..\glue 0.0
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
new file mode 100644
index 00000000000..08d5b24b6df
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_060_alignment.tex
@@ -0,0 +1,37 @@
+\def\w{\ht\cals@current@row=50pt\relax}
+\def\mktable{%
+\begin{calstable}
+\colwidths{{70pt}{80pt}{90pt}}
+\def\cals@framecs@width{\cals@cs@width}
+\def\cals@framers@width{\cals@rs@width}
+\setlength{\cals@paddingR}{2pt plus1fil}
+\brow \nullcell{ltr} \cell{b} \cell{c} \w \erow
+\brow \nullcell{lrb}\spancontent{a,d} \cell{e} \cell{f} \w \erow
+\brow \cell{g} \cell{h} \cell{i} \w \erow
+\end{calstable}
+}
+
+\showboxdepth=2
+\hsize=400pt
+
+\setbox0=\vbox{%
+\leftskip=50pt\relax
+\mktable}
+\showbox0
+\box0
+
+\begin{center}
+some text\\
+\setbox0=\vbox{%
+\mktable}
+\showbox0
+\box0
+\end{center}
+
+\begin{flushright}
+some text\\
+\setbox0=\vbox{%
+\mktable}
+\showbox0
+\box0
+\end{flushright}
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_065_alignment.chk b/Master/texmf-dist/doc/latex/cals/test/regression/test_065_alignment.chk
new file mode 100644
index 00000000000..082696a904c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_065_alignment.chk
@@ -0,0 +1,45 @@
+> \boxXX=
+\hbox(40.0+0.0)x100.0
+.\vbox(40.0+0.0)x100.0
+..\glue 10.0
+..\glue 0.0 plus -1.0
+..\glue(\parskip) 0.0 plus 1.0
+..\glue(\lineskip) 0.0
+..\hbox(20.0+0.0)x100.0, glue set 80.0fil
+...\glue(\leftskip) 10.0
+...\vbox(20.0+0.0)x0.0
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...\glue(\rightskip) 10.0
+..\glue 0.0 plus 1.0fil
+..\glue 10.0
+> \boxXX=
+\hbox(40.0+0.0)x100.0
+.\vbox(40.0+0.0)x100.0
+..\glue 10.0
+..\glue 0.0 plus -1.0
+..\glue(\parskip) 0.0 plus 1.0
+..\glue(\lineskip) 0.0
+..\hbox(20.0+0.0)x100.0, glue set 80.0fil
+...\glue(\leftskip) 10.0
+...\vbox(20.0+0.0)x0.0
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...\glue(\rightskip) 10.0
+..\glue 0.0 plus 1.0fil
+..\glue 10.0
+> \boxXX=
+\hbox(40.0+0.0)x100.0
+.\vbox(40.0+0.0)x100.0
+..\glue 10.0
+..\glue 0.0 plus -1.0
+..\glue(\parskip) 0.0 plus 1.0
+..\glue(\lineskip) 0.0
+..\hbox(20.0+0.0)x100.0, glue set 80.0fil
+...\glue(\leftskip) 10.0
+...\vbox(20.0+0.0)x0.0
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...\glue(\rightskip) 10.0
+..\glue 0.0 plus 1.0fil
+..\glue 10.0
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_065_alignment.tex b/Master/texmf-dist/doc/latex/cals/test/regression/test_065_alignment.tex
new file mode 100644
index 00000000000..41f0523965c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_065_alignment.tex
@@ -0,0 +1,25 @@
+% Alignment outside a table should not affect alignment inside tanle
+\def\tbl{%
+\begin{calstable}
+\colwidths{{100pt}}
+\def\cals@paddingT{10pt}
+\def\cals@paddingR{10pt}
+\def\cals@paddingB{10pt}
+\def\cals@paddingL{10pt}
+\brow
+\cell{\noindent\vbox to 20pt{}}
+\ht\cals@current@row=40pt
+\showbox\cals@current@row
+\erow
+\end{calstable}
+}
+
+\tbl
+
+\begin{center}
+\tbl
+\end{center}
+
+\begin{flushright}
+\tbl
+\end{flushright}