diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4249 -> 4246 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-ctx.lua | 4 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-ocl.lua | 4 | ||||
| -rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 9209 -> 9209 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 268935 -> 268935 bytes | |||
| -rw-r--r-- | tex/context/interface/mkiv/i-context.pdf | bin | 793091 -> 821069 bytes | |||
| -rw-r--r-- | tex/context/interface/mkiv/i-fonts.xml | 41 | ||||
| -rw-r--r-- | tex/context/interface/mkiv/i-readme.pdf | bin | 60787 -> 60788 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 40 insertions, 15 deletions
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 851356b15..7cad31a63 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 967669687..ea0e2182c 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.06.08 10:50} +\newcontextversion{2016.06.08 16:32} %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 a463b5cfe..f6bf3244d 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.06.08 10:50} +\edef\contextversion{2016.06.08 16:32} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua index 32270bf96..4a4808316 100644 --- a/tex/context/base/mkiv/font-ctx.lua +++ b/tex/context/base/mkiv/font-ctx.lua @@ -2510,9 +2510,9 @@ function helpers.getcoloredglyphs(tfmdata) local characters = tfmdata.characters local descriptions = tfmdata.descriptions local collected = { } - for unicode in next, characters do + for unicode, character in next, characters do local description = descriptions[unicode] - if description and (description.colors or description.svg) then + if description and (description.colors or character.svg) then collected[#collected+1] = unicode end end diff --git a/tex/context/base/mkiv/font-ocl.lua b/tex/context/base/mkiv/font-ocl.lua index af57b786b..fd9dcf2e8 100644 --- a/tex/context/base/mkiv/font-ocl.lua +++ b/tex/context/base/mkiv/font-ocl.lua @@ -66,7 +66,7 @@ local function initializecolr(tfmdata,kind,value) -- hm, always value colorvalues[i] = { "special", f_color_start(p[1]/255,p[2]/255,p[3]/255) } end -- - local stop = { "special", "pdf:direct:" .. stopactualtext() } + local stop = { "special", "pdf:direct:" .. stopactualtext() .. " Q" } -- for unicode, character in next, characters do local description = descriptions[unicode] @@ -77,7 +77,7 @@ local function initializecolr(tfmdata,kind,value) -- hm, always value local s = #colorlist local n = 1 local t = { - { "special", "pdf:direct:" .. startactualtext(unicode) } + { "special", "pdf:direct: q " .. startactualtext(unicode) } } for i=1,s do local entry = colorlist[i] diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 991f3c8ea..1d8e59b01 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 2f63a82a6..8899da21f 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 0a641e8b4..dcdcf7e46 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-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml index f288c5df5..c10b56571 100644 --- a/tex/context/interface/mkiv/i-fonts.xml +++ b/tex/context/interface/mkiv/i-fonts.xml @@ -800,14 +800,6 @@ <cd:command name="setupfonts" file="font-ini.mkiv"> <cd:arguments> - <cd:parameters> - <cd:constant type="cd:dimension"/> - </cd:keywords> - </cd:arguments> - </cd:command> - - <cd:command name="setupbodyfont" file="font-ini.mkiv"> - <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="language"> <cd:constant type="no" default="yes"/> @@ -817,6 +809,39 @@ </cd:arguments> </cd:command> + <cd:command name="setupbodyfont" file="font-ini.mkiv"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:dimension"/> + <cd:constant type="cd:name"/> + <cd:constant type="global"/> + <cd:constant type="reset"/> + <cd:constant type="x"/> + <cd:constant type="xx"/> + <cd:constant type="small"/> + <cd:constant type="big"/> + <cd:constant type="script"/> + <cd:constant type="scriptscript"/> + <cd:constant type="rm"/> + <cd:constant type="ss"/> + <cd:constant type="tt"/> + <cd:constant type="hw"/> + <cd:constant type="cg"/> + <cd:constant type="roman"/> + <cd:constant type="serif"/> + <cd:constant type="regular"/> + <cd:constant type="sans"/> + <cd:constant type="sansserif"/> + <cd:constant type="support"/> + <cd:constant type="type"/> + <cd:constant type="teletype"/> + <cd:constant type="mono"/> + <cd:constant type="handwritten"/> + <cd:constant type="calligraphic"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command name="switchtobodyfont" file="font-ini.mkvi"> <cd:arguments> <cd:keywords list="yes"> diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 68e5b4d12..303ccaf36 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 607ec824c..dbbe11f6b 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 : 06/08/16 10:50:01 +-- merge date : 06/08/16 16:32:52 do -- begin closure to overcome local limits and interference |