summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Calvin Pan <calvinpan@google.com> 2022-11-18 07:24:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-11-18 07:24:43 +0000
commit5f86cf89eeec626604a0b83a15445330c7f9b95f (patch)
tree3b20fa0428fd7f439ea7281d5f26392430f3e9fe
parentbdc9177efd6a295f29a9ac1485f5c9c7f82c7781 (diff)
parent1a9701a13805e9acd14957a18f7fa9133d2114d9 (diff)
Merge "Support Hyphenation for Polish"
-rw-r--r--core/jni/android_text_Hyphenator.cpp2
-rwxr-xr-xtools/fonts/fontchain_linter.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_text_Hyphenator.cpp b/core/jni/android_text_Hyphenator.cpp
index 571a8e2e64be..b6bf617b40ae 100644
--- a/core/jni/android_text_Hyphenator.cpp
+++ b/core/jni/android_text_Hyphenator.cpp
@@ -126,6 +126,7 @@ static void init() {
addHyphenator("nn", 2, 2); // Norwegian Nynorsk
addHyphenator("or", INDIC_MIN_PREFIX, INDIC_MIN_SUFFIX); // Oriya
addHyphenator("pa", INDIC_MIN_PREFIX, INDIC_MIN_SUFFIX); // Punjabi
+ addHyphenator("pl", 2, 2); // Polish
addHyphenator("pt", 2, 3); // Portuguese
addHyphenator("ru", 2, 2); // Russian
addHyphenator("sk", 2, 2); // Slovak
@@ -141,7 +142,6 @@ static void init() {
// Following two hyphenators do not have pattern files but there is some special logic based on
// language.
addHyphenatorWithoutPatternFile("ca", 2, 2); // Catalan
- addHyphenatorWithoutPatternFile("pl", 2, 2); // Polish
// English locales that fall back to en-US. The data is from CLDR. It's all English locales,
// minus the locales whose parent is en-001 (from supplementalData.xml, under <parentLocales>).
diff --git a/tools/fonts/fontchain_linter.py b/tools/fonts/fontchain_linter.py
index 87b4c6855638..006a02908643 100755
--- a/tools/fonts/fontchain_linter.py
+++ b/tools/fonts/fontchain_linter.py
@@ -54,6 +54,7 @@ LANG_TO_SCRIPT = {
'or': 'Orya',
'pa': 'Guru',
'pt': 'Latn',
+ 'pl': 'Latn',
'ru': 'Latn',
'sk': 'Latn',
'sl': 'Latn',