[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Allow typesetting format to access system hyphenations (00a58165)

[Joseph Wright]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/00a581655c08b2fcc7bfe355f4f6604a20ea3eee

>---------------------------------------------------------------

commit 00a581655c08b2fcc7bfe355f4f6604a20ea3eee
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Nov 15 17:45:20 2019 +0000

    Allow typesetting format to access system hyphenations


>---------------------------------------------------------------

00a581655c08b2fcc7bfe355f4f6604a20ea3eee
 build-config.lua | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/build-config.lua b/build-config.lua
index b6e63a38..8bd9633a 100644
--- a/build-config.lua
+++ b/build-config.lua
@@ -179,6 +179,9 @@ end
 
 -- Need to build format files
 local function fmt(engines,dest)
+
+  local fmtsearch = false
+
   local function mkfmt(engine)
     -- Use .ini files if available
     local src = "latex.ltx"
@@ -189,10 +192,10 @@ local function fmt(engines,dest)
     print("Building format for " .. engine)
     local errorlevel = os.execute(
       os_setenv .. " TEXINPUTS=" .. unpackdir .. os_pathsep .. localdir
-      .. os_pathsep .. texmfdir .. "//"
+      .. os_pathsep .. texmfdir .. "//" .. (fmtsearch and os_pathsep or "")
       .. os_concat ..
       os_setenv .. " LUAINPUTS=" .. unpackdir .. os_pathsep .. localdir
-      .. os_pathsep .. texmfdir .. "//"
+      .. os_pathsep .. texmfdir .. "//" .. (fmtsearch and os_pathsep or "")
       .. os_concat .. engine .. " -etex -ini -output-directory=" .. unpackdir
       .. " " .. src 
       .. (hide and (" > " .. os_null) or ""))
@@ -213,6 +216,12 @@ local function fmt(engines,dest)
     cp("fonttext.cfg",supportdir,unpackdir)
   end
 
+  -- Zap the custom hyphen.cfg when typesetting
+  if dest == typesetdir then
+    rm(localdir,"hyphen.cfg")
+    fmtsearch =  true
+  end
+
   local errorlevel
   for _,engine in pairs(engines) do
     errorlevel = mkfmt(engine)