summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2017-06-04 17:42:38 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2017-06-04 17:42:38 +0200
commit32f8047624c2fa49c3031a66edb5a039a813f276 (patch)
treed568ec496e3b4c95adc37ce435b0161a3f40c581 /tex/generic
parent3ab20dbdfa095edd8c6bc00b8e3bdccd78900257 (diff)
downloadcontext-32f8047624c2fa49c3031a66edb5a039a813f276.tar.gz
2017-06-04 17:01:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-basics-nod.lua2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua36
-rw-r--r--tex/generic/context/luatex/luatex-pdf.tex11
3 files changed, 24 insertions, 25 deletions
diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index c51473a4b..35fc96b48 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -463,7 +463,7 @@ function nuts.copy_only_glyphs(current)
return head
end
-nuts.uses_font = direct.uses_font
+nuts.uses_font = direct.uses_font
if not nuts.uses_font then
local getdisc = nuts.getdisc
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 67aa5972c..6c5a87a9d 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 : 05/28/17 19:30:32
+-- merge date : 06/04/17 16:55:09
do -- begin closure to overcome local limits and interference
@@ -1833,7 +1833,9 @@ function table.unnest(t)
return unnest(t)
end
local function are_equal(a,b,n,m)
- if a and b and #a==#b then
+ if a==b then
+ return true
+ elseif a and b and #a==#b then
n=n or 1
m=m or #a
for i=n,m do
@@ -1853,15 +1855,17 @@ local function are_equal(a,b,n,m)
end
end
local function identical(a,b)
- for ka,va in next,a do
- local vb=b[ka]
- if va==vb then
- elseif type(va)=="table" and type(vb)=="table" then
- if not identical(va,vb) then
+ if a~=b then
+ for ka,va in next,a do
+ local vb=b[ka]
+ if va==vb then
+ elseif type(va)=="table" and type(vb)=="table" then
+ if not identical(va,vb) then
+ return false
+ end
+ else
return false
end
- else
- return false
end
end
return true
@@ -7534,7 +7538,9 @@ fonts.analyzers={}
fonts.readers={}
fonts.definers={ methods={} }
fonts.loggers={ register=function() end }
-fontloader=nil
+if context then
+ fontloader=nil
+end
end -- closure
@@ -22254,7 +22260,6 @@ local disc_code=nodecodes.disc
local math_code=nodecodes.math
local dir_code=nodecodes.dir
local localpar_code=nodecodes.localpar
-local discretionary_code=disccodes.discretionary
local ligature_code=glyphcodes.ligature
local a_state=attributes.private('state')
local a_noligature=attributes.private("noligature")
@@ -25115,7 +25120,8 @@ otf.helpers=otf.helpers or {}
otf.helpers.txtdirstate=txtdirstate
otf.helpers.pardirstate=pardirstate
do
- local fastdisc=false directives.register("otf.fastdisc",function(v) fastdisc=v end)
+ local fastdisc=context and LUATEXVERSION>=1.005
+ directives.register("otf.fastdisc",function(v) fastdisc=v end)
function otf.featuresprocessor(head,font,attr,direction,n)
local sequences=sequencelists[font]
if not sequencelists then
@@ -25261,9 +25267,9 @@ do
if ok then
done=true
end
- else
- start=getnext(start)
- end
+ else
+ start=getnext(start)
+ end
elseif id==math_code then
start=getnext(end_of_math(start))
elseif id==dir_code then
diff --git a/tex/generic/context/luatex/luatex-pdf.tex b/tex/generic/context/luatex/luatex-pdf.tex
index 57004c6f8..ff6eaedeb 100644
--- a/tex/generic/context/luatex/luatex-pdf.tex
+++ b/tex/generic/context/luatex/luatex-pdf.tex
@@ -138,10 +138,8 @@
\xdef\pdfminorversion {\pdfvariable minorversion}
\xdef\pdfuniqueresname {\pdfvariable uniqueresname}
- \ifnum\luatexversion>88
- \edef\pdfpkfixeddpi {\pdfvariable pkfixeddpi}
- \edef\pdfignoreunknownimages {\pdfvariable ignoreunknownimages}
- \fi
+ \xdef\pdfpkfixeddpi {\pdfvariable pkfixeddpi}
+ \xdef\pdfignoreunknownimages {\pdfvariable ignoreunknownimages}
\xdef\pdfhorigin {\pdfvariable horigin}
\xdef\pdfvorigin {\pdfvariable vorigin}
@@ -187,11 +185,6 @@
\global\pdfdestmargin 0pt
\global\pdfthreadmargin 0pt
- % maybe
-
- % \global\chardef\pdftexversion 140
- % \global\def \pdftexrevision {16}
-
\fi
\endgroup