From bf7fc74b4f42f6bc1c57488da72bbc142c47f86a Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Tue, 12 Jul 2016 11:21:11 +0200 Subject: 2016-07-12 10:18:00 --- tex/context/base/context-version.pdf | Bin 4263 -> 4259 bytes tex/context/base/mkiv/chem-str.lua | 2 +- tex/context/base/mkiv/colo-ini.lua | 13 +++++++-- tex/context/base/mkiv/colo-ini.mkiv | 14 ++++++---- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context-todo.tex | 3 -- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/lang-txt.lua | 31 +++++++++++++++++++-- tex/context/base/mkiv/lpdf-grp.lua | 7 +++-- tex/context/base/mkiv/lpdf-ini.lua | 11 +++++++- tex/context/base/mkiv/status-files.pdf | Bin 9097 -> 9096 bytes tex/context/base/mkiv/status-lua.pdf | Bin 367224 -> 367224 bytes tex/context/base/mkiv/typo-mar.lua | 3 +- tex/context/interface/mkiv/i-context.pdf | Bin 821366 -> 821367 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60794 -> 60792 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 16 files changed, 68 insertions(+), 22 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 321b846c9..090dad0cf 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/chem-str.lua b/tex/context/base/mkiv/chem-str.lua index 9cf12c4c1..c84845ee3 100644 --- a/tex/context/base/mkiv/chem-str.lua +++ b/tex/context/base/mkiv/chem-str.lua @@ -334,7 +334,7 @@ local f_number = formatters['chem_%s%s(%s,%s,"\\chemicaltext{%s}");'] local f_text = f_number local f_empty_normal = formatters['chem_%s(%s,%s,"");'] local f_empty_center = formatters['chem_c%s(%s,%s,"");'] -local f_transform = formatters['chem_%s(%s,%s,%s);'] +local f_transform = formatters['chem_%s(%s,%s,%q);'] local function process(level,spec,text,n,rulethickness,rulecolor,offset,default_variant) insert(stack,{ spec = spec, text = text, n = n }) diff --git a/tex/context/base/mkiv/colo-ini.lua b/tex/context/base/mkiv/colo-ini.lua index b1d9c2f9a..467ec2c47 100644 --- a/tex/context/base/mkiv/colo-ini.lua +++ b/tex/context/base/mkiv/colo-ini.lua @@ -410,7 +410,7 @@ local function defineprocesscolor(name,str,global,freeze) -- still inconsistent -- return defineintermediatecolor(name,two,l_color[one],l_color[three],l_transparency[one],l_transparency[three],"",global,freeze) local c1, t1 = resolvedname(one) local c2, t2 = resolvedname(three) - return defineintermediatecolor(name,two,c1,c1,t1,t2,"",global,freeze) + return defineintermediatecolor(name,two,c1,c2,t1,t2,"",global,freeze) else local settings = settings_to_hash_strict(str) if settings then @@ -517,8 +517,15 @@ end local function f(i,colors,fraction) local otf = 0 - for c=1,#colors do - otf = otf + (tonumber(fraction[c]) or 1) * colors[c][i] + if type(fraction) == "table" then + for c=1,#colors do + otf = otf + (tonumber(fraction[c]) or 1) * colors[c][i] + end + else + fraction = tonumber(fraction) + for c=1,#colors do + otf = otf + fraction * colors[c] + end end if otf > 1 then otf = 1 diff --git a/tex/context/base/mkiv/colo-ini.mkiv b/tex/context/base/mkiv/colo-ini.mkiv index c5705643f..8376a9687 100644 --- a/tex/context/base/mkiv/colo-ini.mkiv +++ b/tex/context/base/mkiv/colo-ini.mkiv @@ -909,11 +909,12 @@ \def\colo_basics_define_intermediate_indeed[#1][#2,#3,#4][#5]% {\clf_defineintermediatecolor % not global - {#1}{#2}% - \thecolorattribute{#3} % - \thecolorattribute{#4} % - \thetransparencyattribute{#3} % - \thetransparencyattribute{#4} % + {#1}% + {#2}% + \rawcolorattribute{#3} % + \rawcolorattribute{#4} % + \rawtransparencyattribute{#3} % + \rawtransparencyattribute{#4} % {#5}% \v_colo_freeze_state \relax @@ -1208,6 +1209,9 @@ %def\thecolorattribute #1{\number\csname\??colorattribute \ifcsname\??colorattribute \currentcolorprefix#1\endcsname\currentcolorprefix#1\else\ifcsname\??colorattribute #1\endcsname#1\fi\fi\endcsname} %def\thetransparencyattribute#1{\number\csname\??transparencyattribute\ifcsname\??transparencyattribute\currentcolorprefix#1\endcsname\currentcolorprefix#1\else\ifcsname\??transparencyattribute#1\endcsname#1\fi\fi\endcsname} +\def\rawcolorattribute #1{\ifcsname\??colorattribute \currentcolorprefix#1\endcsname\lastnamedcs\else\ifcsname\??colorattribute #1\endcsname\lastnamedcs\else\zerocount\fi\fi} +\def\rawtransparencyattribute#1{\ifcsname\??transparencyattribute\currentcolorprefix#1\endcsname\lastnamedcs\else\ifcsname\??transparencyattribute#1\endcsname\lastnamedcs\else\zerocount\fi\fi} + \def\thecolorattribute #1{\number\ifcsname\??colorattribute \currentcolorprefix#1\endcsname\lastnamedcs\else\ifcsname\??colorattribute #1\endcsname\lastnamedcs\else\zerocount\fi\fi} \def\thetransparencyattribute#1{\number\ifcsname\??transparencyattribute\currentcolorprefix#1\endcsname\lastnamedcs\else\ifcsname\??transparencyattribute#1\endcsname\lastnamedcs\else\zerocount\fi\fi} \def\internalspotcolorname #1{\clf_spotcolorname \thecolorattribute{#1} } diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index d0da531db..0c56f6c58 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.07.11 13:44} +\newcontextversion{2016.07.12 10: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-todo.tex b/tex/context/base/mkiv/context-todo.tex index 81ef2bff1..deb912fe8 100644 --- a/tex/context/base/mkiv/context-todo.tex +++ b/tex/context/base/mkiv/context-todo.tex @@ -29,9 +29,6 @@ check why leftskip doesn't always inherit attributes (maybe dir notes don't have them) (also check redundant \type {delete_attribute_ref} after \type {new_glue}) \stopitem - \startitem - implement \type {\hyphenationbounds} - \stopitem \startitem only return nil when we expect multiple calls in in one line \stopitem diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 084f519ea..0fee8b901 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.07.11 13:44} +\edef\contextversion{2016.07.12 10:14} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/lang-txt.lua b/tex/context/base/mkiv/lang-txt.lua index c6fa97401..1575b7543 100644 --- a/tex/context/base/mkiv/lang-txt.lua +++ b/tex/context/base/mkiv/lang-txt.lua @@ -2747,7 +2747,10 @@ data.labels={ labels = { en = "Master's thesis", fr = "Thèse de master (DEA, DESS, master)", + nl = "Masterproef", de = "Masterarbeit", + it = "Tesi di laurea", + es = "Tesis de maestría", }, }, ["phdthesis"] = { @@ -2755,6 +2758,9 @@ data.labels={ en = "PhD thesis", fr = "Thèse de doctorat", de = "Dissertation", + nl = "Proefschrift", + it = "Tesi di dottorato", + es = "Tesis doctoral", }, }, ["technicalreport"] = { @@ -2762,6 +2768,9 @@ data.labels={ en = "Technical report", fr = "Rapport technique", de = "Technischer Bericht", + nl = "Technisch rapport", + it = "Relazione tecnica", + es = "Informe técnico", }, }, -- @@ -2770,6 +2779,7 @@ data.labels={ en = "editor", fr = "éditeur", de = "Herausgeber", + it = "a cura di", }, }, ["editors"] = { @@ -2777,6 +2787,8 @@ data.labels={ en = "editors", fr = "éditeurs", de = "Herausgeber", + it = "a cura di", + es = "editores", }, }, ["edition"] = { @@ -2784,19 +2796,24 @@ data.labels={ en = "edition", fr = "édition", de = "Auflage", - }, + nl = "editie", + it = "edizione", + es = "edición", + }, }, -- ["volume"] = { labels = { en = "volume", de = "Band", + nl = "deel", }, }, ["Volume"] = { labels = { en = "Volume", de = "Band", + nl = "Deel", }, }, ["number"] = { @@ -2804,6 +2821,7 @@ data.labels={ en = "number", fr = "numéro", de = "Numer", + nl = "nummer", }, }, ["Number"] = { @@ -2811,13 +2829,14 @@ data.labels={ en = "Number", fr = "Numéro", de = "Numer", + nl = "Nummer", }, }, ["in"] = { labels = { en = "in", fr = "dans", - de = "in", + es = "en", }, }, ["of"] = { @@ -2825,6 +2844,7 @@ data.labels={ en = "of", fr = "de", de = "von", + nl = "van", }, }, -- @@ -2832,7 +2852,7 @@ data.labels={ labels = { en = "In", fr = "Dans", - de = "In", + es = "En", }, }, -- @@ -2852,13 +2872,18 @@ data.labels={ labels = { en = "pages", de = "Seiten", + nl = "paginas" }, }, -- ["and"] = { labels = { en = "and", + fr = "et", de = "und", + nl = "en", + it = "e", + es = "y", }, }, ["others"] = { diff --git a/tex/context/base/mkiv/lpdf-grp.lua b/tex/context/base/mkiv/lpdf-grp.lua index c5d1b1c65..3ec260ff5 100644 --- a/tex/context/base/mkiv/lpdf-grp.lua +++ b/tex/context/base/mkiv/lpdf-grp.lua @@ -313,8 +313,11 @@ function lpdf.registerpattern(specification) (specification.voffset or 0) * basepoints, }, } - local n = texsavebox(specification.number,d(),lpdf.collectedresources(),true,1) - lpdf.adddocumentpattern("Pt" .. nofpatterns,lpdf.reference(n)) + local resources = lpdf.collectedresources{ patterns = false } + local attributes = d() + local onlybounds = 1 + local patternobj = texsavebox(specification.number,attributes,resources,true,onlybounds) + lpdf.adddocumentpattern("Pt" .. nofpatterns,lpdf.reference(patternobj )) return nofpatterns end diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index 01a045979..a0413dbcd 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -1009,11 +1009,20 @@ do local function flushpatterns () if next(d_patterns ) then trace_flush("patterns") pdfimmediateobject(r_patterns, tostring(d_patterns )) end end local function flushshades () if next(d_shades ) then trace_flush("shades") pdfimmediateobject(r_shades, tostring(d_shades )) end end - function lpdf.collectedresources() + -- patterns are special as they need resources to so we can get recursive references and in that case + -- acrobat doesn't show anything (other viewers handle it well) + -- + -- todo: share them + -- todo: force when not yet set + + function lpdf.collectedresources(options) local ExtGState = next(d_extgstates ) and p_extgstates local ColorSpace = next(d_colorspaces) and p_colorspaces local Pattern = next(d_patterns ) and p_patterns local Shading = next(d_shades ) and p_shades + if options and options.patterns == false then + Pattern = nil + end if ExtGState or ColorSpace or Pattern or Shading then local collected = pdfdictionary { ExtGState = ExtGState, diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 348cb41cb..9db31798c 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 133e6ff9d..67b67bce8 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/mkiv/typo-mar.lua b/tex/context/base/mkiv/typo-mar.lua index 9089c8212..74f5c2eb9 100644 --- a/tex/context/base/mkiv/typo-mar.lua +++ b/tex/context/base/mkiv/typo-mar.lua @@ -930,7 +930,8 @@ function margins.finalhandler(head) end head = tonut(head) local head, done = finalhandler(head) - resetstacked(true) +-- resetstacked(true) +resetstacked(nofdelayed==0) head = tonode(head) return head, done else diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 8752b9498..0bf50a849 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 f720d3e86..31661e08a 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 7aad6aade..206d6251b 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 : 07/11/16 13:44:22 +-- merge date : 07/12/16 10:14:22 do -- begin closure to overcome local limits and interference -- cgit v1.2.3