diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.tex | 2 | ||||
| -rw-r--r-- | tex/context/base/context.tex | 2 | ||||
| -rw-r--r-- | tex/context/base/strc-not.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/tabl-tab.mkiv | 64 | ||||
| -rw-r--r-- | tex/generic/context/luatex-fonts-merged.lua | 2 |
5 files changed, 16 insertions, 56 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index dfd4d8b7b..6210cb11d 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2010.12.01 15:28} +\newcontextversion{2010.12.01 18:05} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 0d9645f59..4cc9163e4 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2010.12.01 15:28} +\edef\contextversion{2010.12.01 18:05} %D For those who want to use this: diff --git a/tex/context/base/strc-not.mkiv b/tex/context/base/strc-not.mkiv index bd1fe1994..6f6f5638a 100644 --- a/tex/context/base/strc-not.mkiv +++ b/tex/context/base/strc-not.mkiv @@ -230,7 +230,7 @@ \setupenumerations [\currentnote] [\s!parent=\??vn\currentnote, - \c!number=\v!yes] % no inheritance from decriptions which is okay + \c!number=\v!yes]% no inheritance from decriptions which is okay \presetlocalframed [\??vn\currentnote]% \getparameters diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/tabl-tab.mkiv index e016c9a24..b5f79ff4b 100644 --- a/tex/context/base/tabl-tab.mkiv +++ b/tex/context/base/tabl-tab.mkiv @@ -306,7 +306,7 @@ \fi} \def\!tgDoParen(#1)% - {\def\!tgCode{2}% + {\def\!tgCode{2}% will be expanded \def\!tgValue{#1}% \!tgReturn} @@ -348,8 +348,8 @@ {\normalexpanded {\noexpand \doreadtableformatkeys b{\dotablebeginparbox - {\ifnum \!tgCode=1 - \ifx \!tgValue\empty + {\ifnum\!tgCode=\plusone + \ifx\!tgValue\empty \tablecolumnwidthfactor \else \!tgValue @@ -363,7 +363,7 @@ \def\!tgInsertKern {\edef\!ttemp {\kern - \ifnum \!tgCode=1 + \ifnum \!tgCode=\plusone \ifx \!tgValue\empty \tablekernfactor \else @@ -919,47 +919,6 @@ {\domakestandardtablestrut \cr} -% ALTERNATE VRULE - -\def\!ttAlternateVrule - {\!tgGetValue{\!ttAVTestForCode}} % AV == Alternate Vrule - -% TEST FOR CODE (2) - -\def\!ttAVTestForCode - {\ifnum\!tgCode=\plustwo % (...) follows "\|" - \expandafter\!ttInsertVrule % \InsertVrule ends with "&" - \else - \expandafter\!ttAVTestForEmpty - \fi} - -% TEST FOR EMPTY (VALUE) - -\def\!ttAVTestForEmpty - {\ifx\!tgValue\empty % non-digit after "\|" - \expandafter\!ttAVTestForBlank - \else - \expandafter\!ttInsertVrule % integer after "\|" - \fi} - -% TEST FOR BLANK - -\def\!ttAVTestForBlank - {\ifx\!ttemp\!thSpaceToken % blank after "\|" - \expandafter\!ttInsertVrule - \else - \expandafter\!ttAVTestForStar - \fi} - -% TEST FOR STAR - -\def\!ttAVTestForStar - {\ifx*\!ttemp % "*" after "\|" - \expandafter\!ttInsertDefaultPR % PR == pseudo-rule - \else - \expandafter\!ttGetPseudoVrule % "Anything else" after "\|" - \fi} - % INSERT VRULE \def\@VLn{1} @@ -1512,8 +1471,8 @@ \def\donormaltablefullrule {\!ttFullHrule} \def\donormaltableendofrow {\!ttEndOfRow} \def\donormaltablesimplebar {\unskip\!ttRightGlue&&} -\def\donormaltablecomplexbar #1{\unskip\!ttRightGlue&\omit\expandafter\!ttAlternateVrule#1 } -\def\donormaltablequote {\unskip\!ttRightGlue&\omit&} +\def\donormaltablecomplexbar {\unskip\!ttRightGlue&\omit\!ttInsertVrule} +\def\donormaltablenobar {\unskip\!ttRightGlue&\omit&} \def\donormaltablelineformat {\donormaltableendofrow+} \def\donormaltablelineending {\donormaltableendofrow0 } \def\donormaltablesinglerule {&\donormaltablelongrule&} @@ -2173,14 +2132,15 @@ \dosingleempty\dodotableVL} \def\dodotableVL[#1]% - {\global\tablecurrentvrulecolor\empty + {\global\let\tablecurrentvrulecolor\empty \global\tablevrulethicknessfactor\@@tiVLwidth\relax \iffirstargument \rawprocesscommalist[#1]\dotablevrulecommand \fi - \normalexpanded{\noexpand\donormaltablecomplexbar\the\tablevrulethicknessfactor} }% \relax breaks \use + %\normalexpanded{\noexpand\donormaltablecomplexbar\the\tablevrulethicknessfactor} }% \relax breaks \use + \donormaltablecomplexbar}% \relax breaks \use -\let\doableVC\dotableVL % for mojca +\let\dotableVC\dotableVL % for mojca % \starttable[|||] % \HL @@ -2289,7 +2249,7 @@ \unexpanded\def\dotableNC {\dochecktableautorow \global\advance\currenttablecolumn \plusone - \donormaltablequote} + \donormaltablenobar} %D \startitemize[3*broad] %D \sym{\type{\DL}} @@ -2365,7 +2325,7 @@ {\dotableDCV\donormaltablesimplebar} \unexpanded\def\dotableDC - {\dotableDCV\donormaltablequote} + {\dotableDCV\donormaltablenobar} \unexpanded\def\dotableDCV#1% {\dochecktabledivision diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index 6224e159c..d332cdc55 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 12/01/10 15:28:31 +-- merge date : 12/01/10 18:05:09 do -- begin closure to overcome local limits and interference |