diff options
| author | Elie Roux <elie.roux@telecom-bretagne.eu> | 2013-05-09 06:42:47 -0700 |
|---|---|---|
| committer | Elie Roux <elie.roux@telecom-bretagne.eu> | 2013-05-09 06:42:47 -0700 |
| commit | 3ef211e80fa60887838bbc16e340733160c20ade (patch) | |
| tree | 15e2986c12cf8a1e0cf8f5fd42f715dfa6077d1f /lualibs.dtx | |
| parent | c2e7deb7254aae721ebefdc6c24ddb3e9913e537 (diff) | |
| parent | fdf45e87dea227d920698370657e62fdf3208579 (diff) | |
| download | lualibs-3ef211e80fa60887838bbc16e340733160c20ade.tar.gz | |
Merge pull request #7 from phi-gamma/master
file integrity test
Diffstat (limited to 'lualibs.dtx')
| -rw-r--r-- | lualibs.dtx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lualibs.dtx b/lualibs.dtx index b8fe169..b8c74c0 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -450,13 +450,9 @@ lualibs.module_info = { config = config or { } config.lualibs = config.lualibs or { } -if config.lualibs.prefer_merged == nil then - lualibs.prefer_merged = true -end -if config.lualibs.load_extended == nil then - lualibs.load_extended = true -end -config.lualibs.verbose = config.lualibs.verbose == false +lualibs.prefer_merged = config.lualibs.prefer_merged or true +lualibs.load_extended = config.lualibs.load_extended or true +config.lualibs.verbose = config.lualibs.verbose or false % \end{macrocode} % The lualibs may be loaded in scripts. @@ -526,13 +522,17 @@ lualibs.loadmodule = loadmodule % % \begin{macrocode} -if lualibs.basic_loaded ~= true then +if lualibs.basic_loaded ~= true +or config.lualibs.force_reload == true +then loadmodule"lualibs-basic.lua" loadmodule"lualibs-compat.lua" --- restore stuff gone since v1.* end -if lualibs.load_extended == true -and lualibs.extended_loaded ~= true then +if lualibs.load_extended == true +and lualibs.extended_loaded ~= true +or config.lualibs.force_reload == true +then loadmodule"lualibs-extended.lua" end |