From 9b70f2ee9e20830cfb39ca3b139e6f3aa04be1f1 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Mon, 6 Feb 2017 21:21:48 +0100 Subject: Revert "[features] remove unneeded tlig features" This reverts commit 7250ac958d842f45d28220db87203506d3ae65c0. As per issue #405. --- src/luaotfload-features.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/luaotfload-features.lua') diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua index 5c35031..a57aac3 100644 --- a/src/luaotfload-features.lua +++ b/src/luaotfload-features.lua @@ -1288,6 +1288,10 @@ local tlig_specification = { data = { [0x2013] = {0x002D, 0x002D}, -- endash [0x2014] = {0x002D, 0x002D, 0x002D}, -- emdash + [0x201C] = {0x2018, 0x2018}, -- quotedblleft + [0x201D] = {0x2019, 0x2019}, -- quotedblright + [0x00A1] = {0x0021, 0x2018}, -- exclamdown + [0x00BF] = {0x003F, 0x2018}, -- questiondown --- next three originate in T1 encoding; Xetex applies --- them too [0x201E] = {0x002C, 0x002C}, -- quotedblbase @@ -1298,6 +1302,19 @@ local tlig_specification = { order = { "tlig" }, prepend = true, }, + { + type = "ligature", + features = everywhere, + data = { + [0x201C] = {0x0060, 0x0060}, -- quotedblleft + [0x201D] = {0x0027, 0x0027}, -- quotedblright + [0x00A1] = {0x0021, 0x0060}, -- exclamdown + [0x00BF] = {0x003F, 0x0060}, -- questiondown + }, + flags = noflags, + order = { "tlig" }, + prepend = true, + }, } local rot13_specification = { -- cgit v1.2.3 From 8f001b0979b8b05079f4df00f174f40ed6badee1 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 7 Feb 2017 07:47:28 +0100 Subject: =?UTF-8?q?[features]=20elucidate=20default=20=E2=80=9Cligatures?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/luaotfload-features.lua | 87 +++++++++++++++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 27 deletions(-) (limited to 'src/luaotfload-features.lua') diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua index a57aac3..8068f4f 100644 --- a/src/luaotfload-features.lua +++ b/src/luaotfload-features.lua @@ -1274,9 +1274,17 @@ local tlig_specification = { type = "substitution", features = everywhere, data = { - [0x0022] = 0x201D, -- quotedblright - [0x0027] = 0x2019, -- quoteleft - [0x0060] = 0x2018, -- quoteright + --- quotedblright: + --- " (QUOTATION MARK) → ” (RIGHT DOUBLE QUOTATION MARK) + [0x0022] = 0x201D, + + --- quoteleft: + --- ' (APOSTROPHE) → ’ (RIGHT SINGLE QUOTATION MARK) + [0x0027] = 0x2019, + + --- quoteright: + --- ` (GRAVE ACCENT) → ‘ (LEFT SINGLE QUOTATION MARK) + [0x0060] = 0x2018, }, flags = noflags, order = { "tlig" }, @@ -1286,30 +1294,55 @@ local tlig_specification = { type = "ligature", features = everywhere, data = { - [0x2013] = {0x002D, 0x002D}, -- endash - [0x2014] = {0x002D, 0x002D, 0x002D}, -- emdash - [0x201C] = {0x2018, 0x2018}, -- quotedblleft - [0x201D] = {0x2019, 0x2019}, -- quotedblright - [0x00A1] = {0x0021, 0x2018}, -- exclamdown - [0x00BF] = {0x003F, 0x2018}, -- questiondown - --- next three originate in T1 encoding; Xetex applies - --- them too - [0x201E] = {0x002C, 0x002C}, -- quotedblbase - [0x00AB] = {0x003C, 0x003C}, -- LEFT-POINTING DOUBLE ANGLE QUOTATION MARK - [0x00BB] = {0x003E, 0x003E}, -- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK - }, - flags = noflags, - order = { "tlig" }, - prepend = true, - }, - { - type = "ligature", - features = everywhere, - data = { - [0x201C] = {0x0060, 0x0060}, -- quotedblleft - [0x201D] = {0x0027, 0x0027}, -- quotedblright - [0x00A1] = {0x0021, 0x0060}, -- exclamdown - [0x00BF] = {0x003F, 0x0060}, -- questiondown + + --- endash: + --- [--] (HYPHEN-MINUS, HYPHEN-MINUS) → – (EN DASH) + [0x2013] = {0x002D, 0x002D}, + + --- emdash: + --- [---] (HYPHEN-MINUS, HYPHEN-MINUS, HYPHEN-MINUS) → — (EM DASH) + [0x2014] = {0x002D, 0x002D, 0x002D}, + + --- quotedblleft: + --- [''] (GRAVE ACCENT, GRAVE ACCENT) → “ (LEFT DOUBLE QUOTATION MARK) + [0x201C] = {0x0060, 0x0060}, + --- quotedblleft: + --- [‘‘] (LEFT SINGLE QUOTATION MARK, LEFT SINGLE QUOTATION MARK) → “ (LEFT DOUBLE QUOTATION MARK) + [0x201C] = {0x2018, 0x2018}, + + --- quotedblright: + --- [``] (APOSTROPHE, APOSTROPHE) → ” (RIGHT DOUBLE QUOTATION MARK) + [0x201D] = {0x0027, 0x0027}, + --- quotedblright: + --- [’’] (RIGHT SINGLE QUOTATION MARK, RIGHT SINGLE QUOTATION MARK) → ” (RIGHT DOUBLE QUOTATION MARK) + [0x201D] = {0x2019, 0x2019}, + + --- exclamdown: + --- [!'] (EXCLAMATION MARK, GRAVE ACCENT) → ¡ (INVERTED EXCLAMATION MARK) + [0x00A1] = {0x0021, 0x0060}, + --- exclamdown: + --- [!‘] (EXCLAMATION MARK, LEFT SINGLE QUOTATION MARK) → ¡ (INVERTED EXCLAMATION MARK) + [0x00A1] = {0x0021, 0x2018}, + + --- questiondown: + --- [?'] (QUESTION MARK, GRAVE ACCENT) → ¡ (INVERTED EXCLAMATION MARK) + [0x00BF] = {0x003F, 0x0060}, + --- questiondown: + --- [?'] (QUESTION MARK, LEFT SINGLE QUOTATION MARK) → ¡ (INVERTED EXCLAMATION MARK) + [0x00BF] = {0x003F, 0x2018}, + + --- next three originate in T1 encoding (Xetex applies them too) + --- quotedblbase: + --- [,,] (COMMA, COMMA) → ¡ (DOUBLE LOW-9 QUOTATION MARK) + [0x201E] = {0x002C, 0x002C}, + + --- LEFT-POINTING DOUBLE ANGLE QUOTATION MARK: + --- [,,] (LESS-THAN SIGN, LESS-THAN SIGN) → ¡ (LEFT-POINTING ANGLE QUOTATION MARK) + [0x00AB] = {0x003C, 0x003C}, + + --- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK: + --- [,,] (GREATER-THAN SIGN, GREATER-THAN SIGN) → ¡ (RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK) + [0x00BB] = {0x003E, 0x003E}, }, flags = noflags, order = { "tlig" }, -- cgit v1.2.3 From 46b9e82b9ec5f02db1fd326115a337142e97fed0 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 7 Feb 2017 07:53:54 +0100 Subject: [features] v2: remove unneeded ligatures V2 of 7250ac958d842f45d28220db87203506d3ae65c0 commit 7250ac958d842f45d28220db87203506d3ae65c0 Author: Philipp Gesang Date: Thu Feb 2 07:38:03 2017 +0100 [features] remove unneeded tlig features Fix #397 These four features should not be inserted automatically. which was reverted in commit 9b70f2ee9e20830cfb39ca3b139e6f3aa04be1f1 Author: Philipp Gesang Date: Mon Feb 6 21:21:48 2017 +0100 Revert "[features] remove unneeded tlig features" addressing issues #397, #405. --- src/luaotfload-features.lua | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/luaotfload-features.lua') diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua index 8068f4f..f11f05b 100644 --- a/src/luaotfload-features.lua +++ b/src/luaotfload-features.lua @@ -1306,30 +1306,18 @@ local tlig_specification = { --- quotedblleft: --- [''] (GRAVE ACCENT, GRAVE ACCENT) → “ (LEFT DOUBLE QUOTATION MARK) [0x201C] = {0x0060, 0x0060}, - --- quotedblleft: - --- [‘‘] (LEFT SINGLE QUOTATION MARK, LEFT SINGLE QUOTATION MARK) → “ (LEFT DOUBLE QUOTATION MARK) - [0x201C] = {0x2018, 0x2018}, --- quotedblright: --- [``] (APOSTROPHE, APOSTROPHE) → ” (RIGHT DOUBLE QUOTATION MARK) [0x201D] = {0x0027, 0x0027}, - --- quotedblright: - --- [’’] (RIGHT SINGLE QUOTATION MARK, RIGHT SINGLE QUOTATION MARK) → ” (RIGHT DOUBLE QUOTATION MARK) - [0x201D] = {0x2019, 0x2019}, --- exclamdown: --- [!'] (EXCLAMATION MARK, GRAVE ACCENT) → ¡ (INVERTED EXCLAMATION MARK) [0x00A1] = {0x0021, 0x0060}, - --- exclamdown: - --- [!‘] (EXCLAMATION MARK, LEFT SINGLE QUOTATION MARK) → ¡ (INVERTED EXCLAMATION MARK) - [0x00A1] = {0x0021, 0x2018}, --- questiondown: --- [?'] (QUESTION MARK, GRAVE ACCENT) → ¡ (INVERTED EXCLAMATION MARK) [0x00BF] = {0x003F, 0x0060}, - --- questiondown: - --- [?'] (QUESTION MARK, LEFT SINGLE QUOTATION MARK) → ¡ (INVERTED EXCLAMATION MARK) - [0x00BF] = {0x003F, 0x2018}, --- next three originate in T1 encoding (Xetex applies them too) --- quotedblbase: -- cgit v1.2.3