diff options
| -rw-r--r-- | scripts/context/lua/mtx-fonts.lua | 2 | ||||
| -rw-r--r-- | scripts/context/lua/mtxrun.lua | 18 | ||||
| -rw-r--r-- | scripts/context/stubs/mswin/mtxrun.lua | 18 | ||||
| -rw-r--r-- | scripts/context/stubs/unix/mtxrun | 18 | ||||
| -rw-r--r-- | scripts/context/stubs/win64/mtxrun.lua | 18 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4248 -> 4253 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-con.lua | 11 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-otl.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-otr.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/lxml-aux.lua | 12 | ||||
| -rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 9120 -> 9121 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 267917 -> 267917 bytes | |||
| -rw-r--r-- | tex/context/interface/mkiv/i-context.pdf | bin | 795943 -> 795943 bytes | |||
| -rw-r--r-- | tex/context/interface/mkiv/i-readme.pdf | bin | 60791 -> 60792 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 16 |
17 files changed, 75 insertions, 46 deletions
diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua index 0a429e3b5..f881e3d3b 100644 --- a/scripts/context/lua/mtx-fonts.lua +++ b/scripts/context/lua/mtx-fonts.lua @@ -15,7 +15,7 @@ local nameonly, basename, joinpath, collapsepath = file.nameonly, file.basename, local lower = string.lower local otfversion = 2.824 -local otlversion = 3.017 +local otlversion = 3.018 local helpinfo = [[ <?xml version="1.0"?> diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 2249c154f..6a4babe99 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -12509,7 +12509,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30339, stripped down to: 21584 +-- original size: 30566, stripped down to: 21741 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12882,18 +12882,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__=ekrt child.__f__=name epdt[ek.ni]=child - local inclusions=xmldata.settings.inclusions + local settings=xmldata.settings + local inclusions=settings and settings.inclusions if inclusions then inclusions[#inclusions+1]=name + elseif settings then + settings.inclusions={ name } else - xmldata.settings.inclusions={ name } + settings={ inclusions={ name } } + xmldata.settings=settings end if child.er then - local badinclusions=xmldata.settings.badinclusions + local badinclusions=settings.badinclusions if badinclusions then badinclusions[#badinclusions+1]=name else - xmldata.settings.badinclusions={ name } + settings.badinclusions={ name } end end end @@ -18735,8 +18739,8 @@ end -- of closure -- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 796599 --- stripped bytes : 288946 +-- original bytes : 796826 +-- stripped bytes : 289016 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 2249c154f..6a4babe99 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -12509,7 +12509,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30339, stripped down to: 21584 +-- original size: 30566, stripped down to: 21741 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12882,18 +12882,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__=ekrt child.__f__=name epdt[ek.ni]=child - local inclusions=xmldata.settings.inclusions + local settings=xmldata.settings + local inclusions=settings and settings.inclusions if inclusions then inclusions[#inclusions+1]=name + elseif settings then + settings.inclusions={ name } else - xmldata.settings.inclusions={ name } + settings={ inclusions={ name } } + xmldata.settings=settings end if child.er then - local badinclusions=xmldata.settings.badinclusions + local badinclusions=settings.badinclusions if badinclusions then badinclusions[#badinclusions+1]=name else - xmldata.settings.badinclusions={ name } + settings.badinclusions={ name } end end end @@ -18735,8 +18739,8 @@ end -- of closure -- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 796599 --- stripped bytes : 288946 +-- original bytes : 796826 +-- stripped bytes : 289016 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 2249c154f..6a4babe99 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -12509,7 +12509,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30339, stripped down to: 21584 +-- original size: 30566, stripped down to: 21741 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12882,18 +12882,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__=ekrt child.__f__=name epdt[ek.ni]=child - local inclusions=xmldata.settings.inclusions + local settings=xmldata.settings + local inclusions=settings and settings.inclusions if inclusions then inclusions[#inclusions+1]=name + elseif settings then + settings.inclusions={ name } else - xmldata.settings.inclusions={ name } + settings={ inclusions={ name } } + xmldata.settings=settings end if child.er then - local badinclusions=xmldata.settings.badinclusions + local badinclusions=settings.badinclusions if badinclusions then badinclusions[#badinclusions+1]=name else - xmldata.settings.badinclusions={ name } + settings.badinclusions={ name } end end end @@ -18735,8 +18739,8 @@ end -- of closure -- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 796599 --- stripped bytes : 288946 +-- original bytes : 796826 +-- stripped bytes : 289016 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index 2249c154f..6a4babe99 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -12509,7 +12509,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30339, stripped down to: 21584 +-- original size: 30566, stripped down to: 21741 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12882,18 +12882,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__=ekrt child.__f__=name epdt[ek.ni]=child - local inclusions=xmldata.settings.inclusions + local settings=xmldata.settings + local inclusions=settings and settings.inclusions if inclusions then inclusions[#inclusions+1]=name + elseif settings then + settings.inclusions={ name } else - xmldata.settings.inclusions={ name } + settings={ inclusions={ name } } + xmldata.settings=settings end if child.er then - local badinclusions=xmldata.settings.badinclusions + local badinclusions=settings.badinclusions if badinclusions then badinclusions[#badinclusions+1]=name else - xmldata.settings.badinclusions={ name } + settings.badinclusions={ name } end end end @@ -18735,8 +18739,8 @@ end -- of closure -- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 796599 --- stripped bytes : 288946 +-- original bytes : 796826 +-- stripped bytes : 289016 -- end library merge diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex f9398bdd2..680925623 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index d92cddf4b..6e3e5ba60 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.04.21 10:10} +\newcontextversion{2016.04.21 12:13} %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index b41e48c10..17eefd0fe 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.04.21 10:10} +\edef\contextversion{2016.04.21 12:13} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-con.lua b/tex/context/base/mkiv/font-con.lua index f36f75077..b11853533 100644 --- a/tex/context/base/mkiv/font-con.lua +++ b/tex/context/base/mkiv/font-con.lua @@ -776,9 +776,14 @@ function constructors.scale(tfmdata,specification) elseif autoitalicamount then -- itlc feature local vi = description.italic if not vi then - local vi = description.boundingbox[3] - description.width + autoitalicamount - if vi > 0 then -- < 0 indicates no overshoot or a very small auto italic - chr.italic = vi*hdelta + local bb = description.boundingbox + if bb then + local vi = bb[3] - description.width + autoitalicamount + if vi > 0 then -- < 0 indicates no overshoot or a very small auto italic + chr.italic = vi*hdelta + end + else + -- report_defining("no boundingbox for character %C in font %a, fullname %a, filename %a",unicode,name,fullname,filename) end elseif vi ~= 0 then chr.italic = vi*hdelta diff --git a/tex/context/base/mkiv/font-otl.lua b/tex/context/base/mkiv/font-otl.lua index 210abfe48..bcea27520 100644 --- a/tex/context/base/mkiv/font-otl.lua +++ b/tex/context/base/mkiv/font-otl.lua @@ -53,7 +53,7 @@ local report_otf = logs.reporter("fonts","otf loading") local fonts = fonts local otf = fonts.handlers.otf -otf.version = 3.017 -- beware: also sync font-mis.lua and in mtx-fonts +otf.version = 3.018 -- beware: also sync font-mis.lua and in mtx-fonts otf.cache = containers.define("fonts", "otl", otf.version, true) local otfreaders = otf.readers diff --git a/tex/context/base/mkiv/font-otr.lua b/tex/context/base/mkiv/font-otr.lua index d20238349..27bb6a621 100644 --- a/tex/context/base/mkiv/font-otr.lua +++ b/tex/context/base/mkiv/font-otr.lua @@ -1081,7 +1081,7 @@ readers.hmtx = function(f,fontdata,specification) end -- The next can happen in for instance a monospace font or in a cjk font -- with fixed widths. - for i=nofmetrics,nofglyphs do + for i=nofmetrics,nofglyphs-1 do local glyph = glyphs[i] if width ~= 0 then glyph.width = width diff --git a/tex/context/base/mkiv/lxml-aux.lua b/tex/context/base/mkiv/lxml-aux.lua index f28fd819d..4112db1e5 100644 --- a/tex/context/base/mkiv/lxml-aux.lua +++ b/tex/context/base/mkiv/lxml-aux.lua @@ -425,18 +425,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__ = ekrt child.__f__ = name -- handy for tracing epdt[ek.ni] = child - local inclusions = xmldata.settings.inclusions + local settings = xmldata.settings + local inclusions = settings and settings.inclusions if inclusions then inclusions[#inclusions+1] = name + elseif settings then + settings.inclusions = { name } else - xmldata.settings.inclusions = { name } + settings = { inclusions = { name } } + xmldata.settings = settings end if child.er then - local badinclusions = xmldata.settings.badinclusions + local badinclusions = settings.badinclusions if badinclusions then badinclusions[#badinclusions+1] = name else - xmldata.settings.badinclusions = { name } + settings.badinclusions = { name } end end end diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 5dc19f144..d7d0a1dd6 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex 9671847cc..fb974b5a2 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex a7da0f9d2..6966d52d1 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 6a3f4c4cb..8f3414b66 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index d029bf4f8..7c06c2552 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 04/21/16 10:10:19 +-- merge date : 04/21/16 12:13:25 do -- begin closure to overcome local limits and interference @@ -5653,9 +5653,13 @@ function constructors.scale(tfmdata,specification) elseif autoitalicamount then local vi=description.italic if not vi then - local vi=description.boundingbox[3]-description.width+autoitalicamount - if vi>0 then - chr.italic=vi*hdelta + local bb=description.boundingbox + if bb then + local vi=bb[3]-description.width+autoitalicamount + if vi>0 then + chr.italic=vi*hdelta + end + else end elseif vi~=0 then chr.italic=vi*hdelta @@ -8809,7 +8813,7 @@ readers.hmtx=function(f,fontdata,specification) glyph.width=width end end - for i=nofmetrics,nofglyphs do + for i=nofmetrics,nofglyphs-1 do local glyph=glyphs[i] if width~=0 then glyph.width=width @@ -15587,7 +15591,7 @@ local trace_defining=false registertracker("fonts.defining",function(v) trace_de local report_otf=logs.reporter("fonts","otf loading") local fonts=fonts local otf=fonts.handlers.otf -otf.version=3.017 +otf.version=3.018 otf.cache=containers.define("fonts","otl",otf.version,true) local otfreaders=otf.readers local hashes=fonts.hashes |