[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - i18npool/source

[Libreoffice Gerrit user]

 i18npool/source/characterclassification/cclass_unicode_parser.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 24e17b53b88dee234f23cf3fad3c7bc75b2d9ab7
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Tue Feb 19 22:37:55 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Feb 21 10:31:35 2019 +0100

    Resolves: tdf#123575 treat Katakana middle dots as midletter
    
    Treat
    U+30FB KATAKANA MIDDLE DOT
    U+FF65 HALFWIDTH KATAKANA MIDDLE DOT
    like
    U+00B7 MIDDLE DOT
    and other U_WB_MIDLETTER.
    
    Change-Id: Iea18e7582f29edf5d8c5bad047f97ed4088edf7c
    Reviewed-on: https://gerrit.libreoffice.org/68032
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit a10df00bd4a2ae293b077701d32c720a63080ebf)
    Reviewed-on: https://gerrit.libreoffice.org/68096
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 7af1dd8baf45..1b7cba461016 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -653,8 +653,12 @@ ParserFlags cclass_Unicode::getFlagsExtended(sal_uInt32 const c)
         case U_OTHER_PUNCTUATION:
             // fdo#61754 Lets see (if we not at the start) if this is midletter
             // punctuation and allow it in a word if it is similarly to
-            // U_NON_SPACING_MARK
-            if (bStart || U_WB_MIDLETTER != u_getIntPropertyValue(c, UCHAR_WORD_BREAK))
+            // U_NON_SPACING_MARK, for example U+00B7 MIDDLE DOT.
+            // tdf#123575 for U+30FB KATAKANA MIDDLE DOT property is not
+            // U_WB_MIDLETTER but U_WB_KATAKANA instead, explicitly test that
+            // and U+FF65 HALFWIDTH KATAKANA MIDDLE DOT.
+            if (bStart || (U_WB_MIDLETTER != u_getIntPropertyValue(c, UCHAR_WORD_BREAK)
+                        && c != 0x30FB && c != 0xFF65))
                 return ParserFlags::ILLEGAL;
             else
             {