2022-12-01 12:41:00

1 files changed, 61 insertions, 25 deletions

diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 376fa61db..eee1dc4e2 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  : 2022-11-18 13:15
+-- merge date  : 2022-12-01 12:38
 
 do -- begin closure to overcome local limits and interference
 
@@ -11306,6 +11306,7 @@ if not modules then modules={} end modules ['font-otr']={
  copyright="PRAGMA ADE / ConTeXt Development Team",
  license="see context related readme files"
 }
+local number=number
 local next,type,tonumber,rawget=next,type,tonumber,rawget
 local byte,lower,char,gsub=string.byte,string.lower,string.char,string.gsub
 local fullstrip=string.fullstrip
@@ -12389,7 +12390,7 @@ end
 function readers.cmap(f,fontdata,specification)
  local tableoffset=gotodatatable(f,fontdata,"cmap",specification.glyphs)
  if tableoffset then
-  local version=readushort(f)
+  local version=readushort(f) 
   local noftables=readushort(f)
   local records={}
   local unicodecid=false
@@ -13050,6 +13051,10 @@ function readers.loadfont(filename,n,instance)
     cidinfo=fontdata.cidinfo,
     mathconstants=fontdata.mathconstants,
     colorpalettes=fontdata.colorpalettes,
+    colorpaintdata=fontdata.colorpaintdata,
+    colorpaintlist=fontdata.colorpaintlist,
+    colorlinesdata=fontdata.colorlinesdata,
+    coloraffinedata=fontdata.coloraffinedata,
     svgshapes=fontdata.svgshapes,
     pngshapes=fontdata.pngshapes,
     variabledata=fontdata.variabledata,
@@ -14833,20 +14838,7 @@ end
        local n=0
        for i=1,top do
         if n==48 then
-         local zero=encode[0]
-         local res3=result[r-3]
-         local res2=result[r-2]
-         local res1=result[r-1]
-         local res0=result[r]
-         result[r-3]=zero
-         result[r-2]=zero
          r=r+1;result[r]=chars[t]
-         r=r+1;result[r]=zero
-         r=r+1;result[r]=zero
-         r=r+1;result[r]=res3
-         r=r+1;result[r]=res2
-         r=r+1;result[r]=res1
-         r=r+1;result[r]=res0
          n=1
         else
          n=n+1
@@ -19275,9 +19267,10 @@ function readers.colr(f,fontdata,specification)
  local tableoffset=gotodatatable(f,fontdata,"colr",specification.glyphs)
  if tableoffset then
   local version=readushort(f)
-  if version~=0 then
+  if version==0 or version==1 then
    report("table version %a of %a is not supported (yet), maybe font %s is bad",version,"colr",fontdata.filename)
    return
+  else
   end
   if not fontdata.tables.cpal then
    report("color table %a in font %a has no mandate %a table","colr",fontdata.filename,"cpal")
@@ -20194,16 +20187,20 @@ local scripts=allocate {
  ["cari"]="carian",
  ["cham"]="cham",
  ["cher"]="cherokee",
+ ["chrs"]="chorasmian",
  ["copt"]="coptic",
+ ["cpmn"]="cypro-minoan",
  ["cprt"]="cypriot syllabary",
  ["cyrl"]="cyrillic",
  ["dev2"]="devanagari variant 2",
  ["deva"]="devanagari",
+ ["diak"]="dives akuru",
  ["dogr"]="dogra",
  ["dsrt"]="deseret",
  ["dupl"]="duployan",
  ["egyp"]="egyptian heiroglyphs",
  ["elba"]="elbasan",
+ ["elym"]="elymaic",
  ["ethi"]="ethiopic",
  ["geor"]="georgian",
  ["gjr2"]="gujarati variant 2",
@@ -20223,6 +20220,7 @@ local scripts=allocate {
  ["hebr"]="hebrew",
  ["hluw"]="anatolian hieroglyphs",
  ["hmng"]="pahawh hmong",
+ ["hmnp"]="nyiakeng puachue hmong",
  ["hung"]="old hungarian",
  ["ital"]="old italic",
  ["jamo"]="hangul jamo",
@@ -20232,6 +20230,7 @@ local scripts=allocate {
  ["khar"]="kharosthi",
  ["khmr"]="khmer",
  ["khoj"]="khojki",
+ ["kits"]="khitan small script",
  ["knd2"]="kannada variant 2",
  ["knda"]="kannada",
  ["kthi"]="kaithi",
@@ -20265,6 +20264,7 @@ local scripts=allocate {
  ["musc"]="musical symbols",
  ["mym2"]="myanmar variant 2",
  ["mymr"]="myanmar",
+ ["nand"]="nandinagari",
  ["narb"]="old north arabian",
  ["nbat"]="nabataean",
  ["newa"]="newa",
@@ -20274,9 +20274,10 @@ local scripts=allocate {
  ["olck"]="ol chiki",
  ["orkh"]="old turkic and orkhon runic",
  ["ory2"]="odia variant 2",
- ["orya"]="oriya",
+ ["orya"]="odia",
  ["osge"]="osage",
  ["osma"]="osmanya",
+ ["ougr"]="old uyghur",
  ["palm"]="palmyrene",
  ["pauc"]="pau cin hau",
  ["perm"]="old permic",
@@ -20308,7 +20309,7 @@ local scripts=allocate {
  ["tagb"]="tagbanwa",
  ["takr"]="takri",
  ["tale"]="tai le",
- ["talu"]="tai lu",
+ ["talu"]="new tai lue",
  ["taml"]="tamil",
  ["tang"]="tangut",
  ["tavt"]="tai viet",
@@ -20320,12 +20321,16 @@ local scripts=allocate {
  ["thai"]="thai",
  ["tibt"]="tibetan",
  ["tirh"]="tirhuta",
+ ["tnsa"]="tangsa",
  ["tml2"]="tamil variant 2",
+ ["toto"]="toto",
  ["ugar"]="ugaritic cuneiform",
  ["vai" ]="vai",
  ["wara"]="warang citi",
+ ["wcho"]="wancho",
  ["xpeo"]="old persian cuneiform",
  ["xsux"]="sumero-akkadian cuneiform",
+ ["yezi"]="yezidi",
  ["yi"  ]="yi",
  ["zanb"]="zanabazar square",
 }
@@ -20340,6 +20345,7 @@ local languages=allocate {
  ["agw" ]="agaw",
  ["aio" ]="aiton",
  ["aka" ]="akan",
+ ["akb" ]="batak angkola",
  ["als" ]="alsatian",
  ["alt" ]="altai",
  ["amh" ]="amharic",
@@ -20352,6 +20358,7 @@ local languages=allocate {
  ["asm" ]="assamese",
  ["ast" ]="asturian",
  ["ath" ]="athapaskan",
+ ["avn" ]="avatime",
  ["avr" ]="avar",
  ["awa" ]="awadhi",
  ["aym" ]="aymara",
@@ -20397,8 +20404,12 @@ local languages=allocate {
  ["brx" ]="bodo",
  ["bsh" ]="bashkir",
  ["bsk" ]="burushaski",
+ ["bta" ]="batak alas kluet",
+ ["btd" ]="batak dairi (pakpak)",
  ["bti" ]="beti",
+ ["btm" ]="batak mandailing",
  ["bts" ]="batak simalungun",
+ ["btx" ]="batak karo",
  ["bug" ]="bugis",
  ["byv" ]="medumba",
  ["cak" ]="kaqchikel",
@@ -20433,14 +20444,16 @@ local languages=allocate {
  ["csl" ]="church slavonic",
  ["csy" ]="czech",
  ["ctg" ]="chittagonian",
+ ["ctt" ]="wayanad chetti",
  ["cuk" ]="san blas kuna",
+ ["dag" ]="dagbani",
  ["dan" ]="danish",
  ["dar" ]="dargwa",
  ["dax" ]="dayi",
  ["dcr" ]="woods cree",
  ["deu" ]="german",
- ["dgo" ]="dogri",
- ["dgr" ]="dogri",
+ ["dgo" ]="dogri (individual language)",
+ ["dgr" ]="dogri (macro language)",
  ["dhg" ]="dhangu",
  ["dhv" ]="divehi (dhivehi, maldivian)",
  ["diq" ]="dimli",
@@ -20512,13 +20525,16 @@ local languages=allocate {
  ["guj" ]="gujarati",
  ["guz" ]="gusii",
  ["hai" ]="haitian (haitian creole)",
+ ["hai0"]="haida",
  ["hal" ]="halam",
  ["har" ]="harauti",
  ["hau" ]="hausa",
  ["haw" ]="hawaiian",
  ["hay" ]="haya",
  ["haz" ]="hazaragi",
+ ["hmz" ]="hmong shuat",
  ["hbn" ]="hammer-banna",
+ ["hei" ]="heiltsuk",
  ["her" ]="herero",
  ["hil" ]="hiligaynon",
  ["hin" ]="hindi",
@@ -20543,10 +20559,12 @@ local languages=allocate {
  ["ind" ]="indonesian",
  ["ing" ]="ingush",
  ["inu" ]="inuktitut",
+ ["inuk"]="nunavik inuktitut",
  ["ipk" ]="inupiat",
  ["ipph"]="phonetic transcription—ipa conventions",
  ["iri" ]="irish",
  ["irt" ]="irish traditional",
+ ["uri" ]="irula",
  ["isl" ]="icelandic",
  ["ism" ]="inari sami",
  ["ita" ]="italian",
@@ -20566,6 +20584,7 @@ local languages=allocate {
  ["kan" ]="kannada",
  ["kar" ]="karachay",
  ["kat" ]="georgian",
+ ["kaw" ]="kawi (old javanese)",
  ["kaz" ]="kazakh",
  ["kde" ]="makonde",
  ["kea" ]="kabuverdianu (crioulo)",
@@ -20623,6 +20642,7 @@ local languages=allocate {
  ["kur" ]="kurdish",
  ["kuu" ]="kurukh",
  ["kuy" ]="kuy",
+ ["kwk" ]="kwakʼwala",
  ["kyk" ]="koryak",
  ["kyu" ]="western kayah",
  ["lad" ]="ladin",
@@ -20634,6 +20654,7 @@ local languages=allocate {
  ["laz" ]="laz",
  ["lcr" ]="l-cree",
  ["ldk" ]="ladakhi",
+ ["lef" ]="lelemi",
  ["lez" ]="lezgi",
  ["lij" ]="ligurian",
  ["lim" ]="limburgish",
@@ -20646,6 +20667,7 @@ local languages=allocate {
  ["lmo" ]="lombard",
  ["lmw" ]="lomwe",
  ["lom" ]="loma",
+ ["lpo" ]="lipo",
  ["lrc" ]="luri",
  ["lsb" ]="lower sorbian",
  ["lsm" ]="lule sami",
@@ -20662,7 +20684,7 @@ local languages=allocate {
  ["mah" ]="marshallese",
  ["maj" ]="majang",
  ["mak" ]="makhuwa",
- ["mal" ]="malayalam reformed",
+ ["mal" ]="malayalam",
  ["mam" ]="mam",
  ["man" ]="mansi",
  ["map" ]="mapudungun",
@@ -20697,6 +20719,7 @@ local languages=allocate {
  ["mok" ]="moksha",
  ["mol" ]="moldavian",
  ["mon" ]="mon",
+ ["mnw" ]="thailand mon",
  ["mor" ]="moroccan",
  ["mos" ]="mossi",
  ["mri" ]="maori",
@@ -20735,7 +20758,7 @@ local languages=allocate {
  ["nor" ]="norwegian",
  ["nov" ]="novial",
  ["nsm" ]="northern sami",
- ["nso" ]="sotho, northern",
+ ["nso" ]="northern sotho",
  ["nta" ]="northern tai",
  ["nto" ]="esperanto",
  ["nym" ]="nyamwezi",
@@ -20783,6 +20806,7 @@ local languages=allocate {
  ["rbu" ]="russian buriat",
  ["rcr" ]="r-cree",
  ["rej" ]="rejang",
+ ["rhg" ]="rohingya",
  ["ria" ]="riang",
  ["rif" ]="tarifit",
  ["rit" ]="ritarungo",
@@ -20807,6 +20831,7 @@ local languages=allocate {
  ["scs" ]="north slavey",
  ["sek" ]="sekota",
  ["sel" ]="selkup",
+ ["sfm" ]="small flowery miao",
  ["sga" ]="old irish",
  ["sgo" ]="sango",
  ["sgs" ]="samogitian",
@@ -20828,7 +20853,7 @@ local languages=allocate {
  ["snk" ]="soninke",
  ["sog" ]="sodo gurage",
  ["sop" ]="songe",
- ["sot" ]="sotho, southern",
+ ["sot" ]="southern sotho",
  ["sqi" ]="albanian",
  ["srb" ]="serbian",
  ["srd" ]="sardinian",
@@ -20869,7 +20894,9 @@ local languages=allocate {
  ["tht" ]="tahitian",
  ["tib" ]="tibetan",
  ["tiv" ]="tiv",
+ ["tj;" ]="tai laing",
  ["tkm" ]="turkmen",
+ ["tli" ]="tlingit",
  ["tmh" ]="tamashek",
  ["tmn" ]="temne",
  ["tna" ]="tswana",
@@ -20883,7 +20910,7 @@ local languages=allocate {
  ["tsj" ]="tshangla",
  ["tua" ]="turoyo aramaic",
  ["tul" ]="tulu",
- ["tum" ]="tulu",
+ ["tum" ]="tumbuka",
  ["tuv" ]="tuvin",
  ["tvl" ]="tuvalu",
  ["twi" ]="twi",
@@ -20905,6 +20932,7 @@ local languages=allocate {
  ["wa"  ]="wa",
  ["wag" ]="wagdi",
  ["war" ]="waray-waray",
+ ["wci" ]="waci gbe",
  ["wcr" ]="west-cree",
  ["wel" ]="welsh",
  ["wlf" ]="wolof",
@@ -20916,17 +20944,23 @@ local languages=allocate {
  ["xkf" ]="khengkha",
  ["xog" ]="soga",
  ["xpe" ]="kpelle (liberia)",
+ ["xub" ]="bette kuruma",
+ ["xuj" ]="jennu kuruma",
  ["yak" ]="sakha",
  ["yao" ]="yao",
  ["yap" ]="yapese",
  ["yba" ]="yoruba",
  ["ycr" ]="y-cree",
+ ["ygp" ]="gepo",
  ["yic" ]="yi classic",
  ["yim" ]="yi modern",
+ ["yna" ]="aluo",
+ ["ywq" ]="wuding-luquan",
  ["zea" ]="zealandic",
  ["zgh" ]="standard morrocan tamazigh",
  ["zha" ]="zhuang",
  ["zhh" ]="chinese, hong kong sar",
+ ["zho" ]="chinese traditional, macao",
  ["zhp" ]="chinese phonetic",
  ["zhs" ]="chinese simplified",
  ["zht" ]="chinese traditional",
@@ -20950,6 +20984,7 @@ local features=allocate {
  ["case"]="case-sensitive forms",
  ["ccmp"]="glyph composition/decomposition",
  ["cfar"]="conjunct form after ro",
+ ["chws"]="contextual half-width spacing",
  ["cjct"]="conjunct forms",
  ["clig"]="contextual ligatures",
  ["cpct"]="centered cjk punctuation",
@@ -21026,8 +21061,8 @@ local features=allocate {
  ["rtbd"]="right bounds",
  ["rtla"]="right-to-left alternates",
  ["rtlm"]="right to left mirrored forms",
- ["rvrn"]="required variation alternates",
  ["ruby"]="ruby notation forms",
+ ["rvrn"]="required variation alternates",
  ["salt"]="stylistic alternates",
  ["sinf"]="scientific inferiors",
  ["size"]="optical size",
@@ -21047,6 +21082,7 @@ local features=allocate {
  ["unic"]="unicase",
  ["valt"]="alternate vertical metrics",
  ["vatu"]="vattu variants",
+ ["vchw"]="vertical contextual half-width spacing",
  ["vert"]="vertical writing",
  ["vhal"]="alternate vertical half metrics",
  ["vjmo"]="vowel jamo forms",