diff options
author | Marius <mariausol@gmail.com> | 2013-04-10 21:20:13 +0300 |
---|---|---|
committer | Marius <mariausol@gmail.com> | 2013-04-10 21:20:13 +0300 |
commit | c8623a0cf0f9ea78aa7fafb089402afb78675742 (patch) | |
tree | e76b7110bb45c9648487dbac45d77d1eb86b64cf /tex/generic | |
parent | 4432badfa09ab01e0bbdd3a287e5fd8faddf86c0 (diff) | |
download | context-c8623a0cf0f9ea78aa7fafb089402afb78675742.tar.gz |
beta 2013.04.10 19:58
Diffstat (limited to 'tex/generic')
-rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 | ||||
-rw-r--r-- | tex/generic/context/luatex/luatex-fonts.lua | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 82e8bb4e2..c6dac339d 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 : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 04/10/13 10:05:04 +-- merge date : 04/10/13 19:58:43 do -- begin closure to overcome local limits and interference diff --git a/tex/generic/context/luatex/luatex-fonts.lua b/tex/generic/context/luatex/luatex-fonts.lua index 75bd07997..0a6dc68e8 100644 --- a/tex/generic/context/luatex/luatex-fonts.lua +++ b/tex/generic/context/luatex/luatex-fonts.lua @@ -156,19 +156,11 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then loadmodule("l-string.lua") loadmodule("l-table.lua") loadmodule("l-io.lua") - ----------("l-number.lua") - ----------("l-set.lua") - ----------("l-os.lua") loadmodule("l-file.lua") - ----------("l-md5.lua") - ----------("l-url.lua") - ----------("l-dir.lua") loadmodule("l-boolean.lua") - ----------("l-unicode.lua") loadmodule("l-math.lua") loadmodule("util-str.lua") - -- The following modules contain code that is either not used at all outside context or will fail -- when enabled due to lack of other modules. @@ -190,7 +182,7 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then -- with context. The mtx-fonts script can be used to genate this file (using the --names option). -- in 2013/14 we will merge/move some generic files into luatex-fonts-* files (copies) so that - -- intermediate updates of context not interfere + -- intermediate updates of context not interfere; we can then also use the general merger loadmodule('font-ini.lua') loadmodule('font-con.lua') |