diff options
author | Karl Berry <karl@freefriends.org> | 2010-07-10 00:15:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-07-10 00:15:07 +0000 |
commit | f5eb2610b3c023c57ae8b6816558d4e6a3c33455 (patch) | |
tree | a975e79ce406a22451b755ef4214466af69c83d0 /Master/texmf-dist/tex/luatex | |
parent | 1046dadf55dc14a285c03628230c033a16a4d0f2 (diff) |
lualibs update (28jun10)
git-svn-id: svn://tug.org/texlive/trunk@19328 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r-- | Master/texmf-dist/tex/luatex/lualibs/lualibs.lua | 177 |
1 files changed, 31 insertions, 146 deletions
diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua index a9df528d668..15915bc7a1d 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua @@ -16,151 +16,36 @@ -- module('lualibs', package.seeall) -do - local lualibs_module = { - name = "lualibs", - version = 0.94, - date = "2010/05/21", - description = "Lua additional functions.", - author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux", - copyright = "PRAGMA ADE / ConTeXt Development Team", - license = "See ConTeXt's mreadme.pdf for the license", - } - if luatexbase and luatexbase.provides_module then - luatexbase.provides_module(lualibs_module) - end -end - -kpse.set_program_name("luatex") - - -local function load_lualibs_module(filename) - local path = kpse.find_file(filename) - if not path then - texio.write_nl(string.format("lualibs: error: cannot find file %s", filename)) - return - end - texio.write_nl('log', string.format("lualibs: loading file %s", path)) - --if (tex and tex.luatexversion and tex.luatexversion > 44) - -- or (status and status.luatex_version and status.luatex_version > 44) then - -- require(filename) - --else - dofile(path) - --end -end - -load_lualibs_module("lualibs-string.lua") -load_lualibs_module("lualibs-lpeg.lua") -load_lualibs_module("lualibs-boolean.lua") -load_lualibs_module("lualibs-number.lua") -load_lualibs_module("lualibs-math.lua") -load_lualibs_module("lualibs-table.lua") -load_lualibs_module("lualibs-aux.lua") -load_lualibs_module("lualibs-io.lua") -load_lualibs_module("lualibs-os.lua") -load_lualibs_module("lualibs-file.lua") -load_lualibs_module("lualibs-md5.lua") -load_lualibs_module("lualibs-dir.lua") -load_lualibs_module("lualibs-unicode.lua") -load_lualibs_module("lualibs-utils.lua") -load_lualibs_module("lualibs-dimen.lua") -load_lualibs_module("lualibs-url.lua") -load_lualibs_module("lualibs-set.lua") -load_lualibs_module("lualibs-dimen.lua") - - -fpath = file -fpath.split = file.split_path -lfs.is_readable = file.is_readable -lfs.is_writable = file.is_writable - - -function string:stripspaces() - return (self:gsub("^%s*(.-)%s*$", "%1")) -end - - -lpeg.space = lpeg.S(" \t\f\v") -lpeg.newline = lpeg.P("\r\n") + lpeg.P("\r") +lpeg.P("\n") - - -function table.contains_value(t, val) - if t then - for k, v in pairs(t) do - if v==val then - return true - end - end - end - return false -end - - -function table.contains_key(t, key) - if t then - for k, v in pairs(t) do - if k==key then - return true - end - end - end - return false -end - - -function table.value_position(t, val) - if t then - local i=1 - for k, v in pairs(t) do - if v==val then - return i - end - i=i+1 - end - end - return 0 -end - - -function table.key_position(t, key) - if t then - local i=1 - for k,v in pairs(t) do - if k==key then - return i - end - i = i+1 - end - end - return -1 -end - - -function table.remove_key(t, k) - local p = table.key_position(t,k) - if p ~= -1 then - table.remove(t, table.key_position(t,k)) - end -end - - -function fpath.normalize_sep(str) - return str:gsub("\\", "/") -end - - -function fpath.localize_sep(str) - if os.type == 'windows' or os.type == 'msdos' then - return str:gsub("/", "\\") - else - return str:gsub("\\", "/") - end -end - - -function table.starts_at(t) - return ipairs(t,1)(t,0) -end - +local lualibs_module = { + name = "lualibs", + version = 0.95, + date = "2010/06/28", + description = "Lua additional functions.", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "See ConTeXt's mreadme.pdf for the license", +} + +if luatexbase and luatexbase.provides_module then + luatexbase.provides_module(lualibs_module) +end +require("lualibs-string") +require("lualibs-lpeg") +require("lualibs-boolean") +require("lualibs-number") +require("lualibs-math") +require("lualibs-table") +require("lualibs-aux") +require("lualibs-io") +require("lualibs-os") +require("lualibs-file") +require("lualibs-md5") +require("lualibs-dir") +require("lualibs-unicode") +require("lualibs-utils") +require("lualibs-dimen") +require("lualibs-url") +require("lualibs-set") +require("lualibs-dimen") -- -- End of File `lualibs.lua'. |