2017-10-01 14:38:00

1 files changed, 19 insertions, 9 deletions

diff --git a/tex/context/base/mkiv/lang-dis.lua b/tex/context/base/mkiv/lang-dis.lua
index 0dfb1ce08..ec470234f 100644
--- a/tex/context/base/mkiv/lang-dis.lua
+++ b/tex/context/base/mkiv/lang-dis.lua
@@ -251,15 +251,25 @@ interfaces.implement {
     actions = languages.showdiscretionaries
 }
 
-local toutf = nodes.listtoutf
-
-function languages.serializediscretionary(d) -- will move to tracer
-    local pre, post, replace = getdisc(d)
-    return string.formatters["{%s}{%s}{%s}"](
-        pre     and toutf(pre)     or "",
-        post    and toutf(post)    or "",
-        replace and toutf(replace) or ""
-    )
+do
+
+    local toutf   = nodes.listtoutf
+    local utfchar = utf.char
+    local f_disc  = string.formatters["{%s}{%s}{%s}"]
+    local replace = lpeg.replacer( {
+        [utfchar(0x200C)] = "|",
+        [utfchar(0x200D)] = "|",
+    }, nil, true)
+
+    local function convert(list)
+        return list and replace(toutf(list)) or ""
+    end
+
+    function languages.serializediscretionary(d) -- will move to tracer
+        local pre, post, replace = getdisc(d)
+        return f_disc(convert(pre),convert(post),convert(replace))
+    end
+
 end
 
 -- --