diff options
| -rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4093 -> 4095 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 106215 -> 106425 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mult-aux.mkiv | 21 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 23920 -> 23891 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 162402 -> 162399 bytes | |||
| -rw-r--r-- | tex/context/base/strc-flt.mkiv | 12 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 26 insertions, 17 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 1c8b636f1..78cc2795c 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.09.19 12:37} +\newcontextversion{2011.09.19 23:43} %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 13f668a54..9c2ac5258 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.09.19 12:37} +\newcontextversion{2011.09.19 23:43} %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-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 766e4e5db..0357c8b6c 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 057f1f014..3b9950001 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index e9886ee4f..9355e5357 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.09.19 12:37} +\edef\contextversion{2011.09.19 23:43} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 688343542..5aaf50cea 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.09.19 12:37} +\edef\contextversion{2011.09.19 23:43} %D For those who want to use this: diff --git a/tex/context/base/mult-aux.mkiv b/tex/context/base/mult-aux.mkiv index 0e71ad661..e19db2481 100644 --- a/tex/context/base/mult-aux.mkiv +++ b/tex/context/base/mult-aux.mkiv @@ -64,15 +64,14 @@ % todo: add (relaxed) postsetup and postdefine hooks, just after the everys -\unexpanded\def\doinstallparameterhandler#1#2#3#4#5#6#7#8#9% +\unexpanded\def\doinstallparameterhandler#1#2#3#4#5#6#7#8% {\ifx#2\relax\let#2\empty\fi \def#3##1{\csname#4{#1#2}{##1}\endcsname}% \def#4##1##2{\ifcsname##1:##2\endcsname##1:##2\else\expandafter#5\csname##1:\s!parent\endcsname{##2}\fi}% \def#5##1##2{\ifx##1\relax\s!empty\else#4{##1}{##2}\fi}% is {} needed around ##1 ? \def#6##1##2{\csname#4{#1##1}{##2}\endcsname}% - \def#7##1{\detokenize\expandafter\expandafter\expandafter{\csname#1:##1\endcsname}}% always root - \def#8##1{\csname\ifcsname#1#2:##1\endcsname#1#2:##1\else\s!empty\fi\endcsname}% - \def#9##1{\csname\ifcsname#1:##1\endcsname#1:##1\else\s!empty\fi\endcsname}} + \def#7##1{\detokenize\expandafter\expandafter\expandafter{\csname#1#2:##1\endcsname}}% always root, no backtrack + \def#8##1{\csname\ifcsname#1#2:##1\endcsname#1#2:##1\else\s!empty\fi\endcsname}} \unexpanded\def\installparameterhandler#1#2% {\normalexpanded @@ -84,7 +83,17 @@ \expandafter\noexpand\csname do#2parentparameter\endcsname \expandafter\noexpand\csname named#2parameter\endcsname \expandafter\noexpand\csname detokenized#2parameter\endcsname - \expandafter\noexpand\csname strict#2parameter\endcsname + \expandafter\noexpand\csname strict#2parameter\endcsname}} + +\unexpanded\def\doinstallrootparameterhandler#1#2#3% + {\def#2##1{\detokenize\expandafter\expandafter\expandafter{\csname#1:##1\endcsname}}% always root + \def#3##1{\csname\ifcsname#1:##1\endcsname#1:##1\else\s!empty\fi\endcsname}} + +\unexpanded\def\installrootparameterhandler#1#2% + {\normalexpanded + {\doinstallrootparameterhandler + {\noexpand#1}% \??aa + \expandafter\noexpand\csname detokenizedroot#2parameter\endcsname \expandafter\noexpand\csname root#2parameter\endcsname}} \unexpanded\def\doinstallparameterhashhandler#1#2#3#4#5#6#7% @@ -251,6 +260,7 @@ {\installparameterhandler {#1}{#2}% \installparameterhashhandler{#1}{#2}% \installparametersethandler {#1}{#2}% + \installrootparameterhandler{#1}{#2}% \installdefinehandler {#1}{#2}{#3}% \installsetuphandler {#1}{#2}% \installattributehandler {#1}{#2}} @@ -259,6 +269,7 @@ {\installparameterhandler {#1}{#2}% \installparameterhashhandler{#1}{#2}% \installparametersethandler {#1}{#2}% + \installrootparameterhandler{#1}{#2}% \installdefinehandler {#1}{#2}{#3}% \installswitchsetuphandler {#1}{#2}% \installattributehandler {#1}{#2}} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 11af3c52f..a72d471d4 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex b5d01bcb5..27829fd27 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/strc-flt.mkiv b/tex/context/base/strc-flt.mkiv index 50a893c67..739e81c80 100644 --- a/tex/context/base/strc-flt.mkiv +++ b/tex/context/base/strc-flt.mkiv @@ -128,8 +128,8 @@ \appendtoks \let\currentfloat\currentfloatcaption - \dostructurecountersetup\currentfloat\floatcaptionparameter - \docheckstructurecountersetup\currentfloat + \dostructurecountersetup\currentfloatcaption\floatcaptionparameter + \docheckstructurecountersetup\currentfloatcaption \to \everysetupfloatcaption %D Definitions: @@ -197,8 +197,6 @@ \newif\ifnofloatnumber \newif\ifemptyfloatcaption -\def\getcaptionparameters{\getparameters[\??kj\currentfloat]} - \installstructurelistprocessor{float}{\usestructurelistprocessor{number+title}} \unexpanded\def\thecurrentfloatnumbersuffix @@ -266,7 +264,7 @@ \fi \letgvalue{@fl@r@#1}\relax}% nils \setgvalue{@fl@t@#1}% - {\preparefullnumber{\??kj#1}{\getvalue{@fl@n@#1}}\preparednumber + {\preparefullnumber{\??kj#1}{\getvalue{@fl@n@#1}}\preparednumber % !!!!!!!!!!!!!!!!!!!!!!!!!!! wrong \begingroup \dosetfloatcaptionattributes\c!style\c!color \begingroup @@ -480,8 +478,8 @@ \unexpanded\def\docomplexplacefloat[#1][#2]% [#3]#4% {\edef\currentfloat{#1}% - \let\currentfloatcaption\currentfloat \doifnothing\currentfloat{\let\currentfloat\v!figure}% hack + \let\currentfloatcaption\currentfloat \doifelsenothing{#2} {\edef\floatlocation{\floatparameter\c!default}} {\edef\floatlocation{#2}}% @@ -707,7 +705,7 @@ \else \dostructurecountercomponent {float}% - \getcaptionparameters + \setupcurrentfloatcaption \floatcaptionparameter \detokenizedfloatcaptionparameter \relax diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 54d936f87..28ac0347a 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 09/19/11 12:37:04 +-- merge date : 09/19/11 23:43:44 do -- begin closure to overcome local limits and interference |
