X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgunibreak.c;h=8fcd4de3649178fd4469b4343ad85f3a7a5b3b03;hb=49a5d0f6f2aed99cd78f25655f137f4448e47d92;hp=28757067c78243d8324dc8713315efb0235786ed;hpb=bbbd329ff5bd634b4e1d4fb43b13538779e44a78;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/gunibreak.c b/glib/gunibreak.c
index 2875706..8fcd4de 100644
--- a/glib/gunibreak.c
+++ b/glib/gunibreak.c
@@ -14,24 +14,31 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 
 #include <stdlib.h>
 
-#include "glib.h"
 #include "gunibreak.h"
 
+#define TPROP_PART1(Page, Char) \
+  ((break_property_table_part1[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
+   ? (break_property_table_part1[Page] - G_UNICODE_MAX_TABLE_INDEX) \
+   : (break_property_data[break_property_table_part1[Page]][Char]))
 
-#define TPROP(Page, Char) \
-  ((break_property_table[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
-   ? (break_property_table[Page] - G_UNICODE_MAX_TABLE_INDEX) \
-   : (break_property_data[break_property_table[Page]][Char]))
+#define TPROP_PART2(Page, Char) \
+  ((break_property_table_part2[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
+   ? (break_property_table_part2[Page] - G_UNICODE_MAX_TABLE_INDEX) \
+   : (break_property_data[break_property_table_part2[Page]][Char]))
 
-#define PROP(Char) (((Char) > (G_UNICODE_LAST_CHAR)) ? G_UNICODE_UNASSIGNED : TPROP ((Char) >> 8, (Char) & 0xff))
+#define PROP(Char) \
+  (((Char) <= G_UNICODE_LAST_CHAR_PART1) \
+   ? TPROP_PART1 ((Char) >> 8, (Char) & 0xff) \
+   : (((Char) >= 0xe0000 && (Char) <= G_UNICODE_LAST_CHAR) \
+      ? TPROP_PART2 (((Char) - 0xe0000) >> 8, (Char) & 0xff) \
+      : G_UNICODE_BREAK_UNKNOWN))
 
 /**
  * g_unichar_break_type:
@@ -44,7 +51,7 @@
  * resolution algorithms and normally you would use a function such
  * as pango_break() instead of caring about break types yourself.
  * 
- * Return value: the break type of @c
+ * Returns: the break type of @c
  **/
 GUnicodeBreakType
 g_unichar_break_type (gunichar c)