From acf69d3d7873025941544add3ba168b367c84edd Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Thu, 25 Aug 2016 14:22:28 +0200 Subject: 2016-08-25 14:18:00 --- tex/context/base/context-version.pdf | Bin 4262 -> 4260 bytes tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/file-lib.lua | 23 ++++++++++++--------- tex/context/base/mkiv/font-mps.lua | 2 +- tex/context/base/mkiv/meta-imp-outlines.mkiv | 2 +- tex/context/base/mkiv/publ-imp-apa.mkvi | 6 ++++-- tex/context/base/mkiv/status-files.pdf | Bin 9219 -> 9238 bytes tex/context/base/mkiv/status-lua.pdf | Bin 369104 -> 369102 bytes tex/context/interface/mkiv/i-context.pdf | Bin 774578 -> 774602 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60795 -> 60792 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 22 insertions(+), 17 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 69116a012..ffa980a47 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 06fa9865c..0886f6e81 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.08.24 21:16} +\newcontextversion{2016.08.25 14:14} %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 83a0d0162..1ca5dbb5e 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.08.24 21:16} +\edef\contextversion{2016.08.25 14:14} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/file-lib.lua b/tex/context/base/mkiv/file-lib.lua index b8ba69427..62cf938ba 100644 --- a/tex/context/base/mkiv/file-lib.lua +++ b/tex/context/base/mkiv/file-lib.lua @@ -48,12 +48,7 @@ function resolvers.uselibrary(specification) -- todo: reporter end for i=1,#files do local filename = files[i] - if loaded[filename] then - -- next one - else - if onlyonce then - loaded[filename] = true -- todo: base this on return value - end + if not loaded[filename] then local foundname = nil local barename = removesuffix(filename) -- direct search (we have an explicit suffix) @@ -76,10 +71,18 @@ function resolvers.uselibrary(specification) -- todo: reporter end end end - if foundname then - action(name,foundname) - elseif failure then - failure(name) + if not loaded[foundname] then + if foundname then + action(name,foundname) + if onlyonce then + loaded[foundname] = true -- todo: base this on return value + end + elseif failure then + failure(name) + end + if onlyonce then + loaded[filename] = true -- todo: base this on return value + end end end end diff --git a/tex/context/base/mkiv/font-mps.lua b/tex/context/base/mkiv/font-mps.lua index d56c25731..39c17a1cc 100644 --- a/tex/context/base/mkiv/font-mps.lua +++ b/tex/context/base/mkiv/font-mps.lua @@ -289,7 +289,7 @@ function metapost.output(kind,font,char,advance,shift,ex) if glyphs then local glyf = glyphs[index] if glyf then - local units = shapedata.units or 1000 + local units = 1000 -- factor already takes shapedata.units into account local yfactor = (sc/units) * parameters[font].factor / 655.36 local xfactor = yfactor local shift = shift or 0 diff --git a/tex/context/base/mkiv/meta-imp-outlines.mkiv b/tex/context/base/mkiv/meta-imp-outlines.mkiv index 199dadb32..7629c0c92 100644 --- a/tex/context/base/mkiv/meta-imp-outlines.mkiv +++ b/tex/context/base/mkiv/meta-imp-outlines.mkiv @@ -67,7 +67,7 @@ function metapost.showglyph(specification) end local glyph = shapeglyphs[index] if glyph and (glyph.segments or glyph.sequence) then - local units = data.fontheader and data.fontheader.emsize or 1000 + local units = shapedata.units or 1000 local factor = 100/units local paths = metapost.paths(glyph,factor) if #paths > 0 and glyph.boundingbox and glyph.width then diff --git a/tex/context/base/mkiv/publ-imp-apa.mkvi b/tex/context/base/mkiv/publ-imp-apa.mkvi index 5d11ef62f..9492b44e8 100644 --- a/tex/context/base/mkiv/publ-imp-apa.mkvi +++ b/tex/context/base/mkiv/publ-imp-apa.mkvi @@ -318,7 +318,9 @@ [apa:\s!cite:author] [\c!left={(}, \c!right={)}, - \c!inbetween={\btxcomma}] + \c!inbetween={\btxcomma}, + \c!separator:names:3={\btxcomma\texampersand\space}, + \c!separator:names:4={\btxspace\texampersand\space}] \definebtx [apa:\s!cite:default] @@ -326,7 +328,7 @@ \definebtx [apa:\s!cite:authoryears] - [apa:\s!cite:authoryear] + [apa:\s!cite:author] [\c!left=, \c!right=, \c!inbetween={\btxspace}] diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index b1184e1eb..50eaedba1 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index 829a8576a..61861f2bd 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 86a044447..d2bf8cfbd 100644 Binary files a/tex/context/interface/mkiv/i-context.pdf and b/tex/context/interface/mkiv/i-context.pdf differ diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index 0f70e266c..dc1a443e2 100644 Binary files a/tex/context/interface/mkiv/i-readme.pdf and b/tex/context/interface/mkiv/i-readme.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 2bac536cd..d86763204 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 : 08/24/16 21:16:06 +-- merge date : 08/25/16 14:14:14 do -- begin closure to overcome local limits and interference -- cgit v1.2.3