diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4200 -> 4205 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/core-env.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/font-fea.mkvi | 8 | ||||
| -rw-r--r-- | tex/context/base/page-lin.lua | 6 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24450 -> 24455 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 255170 -> 255169 bytes | |||
| -rw-r--r-- | tex/context/base/typo-bld.lua | 5 | ||||
| -rw-r--r-- | tex/context/base/typo-lin.lua | 8 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 20 insertions, 15 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 822f9f09b..86f9d7473 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{2015.08.30 17:07} +\newcontextversion{2015.08.30 23:03} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 4fed34b6b..6625867b0 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index e1c93c484..f013626e6 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2015.08.30 17:07} +\edef\contextversion{2015.08.30 23:03} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/core-env.mkiv b/tex/context/base/core-env.mkiv index bebc1bef0..5dc6f6902 100644 --- a/tex/context/base/core-env.mkiv +++ b/tex/context/base/core-env.mkiv @@ -473,7 +473,7 @@ % no checking and we assume it being defined: \def\fastsetup #1{\csname\??setup:#1\endcsname\empty} -\def\fastsetupwithargument #1#2{\csname\??setup:#2\endcsname{#1}} +\def\fastsetupwithargument #1#2{\csname\??setup:#1\endcsname{#2}} % swapped per 2015-08-30 \def\fastsetupwithargumentswapped #1{\csname\??setup:#1\endcsname} % the next one is meant for \c!setups situations, hence the check for diff --git a/tex/context/base/font-fea.mkvi b/tex/context/base/font-fea.mkvi index 512b59506..6280ae2bc 100644 --- a/tex/context/base/font-fea.mkvi +++ b/tex/context/base/font-fea.mkvi @@ -248,8 +248,8 @@ \installcorenamespace{featureyes} \installcorenamespace{featurenop} -\unexpanded\def\font_feature_yes[#method]{\csname\??featureyes\ifcsname\??featureyes#1\endcsname#1\else\s!unknown\fi\endcsname} -\unexpanded\def\font_feature_nop #method{\csname\??featurenop\ifcsname\??featurenop#1\endcsname#1\else\s!unknown\fi\endcsname} +\unexpanded\def\font_feature_yes[#method]{\csname\??featureyes\ifcsname\??featureyes#method\endcsname#method\else\s!unknown\fi\endcsname} +\unexpanded\def\font_feature_nop #method{\csname\??featurenop\ifcsname\??featurenop#method\endcsname#method\else\s!unknown\fi\endcsname} \letvalue{\??featureyes +}\addfeature \letvalue{\??featurenop +}\addfeature @@ -334,8 +334,8 @@ % also new -\unexpanded\def\useaddfontfeatureparameter#1% faster local variant - {\edef\m_font_feature_asked{#1\c!features}% +\unexpanded\def\useaddfontfeatureparameter#namespace% faster local variant + {\edef\m_font_feature_asked{#namespace\c!features}% \ifx\m_font_feature_asked\empty\else \font_feature_add \fi} diff --git a/tex/context/base/page-lin.lua b/tex/context/base/page-lin.lua index 359aed877..788ca0a18 100644 --- a/tex/context/base/page-lin.lua +++ b/tex/context/base/page-lin.lua @@ -245,7 +245,11 @@ local function check_number(n,a,skip,sameline) end end local p = getprop(n,"line") - ctx_makelinenumber(tag,skipflag,s,p.hsize,p.reverse and "TRT" or "TLT") -- getfield(n,"dir")) + if p then + ctx_makelinenumber(tag,skipflag,s,p.hsize,p.reverse and "TRT" or "TLT") + else + report_lines("needs checking") + end end end diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 149bef03a..4d56f3d84 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 9c3fbb81c..c12c6a530 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/typo-bld.lua b/tex/context/base/typo-bld.lua index 75b294188..a9767981c 100644 --- a/tex/context/base/typo-bld.lua +++ b/tex/context/base/typo-bld.lua @@ -179,12 +179,15 @@ end) nodes.builders = nodes.builder or { } local builders = nodes.builders +local normalize = typesetters.paragraphs.normalize + local vboxactions = nodes.tasks.actions("vboxbuilders") function builders.vpack_filter(head,groupcode,size,packtype,maxdepth,direction) local done = false if head then starttiming(builders) + normalize(head,true) -- a bit weird place if trace_vpacking then local before = nodes.count(head) head, done = vboxactions(head,groupcode,size,packtype,maxdepth,direction) @@ -228,8 +231,6 @@ local build_par_codes = { adjust = true, } -local normalize = typesetters.paragraphs.normalize - function builders.buildpage_filter(groupcode) -- the next check saves 1% runtime on 1000 tufte pages local head = texlists.contrib_head diff --git a/tex/context/base/typo-lin.lua b/tex/context/base/typo-lin.lua index ef7bbe6ac..536252960 100644 --- a/tex/context/base/typo-lin.lua +++ b/tex/context/base/typo-lin.lua @@ -107,20 +107,20 @@ typesetters.paragraphs = paragraphs -- todo: see if we can hook into box in buildpagefilter .. saves traverse -function paragraphs.normalize(head,...) +function paragraphs.normalize(head,islocal) if texgetcount("pagebodymode") > 0 then - -- can be an option, maybe we need a proper state in lua itself + -- can be an option, maybe we need a proper state in lua itself ... is this check still needed? return head, false end for line in traverse_id(hlist_code,tonut(head)) do - if getsubtype(line) == line_code then + if getsubtype(line) == line_code and not getprop(line,"line") then local head = getlist(line) local leftskip = nil local anchor = new_hlist() local id = getid(head) local shift = getfield(line,"shift") local width = getfield(line,"width") - local hsize = tex.hsize + local hsize = islocal and width or tex.hsize local reverse = getfield(line,"dir") == "TRT" or false if id == glue_code then local subtype = getsubtype(head) diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 36548e688..97222c733 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 : 08/30/15 17:07:45 +-- merge date : 08/30/15 23:03:00 do -- begin closure to overcome local limits and interference |