From 0cc11c367790d57add52c09d8c8812f8858f47ba Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 2 Mar 2011 20:35:37 +0200 Subject: Now the changes that need to pushed into ConTeXt --- otfl-font-def.lua | 4 ++-- otfl-font-otc.lua | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/otfl-font-def.lua b/otfl-font-def.lua index 3a09b66..d56520b 100644 --- a/otfl-font-def.lua +++ b/otfl-font-def.lua @@ -260,7 +260,7 @@ end function resolvers.name(specification) local resolve = fonts.names.resolve if resolve then - local resolved, sub = fonts.names.resolve(specification.name,specification.sub) + local resolved, sub = fonts.names.resolve(specification) specification.resolved, specification.sub = resolved, sub if resolved then local suffix = file.suffix(resolved) @@ -279,7 +279,7 @@ end function resolvers.spec(specification) local resolvespec = fonts.names.resolvespec if resolvespec then - specification.resolved, specification.sub = fonts.names.resolvespec(specification.name,specification.sub) + specification.resolved, specification.sub = fonts.names.resolvespec(specification) if specification.resolved then specification.forced = file.extname(specification.resolved) specification.name = file.removesuffix(specification.resolved) diff --git a/otfl-font-otc.lua b/otfl-font-otc.lua index 93b942f..5eb51f9 100644 --- a/otfl-font-otc.lua +++ b/otfl-font-otc.lua @@ -35,18 +35,22 @@ local extra_lists = { { endash = "hyphen hyphen", emdash = "hyphen hyphen hyphen", - -- quotedblleft = "quoteleft quoteleft", - -- quotedblright = "quoteright quoteright", - -- quotedblleft = "grave grave", - -- quotedblright = "quotesingle quotesingle", - -- quotedblbase = "comma comma", + quotedblleft = "quoteleft quoteleft", + quotedblright = "quoteright quoteright", + quotedblleft = "grave grave", + quotedblright = "quotesingle quotesingle", + quotedblbase = "comma comma", + exclamdown = "exclam grave", + questiondown = "question grave", + guillemotleft = "less less", + guillemotright= "greater greater", }, }, trep = { { - -- [0x0022] = 0x201D, + [0x0022] = 0x201D, [0x0027] = 0x2019, - -- [0x0060] = 0x2018, + [0x0060] = 0x2018, }, }, anum = { @@ -98,14 +102,14 @@ local extra_features = { -- maybe just 1..n so that we prescribe order }, anum = { { - features = { arab = { URD = true, dflt = true } }, + features = { arab = { FAR = true, dflt = true } }, name = "ctx_anum_1", subtables = { "ctx_anum_1_s" }, type = "gsub_single", flags = { }, }, { - features = { arab = { URD = true } }, + features = { arab = { FAR = true } }, name = "ctx_anum_2", subtables = { "ctx_anum_2_s" }, type = "gsub_single", -- cgit v1.2.3