From 7e1a7178de67590f0a484d06abfb933062c0ac87 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 3 Jan 2014 20:17:47 +0100 Subject: [tests] include two kinds of tests for Minion Pro --- mktests | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'mktests') diff --git a/mktests b/mktests index 688e5f8..baa710c 100755 --- a/mktests +++ b/mktests @@ -86,6 +86,11 @@ local infer_regular_style = { { "Garamond Premier Pro", "GaramondPremrPro.otf" }, { "CMU Serif", "cmunrm.otf" }, { "CMU Sans Serif", "cmunss.otf" }, + { "Minion Pro", "MinionPro_Regular.otf" }, + --- Below test will succeed only if we match for the + --- splainname (= sanitized tfmdata.fullname) field + --- explicitly. + { "Minion Pro Italic", "MinionPro_It.otf" }, } local choose_optical_size = { @@ -120,6 +125,25 @@ local choose_style = { { { name = "CMU Sans Serif", style = "italic" }, "cmunsi.otf" }, -- no “italic” but “oblique” { { name = "CMU Sans Serif", style = "bold" }, "cmunsx.otf" }, { { name = "CMU Sans Serif", style = "bolditalic" }, "cmunso.otf" }, + --[[-- + Minion Pro Italic is exceptionally weird regarding identifiers in + that the postscript fontname and both info.fontname and + info.fullname are given as “minionproit”. Now its english fullname + (field 18) is “minionproital”. Only the value “fullname” in the root of + the tfmdata structure (not the one returned by fontloader.info()!) + accurately yields “Minion Pro Italic”. + + To complete the picture, the file naming isn’t very consistent either: + we find the suffixes “Regular” and “Bold”, but “It” and “BoldIt”. What + the hell were the designers smoking? + + Also, the full Minion Pro set comes with different optical sizes which + for monetary reasons cannot considered here. + --]]-- + { { name = "Minion Pro", style = "regular" }, "MinionPro_Regular.otf" }, + { { name = "Minion Pro", style = "italic" }, "MinionPro_It.otf" }, + { { name = "Minion Pro", style = "bold" }, "MinionPro_Bold.otf" }, + { { name = "Minion Pro", style = "bolditalic" }, "MinionPro_BoldIt.otf" }, } --- this needs a database built with --formats=+pfa,pfb,afm -- cgit v1.2.3 From 0380abcae75cccdc394c4da1fbfe838e876e53cc Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 26 Jan 2014 13:52:55 +0100 Subject: [tests] include new parsers file --- mktests | 1 + 1 file changed, 1 insertion(+) (limited to 'mktests') diff --git a/mktests b/mktests index baa710c..817fbf6 100755 --- a/mktests +++ b/mktests @@ -31,6 +31,7 @@ kpse.set_program_name "luatex" require "lualibs" require "luaotfload-basics-gen.lua" require "luaotfload-override.lua" +require "luaotfload-parsers" require "luaotfload-database" local names = fonts.names -- cgit v1.2.3 From a52e157de5a969b7d80af1c8621a7d7b031b572f Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 26 Jan 2014 14:19:09 +0100 Subject: [tests] adapt file names --- mktests | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mktests') diff --git a/mktests b/mktests index 817fbf6..3a55b8d 100755 --- a/mktests +++ b/mktests @@ -87,11 +87,11 @@ local infer_regular_style = { { "Garamond Premier Pro", "GaramondPremrPro.otf" }, { "CMU Serif", "cmunrm.otf" }, { "CMU Sans Serif", "cmunss.otf" }, - { "Minion Pro", "MinionPro_Regular.otf" }, + { "Minion Pro", "MinionPro-Regular.otf" }, --- Below test will succeed only if we match for the --- splainname (= sanitized tfmdata.fullname) field --- explicitly. - { "Minion Pro Italic", "MinionPro_It.otf" }, + { "Minion Pro Italic", "MinionPro-It.otf" }, } local choose_optical_size = { @@ -141,10 +141,10 @@ local choose_style = { Also, the full Minion Pro set comes with different optical sizes which for monetary reasons cannot considered here. --]]-- - { { name = "Minion Pro", style = "regular" }, "MinionPro_Regular.otf" }, - { { name = "Minion Pro", style = "italic" }, "MinionPro_It.otf" }, - { { name = "Minion Pro", style = "bold" }, "MinionPro_Bold.otf" }, - { { name = "Minion Pro", style = "bolditalic" }, "MinionPro_BoldIt.otf" }, + { { name = "Minion Pro", style = "regular" }, "MinionPro-Regular.otf" }, + { { name = "Minion Pro", style = "italic" }, "MinionPro-It.otf" }, + { { name = "Minion Pro", style = "bold" }, "MinionPro-Bold.otf" }, + { { name = "Minion Pro", style = "bolditalic" }, "MinionPro-BoldIt.otf" }, } --- this needs a database built with --formats=+pfa,pfb,afm -- cgit v1.2.3 From 405ff5a3f24566f76a3d08d7ba217a137fcb5bdd Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 9 Feb 2014 14:04:26 +0100 Subject: [*] update references to luaotfload-override/luaotfload-log --- mktests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mktests') diff --git a/mktests b/mktests index 3a55b8d..0bf3f64 100755 --- a/mktests +++ b/mktests @@ -30,7 +30,7 @@ kpse.set_program_name "luatex" require "lualibs" require "luaotfload-basics-gen.lua" -require "luaotfload-override.lua" +require "luaotfload-log.lua" require "luaotfload-parsers" require "luaotfload-database" -- cgit v1.2.3 From d9825168b0fb7b07e315879584487f9d4d9e9494 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 11 Feb 2014 06:27:04 +0100 Subject: [*] move mkcharacters, mktests, mkglyphlist, mkstatus to separate subdirectory scripts --- mktests | 260 ---------------------------------------------------------------- 1 file changed, 260 deletions(-) delete mode 100755 mktests (limited to 'mktests') diff --git a/mktests b/mktests deleted file mode 100755 index 0bf3f64..0000000 --- a/mktests +++ /dev/null @@ -1,260 +0,0 @@ -#!/usr/bin/env texlua ------------------------------------------------------------------------ --- FILE: mktests --- USAGE: ./mktests --- DESCRIPTION: test the behavior of Luaotfload --- REQUIREMENTS: Luatex > 0.76, Luaotfload --- AUTHOR: Philipp Gesang (Phg), --- VERSION: 2.4 --- MODIFIED: 2013-08-26 09:31:22+0200 ------------------------------------------------------------------------ --- ---===================================================================-- --- NOTE --- this is a stub, to be completed long-term --- suggestions welcome ---===================================================================-- - - -local tests = { } - -config = { luaotfload = { - names_dir = "names", - cache_dir = "fonts", - index_file = "luaotfload-names.lua", - resolver = "normal", - update_live = true, --- suppress db updates -}} - -kpse.set_program_name "luatex" - -require "lualibs" -require "luaotfload-basics-gen.lua" -require "luaotfload-log.lua" -require "luaotfload-parsers" -require "luaotfload-database" - -local names = fonts.names - ------------------------------------------------------------------------ ---- helper functions ------------------------------------------------------------------------ - -local pprint_resolve = function (input, output, result) - texio.write_nl (string.format ("[%s] “%s” -> “%s”", - result == true and "passed" or "failed", - input, - output)) -end - -local pprint_result = function (name, failed, total) - if failed == 0 then - texio.write_nl (string.format ("[%s] all %d passed", name, total)) - else - texio.write_nl (string.format ("[%s] %d of %d failed", - name, - failed, - total)) - end -end - -local pprint_spec = function (spec) - return string.format ("%s/%s*%.2fpt", - spec.specification, - spec.style or "regular", - spec.optsize or 0) -end - ------------------------------------------------------------------------ ---- tool tests ------------------------------------------------------------------------ - - - ------------------------------------------------------------------------ ---- font tests ------------------------------------------------------------------------ - ---- test sets - -local infer_regular_style = { - --- inferring which one is the correct style for “regular”; can be - --- obscured by synonyms like “book” etc. - { "Iwona", "Iwona-Regular.otf" }, -- trivial case - { "DejaVu Serif", "DejaVuSerif.ttf" }, - { "DejaVu Sans", "DejaVuSans.ttf" }, - { "Adobe Garamond Pro", "agaramondpro_regular.otf" }, - { "Garamond Premier Pro", "GaramondPremrPro.otf" }, - { "CMU Serif", "cmunrm.otf" }, - { "CMU Sans Serif", "cmunss.otf" }, - { "Minion Pro", "MinionPro-Regular.otf" }, - --- Below test will succeed only if we match for the - --- splainname (= sanitized tfmdata.fullname) field - --- explicitly. - { "Minion Pro Italic", "MinionPro-It.otf" }, -} - -local choose_optical_size = { - { { 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 = 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 = 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" }, -} - -local choose_style = { - { { name = "DejaVu Sans", style = "regular" }, "DejaVuSans.ttf" }, - { { name = "DejaVu Sans", style = "italic" }, "DejaVuSans-Oblique.ttf" }, - { { name = "DejaVu Sans", style = "bold" }, "DejaVuSans-Bold.ttf" }, - { { name = "DejaVu Sans", style = "bolditalic" }, "DejaVuSans-BoldOblique.ttf" }, - { { name = "Linux Libertine O", style = "regular" }, "LinLibertine_R.otf" }, - { { name = "Linux Libertine O", style = "italic" }, "LinLibertine_RI.otf" }, - { { name = "Linux Libertine O", style = "bold" }, "LinLibertine_RB.otf" }, - { { name = "Linux Libertine O", style = "bolditalic" }, "LinLibertine_RBI.otf" }, - { { name = "Liberation Serif", style = "regular" }, "LiberationSerif-Regular.ttf" }, - { { name = "Liberation Serif", style = "italic" }, "LiberationSerif-Italic.ttf" }, - { { name = "Liberation Serif", style = "bold" }, "LiberationSerif-Bold.ttf" }, - { { name = "Liberation Serif", style = "bolditalic" }, "LiberationSerif-BoldItalic.ttf" }, - { { name = "CMU Sans Serif", style = "regular" }, "cmunss.otf" }, -- no “regular” but “medium” - { { name = "CMU Sans Serif", style = "italic" }, "cmunsi.otf" }, -- no “italic” but “oblique” - { { name = "CMU Sans Serif", style = "bold" }, "cmunsx.otf" }, - { { name = "CMU Sans Serif", style = "bolditalic" }, "cmunso.otf" }, - --[[-- - Minion Pro Italic is exceptionally weird regarding identifiers in - that the postscript fontname and both info.fontname and - info.fullname are given as “minionproit”. Now its english fullname - (field 18) is “minionproital”. Only the value “fullname” in the root of - the tfmdata structure (not the one returned by fontloader.info()!) - accurately yields “Minion Pro Italic”. - - To complete the picture, the file naming isn’t very consistent either: - we find the suffixes “Regular” and “Bold”, but “It” and “BoldIt”. What - the hell were the designers smoking? - - Also, the full Minion Pro set comes with different optical sizes which - for monetary reasons cannot considered here. - --]]-- - { { name = "Minion Pro", style = "regular" }, "MinionPro-Regular.otf" }, - { { name = "Minion Pro", style = "italic" }, "MinionPro-It.otf" }, - { { name = "Minion Pro", style = "bold" }, "MinionPro-Bold.otf" }, - { { name = "Minion Pro", style = "bolditalic" }, "MinionPro-BoldIt.otf" }, -} - ---- this needs a database built with --formats=+pfa,pfb,afm - -local resolve_t1_font = { - { { name = "URW Gothic L", style = "regular" }, "a010013l.pfb" }, --> “book” --- { { name = "URW Gothic L", style = "italic" }, "a010033l.pfb" }, --> “book oblique” --- { { name = "URW Gothic L", style = "bold" }, "a010015l.pfb" }, --> “demi” --- { { name = "URW Gothic L", style = "bolditalic" }, "a010035l.pfb" }, --> “demi oblique” - { { name = "Century Schoolbook L", style = "regular" }, "c059013l.pfb" }, - { { name = "Century Schoolbook L", style = "italic" }, "c059033l.pfb" }, - { { name = "Century Schoolbook L", style = "bold" }, "c059016l.pfb" }, - { { name = "Century Schoolbook L", style = "bolditalic" }, "c059036l.pfb" }, - { { name = "Nimbus Roman No9 L", style = "regular" }, "n021003l.pfb" }, - { { name = "Nimbus Roman No9 L", style = "italic" }, "n021023l.pfb" }, - { { name = "Nimbus Roman No9 L", style = "bold" }, "n021004l.pfb" }, --- medium, actually - { { name = "Nimbus Roman No9 L", style = "bolditalic" }, "n021024l.pfb" }, -} - -local translate_style = { - regular = "r", - italic = "i", - bold = "b", - bolditalic = "bi", -} - -local font_name_tests = { - infer_regular_style, - choose_optical_size, - choose_style, - resolve_t1_font, -} - -local default_spec = { - name = false, - lookup = "name", - specification = false, - optsize = 0, -} - -local resolve_font_name = function () - local failed, total = 0, 0 - local resolve_name = names.resolve_name - for nset = 1, #font_name_tests do - local set = font_name_tests[nset] - - for ntest = 1, #set do - local test = set[ntest] - local input, output = test[1], test[2] - - if type (input) == "string" then - local input_spec = table.copy (default_spec) - input_spec.name = input - input_spec.specification = input_spec.lookup .. ":" .. input - local result = resolve_name (input_spec) == output - total = total + 1 - if not result then - failed = failed + 1 - end - pprint_resolve (input, output, result) - - else - local input_spec, output = test[1], test[2] - input_spec.specification = (input_spec.lookup - 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 - failed = failed + 1 - end - pprint_resolve (pprint_spec (input_spec), output, result) - end - - end - end - return failed, total -end - -tests ["resolve_font_name"] = resolve_font_name - ------------------------------------------------------------------------ ---- runner ------------------------------------------------------------------------ - -local main = function () - local failed, total = 0, 0 - for name, test in next, tests do - texio.write_nl ("[" .. name .. "]") - local newfailed, newtotal = test () - total = total + 1 - pprint_result (name, newfailed, newtotal) - failed = failed + newfailed - total = total + newtotal - end - - if failed == 0 then - texio.write_nl (string.format ("[report] all %d tests passed.", total)) - else - texio.write_nl (string.format ("[report] %d of %d tests failed (%d %%).", - failed, - total, - failed / total * 100)) - end - texio.write_nl "" - os.exit (0) -end - -return main () - ---- vim:ft=lua:ts=2:et:sw=2 -- cgit v1.2.3