diff options
Diffstat (limited to 'tex')
| -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 | 4076 -> 4069 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 106398 -> 105821 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/page-ini.mkiv | 46 | ||||
| -rw-r--r-- | tex/context/base/page-set.mkiv | 8 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24036 -> 23989 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 169513 -> 169508 bytes | |||
| -rw-r--r-- | tex/context/base/strc-flt.mkvi | 83 | ||||
| -rw-r--r-- | tex/context/base/strc-ref.mkvi | 4 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
13 files changed, 86 insertions, 65 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 9722ce612..6124778a6 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.11.25 21:29} +\newcontextversion{2011.11.29 23:11} %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 f179f1feb..f141e451f 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.11.25 21:29} +\newcontextversion{2011.11.29 23:11} %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 719e68b01..3a029c70b 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 d5c91793d..84c8ee74e 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 da9357673..caae9f255 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.11.25 21:29} +\edef\contextversion{2011.11.29 23:11} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 395e6dc15..0cb59b556 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.11.25 21:29} +\edef\contextversion{2011.11.29 23:11} %D For those who want to use this: diff --git a/tex/context/base/page-ini.mkiv b/tex/context/base/page-ini.mkiv index 4b325cc85..c9bd05775 100644 --- a/tex/context/base/page-ini.mkiv +++ b/tex/context/base/page-ini.mkiv @@ -197,31 +197,33 @@ % todo: \registerotrcommand\output, is a toks -\registerotrcommand\setvsize % \def\setvsize {\OTRcommand\setvsize} -\registerotrcommand\sethsize % \def\sethsize {\OTRcommand\sethsize} -\registerotrcommand\finalsidefloatoutput % \def\finalsidefloatoutput {\OTRcommand\finalsidefloatoutput} -\registerotrcommand\dopagecontents % \def\dopagecontents {\OTRcommand\dopagecontents} -\registerotrcommand\dosettopinserts % \def\dosettopinserts {\OTRcommand\dosettopinserts} -\registerotrcommand\dosetbotinserts % \def\dosetbotinserts {\OTRcommand\dosetbotinserts} -\registerotrcommand\dotopinsertions % \def\dotopinsertions {\OTRcommand\dotopinsertions} -\registerotrcommand\dobotinsertions % \def\dobotinsertions {\OTRcommand\dobotinsertions} -\registerotrcommand\dosetbothinserts % \def\dosetbothinserts {\OTRcommand\dosetbothinserts} -\registerotrcommand\doflushfloats % \def\doflushfloats {\OTRcommand\doflushfloats} -\registerotrcommand\flushfloatbox % \def\flushfloatbox {\OTRcommand\flushfloatbox} -\registerotrcommand\docheckiffloatfits % \def\docheckiffloatfits {\OTRcommand\docheckiffloatfits} -\registerotrcommand\flushsavedfloats % \def\flushsavedfloats {\OTRcommand\flushsavedfloats} -\registerotrcommand\synchronizehsize % \def\synchronizehsize {\OTRcommand\synchronizehsize} -\registerotrcommand\gotonextpage % \def\gotonextpage {\OTRcommand\gotonextpage } -\registerotrcommand\gotonextpageX % \def\gotonextpageX {\OTRcommand\gotonextpageX} % will become obsolete +\registerotrcommand\setvsize +\registerotrcommand\sethsize +\registerotrcommand\finalsidefloatoutput +\registerotrcommand\dopagecontents +\registerotrcommand\dosettopinserts +\registerotrcommand\dosetbotinserts +\registerotrcommand\dotopinsertions +\registerotrcommand\dobotinsertions +\registerotrcommand\dosetbothinserts +\registerotrcommand\doflushfloats +\registerotrcommand\flushfloatbox +\registerotrcommand\docheckiffloatfits +\registerotrcommand\flushsavedfloats +\registerotrcommand\synchronizehsize +\registerotrcommand\gotonextpage +\registerotrcommand\gotonextpageX + +\registerotrcommand\setfloathsize % wrong, will be redone % -% \registerotrcommand\someherefloat % \def\someherefloat {\OTRcommand\someherefloat} -% \registerotrcommand\somefixdfloat % \def\somefixdfloat {\OTRcommand\somefixdfloat} -% \registerotrcommand\somepagefloat % \def\somepagefloat {\OTRcommand\somepagefloat} -% \registerotrcommand\sometopsfloat % \def\sometopsfloat {\OTRcommand\sometopsfloat} -% \registerotrcommand\somebotsfloat % \def\somebotsfloat {\OTRcommand\somebotsfloat} -% \registerotrcommand\somesidefloat % \def\somesidefloat {\OTRcommand\somesidefloat} +% \registerotrcommand\someherefloat +% \registerotrcommand\somefixdfloat +% \registerotrcommand\somepagefloat +% \registerotrcommand\sometopsfloat +% \registerotrcommand\somebotsfloat +% \registerotrcommand\somesidefloat % beter een \installotr#1 met #1 = macro en auto test diff --git a/tex/context/base/page-set.mkiv b/tex/context/base/page-set.mkiv index 0c3dfff30..0796dbb2b 100644 --- a/tex/context/base/page-set.mkiv +++ b/tex/context/base/page-set.mkiv @@ -2406,6 +2406,14 @@ \def\setcolumnsetspanhsize#1#2% x nx / uses counta/b {\!!counta#1\!!countb#2\docalculatecolumnsetspan \edef\columnsetspanhsize{\the\!!widtha}} + +\def\OTRSETsetfloathsize % new, otherwise wrong spanning floats in columnset + {\hsize % maybe checking optional + \ifdim\tempfloatwidth>\makeupwidth + \makeupwidth + \else + \tempfloatwidth + \fi} \unexpanded\def\definecolumnsetspan {\dodoubleempty\dodefinecolumnsetspan} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex a4cfc9fe9..3b3b029d1 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 9f4eb79ff..93d4231cb 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi index 34bcf0538..939cb2736 100644 --- a/tex/context/base/strc-flt.mkvi +++ b/tex/context/base/strc-flt.mkvi @@ -706,13 +706,13 @@ \def\float_place_packaged_boxes {\bgroup \ifconditional\usesamefloatnumber - \globallet\currentfloatnumber \previousfloatnumber - \globallet\currentfloatattribute \empty - \globallet\currentfloatsynchronize\relax + \globallet\currentfloatnumber \previousfloatnumber + \globallet\currentfloatattribute \empty + \globallet\currentfloatsynchronize\relax \else - \ifnofloatnumber \else \ifnofloatcaption \else - \doincrementsubstructurecounter[\@@thestructurecounter\currentfloat][1]% - \fi \fi + \ifnofloatnumber \else \ifnofloatcaption \else + \doincrementsubstructurecounter[\@@thestructurecounter\currentfloat][1]% + \fi \fi \dostructurecountercomponent {float}% \setupcurrentfloatcaption @@ -1173,7 +1173,7 @@ \postponenotes \dontcomplain \setbox\float_content_box\vbox{\borderedfloatbox}% - \let\float_align_content \float_align_content_indeed + \let\float_align_content\float_align_content_indeed \let\float_align_caption\float_align_caption_indeed \check_float_caption_content \ifcase\floatparameter\c!method @@ -1507,26 +1507,28 @@ {\expanded{\doifinset{\v!overlay}{\floatcaptionparameter\c!location}}\tophangfloat {\tempfloatwidth\wd\float_content_box \ifparfloat - \hbox{\locatesidefloat{\box\float_caption_box}}% + \hbox{\locate_side_float {\box\float_caption_box}}% \dofloatboxbetweenstack - \hbox{\hbox {\box\float_content_box }}% + \hbox{\hbox {\box\float_content_box}}% \else - \hbox{\locatetextfloat{\box\float_caption_box}} + \setfloathsize + \hbox{\locate_text_float {\box\float_caption_box}} \dofloatboxbetweenstack - \hbox{\float_align_content {\box\float_content_box }}% + \hbox{\float_align_content{\box\float_content_box}}% \fi}} \def\dofloatboxnormalbotstackbuilder {\expanded{\doifinset{\v!overlay}{\floatcaptionparameter\c!location}}\bothangfloat {\tempfloatwidth\wd\float_content_box \ifparfloat - \hbox{\hbox {\box\float_content_box }}% + \hbox{\hbox {\box\float_content_box}}% \dofloatboxbetweenstack - \hbox{\locatesidefloat{\box\float_caption_box}}% + \hbox{\locate_side_float {\box\float_caption_box}}% \else - \hbox{\float_align_content {\box\float_content_box }}% + \setfloathsize + \hbox{\float_align_content{\box\float_content_box}}% \dofloatboxbetweenstack - \hbox{\locatetextfloat{\box\float_caption_box}}% + \hbox{\locate_text_float {\box\float_caption_box}}% \fi}} \def\dofloatboxgridtopstackbuilder @@ -1534,13 +1536,14 @@ \setbox\scratchbox\vbox {\tempfloatwidth\wd\float_content_box \ifparfloat - \locatesidefloat{\box\float_caption_box}% + \locate_side_float {\box\float_caption_box}% \vss\dofloatboxbetweenstack - \hbox {\box\float_content_box }% + \hbox {\box\float_content_box}% \else - \locatetextfloat{\box\float_caption_box}% + \setfloathsize + \locate_text_float {\box\float_caption_box}% \vss\dofloatboxbetweenstack - \float_align_content {\box\float_content_box }% + \float_align_content{\box\float_content_box}% \fi}% \getnoflines{\dimexpr\htdp\scratchbox-10\scaledpoint\relax}% get rid of inaccuracy \vbox to \noflines\lineheight{\unvbox\scratchbox}} @@ -1550,13 +1553,14 @@ \setbox\scratchbox\vbox {\tempfloatwidth\wd\float_content_box \ifparfloat - \hbox {\box\float_content_box }% + \hbox {\box\float_content_box}% \vss\dofloatboxbetweenstack - \locatesidefloat{\box\float_caption_box}% + \locate_side_float {\box\float_caption_box}% \else - \float_align_content {\box\float_content_box }% + \setfloathsize + \float_align_content{\box\float_content_box}% \vss\dofloatboxbetweenstack - \locatetextfloat{\box\float_caption_box}% + \locate_text_float {\box\float_caption_box}% \fi}% \getnoflines{\dimexpr\htdp\scratchbox-10\scaledpoint\relax}% get rid of inaccuracy \vbox to \noflines\lineheight{\unvbox\scratchbox}} @@ -1570,13 +1574,14 @@ \vbox to \noflines\lineheight {\tempfloatwidth\wd\float_content_box \ifparfloat - \locatesidefloat{\box\float_caption_box}% + \locate_side_float {\box\float_caption_box}% \vss\dofloatboxbetweenstack\vss - \hbox {\box\float_content_box }% + \hbox {\box\float_content_box}% \else - \locatetextfloat{\box\float_caption_box}% + \setfloathsize + \locate_text_float {\box\float_caption_box}% \vss\dofloatboxbetweenstack\vss - \float_align_content {\box\float_content_box }% + \float_align_content{\box\float_content_box}% \fi}} \def\dofloatboxstretchbotstackbuilder @@ -1588,13 +1593,14 @@ \vbox to \noflines\lineheight {\tempfloatwidth\wd\float_content_box \ifparfloat - \hbox {\box\float_content_box }% + \hbox {\box\float_content_box}% \vss\dofloatboxbetweenstack\vss - \locatesidefloat{\box\float_caption_box} + \locate_side_float {\box\float_caption_box} \else - \float_align_content {\box\float_content_box }% + \setfloathsize + \float_align_content{\box\float_content_box}% \vss\dofloatboxbetweenstack\vss - \locatetextfloat{\box\float_caption_box}% + \locate_text_float {\box\float_caption_box}% \fi}} \def\dofloatboxtopbuilder @@ -1626,7 +1632,7 @@ \processcommacommand[\floatcaptionparameter\c!location]\docommand \executeifdefined{\??kj:\floatcaptionarrangement}{\getvalue{\??kj:\s!default}}}} -\def\locatetextfloat +\def\locate_text_float {\let\next\float_align_caption \expanded{\processallactionsinset[\floatcaptionparameter\c!location]} [ \v!left=>\let\next\relocatecaptionleft, @@ -1731,15 +1737,16 @@ \float_make_complete_caption}}}% \dostoptagged} +\def\locate_side_float#1% + {\begingroup + \alignstrutmode\zerocount + \hsize\tempfloatwidth \forgetall + \alignedline{\floatparameter\c!location}\v!middle{#1}% + \endgroup} + \def\build_side_float_box {\let\float_align_content\relax \let\float_align_caption\relax - \def\locatesidefloat##1% - {\begingroup - \alignstrutmode\zerocount - \hsize\tempfloatwidth \forgetall - \alignedline{\floatparameter\c!location}\v!middle{##1}% - \endgroup}% \build_float_box} \newif\ifparfloat diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi index e285a1a8d..dfb31d066 100644 --- a/tex/context/base/strc-ref.mkvi +++ b/tex/context/base/strc-ref.mkvi @@ -687,6 +687,10 @@ \unexpanded\def\popreferenceprefix {\popmacro\referenceprefix} +\appendtoks + \setupreferenceprefix[\@@rfprefix] +\to \everysetupreferencing + %D We can typeset a reference using \type{\in}, \type{\at} and %D \type{\about} and goto specific locations using %D \type{\goto}. The last one does not make that much sense in diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 907b4fd81..5686a4177 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 : 11/29/11 18:47:56 +-- merge date : 11/29/11 23:11:46 do -- begin closure to overcome local limits and interference |
