summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-05-09 19:57:08 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2013-05-09 19:57:08 +0200
commite43ad352b065f3a45effa2bfc0e9f3c7e703cd64 (patch)
tree8f0a4101513c9b63c0928011dd6b3fff8f048768
parent665e041585120500b330d25868977964df07a2a9 (diff)
downloadlualibs-e43ad352b065f3a45effa2bfc0e9f3c7e703cd64.tar.gz
include util-jsn in merged package
today (2013-05-09 19:57:43+0200) Hans removed the return statement from ``util-jsn`` so we can include it in the ``lualibs-extended-merged.lua``
-rw-r--r--lualibs.dtx10
1 files changed, 1 insertions, 9 deletions
diff --git a/lualibs.dtx b/lualibs.dtx
index b8c74c0..b3e6bdb 100644
--- a/lualibs.dtx
+++ b/lualibs.dtx
@@ -403,12 +403,6 @@ and the derived file lualibs.lua.
% ...
% \end{verbatim}\end{quote}
%
-% Note that there is one exception to the packaging:
-% \fileent{lualibs-util-jsn.lua} cannot be successfully packaged because
-% it follows a different coding convention, returning a \LUA table on exit.
-% Therefore, the file is loaded separately as part of the \identifier{extended}
-% set like any other \LUA module.
-%
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \part{\fileent{lualibs.lua}}
@@ -780,7 +774,7 @@ if loaded == false then
loadmodule("lualibs-util-prs.lua")--- miscellaneous parsers; cool. cool cool cool
----------("lualibs-util-fmt.lua")---!column formatter (rarely used)
loadmodule("lualibs-util-dim.lua")--- conversions between dimensions
- ----------("lualibs-util-jsn.lua")--- JSON parser
+ loadmodule("lualibs-util-jsn.lua")--- JSON parser
----------("lualibs-trac-set.lua")---!generalization of trackers
----------("lualibs-trac-log.lua")---!logging
@@ -796,8 +790,6 @@ if loaded == false then
----------("lualibs-core-con.lua")---
end
-loadmodule"lualibs-util-jsn.lua"--- cannot be merged because of return statement
-
unfake_context() --- TODO check if this works at runtime
lualibs.extended_loaded = true