From a784490c3d6a27467c930594ca8b78585ab65baf Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 28 Dec 2020 02:44:53 +0100 Subject: 2020-12-28 01:40:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkii/mult-pe.mkii | 1 + tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/mult-fun.lua | 3 +++ tex/context/base/mkiv/status-files.pdf | Bin 26485 -> 26387 bytes tex/context/base/mkiv/status-lua.pdf | Bin 253526 -> 253447 bytes tex/context/base/mkxl/cont-new.mkxl | 2 +- tex/context/base/mkxl/context.mkxl | 2 +- tex/context/base/mkxl/driv-shp.lmt | 20 +++++++++---------- tex/context/base/mkxl/lpdf-lmt.lmt | 22 +++++++++------------ tex/context/base/mkxl/strc-des.mklx | 3 +-- tex/context/interface/mkii/keys-pe.xml | 1 + tex/generic/context/luatex/luatex-basics-nod.lua | 5 +++++ tex/generic/context/luatex/luatex-fonts-merged.lua | 5 ++++- 16 files changed, 40 insertions(+), 32 deletions(-) (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 5ccc6f75e..d7324dd0e 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2020.12.27 16:34} +\newcontextversion{2020.12.28 01:37} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index c4b59da29..706d4230b 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2020.12.27 16:34} +\edef\contextversion{2020.12.28 01:37} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii index fb4ab46f0..d265ced0d 100644 --- a/tex/context/base/mkii/mult-pe.mkii +++ b/tex/context/base/mkii/mult-pe.mkii @@ -1131,6 +1131,7 @@ \setinterfaceconstant{reference}{مرجع} \setinterfaceconstant{referencemethod}{referencemethod} \setinterfaceconstant{referenceprefix}{referenceprefix} +\setinterfaceconstant{referencetext}{referencetext} \setinterfaceconstant{referencing}{مراجعه} \setinterfaceconstant{region}{region} \setinterfaceconstant{regionin}{ناحیه‌درون} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 6382ad7d5..f1ef91312 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.12.27 16:34} +\newcontextversion{2020.12.28 01:37} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 38344c8e2..3288402bb 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.12.27 16:34} +\edef\contextversion{2020.12.28 01:37} %D Kind of special: diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua index ba2e3469c..4d99e8320 100644 --- a/tex/context/base/mkiv/mult-fun.lua +++ b/tex/context/base/mkiv/mult-fun.lua @@ -198,5 +198,8 @@ return { "mirrored", "mirroredabout", -- "scriptindex", "newscriptindex", + -- + "newcolor", "newrgbcolor", "newcmykcolor", + "newnumeric", "newboolean", "newtransform", "newpath", "newpicture", "newstring", "newpair", }, } diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 3d46ca41f..fcdf903a0 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 57f514203..126f254c3 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/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index fe62d0f8e..c972c07a0 100644 --- a/tex/context/base/mkxl/cont-new.mkxl +++ b/tex/context/base/mkxl/cont-new.mkxl @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.12.27 16:34} +\newcontextversion{2020.12.28 01:37} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl index ab96731e4..80bbe9777 100644 --- a/tex/context/base/mkxl/context.mkxl +++ b/tex/context/base/mkxl/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \immutable\edef\contextformat {\jobname} -\immutable\edef\contextversion{2020.12.27 16:34} +\immutable\edef\contextversion{2020.12.28 01:37} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/driv-shp.lmt b/tex/context/base/mkxl/driv-shp.lmt index e11ca76be..7a0ccf25b 100644 --- a/tex/context/base/mkxl/driv-shp.lmt +++ b/tex/context/base/mkxl/driv-shp.lmt @@ -55,7 +55,7 @@ local findtail = nuts.tail local nextdir = nuts.traversers.dir local nextnode = nuts.traversers.node -local rangedimensions = node.direct.rangedimensions -- nuts ? +----- rangedimensions = node.direct.rangedimensions -- nuts ? local effectiveglue = nuts.effective_glue local start_of_par = nuts.start_of_par local dirdimensions = nuts.dirdimensions @@ -220,7 +220,7 @@ local function flush_vf_packet(current,pos_h,pos_v,pos_r,font,char,data,factor,v if fnt == 0 then fnt = main end --- return flush_character(false,fnt,chr,factor,nest,pos_h,pos_v,pos_r,f,e) +-- return flush_character(false,fnt,chr,factor,nest,pos_h,pos_v,pos_r,f,e) return flush_character(current,fnt,chr,factor,nest,pos_h,pos_v,pos_r,f,e) else return 0 @@ -287,11 +287,11 @@ local function flush_vf_packet(current,pos_h,pos_v,pos_r,font,char,data,factor,v if factor ~= 0 and h ~= 0 then h = h + h * factor / 1000 -- expansion end -h = h * sx + h = h * sx pos_h = pos_h + h elseif command == "down" then local v = packet[2] -- already scaled -v = v * sy + v = v * sy pos_v = pos_v - v elseif command == "push" then level = level + 1 @@ -313,8 +313,8 @@ v = v * sy size_h = size_h + size_h * factor / 1000 end if size_h > 0 then -size_h = size_h * sx -size_v = size_v * sy + size_h = size_h * sx + size_v = size_v * sy flushsimplerule(pos_h,pos_v,pos_r,size_h,size_v) pos_h = pos_h + size_h end @@ -339,9 +339,9 @@ size_v = size_v * sy if color then startcolor(color) end -width = width * sx -height = height * sy -depth = depth * sy + width = width * sx + height = height * sy + depth = depth * sy flushspecialrule(pos_h,pos_v,pos_r,width,height,depth,line,outline,baseline) if color then stopcolor() @@ -627,7 +627,7 @@ local hlist_out, vlist_out do for current, id, subtype in nextnode, current do if id == glyph_code then local char, font = isglyph(current) - local x_offset, y_offset = getoffsets(current) + local x_offset, y_offset = getoffsets(current) -- todo: also get scales here if x_offset ~= 0 or y_offset ~= 0 then if pos_r == righttoleft_code then pos_h = ref_h - (cur_h + x_offset) diff --git a/tex/context/base/mkxl/lpdf-lmt.lmt b/tex/context/base/mkxl/lpdf-lmt.lmt index 545649243..76b7a025e 100644 --- a/tex/context/base/mkxl/lpdf-lmt.lmt +++ b/tex/context/base/mkxl/lpdf-lmt.lmt @@ -503,15 +503,14 @@ local flushcharacter do fs = fs * 1000 / fontparameters.units -- can we avoid this ? end -- -f_x_scale = sx -if f_x_scale ~= 1.0 then --- fs = fs * f_x_scale - tmrx = tmrx * f_x_scale -end -f_y_scale = sy -if f_y_scale ~= 1.0 then - tmry = tmry * f_y_scale -end + f_x_scale = sx + if f_x_scale ~= 1.0 then + tmrx = tmrx * f_x_scale + end + f_y_scale = sy + if f_y_scale ~= 1.0 then + tmry = tmry * f_y_scale + end -- naturalwidth = naturalwidths[font] -- @@ -593,10 +592,9 @@ end -- luatex (a precursor to lmtx and also for comparison) but only in lmtx now so ... -- time to move on I guess. - local getscales = nuts.getscales + local getscales = nuts.getscales -- move to caller (driv-shp) flushcharacter = function(current,pos_h,pos_v,pos_r,font,char,data,f,e,factor,sx,sy) -- ,naturalwidth,width) - if sx ~= f_x_scale or sy ~= f_y_scale or need_tf or font ~= f_cur or f_pdf ~= f_pdf_cur or fs ~= fs_cur or mode == "page" then pdf_goto_textmode() setup_fontparameters(font,factor,f,e,sx,sy) @@ -608,7 +606,6 @@ end local move = calc_pdfpos(pos_h,pos_v) - -- if trace_threshold then -- report( -- "font %i, char %C, factor %i, naturalwidth %p, move %l, tm %l, hpos %p, delta %p, threshold %p, cw %p", @@ -659,7 +656,6 @@ end begin_charmode() end --- cw = cw + naturalwidth[char] * tmef cw = cw + naturalwidth[char] * tmef * f_x_scale diff --git a/tex/context/base/mkxl/strc-des.mklx b/tex/context/base/mkxl/strc-des.mklx index 0f4e7bcb5..dce8f0537 100644 --- a/tex/context/base/mkxl/strc-des.mklx +++ b/tex/context/base/mkxl/strc-des.mklx @@ -149,8 +149,7 @@ \fi[#2]} \protected\def\strc_descriptions_command_setups[#1]% - {\setfalse\c_strc_constructions_title_state - \strc_constructions_register[][\c!label={\descriptionparameter\c!text},\c!reference=,\c!title=,\c!bookmark=,\c!list=,\c!referencetext=,#1]% + {\strc_constructions_register[][\c!label={\descriptionparameter\c!text},\c!reference=,\c!title=,\c!bookmark=,\c!list=,\c!referencetext=,#1]% \csname\??constructioncommandhandler\currentconstructionhandler\endcsname} \protected\tolerant\def\strc_descriptions_command_title[#1]#:#*#=% diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml index da58ff34c..2d4747c87 100644 --- a/tex/context/interface/mkii/keys-pe.xml +++ b/tex/context/interface/mkii/keys-pe.xml @@ -1137,6 +1137,7 @@ + diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua index 7a956f44f..25f5473a5 100644 --- a/tex/generic/context/luatex/luatex-basics-nod.lua +++ b/tex/generic/context/luatex/luatex-basics-nod.lua @@ -278,11 +278,16 @@ do return 0 end + local function flush_components() + -- this is a no-op in mkiv / generic + end + nuts.set_components = set_components nuts.get_components = get_components nuts.copy_only_glyphs = copy_only_glyphs nuts.copy_no_components = copy_no_components nuts.count_components = count_components + nuts.flush_components = flush_components end diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 4665b52fd..42894efdb 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 : 2020-12-27 16:34 +-- merge date : 2020-12-28 01:37 do -- begin closure to overcome local limits and interference @@ -5084,11 +5084,14 @@ do end return 0 end + local function flush_components() + end nuts.set_components=set_components nuts.get_components=get_components nuts.copy_only_glyphs=copy_only_glyphs nuts.copy_no_components=copy_no_components nuts.count_components=count_components + nuts.flush_components=flush_components end nuts.uses_font=direct.uses_font do -- cgit v1.2.3