summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/optex/base/table.opm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/optex/base/table.opm')
-rw-r--r--Master/texmf-dist/tex/luatex/optex/base/table.opm19
1 files changed, 10 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/luatex/optex/base/table.opm b/Master/texmf-dist/tex/luatex/optex/base/table.opm
index 09ece437ea4..d6edaff20f7 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/table.opm
+++ b/Master/texmf-dist/tex/luatex/optex/base/table.opm
@@ -1,10 +1,10 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \table {Basic macros for OpTeX <2020-05-26>} % preloaded in format
+\_codedecl \table {Basic macros for OpTeX <2021-01-27>} % preloaded in format
\_doc -----------------------------
The result of the \`\table``{<declaration>}{<data>}` macro is inserted into
- `\_tablebox`. You can change default value if you want by
+ \`\_tablebox`. You can change default value if you want by
`\let\_tablebox=\vtop` or `\let\_tablebox=\relax`.
\_cod -----------------------------
@@ -95,7 +95,7 @@
work in special cases here like \code{`\{`} for example.
\_cod -----------------------------
-\_def\_tableB #1{\_egroup \_def\_tmpb{#1}%
+\_long\_def\_tableB #1{\_egroup \_def\_tmpb{#1}%
\_replstring\_tmpb{\crl}{\_crcr\crl}\_replstring\_tmpb{\crll}{\_crcr\crll}%
\_replstring\_tmpb{\crli}{\_crcr\crli}\_replstring\_tmpb{\crlli}{\_crcr\crlli}%
\_replstring\_tmpb{\crlp}{\_crcr\crlp}%
@@ -199,8 +199,8 @@
\_doc -----------------------------
The default \"declaration letters" `c`, `l`, `r` and `p` are declared
- by setting \`\tabdeclarec`, \`\tabdeclarel`, \`\tabdeclarer` and
- \`\paramtabdeclarep` macros. In general, define
+ by setting \`\_tabdeclarec`, \`\_tabdeclarel`, \`\_tabdeclarer` and
+ \`\_paramtabdeclarep` macros. In general, define
`\def\_tabdeclare<letter>{...}` for a non-parametric
letter and `\def\_paramtabdeclare<letter>{...}` for a letter with a parameter.
The double hash `##` must be in the definition, it is replaced by a real table item data.
@@ -269,8 +269,7 @@
\_def\_crlpB#1#2-#3,{\_ifx\_end#3\_xdef\_crlplist{\_crlplist#1#2,}\_else\_crlpC#1#2-#3,\_fi}
\_def\_crlpC#1-#2-#3,{\_tmpnum=#1\_relax
\_loop \_xdef\_crlplist{\_crlplist\_the\_tmpnum,}\_ifnum\_tmpnum<#2\_advance\_tmpnum by1 \_repeat}
-\_def\_crlpD{\_global\_advance\_tmpnum by1
- \_edef\_tmpa{\_noexpand\_isinlist\_noexpand\_crlplist{,\_the\_tmpnum,}}%
+\_def\_crlpD{\_incr\_tmpnum \_edef\_tmpa{\_noexpand\_isinlist\_noexpand\_crlplist{,\_the\_tmpnum,}}%
\_tmpa\_iftrue \_kern-\_drulewidth \_tablinefil \_kern-\_drulewidth\_else\_hfil \_fi}
\_def\_tskip{\_afterassignment\_tskipA \_tmpdim}
@@ -296,7 +295,7 @@
\_public \mspan ;
\_doc -----------------------------
- The \`\vspan``{<number>}{<text>}` implementation is here.
+ The \`\vspan``<number>{<text>}` implementation is here.
We need to lower the box by
\begtt \catcode`\<=13
(<number>-1)*(\ht+\dp of \tabstrut) / 2.
@@ -305,7 +304,8 @@
then use braces.
\_cod -----------------------------
-\_def\_vspan#1#2{\_vtop to\_zo{\_hbox{\_lower \_dimexpr
+\_def\_vspan#1#2#{\_vspanA{#1#2}}
+\_def\_vspanA#1#2{\_vtop to\_zo{\_hbox{\_lower \_dimexpr
#1\_dimexpr(\_ht\_tstrutbox+\_dp\_tstrutbox)/2\_relax
-\_dimexpr(\_ht\_tstrutbox+\_dp\_tstrutbox)/2\_relax \_hbox{#2}}\_vss}}
\_public \vspan ;
@@ -511,6 +511,7 @@ after the second one.
\_endinput
+2021-01-27 \_tableB: \long\def added, \vspan syntax improved
2020-05-26 \eqbox implemented
2020-05-20 \colnum implemented.
\vspan implemented.