From 2bdf510f4969383b1f4ca31df252c6c026f2ca1b Mon Sep 17 00:00:00 2001 From: reuk Date: Tue, 20 Aug 2024 18:19:23 +0100 Subject: [PATCH] SheenBidi: Remove emoji script type --- modules/juce_graphics/unicode/juce_UnicodeGenerated.cpp | 3 +-- modules/juce_graphics/unicode/juce_UnicodeScript.cpp | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/juce_graphics/unicode/juce_UnicodeGenerated.cpp b/modules/juce_graphics/unicode/juce_UnicodeGenerated.cpp index bdaa1b9de1..e2389b336b 100644 --- a/modules/juce_graphics/unicode/juce_UnicodeGenerated.cpp +++ b/modules/juce_graphics/unicode/juce_UnicodeGenerated.cpp @@ -302,8 +302,7 @@ enum class UnicodeScriptType : uint8_t inscriptional_parthian, anatolian_hieroglyphs, egyptian_hieroglyphs, - meroitic_hieroglyphs, - emoji + meroitic_hieroglyphs }; enum class BreakOpportunity : uint8_t diff --git a/modules/juce_graphics/unicode/juce_UnicodeScript.cpp b/modules/juce_graphics/unicode/juce_UnicodeScript.cpp index 21b86a00e0..4e199d6f5b 100644 --- a/modules/juce_graphics/unicode/juce_UnicodeScript.cpp +++ b/modules/juce_graphics/unicode/juce_UnicodeScript.cpp @@ -104,10 +104,6 @@ enum class TextScript vai, wancho, yi, - - emoji, - - scriptCount }; // https://www.unicode.org/reports/tr24/tr24-32.html @@ -135,9 +131,6 @@ public: previousBaseTextScript = script; } - if (script == UnicodeScriptType::common && entry.emoji == EmojiType::extended) - script = UnicodeScriptType::emoji; - if (script == UnicodeScriptType::common || script == UnicodeScriptType::inherited) script = previousBaseTextScript; @@ -156,7 +149,6 @@ private: switch (type) { case UnicodeScriptType::common: return TextScript::common; - case UnicodeScriptType::emoji: return TextScript::emoji; case UnicodeScriptType::arabic: return TextScript::arabic; case UnicodeScriptType::armenian: return TextScript::armenian; case UnicodeScriptType::bengali: return TextScript::bengali;