summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--luaotfload-database.lua8
-rwxr-xr-xmktests16
2 files changed, 16 insertions, 8 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index d25b846..bace8bb 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -2628,12 +2628,12 @@ do
if prefmodifiers then
style = choose_exact (prefmodifiers)
elseif subfamily then
- --style = choose_exact (subfamily)
+ style = choose_exact (subfamily)
end
end
- if not style and splitstyle then
- style = choose_exact (splitstyle)
- end
+-- if not style and splitstyle then
+-- style = choose_exact (splitstyle)
+-- end
return style
end
diff --git a/mktests b/mktests
index e7949fb..eaf931f 100755
--- a/mktests
+++ b/mktests
@@ -77,21 +77,21 @@ local infer_regular_style = {
{ "DejaVu Serif", "DejaVuSerif.ttf" },
{ "DejaVu Sans", "DejaVuSans.ttf" },
{ "Adobe Garamond Pro", "agaramondpro_regular.otf" },
- { "Garamond Premier Pro", "GaramondPremrPro-Capt.otf" },
+ { "Garamond Premier Pro", "GaramondPremrPro.otf" },
{ "CMU Serif", "cmunrm.otf" },
{ "CMU Sans Serif", "cmunss.otf" },
}
local choose_optical_size = {
- { { name = "Latin Modern Roman", optsize = 0 }, "lmroman5-regular.otf" },
+ { { name = "Latin Modern Roman", optsize = 1 }, "lmroman5-regular.otf" },
{ { name = "Latin Modern Roman", optsize = 10 }, "lmroman10-regular.otf" },
{ { name = "Latin Modern Roman", optsize = 12 }, "lmroman12-regular.otf" },
{ { name = "Latin Modern Roman", optsize = 42 }, "lmroman17-regular.otf" },
- { { name = "EB Garamond", optsize = 0 }, "EBGaramond08-Regular.otf" },
+ { { name = "EB Garamond", optsize = 1 }, "EBGaramond08-Regular.otf" },
{ { name = "EB Garamond", optsize = 8 }, "EBGaramond08-Regular.otf" },
{ { name = "EB Garamond", optsize = 12 }, "EBGaramond12-Regular.otf" },
{ { name = "EB Garamond", optsize = 42 }, "EBGaramond12-Regular.otf" },
- { { name = "Garamond Premier Pro", optsize = 0 }, "GaramondPremrPro-Capt.otf" },
+ { { name = "Garamond Premier Pro", optsize = 1 }, "GaramondPremrPro-Capt.otf" },
{ { name = "Garamond Premier Pro", optsize = 10 }, "GaramondPremrPro.otf" },
{ { name = "Garamond Premier Pro", optsize = 15 }, "GaramondPremrPro-Subh.otf" },
{ { name = "Garamond Premier Pro", optsize = 42 }, "GaramondPremrPro-Disp.otf" },
@@ -133,6 +133,13 @@ local resolve_t1_font = {
{ { name = "Nimbus Roman No9 L", style = "bolditalic" }, "utmbi8a.pfb" },
}
+local translate_style = {
+ regular = "r",
+ italic = "i",
+ bold = "b",
+ bolditalic = "bi",
+}
+
local font_name_tests = {
infer_regular_style,
choose_optical_size,
@@ -174,6 +181,7 @@ local resolve_font_name = function ()
or default_spec.lookup)
.. ":" .. input_spec.name
input_spec.optsize = input_spec.optsize or default_spec.optsize
+ input_spec.style = translate_style [input_spec.style]
local result = resolve_name (input_spec) == output
total = total + 1
if not result then