From c06e3acd4fc31d61e31a7172ae36bae6b929e20a Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sun, 26 Jun 2011 13:23:00 +0200 Subject: beta 2011.06.26 13:23 --- tex/context/base/cont-log.mkiv | 2 +- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/font-tfm.lua | 2 ++ tex/context/base/mult-aux.mkiv | 2 ++ tex/context/base/page-one.mkiv | 5 ++++- tex/context/base/scrp-ini.lua | 7 ++++++- tex/context/base/status-files.pdf | Bin 23705 -> 23742 bytes tex/context/base/status-lua.pdf | Bin 157618 -> 157615 bytes tex/context/base/strc-not.mkiv | 23 +++++++++++++++++---- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 13 files changed, 39 insertions(+), 12 deletions(-) diff --git a/tex/context/base/cont-log.mkiv b/tex/context/base/cont-log.mkiv index 3f2f34bc8..3708d9b07 100644 --- a/tex/context/base/cont-log.mkiv +++ b/tex/context/base/cont-log.mkiv @@ -103,7 +103,7 @@ \ifx\fontalternative\c!bi\else \ifx\fontalternative\c!bs\else \fi\fi\fi\fi\fi - 10 at \currentfontscale\bodyfontsize + 10 at \currentfontscale\bodyfontsize % there is no afm in the minimals yet \logofont} \def\MetaHyphen% there is no hyphenchar in this font diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index b5ac8dabe..c0753b8ae 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.06.25 14:54} +\newcontextversion{2011.06.26 13:23} %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 c297d5009..391315f13 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.06.25 14:54} +\newcontextversion{2011.06.26 13:23} %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.mkii b/tex/context/base/context.mkii index ab1fd18bd..b9e18eb63 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.06.25 14:54} +\edef\contextversion{2011.06.26 13:23} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 8cc20680d..c03d3b707 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.06.25 14:54} +\edef\contextversion{2011.06.26 13:23} %D For those who want to use this: diff --git a/tex/context/base/font-tfm.lua b/tex/context/base/font-tfm.lua index 8f0a99d5a..d7c8fe314 100644 --- a/tex/context/base/font-tfm.lua +++ b/tex/context/base/font-tfm.lua @@ -63,6 +63,7 @@ local function read_from_tfm(specification) local tfmdata = font.read_tfm(filename,size) -- not cached, fast enough if tfmdata then local features = specification.features and specification.features.normal or { } + local resources = tfmdata.resources or { } local properties = tfmdata.properties or { } local parameters = tfmdata.parameters or { } local shared = tfmdata.shared or { } @@ -76,6 +77,7 @@ local function read_from_tfm(specification) shared.processes = next(features) and tfm.setfeatures(tfmdata,features) or nil -- tfmdata.properties = properties + tfmdata.resources = resources tfmdata.parameters = parameters tfmdata.shared = shared -- diff --git a/tex/context/base/mult-aux.mkiv b/tex/context/base/mult-aux.mkiv index 47d578ab5..65cc3b0fe 100644 --- a/tex/context/base/mult-aux.mkiv +++ b/tex/context/base/mult-aux.mkiv @@ -62,6 +62,8 @@ % watch the push/pop and predefinition of current .. this is needed for nested % definitions and overloaded defines using the predefined one +% todo: add (relaxed) postsetup and postdefine hooks, just after the everys + \unexpanded\def\doinstallparameterhandler#1#2#3#4#5#6#7% {\ifx#2\relax\let#2\empty\fi \def#3##1{\csname#4{#1#2}{##1}\endcsname}% diff --git a/tex/context/base/page-one.mkiv b/tex/context/base/page-one.mkiv index 2d639664d..224bdcedb 100644 --- a/tex/context/base/page-one.mkiv +++ b/tex/context/base/page-one.mkiv @@ -344,7 +344,10 @@ \ifpackflushedfloats \centerfloatboxfalse % not needed as we do call directly \dofloatscollect\s!text{\hsize}{1em}% - \OTRONEsetvsize + %% no longer (interferes with footnotes): + %% + %% \OTRONEsetvsize / test 2011.06.24.001 + %% \global\setbox\floatbox\hbox to \hsize {\hfil \dorecurse\nofcollectedfloats diff --git a/tex/context/base/scrp-ini.lua b/tex/context/base/scrp-ini.lua index 0e1d450e2..6e33bac11 100644 --- a/tex/context/base/scrp-ini.lua +++ b/tex/context/base/scrp-ini.lua @@ -379,7 +379,12 @@ function scripts.preprocess(head) if normal_process then local f = start.font if f ~= lastfont then - originals = fontdata[f].resources.originals + originals = fontdata[f].resources + if resources then + originals = resources.originals + else + -- can't happen + end lastfont = f end local c = start.char diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 8cb4e184f..d872011d3 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index c98bcc945..2b38edff7 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/strc-not.mkiv b/tex/context/base/strc-not.mkiv index 8099e7942..404299770 100644 --- a/tex/context/base/strc-not.mkiv +++ b/tex/context/base/strc-not.mkiv @@ -102,6 +102,8 @@ %D is that we use descriptions to typeset the note, so we have several %D resolvers. +% will be commandhandler (but we need a finalizer for setup and define (just after \every) + \let\currentnote\v!footnote \def\noteparameter #1{\csname\donoteparameter{\??vn\currentnote}#1\endcsname} @@ -123,6 +125,8 @@ \ifx\fontattributehash \empty\else\dosetfontattribute \fontattributehash #1\fi \ifx\colorattributehash\empty\else\dosetcolorattribute\colorattributehash#2\fi} +\def\setnoteparameter#1{\dosetvalue{\??vn\currentnote}{#1}} + %D \macros %D {setupnote,setupnotedefinition} %D @@ -361,6 +365,16 @@ \s!unknown=>\notepenalty\commalistelement]% \to \everysetupnote +\appendtoks + \edef\currentnotewidth{\noteparameter\c!width}% + \ifx\currentnotewidth\empty + \setnoteparameter\c!width{\hsize}% + \else + % \doifdimensionelse\currentnotewidth\donothing + % {\setnoteparameter\c!width{\hsize}}% + \fi +\to \everysetupnote + %D The following switch can be used to disable limiting the %D height of the footnote area, something that is needed in %D multi column balancing. Use this switch with care. @@ -872,6 +886,10 @@ % \fi \to \everyinsidenoteinsert +\appendtoks + \setsimplecolumnshsize[\c!distance=\noteparameter\c!columndistance,\c!n=\noteparameter\c!n,\c!width=\noteparameter\c!width]%\currentnotewidth]% +\to \everyinsidenoteinsert + % not: \appendtoks \setnotehsize \to \everyinsidenoteinsert (spoils columns) \let\lastnotesymbol\relax @@ -953,10 +971,7 @@ \obeydepth} % (a) added , since split footnotes will not align properly \def\doglobalflushnotescolums - {\edef\currentnotewidth{\noteparameter\c!width}% brrr, is no linger valid as it's description width - \doifdimensionelse\currentnotewidth\donothing - {\edef\currentnotewidth{\the\hsize}}% - \startsimplecolumns[\c!distance=\noteparameter\c!columndistance,\c!n=\noteparameter\c!n,\c!width=\currentnotewidth]% + {\startsimplecolumns[\c!distance=\noteparameter\c!columndistance,\c!n=\noteparameter\c!n,\c!width=\noteparameter\c!width]%,\c!width=\currentnotewidth]% %\iftrialtypesetting\unvcopied\else\unvboxed\fi\currentnoteins % compare with local \doflushglobalnotes \stopsimplecolumns} diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index a17ff12ee..2b3fc5fc7 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 : 06/26/11 11:37:32 +-- merge date : 06/26/11 13:23:20 do -- begin closure to overcome local limits and interference -- cgit v1.2.3