diff options
| author | Hans Hagen <pragma@wxs.nl> | 2017-01-17 18:05:46 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2017-01-17 18:05:46 +0100 |
| commit | 0cfeab235554eeee0dddd6c3f44d3939ab490ff1 (patch) | |
| tree | fed70e9a3332741e5294a01197c716dff8556506 /tex/generic | |
| parent | 72d161c0a522fd92f32edd3588fa126c453f4a3d (diff) | |
| download | context-0cfeab235554eeee0dddd6c3f44d3939ab490ff1.tar.gz | |
2017-01-17 17:43:00
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 9 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-pdf.tex | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f5339a3b7..cc7ed88ad 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 : 12/28/16 17:55:48 +-- merge date : 01/17/17 17:37:54 do -- begin closure to overcome local limits and interference @@ -9092,8 +9092,8 @@ local function getinfo(maindata,sub,platformnames,rawfamilynames,metricstoo) local fontheader=fontdata.fontheader or {} local cffinfo=fontdata.cffinfo or {} local filename=fontdata.filename - local weight=getname(fontdata,"weight") or cffinfo.weight or metrics.weight - local width=getname(fontdata,"width") or cffinfo.width or metrics.width + local weight=getname(fontdata,"weight") or (cffinfo and cffinfo.weight) or (metrics and metrics.weight) + local width=getname(fontdata,"width") or (cffinfo and cffinfo.width ) or (metrics and metrics.width ) local fontname=getname(fontdata,"postscriptname") local fullname=getname(fontdata,"fullname") local family=getname(fontdata,"family") @@ -18462,6 +18462,7 @@ local fontfeatures=fonthashes.features local otffeatures=fonts.constructors.features.otf local registerotffeature=otffeatures.register local onetimemessage=fonts.loggers.onetimemessage or function() end +local getrandom=utilities and utilities.randomizer and utilities.randomizer.get otf.defaultnodealternate="none" local tfmdata=false local characters=false @@ -18807,7 +18808,7 @@ end local function get_alternative_glyph(start,alternatives,value) local n=#alternatives if value=="random" then - local r=random(1,n) + local r=getrandom and getrandom("glyph",1,n) or random(1,n) return alternatives[r],trace_alternatives and formatters["value %a, taking %a"](value,r) elseif value=="first" then return alternatives[1],trace_alternatives and formatters["value %a, taking %a"](value,1) diff --git a/tex/generic/context/luatex/luatex-pdf.tex b/tex/generic/context/luatex/luatex-pdf.tex index 81eb872ab..57004c6f8 100644 --- a/tex/generic/context/luatex/luatex-pdf.tex +++ b/tex/generic/context/luatex/luatex-pdf.tex @@ -168,7 +168,7 @@ \global\pdfobjcompresslevel 1 \global\pdfdecimaldigits 4 \global\pdfgamma 1000 - \global\pdfimageresolution 71 + \global\pdfimageresolution 72 \global\pdfimageapplygamma 0 \global\pdfimagegamma 2200 \global\pdfimagehicolor 1 |