summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaeHyun Sung <sungdh86@gmail.com>2019-06-01 22:51:21 +0900
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2019-06-09 16:23:55 +0200
commitdbb046db3ec1523b2c1ba6c5446b05a77bebfeb4 (patch)
tree2d89789140fd261b6db46fedad51b84f0a9da794
parentQt5Widget: lcl_retrieveSurrounding needs SolarMutex (diff)
downloadcore-dbb046db3ec1523b2c1ba6c5446b05a77bebfeb4.tar.gz
core-dbb046db3ec1523b2c1ba6c5446b05a77bebfeb4.zip
tdf#125620 add Korean Hangul Jamo codepoint ranges
In LibreOffice's Korean Hangul part, It check Korean code points only 3 part ranges. (such as, U+AC00 - U+D7AF - Hangul Syllables U+3130 - U+318F - Hangul Compatibility Jamo U+1100 - U+11FF - Hangul Jamo ) So, add Korean Hangul jamo code point ranges. such as, U+A960 - U+A97F: Hangul Jamo Extended-A U+D7B0 - U+D7FF: Hangul Jamo Extended-B Below is Korean Hangul Jamo and Syllables code point ranges on Unicode Consortium Hangul Jamo (Range: U+1100 - U+11FF) http://www.unicode.org/charts/PDF/U1100.pdf Hangul Jamo Extended-A (Range: U+A960 - U+A97F) http://www.unicode.org/charts/PDF/UA960.pdf Hangul Jamo Extended-B (Range: U+D7B0 - U+D7FF) http://www.unicode.org/charts/PDF/UD7B0.pdf Hangul Compatibility Jamo (Range: U+3130 - U+318F) http://www.unicode.org/charts/PDF/U3130.pdf Hangul Syllables (Range: U+AC00 - U+D7AF) http://www.unicode.org/charts/PDF/UAC00.pdf Change-Id: I65da4d9c6c43e01eb61f2e420faf1ad6cd986d86 Reviewed-on: https://gerrit.libreoffice.org/73309 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d9a31b8e164ad39e8b2f49b8e136cd9108ccac36) Reviewed-on: https://gerrit.libreoffice.org/73733 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--i18npool/source/breakiterator/breakiterator_cjk.cxx4
-rw-r--r--vcl/source/font/PhysicalFontCollection.cxx2
-rw-r--r--vcl/source/font/PhysicalFontFamily.cxx2
3 files changed, 7 insertions, 1 deletions
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 42a7ac6392c5..3854ce2ca628 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -89,7 +89,9 @@ BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos,
namespace {
bool isHangul( sal_Unicode cCh )
{
- return (cCh >= 0xAC00 && cCh <= 0xD7AF) || (cCh >= 0x1100 && cCh <= 0x11FF);
+ return (cCh >= 0xAC00 && cCh <= 0xD7AF) || (cCh >= 0x1100 && cCh <= 0x11FF) ||
+ (cCh >= 0xA960 && cCh <= 0xA97F) || (cCh >= 0xD7B0 && cCh <= 0xD7FF) ||
+ (cCh >= 0x3130 && cCh <= 0x318F);
}
}
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index d788d7382428..6ddc0e57de9f 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -42,6 +42,8 @@ static ImplFontAttrs lcl_IsCJKFont( const OUString& rFontName )
// korean
if ( ((ch >= 0xAC00) && (ch <= 0xD7AF)) ||
+ ((ch >= 0xA960) && (ch <= 0xA97F)) ||
+ ((ch >= 0xD7B0) && (ch <= 0xD7FF)) ||
((ch >= 0x3130) && (ch <= 0x318F)) ||
((ch >= 0x1100) && (ch <= 0x11FF)) )
return ImplFontAttrs::CJK|ImplFontAttrs::CJK_KR;
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index 6953d259798f..b8c630b6a7b3 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -67,6 +67,8 @@ static ImplFontAttrs lcl_IsCJKFont( const OUString& rFontName )
// korean
if ( ((ch >= 0xAC00) && (ch <= 0xD7AF)) ||
+ ((ch >= 0xA960) && (ch <= 0xA97F)) ||
+ ((ch >= 0xD7B0) && (ch <= 0xD7FF)) ||
((ch >= 0x3130) && (ch <= 0x318F)) ||
((ch >= 0x1100) && (ch <= 0x11FF)) )
return ImplFontAttrs::CJK|ImplFontAttrs::CJK_KR;