From 99dc1cd9bb77ac9fa68b0584f58f57749994fdba Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Thu, 7 Feb 2019 19:16:06 +0100
Subject: 2019-02-07 18:55:00

---
 tex/generic/context/luatex/luatex-basics-nod.lua   |  7 +++---
 tex/generic/context/luatex/luatex-fonts-merged.lua | 27 +++++++++++++++-------
 2 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'tex/generic')

diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 276c7efa5..e22f170ef 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -259,9 +259,10 @@ end
 local propertydata = direct.get_properties_table()
 nodes.properties   = { data = propertydata }
 
-direct.set_properties_mode(true,true)     -- needed for injection
-
-function direct.set_properties_mode() end -- we really need the set modes
+if direct.set_properties_mode then
+    direct.set_properties_mode(true,true)
+    function direct.set_properties_mode() end
+end
 
 nuts.getprop = function(n,k)
     local p = propertydata[n]
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 89ae7d64d..679efbd87 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  : 01/28/19 16:58:09
+-- merge date  : 02/07/19 18:46:18
 
 do -- begin closure to overcome local limits and interference
 
@@ -3386,6 +3386,7 @@ local environment={
  formattedfloat=number.formattedfloat,
  stripzero=lpeg.patterns.stripzero,
  stripzeros=lpeg.patterns.stripzeros,
+ FORMAT=string.f9,
 }
 local arguments={ "a1" } 
 setmetatable(arguments,{ __index=function(t,k)
@@ -4855,8 +4856,10 @@ if not nuts.getdirection then
 end
 local propertydata=direct.get_properties_table()
 nodes.properties={ data=propertydata }
-direct.set_properties_mode(true,true)  
-function direct.set_properties_mode() end 
+if direct.set_properties_mode then
+ direct.set_properties_mode(true,true)
+ function direct.set_properties_mode() end
+end
 nuts.getprop=function(n,k)
  local p=propertydata[n]
  if p then
@@ -8283,7 +8286,8 @@ constructors.namemode="fullpath"
 constructors.version=1.01
 constructors.cache=containers.define("fonts","constructors",constructors.version,false)
 constructors.privateoffset=fonts.privateoffsets.textbase or 0xF0000
-constructors.cacheintex=true
+constructors.cacheintex=true 
+constructors.addtounicode=true
 local designsizes=allocate()
 constructors.designsizes=designsizes
 local loadedfonts=allocate()
@@ -8543,6 +8547,7 @@ function constructors.scale(tfmdata,specification)
  targetparameters.textsize=textsize 
  targetparameters.forcedsize=forcedsize  
  targetparameters.extrafactor=extrafactor
+ local addtounicode=constructors.addtounicode
  local tounicode=fonts.mappings.tounicode
  local unknowncode=tounicode(0xFFFD)
  local defaultwidth=resources.defaultwidth  or 0
@@ -8796,11 +8801,17 @@ function constructors.scale(tfmdata,specification)
    end
   end
   local isunicode=description.unicode
-  if isunicode then
-   chr.unicode=isunicode
-   chr.tounicode=tounicode(isunicode)
+  if addtounicode then
+   if isunicode then
+    chr.unicode=isunicode
+    chr.tounicode=tounicode(isunicode)
+   else
+    chr.tounicode=unknowncode
+   end
   else
-   chr.tounicode=unknowncode
+   if isunicode then
+    chr.unicode=isunicode
+   end
   end
   if hasquality then
    local ve=character.expansion_factor
-- 
cgit v1.2.3