Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into docs-c05-revamping
- Loading branch information
Showing
25 changed files
with
280 additions
and
191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| local executable = debug.getinfo(3, "S").source | ||
| local luaversion = _VERSION:match("%d+%.%d+") | ||
|
|
||
| -- Normalize possibly dirty Lua path formatting shortcut: /./ → / | ||
| -- Even leafo/gh-actions-luarocks takes this shortcut which inhibits duplicate cleanup | ||
| package.path = package.path:gsub("/%./", "/") | ||
| package.cpath = package.cpath:gsub("/%./", "/") | ||
|
|
||
| local function prepend_and_dedup (segment, path) | ||
| local escaped = segment:gsub('[%-%.%+%[%]%(%)%$%^%%%?%*]','%%%1') -- copied from pl.utils.escape() which we can't load yet | ||
| local striped = path:gsub(("^%s"):format(escaped), ""):gsub((";%s"):format(escaped), "") | ||
| return ("%s;%s"):format(segment, striped) | ||
| end | ||
|
|
||
| local function prependPath (path) | ||
| package.path = prepend_and_dedup(path .. "/?/init.lua", package.path) | ||
| package.path = prepend_and_dedup(path .. "/?.lua", package.path) | ||
| end | ||
|
|
||
| local function prependCPath (path) | ||
| package.cpath = prepend_and_dedup(path .. "/?.@SHARED_LIB_EXT@", package.cpath) | ||
| end | ||
|
|
||
| local function extendPaths (path, ours) | ||
| prependCPath(path) | ||
| prependPath(path) | ||
| if ours then | ||
| prependPath(path .. "/lua-libraries") | ||
| if "@SYSTEM_LUAROCKS_FALSE@" == "" then -- see ./configure --with[out]-system-luarocks | ||
| prependCPath(path .. "/lua_modules/lib/lua/" .. luaversion) | ||
| prependPath(path .. "/lua_modules/share/lua/" .. luaversion) | ||
| end | ||
| else | ||
| prependCPath(path .. "/sile") | ||
| prependPath(path .. "/sile") | ||
| end | ||
| end | ||
|
|
||
| -- Facilitate loading SILE classes & packages from system LuaRocks | ||
| -- Also weed out CWD relative paths, we add them in a different order later | ||
| local luapath = {} | ||
| local extpath = {} | ||
| for path in package.path:gmatch("[^;]+") do | ||
| table.insert(extpath, tostring(path:gsub("%?", "sile/?"))) | ||
| table.insert(luapath, path) | ||
| end | ||
| package.path = table.concat(luapath, ";") | ||
|
|
||
| extendPaths("@SILE_PATH@", true) | ||
| extendPaths("@SILE_LIB_PATH@", true) | ||
|
|
||
| package.path = table.concat(extpath, ";") .. ";" .. package.path | ||
|
|
||
| local pathvar = os.getenv("SILE_PATH") | ||
| if pathvar then | ||
| for path in string.gmatch(pathvar, "[^;]+") do | ||
| if not path:match("^./") and path:len() >= 1 then | ||
| extendPaths(path) | ||
| end | ||
| end | ||
| end | ||
|
|
||
| local cwd = executable:gsub("(.*)(/.*)", "%1") | ||
| if cwd:match("^@") then -- Consider "ours" for the sake of Nix Flake | ||
| extendPaths(".", true) | ||
| else | ||
| if cwd ~= "./" then extendPaths(cwd) end | ||
| extendPaths(".") | ||
| end | ||
|
|
||
| _G.extendSilePath = extendPaths | ||
| _G.executablePath = executable |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.