Forgot gunibreak.c, mistake in ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 9e172ea..ceda10b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,7 @@
 
        * gunidecomp.c (COMBINING_CLASS): s/UNICODE_LAST_CHAR/G_UNICODE_LAST_CHAR/
 
-       * gunichartables.h: Update for data in Unicode 3.0.1, 
-       and include tables for line break properties
+       * gunichartables.h: Update for data in Unicode 3.0.1
 
        * gunidecomp.h: Ditto
        

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9e172ea..ceda10b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -2,8 +2,7 @@
 
        * gunidecomp.c (COMBINING_CLASS): s/UNICODE_LAST_CHAR/G_UNICODE_LAST_CHAR/
 
-       * gunichartables.h: Update for data in Unicode 3.0.1, 
-       and include tables for line break properties
+       * gunichartables.h: Update for data in Unicode 3.0.1
 
        * gunidecomp.h: Ditto
        

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9e172ea..ceda10b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -2,8 +2,7 @@
 
        * gunidecomp.c (COMBINING_CLASS): s/UNICODE_LAST_CHAR/G_UNICODE_LAST_CHAR/
 
-       * gunichartables.h: Update for data in Unicode 3.0.1, 
-       and include tables for line break properties
+       * gunichartables.h: Update for data in Unicode 3.0.1
 
        * gunidecomp.h: Ditto
        

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9e172ea..ceda10b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -2,8 +2,7 @@
 
        * gunidecomp.c (COMBINING_CLASS): s/UNICODE_LAST_CHAR/G_UNICODE_LAST_CHAR/
 
-       * gunichartables.h: Update for data in Unicode 3.0.1, 
-       and include tables for line break properties
+       * gunichartables.h: Update for data in Unicode 3.0.1
 
        * gunidecomp.h: Ditto
        

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9e172ea..ceda10b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -2,8 +2,7 @@
 
        * gunidecomp.c (COMBINING_CLASS): s/UNICODE_LAST_CHAR/G_UNICODE_LAST_CHAR/
 
-       * gunichartables.h: Update for data in Unicode 3.0.1, 
-       and include tables for line break properties
+       * gunichartables.h: Update for data in Unicode 3.0.1
 
        * gunidecomp.h: Ditto
        

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9e172ea..ceda10b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -2,8 +2,7 @@
 
        * gunidecomp.c (COMBINING_CLASS): s/UNICODE_LAST_CHAR/G_UNICODE_LAST_CHAR/
 
-       * gunichartables.h: Update for data in Unicode 3.0.1, 
-       and include tables for line break properties
+       * gunichartables.h: Update for data in Unicode 3.0.1
 
        * gunidecomp.h: Ditto
        

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9e172ea..ceda10b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -2,8 +2,7 @@
 
        * gunidecomp.c (COMBINING_CLASS): s/UNICODE_LAST_CHAR/G_UNICODE_LAST_CHAR/
 
-       * gunichartables.h: Update for data in Unicode 3.0.1, 
-       and include tables for line break properties
+       * gunichartables.h: Update for data in Unicode 3.0.1
 
        * gunidecomp.h: Ditto
        

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9e172ea..ceda10b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -2,8 +2,7 @@
 
        * gunidecomp.c (COMBINING_CLASS): s/UNICODE_LAST_CHAR/G_UNICODE_LAST_CHAR/
 
-       * gunichartables.h: Update for data in Unicode 3.0.1, 
-       and include tables for line break properties
+       * gunichartables.h: Update for data in Unicode 3.0.1
 
        * gunidecomp.h: Ditto
        

diff --git a/glib/gunibreak.c b/glib/gunibreak.c
new file mode 100644 (file)
index 0000000..6a4b837
--- /dev/null
+++ b/glib/gunibreak.c
@@ -0,0 +1,42 @@
+/* gunibreak.c - line break properties
+ *
+ *  Copyright 2000 Red Hat, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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.
+ */
+
+#include "glib.h"
+#include "gunibreak.h"
+
+#include <config.h>
+
+#include <stdlib.h>
+
+
+/* We cheat a bit and cast type values to (char *).  We detect these
+   using the &0xff trick.  */
+#define TPROP(Page, Char) \
+  (((GPOINTER_TO_INT(break_property_table[Page]) & 0xff) == GPOINTER_TO_INT(break_property_table[Page])) \
+   ? GPOINTER_TO_INT(break_property_table[Page]) \
+   : (break_property_table[Page][Char]))
+
+#define PROP(Char) (((Char) > (G_UNICODE_LAST_CHAR)) ? G_UNICODE_UNASSIGNED : TPROP ((Char) >> 8, (Char) & 0xff))
+
+GUnicodeBreakType
+g_unichar_break_type (gunichar c)
+{
+  return PROP (c);
+}

diff --git a/gunibreak.c b/gunibreak.c
new file mode 100644 (file)
index 0000000..6a4b837
--- /dev/null
+++ b/gunibreak.c
@@ -0,0 +1,42 @@
+/* gunibreak.c - line break properties
+ *
+ *  Copyright 2000 Red Hat, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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.
+ */
+
+#include "glib.h"
+#include "gunibreak.h"
+
+#include <config.h>
+
+#include <stdlib.h>
+
+
+/* We cheat a bit and cast type values to (char *).  We detect these
+   using the &0xff trick.  */
+#define TPROP(Page, Char) \
+  (((GPOINTER_TO_INT(break_property_table[Page]) & 0xff) == GPOINTER_TO_INT(break_property_table[Page])) \
+   ? GPOINTER_TO_INT(break_property_table[Page]) \
+   : (break_property_table[Page][Char]))
+
+#define PROP(Char) (((Char) > (G_UNICODE_LAST_CHAR)) ? G_UNICODE_UNASSIGNED : TPROP ((Char) >> 8, (Char) & 0xff))
+
+GUnicodeBreakType
+g_unichar_break_type (gunichar c)
+{
+  return PROP (c);
+}