[fontloader] sync with Context as of 2015-12-21

1 files changed, 10 insertions, 5 deletions

diff --git a/src/fontloader/misc/fontloader-languages.lua b/src/fontloader/misc/fontloader-languages.lua
index 1ea8c1f..cecd60c 100644
--- a/src/fontloader/misc/fontloader-languages.lua
+++ b/src/fontloader/misc/fontloader-languages.lua
@@ -16,28 +16,33 @@ function languages.loadpatterns(tag)
     if not loaded[tag] then
         loaded[tag] = 0
         local filename = kpse.find_file("lang-" .. tag .. ".lua")
-        if filename and filename == "" then
-            print("<unknown language file for: " .. tag .. ">")
+        if not filename or filename == "" then
+            texio.write("<unknown language file for: " .. tag .. ">")
         else
             local whatever = loadfile(filename)
             if type(whatever) == "function" then
                 whatever = whatever()
                 if type(whatever) == "table" then
+                    texio.write("<language file: " .. tag .. ">")
                     local characters = whatever.patterns.characters or ""
                     local patterns = whatever.patterns.data or ""
                     local exceptions = whatever.exceptions.data or ""
-                    local language = lang.new()
                     for b in string.utfvalues(characters) do
+                        -- what about uppercase
+-- lang.sethjcode(b,b)
                         tex.setlccode(b,b)
                     end
+                    local language = lang.new()
                     lang.patterns(language, patterns)
                     lang.hyphenation(language, exceptions)
                     loaded[tag] = lang.id(language)
                 else
-                    print("<invalid language table: " .. tag .. ">")
+                    texio.write("<invalid language table: " .. tag .. ">")
+                    os.exit()
                 end
             else
-                print("<invalid language file: " .. tag .. ">")
+                texio.write("<invalid language file: " .. tag .. ">")
+                os.exit()
             end
         end
     end