From 831cac33e6e1ddcdcf6143b232d5197911dfe4ff Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 5 Jan 2012 19:27:22 +0100 Subject: beta 2011.11.09 20:58 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | 22 +++--- tex/context/base/context-version.png | Bin 106326 -> 106288 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/status-files.pdf | 72 ++++++++--------- tex/context/base/status-lua.pdf | 18 ++--- tex/context/base/strc-flt.mkvi | 5 +- tex/context/base/tabl-tsp.mkiv | 88 +++++++++++---------- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 11 files changed, 111 insertions(+), 104 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index f900217ec..63801484d 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.09 19:33} +\newcontextversion{2011.11.09 20:58} %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 bfd707d1f..086e7b290 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.09 19:33} +\newcontextversion{2011.11.09 20:58} %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 index 5c5982ccc..f66c99244 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf @@ -83,7 +83,7 @@ h f 0.000 0.700 0.700 rg 0.000 0.700 0.700 RG -1.345032 -9.998840 m 29.874359 -90.097046 l -12.909622 -61.943100 -29.662781 -62.600357 -54.288406 -91.396378 c +13.670990 -60.770996 -30.111328 -61.446930 -54.288406 -91.396378 c -1.345032 -9.998840 l h f 0 g 0 G @@ -97,7 +97,7 @@ h f 0.700 0.000 0.700 rg 0.700 0.000 0.700 RG -8.674164 -6.355164 m -56.902374 -90.097046 l --49.349472 -57.605606 -68.688110 -28.875458 -100.546051 -25.258499 c +-36.290054 -54.805786 -61.730881 -17.010040 -100.546051 -25.258499 c -8.674164 -6.355164 l h f 0 g 0 G @@ -163,17 +163,17 @@ stream s-version - 2011.11.09 19:33 + 2011.11.09 20:58 www.pragma-ade.com - 2011.11.09 19:33 - s-version.2011-11-09T19:33:51+01:00 + 2011.11.09 20:58 + s-version.2011-11-09T20:58:19+01:00 This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1 - 2011-11-09T19:33:51+01:00 - ConTeXt - 2011.11.09 19:33 - 2011-11-09T19:33:51+01:00 - 2011-11-09T19:33:51+01:00 + 2011-11-09T20:58:19+01:00 + ConTeXt - 2011.11.09 20:58 + 2011-11-09T20:58:19+01:00 + 2011-11-09T20:58:19+01:00 @@ -201,7 +201,7 @@ endobj endobj 22 0 obj << -/ConTeXt.Url (www.pragma-ade.com) /ConTeXt.Version (2011.11.09 19:33) /ConTeXt.Jobname (s-version) /CreationDate (D:20111109193351+01'00') /Trapped /False /Title /ConTeXt.Time (2011.11.09 19:33) /ID (s-version.2011-11-09T19:33:51+01:00) /Producer (LuaTeX-0.71.0) /ModDate (D:20111109193351+01'00') /Creator +/ConTeXt.Url (www.pragma-ade.com) /ConTeXt.Version (2011.11.09 20:58) /ConTeXt.Jobname (s-version) /CreationDate (D:20111109205819+01'00') /Trapped /False /Title /ConTeXt.Time (2011.11.09 20:58) /ID (s-version.2011-11-09T20:58:19+01:00) /Producer (LuaTeX-0.71.0) /ModDate (D:20111109205819+01'00') /Creator /PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>> endobj xref @@ -230,7 +230,7 @@ xref 0000006116 00000 n 0000006268 00000 n trailer -< ]>> +< <1A6F1610FB70B948C8CF26525257A1F8>]>> startxref 6866 %%EOF diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index bda97b0d7..247bab76c 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 161b8759f..8c7f83f76 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.09 19:33} +\edef\contextversion{2011.11.09 20:58} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index bd07aad05..f8ebb88ef 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.09 19:33} +\edef\contextversion{2011.11.09 20:58} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 020dfd0ed..a21e1d7ce 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf @@ -1429,13 +1429,13 @@ endobj <>/ProcSet[/PDF/Text]>> endobj 22 0 obj -<> +<> stream 0 g 0 G 0 g 0 G BT /F47 11.955168 Tf 1 0 0 1 12.3537 968.1015 Tm [<004C005100700032004B002300320060>-515<004E002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<0062004200780032>-515<00510037>-515<0055002B0051006000320056>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<00550040>-515<0042004D002F0042002B001C006900320062>-515<00320074002B0048006D006200420051004D>-514<00510037>-515<0048001C0060003B0032>-515<002F001C0069001C>-515<003700420048003200620063>-515<0059>-515<0042004D002F0042002B001C006900320062>-515<0042004D002B0048006D006200420051004D>-515<00510037>-515<0048001C0060003B0032>-515<002F001C0069001C>-515<003700420048003200620063>-515<002B0051004B004B0032004D0069>-515<001C004D002F>-515<00620054001C002B00320062>-515<00600032004B005100700032002F00580056>]TJ -1 0 0 1 139.4968 941.7188 Tm [<006B00790038005200790079>-500<006900320074>-8128<0039006B006B0038003900790039>-500<004B004600420042>-515<0039003300330038003900390052>-515<0059>-12028<006B006B00380033007900380065>-500<004B004600420070>-14066<006B00520065006A00640039>-500<004B004600700042>-4158<006B006B0079004E00790038004E>-500<0048006D001C>-515<003800650052004E005200380038>-515<0059>]TJ +1 0 0 1 139.4968 941.7188 Tm [<006B00790038005200790079>-500<006900320074>-8128<0039006B006B0038003900790039>-500<004B004600420042>-515<0039003300330038003900390052>-515<0059>-12027<006B006B003800330052006B0033>-500<004B004600420070>-14066<006B0052006500390033006A>-500<004B004600700042>-4158<006B006B0079004E00790038004E>-500<0048006D001C>-515<003800650052004E005200380038>-515<0059>]TJ ET q 1 0 0 1 12.3537 935.4601 cm @@ -2481,12 +2481,12 @@ q Q 0 g 0 G BT -/F47 11.955168 Tf 1 0 0 1 825.1437 259.1884 Tm [<00640065007900790079>]TJ +/F47 11.955168 Tf 1 0 0 1 825.1557 259.1884 Tm [<0064006500520079004E>]TJ ET 0.6 0.6 0 rg 0.6 0.6 0 RG q 1 0 0 1 861.8939 259.1884 cm -0 0 42.7267 8.3103 re f +0 0 42.7851 8.3103 re f Q 0 g 0 G BT @@ -2589,12 +2589,12 @@ q Q 0 g 0 G BT -/F47 11.955168 Tf 1 0 0 1 583.2904 201.4784 Tm [<0052006A006A0064004E0039>]TJ +/F47 11.955168 Tf 1 0 0 1 583.3023 201.4784 Tm [<0052006A006A003300650065>]TJ ET 0.8 0 0 rg 0.8 0 0 RG q 1 0 0 1 626.1974 201.4784 cm -0 0 75.216 8.3103 re f +0 0 75.2561 8.3103 re f Q 0 g 0 G BT @@ -5219,7 +5219,7 @@ Q 0.6 0.6 0 rg 0.6 0.6 0 RG q 1 0 0 1 800.9493 253.7327 cm -0 0 11.9552 34.1814 re f +0 0 11.9552 34.2281 re f Q 0.725 g 0.725 G q @@ -5315,7 +5315,7 @@ Q 0.8 0 0 rg 0.8 0 0 RG q 1 0 0 1 1089.4115 253.7327 cm -0 0 11.9552 60.1728 re f +0 0 11.9552 60.2049 re f Q 0.6 0.6 0 rg 0.6 0.6 0 RG q @@ -5609,14 +5609,14 @@ stream - s-inf-01.2011-11-09T19:38:52+01:00 + s-inf-01.2011-11-09T21:03:00+01:00 This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1 - 2011-11-09T19:38:52+01:00 - ConTeXt - 2011.11.09 19:33 - 2011-11-09T19:38:52+01:00 - 2011-11-09T19:38:52+01:00 + 2011-11-09T21:03:00+01:00 + ConTeXt - 2011.11.09 20:58 + 2011-11-09T21:03:00+01:00 + 2011-11-09T21:03:00+01:00 @@ -5757,7 +5757,7 @@ endobj endobj 38 0 obj << -/CreationDate (D:20111109193852+01'00') /Creator /Producer (LuaTeX-0.71.0) /ID (s-inf-01.2011-11-09T19:38:52+01:00) /Trapped /False /ModDate (D:20111109193852+01'00') /Title +/CreationDate (D:20111109210300+01'00') /Creator /Producer (LuaTeX-0.71.0) /ID (s-inf-01.2011-11-09T21:03:00+01:00) /Trapped /False /ModDate (D:20111109210300+01'00') /Title /PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>> endobj xref @@ -5780,29 +5780,29 @@ xref 0000027264 00000 n 0000027064 00000 n 0000000015 00000 n -0000114502 00000 n -0000114825 00000 n -0000057536 00000 n -0000057335 00000 n +0000114503 00000 n +0000114826 00000 n +0000057537 00000 n +0000057336 00000 n 0000027324 00000 n -0000080961 00000 n -0000080760 00000 n -0000057596 00000 n -0000104693 00000 n -0000104492 00000 n -0000081021 00000 n -0000104753 00000 n -0000106975 00000 n -0000107255 00000 n -0000107328 00000 n -0000112932 00000 n -0000113149 00000 n -0000114641 00000 n -0000114899 00000 n -0000114920 00000 n -0000115072 00000 n +0000080962 00000 n +0000080761 00000 n +0000057597 00000 n +0000104694 00000 n +0000104493 00000 n +0000081022 00000 n +0000104754 00000 n +0000106976 00000 n +0000107256 00000 n +0000107329 00000 n +0000112933 00000 n +0000113150 00000 n +0000114642 00000 n +0000114900 00000 n +0000114921 00000 n +0000115073 00000 n trailer -< <15BCC188490C082BD359E02F63571E64>]>> +< ]>> startxref -115533 +115534 %%EOF diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 192aa01cd..34ff0d71b 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf @@ -13936,17 +13936,17 @@ stream s-inf-03 - 2011.11.09 19:39 + 2011.11.09 21:03 www.pragma-ade.com - 2011.11.09 19:33 - s-inf-03.2011-11-09T19:39:24+01:00 + 2011.11.09 20:58 + s-inf-03.2011-11-09T21:03:31+01:00 This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1 - 2011-11-09T19:39:24+01:00 - ConTeXt - 2011.11.09 19:33 - 2011-11-09T19:39:24+01:00 - 2011-11-09T19:39:24+01:00 + 2011-11-09T21:03:31+01:00 + ConTeXt - 2011.11.09 20:58 + 2011-11-09T21:03:31+01:00 + 2011-11-09T21:03:31+01:00 @@ -14789,7 +14789,7 @@ endobj endobj 1445 0 obj << -/ConTeXt.Url (www.pragma-ade.com) /Creator /ConTeXt.Jobname (s-inf-03) /Author /Trapped /False /CreationDate (D:20111109193924+01'00') /Producer (LuaTeX-0.71.0) /Title /ConTeXt.Time (2011.11.09 19:39) /ID (s-inf-03.2011-11-09T19:39:24+01:00) /ConTeXt.Version (2011.11.09 19:33) /ModDate (D:20111109193924+01'00') /Subject +/ConTeXt.Url (www.pragma-ade.com) /Creator /ConTeXt.Jobname (s-inf-03) /Author /Trapped /False /CreationDate (D:20111109210331+01'00') /Producer (LuaTeX-0.71.0) /Title /ConTeXt.Time (2011.11.09 21:03) /ID (s-inf-03.2011-11-09T21:03:31+01:00) /ConTeXt.Version (2011.11.09 20:58) /ModDate (D:20111109210331+01'00') /Subject /PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>> endobj xref @@ -16241,7 +16241,7 @@ xref 0000815020 00000 n 0000815203 00000 n trailer -< <7C6E05E145ADC1A6BE3C5667671676BF>]>> +< ]>> startxref 816088 %%EOF diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi index e330bb5d7..6196ae1ba 100644 --- a/tex/context/base/strc-flt.mkvi +++ b/tex/context/base/strc-flt.mkvi @@ -487,6 +487,7 @@ \def\float_begin_group {\begingroup} \def\float_end_group {\carryoverpar\endgroup} +\def\float_end_split_group {\endgroup} \def\float_begin_text_group {\begingroup\let\float_end_group\relax} \def\float_end_text_group {\endgroup} @@ -502,7 +503,9 @@ \v!text,\v!opposite}% \v!page \unexpanded\def\place_next_float_box_split - {\splitfloat{\place_next_float_box_normal}} + {\let\splitfloatfinalizer\float_end_split_group + \let\float_end_group\relax + \splitfloat{\place_next_float_box_normal}} \unexpanded\def\place_next_float_box_normal {\ifsomefloatwaiting diff --git a/tex/context/base/tabl-tsp.mkiv b/tex/context/base/tabl-tsp.mkiv index 2e89aa2d8..639751dcd 100644 --- a/tex/context/base/tabl-tsp.mkiv +++ b/tex/context/base/tabl-tsp.mkiv @@ -28,23 +28,57 @@ % there is no need for a tracked structure number here +%D When \type {inbetween} is made empty instead of the +%D default \type {\page}, we will get delayed flushing +%D and text may continue below the graphic. +%D +%D \starttyping +%D \dorecurse{2}{\input tufte } +%D +%D \splitfloat[lines=auto,inbetween=] +%D {\placetable{\dorecurse{5}{test\recurselevel\endgraf}}} +%D {\bTABLE[split=yes] +%D \bTR \bTD 11 \eTD \bTD \input tufte \eTD \eTR +%D \bTR \bTD 12 \eTD \bTD \input zapf \eTD \eTR +%D \bTR \bTD 13 \eTD \bTD \input bryson \eTD \eTR +%D \bTR \bTD 14 \eTD \bTD test \eTD \eTR +%D \bTR \bTD 21 \eTD \bTD \input tufte \eTD \eTR +%D \bTR \bTD 22 \eTD \bTD \input zapf \eTD \eTR +%D \bTR \bTD 23 \eTD \bTD \input bryson \eTD \eTR +%D \bTR \bTD 24 \eTD \bTD test \eTD \eTR +%D \bTR \bTD 31 \eTD \bTD \input tufte \eTD \eTR +%D \bTR \bTD 32 \eTD \bTD \input zapf \eTD \eTR +%D \bTR \bTD 33 \eTD \bTD \input bryson \eTD \eTR +%D \bTR \bTD 34 \eTD \bTD test \eTD \eTR +%D \eTABLE} +%D +%D \dorecurse{10}{\input tufte } +%D \stoptyping + \newcount\noffloatssplits -\unexpanded\def\setupfloatsplitting - {\dodoubleargument\getparameters[\??si]} +\settrue \onlyonesplitofffloat +\setfalse\somenextsplitofffloat + +\newconditional\splitfloatdone \newif\ifinsidesplitfloat % will become chardef -\newtoks \everysplitfloatsetup +\newtoks\everysplitfloatsetup -\def\splitfloat - {\dosingleempty\dosplitfloat} +\def\extrasplitfloatlines{0} + +\let\splitfloatfinalizer\relax \ifx\floatcaptionsuffix\undefined \else \let\floatcaptionsuffix\empty % will become \splitfloatcaptionsuffix \fi -\def\extrasplitfloatlines{0} +\unexpanded\def\setupfloatsplitting + {\dodoubleargument\getparameters[\??si]} + +\unexpanded\def\splitfloat + {\dosingleempty\dosplitfloat} \def\dosplitfloat[#1]#2% nog dubbele refs {\bgroup @@ -64,44 +98,14 @@ \@@sibefore \let\next} % \bgroup -\def\checksplitfloat - {\ifconditional\splitfloatdone\else - \blank{\tttf \getmessage\m!floatblocks{13}\empty}\blank - \showmessage\m!floatblocks{13}\empty +\unexpanded\def\checksplitfloat + {\ifconditional\splitfloatdone + \splitfloatfinalizer % a weird place (could interfere with flushing) + \else + \blank{\tttf \getmessage\m!floatblocks{13}\empty}\blank + \showmessage\m!floatblocks{13}\empty \fi} -\settrue \onlyonesplitofffloat -\setfalse\somenextsplitofffloat - -%D When \type {inbetween} is made empty instead of the -%D default \type {\page}, we will get delayed flushing -%D and text may continue below the graphic. -%D -%D \starttyping -%D \dorecurse{2}{\input tufte } -%D -%D \splitfloat[lines=auto,inbetween=] -%D {\placetable{\dorecurse{5}{test\recurselevel\endgraf}}} -%D {\bTABLE[split=yes] -%D \bTR \bTD 11 \eTD \bTD \input tufte \eTD \eTR -%D \bTR \bTD 12 \eTD \bTD \input zapf \eTD \eTR -%D \bTR \bTD 13 \eTD \bTD \input bryson \eTD \eTR -%D \bTR \bTD 14 \eTD \bTD test \eTD \eTR -%D \bTR \bTD 21 \eTD \bTD \input tufte \eTD \eTR -%D \bTR \bTD 22 \eTD \bTD \input zapf \eTD \eTR -%D \bTR \bTD 23 \eTD \bTD \input bryson \eTD \eTR -%D \bTR \bTD 24 \eTD \bTD test \eTD \eTR -%D \bTR \bTD 31 \eTD \bTD \input tufte \eTD \eTR -%D \bTR \bTD 32 \eTD \bTD \input zapf \eTD \eTR -%D \bTR \bTD 33 \eTD \bTD \input bryson \eTD \eTR -%D \bTR \bTD 34 \eTD \bTD test \eTD \eTR -%D \eTABLE} -%D -%D \dorecurse{10}{\input tufte } -%D \stoptyping - -\newconditional\splitfloatdone - \def\dodowithsplitofffloat {\dowithnextbox {\forgetall diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index b6c269569..7c5c03b8a 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/09/11 19:33:25 +-- merge date : 11/09/11 20:58:06 do -- begin closure to overcome local limits and interference -- cgit v1.2.3