summaryrefslogtreecommitdiff
path: root/luaotfload-database.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-01-14 13:21:20 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2014-01-14 13:21:20 +0100
commitcbf1a28451ad42a7f8c2a9256810868f378e4631 (patch)
treeb14244826ff599ca66bd624e90c5b4fe1ce77e40 /luaotfload-database.lua
parent6232768122e63018a69bfd6159514b60020b75bb (diff)
downloadluaotfload-cbf1a28451ad42a7f8c2a9256810868f378e4631.tar.gz
[db,tool,diagnose,parsers] move miscellaneous patterns into luaotfload-parsers
Diffstat (limited to 'luaotfload-database.lua')
-rw-r--r--luaotfload-database.lua17
1 files changed, 4 insertions, 13 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index 32197cc..762e853 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -44,7 +44,10 @@ local P, R, S, lpegmatch
local C, Cc, Cf, Cg, Cs, Ct
= lpeg.C, lpeg.Cc, lpeg.Cf, lpeg.Cg, lpeg.Cs, lpeg.Ct
-local read_fonts_conf = luaotfload.parsers.read_fonts_conf
+local parsers = luaotfload.parsers
+local read_fonts_conf = parsers.read_fonts_conf
+local stripslashes = parsers.stripslashes
+local splitcomma = parsers.splitcomma
--- Luatex builtins
local load = load
@@ -183,18 +186,6 @@ if not luaotfloadconfig.termwidth then
luaotfloadconfig.termwidth = tw
end
-names.patterns = { }
-local patterns = names.patterns
-
-local trailingslashes = P"/"^1 * P(-1)
-local stripslashes = C((1 - trailingslashes)^0)
-patterns.stripslashes = stripslashes
-
-local comma = P","
-local noncomma = 1-comma
-local splitcomma = Ct((C(noncomma^1) + comma)^1)
-patterns.splitcomma = splitcomma
-
local format_precedence = {
"otf", "ttc", "ttf",
"dfont", "afm", "pfb",