From e43ad352b065f3a45effa2bfc0e9f3c7e703cd64 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 9 May 2013 19:57:08 +0200 Subject: 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`` --- lualibs.dtx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'lualibs.dtx') 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 -- cgit v1.2.3