Move text script code to adaptor.

Change-Id: Ib4427dde44f13573e40f66f8323109cc58fbc1b1
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index 171f529..09eb7c8 100644 (file)
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -77,7 +77,6 @@ toolkit_src_files = \
    $(toolkit_src_dir)/text/character-set-conversion.cpp \
    $(toolkit_src_dir)/text/logical-model.cpp \
    $(toolkit_src_dir)/text/multi-language-support.cpp \
-   $(toolkit_src_dir)/text/text-script.cpp \
    $(toolkit_src_dir)/text/segmentation.cpp \
    $(toolkit_src_dir)/text/shaper.cpp \
    $(toolkit_src_dir)/text/text-control-interface.cpp \

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index 711b7c3..6e41ae3 100644 (file)
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -23,11 +23,11 @@
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/adaptor-framework/singleton-service.h>
 #include <dali/public-api/text-abstraction/font-client.h>
+#include <dali/public-api/text-abstraction/script.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/logical-model.h>
 #include <dali-toolkit/internal/text/font-run.h>
-#include <dali-toolkit/internal/text/script.h>
 #include <dali-toolkit/internal/text/script-run.h>
 
 namespace Dali
@@ -134,13 +134,13 @@ Script GetScript( Length index,
  */
 bool IsValidForAllScripts( Character character )
 {
-  return ( IsWhiteSpace( character )         ||
-           IsZeroWidthNonJoiner( character ) ||
-           IsZeroWidthJoiner( character )    ||
-           IsZeroWidthSpace( character )     ||
-           IsLeftToRightMark( character )    ||
-           IsRightToLeftMark( character )    ||
-           IsThinSpace( character ) );
+  return ( TextAbstraction::IsWhiteSpace( character )         ||
+           TextAbstraction::IsZeroWidthNonJoiner( character ) ||
+           TextAbstraction::IsZeroWidthJoiner( character )    ||
+           TextAbstraction::IsZeroWidthSpace( character )     ||
+           TextAbstraction::IsLeftToRightMark( character )    ||
+           TextAbstraction::IsRightToLeftMark( character )    ||
+           TextAbstraction::IsThinSpace( character ) );
 }
 
 bool ValidateFontsPerScript::FindValidFont( FontId fontId ) const
@@ -294,14 +294,14 @@ void MultilanguageSupport::SetScripts( const Vector<Character>& text,
     }
 
     // Get the script of the character.
-    Script script = GetCharacterScript( character );
+    Script script = TextAbstraction::GetCharacterScript( character );
 
     // Check if it is the first character of a paragraph.
     if( firstValidScript &&
         ( TextAbstraction::UNKNOWN != script ) )
     {
       // Sets the direction of the first valid script.
-      isParagraphRTL = ( TextAbstraction::ARABIC == script );
+      isParagraphRTL = TextAbstraction::IsRightToLeftScript( script );
       firstValidScript = false;
     }
 
@@ -309,7 +309,7 @@ void MultilanguageSupport::SetScripts( const Vector<Character>& text,
     {
       // Current run needs to be stored and a new one initialized.
 
-      if( isParagraphRTL != ( TextAbstraction::ARABIC == script ) )
+      if( isParagraphRTL != TextAbstraction::IsRightToLeftScript( script ) )
       {
         // Current script has different direction than the first script of the paragraph.
         // All the previously skipped characters need to be added to the previous script before it's stored.

diff --git a/dali-toolkit/internal/text/script.h b/dali-toolkit/internal/text/script.h
deleted file mode 100644 (file)
index c7a3efa..0000000
--- a/dali-toolkit/internal/text/script.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef __DALI_TOOLKIT_TEXT_SCRIPT_H__
-#define __DALI_TOOLKIT_TEXT_SCRIPT_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-definitions.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Text
-{
-
-/**
- * @brief Retrieves a character's script.
- *
- * @param[in] character The character.
- *
- * @return The chraracter's script.
- */
-Script GetCharacterScript( Character character );
-
-/**
- * @brief Whether the character is a white space.
- *
- * @param[in] character The character.
- *
- * @return @e true if the character is a white space.
- */
-bool IsWhiteSpace( Character character );
-
-/**
- * @brief Whether the character is a new paragraph character.
- *
- * @param[in] character The character.
- *
- * @return @e true if the character is a new paragraph character.
- */
-bool IsNewParagraph( Character character );
-
-/**
- * @brief Whether the character is a zero width non joiner.
- *
- * @param[in] character The character.
- *
- * @return @e true if the character is a zero width non joiner.
- */
-bool IsZeroWidthNonJoiner( Character character );
-
-/**
- * @brief Whether the character is a zero width joiner.
- *
- * @param[in] character The character.
- *
- * @return @e true if the character is a zero width joiner.
- */
-bool IsZeroWidthJoiner( Character character );
-
-/**
- * @brief Whether the character is a zero width space.
- *
- * @param[in] character The character.
- *
- * @return @e true if the character is a zero width space.
- */
-bool IsZeroWidthSpace( Character character );
-
-/**
- * @brief Whether the character is a left to right mark.
- *
- * @param[in] character The character.
- *
- * @return @e true if the character is a left to right mark.
- */
-bool IsLeftToRightMark( Character character );
-
-/**
- * @brief Whether the character is a right to left mark.
- *
- * @param[in] character The character.
- *
- * @return @e true if the character is a right to left mark.
- */
-bool IsRightToLeftMark( Character character );
-
-/**
- * @brief Whether the character is a thin space.
- *
- * @param[in] character The character.
- *
- * @return @e true if the character is a thin space.
- */
-bool IsThinSpace( Character character );
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_TEXT_SCRIPT_H__

diff --git a/dali-toolkit/internal/text/shaper.cpp b/dali-toolkit/internal/text/shaper.cpp
index eaaedeb..c0c45fd 100644 (file)
--- a/dali-toolkit/internal/text/shaper.cpp
+++ b/dali-toolkit/internal/text/shaper.cpp
@@ -19,12 +19,12 @@
 #include <dali-toolkit/internal/text/shaper.h>
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/text-abstraction/script.h>
 #include <dali/public-api/text-abstraction/shaping.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/font-run.h>
 #include <dali-toolkit/internal/text/logical-model.h>
-#include <dali-toolkit/internal/text/script.h>
 #include <dali-toolkit/internal/text/script-run.h>
 #include <dali-toolkit/internal/text/visual-model.h>
 
@@ -134,7 +134,7 @@ void ShapeText( const Vector<Character>& text,
     // Check if the current index is a white space. Do not want to shape a \n.
     // The last character is always a must-break even if it's not a \n.
     Length numberOfCharactersToShape = currentIndex - previousIndex;
-    if( mustBreak && !IsWhiteSpace( *( textBuffer + currentIndex ) ) )
+    if( mustBreak && !TextAbstraction::IsWhiteSpace( *( textBuffer + currentIndex ) ) )
     {
       ++numberOfCharactersToShape;
     }

diff --git a/dali-toolkit/internal/text/text-script.cpp b/dali-toolkit/internal/text/text-script.cpp
deleted file mode 100644 (file)
index b8e0803..0000000
--- a/dali-toolkit/internal/text/text-script.cpp
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/script.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Text
-{
-
-namespace
-{
-const unsigned int WHITE_SPACE_THRESHOLD  = 0x21; ///< All characters below 0x21 are considered white spaces.
-const unsigned int CHAR_FL   = 0x000A; ///< NL Line feed, new line.
-const unsigned int CHAR_VT   = 0x000B; ///< Vertical tab.
-const unsigned int CHAR_FF   = 0x000C; ///< NP Form feed, new page.
-const unsigned int CHAR_NEL  = 0x0085; ///< Next line.
-const unsigned int CHAR_LS   = 0x2028; ///< Line separator.
-const unsigned int CHAR_PS   = 0x2029; ///< Paragraph separator
-
-const unsigned int CHAR_ZWS  = 0x200B; ///< Zero width space.
-const unsigned int CHAR_ZWNJ = 0x200C; ///< Zero width non joiner.
-const unsigned int CHAR_ZWJ  = 0x200D; ///< Zero width joiner.
-const unsigned int CHAR_LTRM = 0x200E; ///< Left to Right Mark.
-const unsigned int CHAR_RTLM = 0x200F; ///< Right to Left Mark.
-const unsigned int CHAR_TS   = 0x2009; ///< Thin Space.
-} // namespace
-
-Script GetCharacterScript( Character character )
-{
-  // Latin script:
-  // 0x0000 - 0x007f C0 Controls and Basic Latin
-  // 0x0080 - 0x00ff C1 Controls and Latin-1 Supplement
-  // 0x0100 - 0x017f Latin Extended-A
-  // 0x0180 - 0x024f Latin Extended-B
-  // 0x0250 - 0x02af IPA Extensions
-  // 0x02b0 - 0x02ff Spacing Modifier Letters
-  // 0x1d00 - 0x1d7f Phonetic Extensions
-  // 0x1d80 - 0x1dbf Phonetic Extensions Supplement
-  // 0x1e00 - 0x1eff Latin Extended Additional
-  // 0x2070 - 0x209f Superscripts and Subscripts
-  // 0x2100 - 0x214f Letterlike symbols
-  // 0x2150 - 0x218f Number Forms
-  // 0x2c60 - 0x2c7f Latin Extended-C
-  // 0xa720 - 0xa7ff Latin Extended-D
-  // 0xab30 - 0xab6f Latin Extended-E
-  // 0xfb00 - 0xfb4f Alphabetic Presentation Forms
-  // 0xff00 - 0xffef Halfwidth and Fullwidth Forms
-
-  // Brahmic scripts:
-  // 0x0900 - 0x097f Devanagari
-  // 0x0980 - 0x09ff Bengali
-  // 0x0a00 - 0x0a7f Gurmukhi
-  // 0x0a80 - 0x0aff Gujarati
-  // 0x0b00 - 0x0b7f Oriya
-  // 0x0b80 - 0x0bff Tamil
-  // 0x0c00 - 0x0c7f Telugu
-  // 0x0c80 - 0x0cff Kannada
-  // 0x0d00 - 0x0d7f Malayalam
-
-  // Sinhala script.
-  // 0x0d80 - 0x0dff Sinhala
-
-  // Arabic script.
-  // 0x0600 - 0x06ff Arabic
-  // 0x0750 - 0x077f Arabic Supplement
-  // 0x08A0 - 0x08ff Arabic Extended-A
-  // 0xfb50 - 0xfdff Arabic Presentation Forms-A
-  // 0xfe70 - 0xfeff Arabic Presentation Forms-B
-  // 0x1ee00 - 0x1eeff Arabic Mathematical Alphabetic Symbols
-
-  // CJK and Vietnamese script.
-  // 0x2E80 - 0x2eff CJK Radicals Supplement
-  // 0x3000 - 0x303f CJK Symbols and Punctuation
-  // 0x3200 - 0x32ff Enclosed CJK Letters and Months
-  // 0x3400 - 0x4dbf CJK Unified Ideographs Extension A
-  // 0x4e00 - 0x62ff CJK Unified Ideographs
-  // 0x6300 - 0x77ff CJK Unified Ideographs
-  // 0x7800 - 0x8cff CJK Unified Ideographs
-  // 0x8d00 - 0x9fff CJK Unified Ideographs
-  // 0x20000 - 0x215ff CJK Unified Ideographs Extension B
-  // 0x21600 - 0x230ff CJK Unified Ideographs Extension B
-  // 0x23100 - 0x245ff CJK Unified Ideographs Extension B
-  // 0x24600 - 0x260ff CJK Unified Ideographs Extension B
-  // 0x26100 - 0x275ff CJK Unified Ideographs Extension B
-  // 0x27600 - 0x290ff CJK Unified Ideographs Extension B
-  // 0x29100 - 0x2a6df CJK Unified Ideographs Extension B
-  // 2a700-2b73f. CJK Unified Ideographs Extension C
-  // 2b740-2b81f. CJK Unified Ideographs Extension D
-
-  // Hangul script
-  // 0x1100 - 0x11ff Hangul jamo
-  // 0x3130 - 0x318f Hangul Compatibility Jamo
-  // 0xa960 - 0xa97f Hangul Jamo Extended-A
-  // 0xac00 - 0xd7af Hangul Syllables
-  // 0xd7b0 - 0xd7ff Hangul Jamo Extended-B
-
-  // Khmer script
-  // 0x1780 - 0x17ff Khmer
-  // 0x19e0 - 0x19ff Khmer Symbols
-
-  // Lao script
-  // 0x0e80 - 0x0eff Lao
-
-  // Thai script
-  // 0x0e00 - 0x0e7f Thai
-
-  // Burmese script
-  // 0x1000 - 0x109f Myanmar
-
-  // The Emoji which map to standardized Unicode characters
-  // 1. Emoticons ( 1F601 - 1F64F )
-  // 2. Dingbats ( 2702 - 27B0 )
-  // 3. Transport and map symbols ( 1F680 - 1F6C0 )
-  // 4. Enclosed characters ( 24C2 - 1F251 )
-  // 5. Uncategorized :-S
-  // 6. Additional Emoticons ( 1F600 - 1F636 )
-  // 6b. Additional transport and map symbols ( 1F681 - 1F6C5 )
-  // 6c. Other additional symbols ( 1F30D - 1F567 )
-
-  if( character <= 0x0cff )
-  {
-    if( character <= 0x09ff )
-    {
-      if( character <= 0x077f )
-      {
-        if( character == 0x00A9 )
-        {
-          return TextAbstraction::EMOJI; // 5. Uncategorized: copyright sign
-        }
-        if( character == 0x00AE )
-        {
-          return TextAbstraction::EMOJI; // 5. Uncategorized: registered sign
-        }
-        if( character <= 0x02ff )
-        {
-          return TextAbstraction::LATIN;
-        }
-        if( ( 0x0600 <= character ) && ( character <= 0x06ff ) )
-        {
-          return TextAbstraction::ARABIC;
-        }
-        if( ( 0x0750 <= character ) && ( character <= 0x077f ) )
-        {
-          return TextAbstraction::ARABIC;
-        }
-      }
-      else // > 0x077f
-      {
-        if( ( 0x08A0 <= character ) && ( character <= 0x08ff ) )
-        {
-          return TextAbstraction::ARABIC;
-        }
-        if( ( 0x0900 <= character ) && ( character <= 0x097f ) )
-        {
-          return TextAbstraction::DEVANAGARI;
-        }
-        if( ( 0x0980 <= character ) && ( character <= 0x09ff ) )
-        {
-          return TextAbstraction::BENGALI;
-        }
-      }
-    }
-    else // > 0x09ff
-    {
-      if( character <= 0x0b7f )
-      {
-        if( ( 0x0a00 <= character ) && ( character <= 0x0a7f ) )
-        {
-          return TextAbstraction::GURMUKHI;
-        }
-        if( ( 0x0a80 <= character ) && ( character <= 0x0aff ) )
-        {
-          return TextAbstraction::GUJARATI;
-        }
-        if( ( 0x0b00 <= character ) && ( character <= 0x0b7f ) )
-        {
-          return TextAbstraction::ORIYA;
-        }
-      }
-      else // > 0x0b7f
-      {
-        if( ( 0x0b80 <= character ) && ( character <= 0x0bff ) )
-        {
-          return TextAbstraction::TAMIL;
-        }
-        if( ( 0x0c00 <= character ) && ( character <= 0x0c7f ) )
-        {
-          return TextAbstraction::TELUGU;
-        }
-        if( ( 0x0c80 <= character ) && ( character <= 0x0cff ) )
-        {
-          return TextAbstraction::KANNADA;
-        }
-      }
-    }
-  }
-  else // > 0x0cff
-  {
-    if( character <= 0x2c7f )
-    {
-      if( character <= 0x1eff )
-      {
-        if( ( 0x0d00 <= character ) && ( character <= 0x0d7f ) )
-        {
-          return TextAbstraction::MALAYALAM;
-        }
-        if( ( 0x0d80 <= character ) && ( character <= 0x0dff ) )
-        {
-          return TextAbstraction::SINHALA;
-        }
-        if( ( 0x0e00 <= character ) && ( character <= 0x0e7f ) )
-        {
-          return TextAbstraction::THAI;
-        }
-        if( ( 0x0e80 <= character ) && ( character <= 0x0eff ) )
-        {
-          return TextAbstraction::LAO;
-        }
-        if( ( 0x1000 <= character ) && ( character <= 0x109f ) )
-        {
-          return TextAbstraction::BURMESE;
-        }
-        if( ( 0x1100 <= character ) && ( character <= 0x11ff ) )
-        {
-          return TextAbstraction::HANGUL;
-        }
-        if( ( 0x1780 <= character ) && ( character <= 0x17ff ) )
-        {
-          return TextAbstraction::KHMER;
-        }
-        if( ( 0x19e0 <= character ) && ( character <= 0x19ff ) )
-        {
-          return TextAbstraction::KHMER;
-        }
-        if( ( 0x1d00 <= character ) && ( character <= 0x1eff ) )
-        {
-          return TextAbstraction::LATIN;
-        }
-      }
-      else // > 0x1eff
-      {
-        if( character == 0x203c )
-        {
-          return TextAbstraction::EMOJI; // 5. Uncategorized: double exclamation mark
-        }
-        if( character == 0x2049 )
-        {
-          return TextAbstraction::EMOJI; // 5. Uncategorized: exclamation question mark
-        }
-        if( ( 0x2070 <= character ) && ( character <= 0x209f ) )
-        {
-          return TextAbstraction::LATIN;
-        }
-        if( character == 0x20e3 )
-        {
-          return TextAbstraction::EMOJI; // 5. Uncategorized: combining enclosing keycap
-        }
-        if( character == 0x2122 )
-        {
-          return TextAbstraction::EMOJI; // 5. Uncategorized: trade mark sign
-        }
-        if( character == 0x2139 )
-        {
-          return TextAbstraction::EMOJI; // 5. Uncategorized: information source
-        }
-        if( ( 0x2100 <= character ) && ( character <= 0x218f ) )
-        {
-          return TextAbstraction::LATIN;
-        }
-        // U+2194 5. Uncategorized: left right arrow
-        // U+2B55 5. Uncategorized: heavy large circle
-        if( ( 0x2194 <= character ) && ( character <= 0x2B55 ) )
-        {
-          return TextAbstraction::EMOJI;
-        }
-        if( ( 0x2c60 <= character ) && ( character <= 0x2c7f ) )
-        {
-          return TextAbstraction::LATIN;
-        }
-      }
-    }
-    else // > 0x2c7f
-    {
-      if( character <= 0xfdff )
-      {
-        if( ( 0x2e80 <= character ) && ( character <= 0x2eff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x3000 <= character ) && ( character <= 0x303f ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x3130 <= character ) && ( character <= 0x318f ) )
-        {
-          return TextAbstraction::HANGUL;
-        }
-        if( ( 0x3200 <= character ) && ( character <= 0x32ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x3400 <= character ) && ( character <= 0x4dbf ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x4e00 <= character ) && ( character <= 0x62ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x6300 <= character ) && ( character <= 0x77ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x7800 <= character ) && ( character <= 0x8cff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x8d00 <= character ) && ( character <= 0x9fff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0xa720 <= character ) && ( character <= 0xa7ff ) )
-        {
-          return TextAbstraction::LATIN;
-        }
-        if( ( 0xa960 <= character ) && ( character <= 0xa97f ) )
-        {
-          return TextAbstraction::HANGUL;
-        }
-        if( ( 0xab30 <= character ) && ( character <= 0xab6f ) )
-        {
-          return TextAbstraction::LATIN;
-        }
-        if( ( 0xac00 <= character ) && ( character <= 0xd7af ) )
-        {
-          return TextAbstraction::HANGUL;
-        }
-        if( ( 0xd7b0 <= character ) && ( character <= 0xd7ff ) )
-        {
-          return TextAbstraction::HANGUL;
-        }
-        if( ( 0xfb00 <= character ) && ( character <= 0xfb4f ) )
-        {
-          return TextAbstraction::LATIN;
-        }
-        if( ( 0xfb50 <= character ) && ( character <= 0xfdff ) )
-        {
-          return TextAbstraction::ARABIC;
-        }
-      }
-      else // > 0xfdff
-      {
-        if( ( 0xfe70 <= character ) && ( character <= 0xfeff ) )
-        {
-          return TextAbstraction::ARABIC;
-        }
-        if( ( 0xff00 <= character ) && ( character <= 0xffef ) )
-        {
-          return TextAbstraction::LATIN;
-        }
-        if( ( 0x1ee00 <= character ) && ( character <= 0x1eeff ) )
-        {
-          return TextAbstraction::ARABIC;
-        }
-        // U+1f170 4. Enclosed characters: negative squared latin capital letter A
-        // U+1f6c5 6b. Additional transport and map symbols
-        if( ( 0x1f170 <= character ) && ( character <= 0x1f6c5 ) )
-        {
-          return TextAbstraction::EMOJI;
-        }
-        if( ( 0x20000 <= character ) && ( character <= 0x215ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x21600 <= character ) && ( character <= 0x230ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x23100 <= character ) && ( character <= 0x245ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x24600 <= character ) && ( character <= 0x260ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x26100 <= character ) && ( character <= 0x275ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x27600 <= character ) && ( character <= 0x290ff ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x29100 <= character ) && ( character <= 0x2a6df ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x2a700 <= character ) && ( character <= 0x2b73f ) )
-        {
-          return TextAbstraction::CJK;
-        }
-        if( ( 0x2b740 <= character ) && ( character <= 0x2b81f ) )
-        {
-          return TextAbstraction::CJK;
-        }
-      }
-    }
-  }
-
-  return TextAbstraction::UNKNOWN;
-}
-
-bool IsWhiteSpace( Character character )
-{
-  return character < WHITE_SPACE_THRESHOLD;
-}
-
-bool IsNewParagraph( Character character )
-{
-  return ( ( CHAR_FL == character )  ||
-           ( CHAR_VT == character )  ||
-           ( CHAR_FF == character )  ||
-           ( CHAR_NEL == character ) ||
-           ( CHAR_LS == character )  ||
-           ( CHAR_PS == character ) );
-}
-
-bool IsZeroWidthNonJoiner( Character character )
-{
-  return CHAR_ZWNJ == character;
-}
-
-bool IsZeroWidthJoiner( Character character )
-{
-  return CHAR_ZWJ == character;
-}
-
-bool IsZeroWidthSpace( Character character )
-{
-  return CHAR_ZWS == character;
-}
-
-bool IsLeftToRightMark( Character character )
-{
-  return CHAR_LTRM == character;
-}
-
-bool IsRightToLeftMark( Character character )
-{
-  return CHAR_RTLM == character;
-}
-
-bool IsThinSpace( Character character )
-{
-  return CHAR_TS == character;
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali