Derive bidi type table from UnicodeData.txt.

src/bidi.c (bidi_initialize): Remove explicit initialization of bidi_type_table; include biditype.h instead. Don't support entries whose second codepoint is zero. src/biditype.h: New file. admin/unidata/biditype.awk: New file. admin/unidata/Makefile.in (../../src/biditype.h): New target. admin/unidata/makefile.w32-in (../../src/biditype.h): New target.
author: Eli Zaretskii 2010-06-12 17:15:25 +0300
committer: Eli Zaretskii 2010-06-12 17:15:25 +0300
commit: 317fbf3360f9b1163bc371d8d66c67994cb238e9 (patch)
tree: 9a86894ea0180bd8282e8076becd63865f32bded /src
parent: 6e6e5760b3bafc41e425aad03ec61e59731713d5 (diff)
download: emacs-317fbf3360f9b1163bc371d8d66c67994cb238e9.tar.gz
emacs-317fbf3360f9b1163bc371d8d66c67994cb238e9.zip
2 files changed, 10 insertions, 283 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5036910751c..19615190b62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-12  Eli Zaretskii  <eliz@gnu.org>
+        * bidi.c (bidi_initialize): Remove explicit initialization of
+        bidi_type_table; include biditype.h instead.  Don't support
+        entries whose second codepoint is zero.
+        * biditype.h: New file.
        * window.c (syms_of_window): Doc fix (bug#6409).
 2010-06-12  Romain Francoise  <romain@orebokech.com>
diff --git a/src/bidi.c b/src/bidi.c
index a25976dcc01..190320bbe0e 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -108,295 +108,16 @@ static Lisp_Object Qparagraph_start, Qparagraph_separate;
 static void
 bidi_initialize ()
 {
-  /* FIXME: This should come from the Unicode Database.  */
-  struct {
+#include "biditype.h"
-    int from, to;
-    bidi_type_t type;
-  } bidi_type[] =
-      { { 0x0000, 0x0008, WEAK_BN },
-        { 0x0009, 0x0000, NEUTRAL_S },
-        { 0x000A, 0x0000, NEUTRAL_B },
-        { 0x000B, 0x0000, NEUTRAL_S },
-        { 0x000C, 0x0000, NEUTRAL_WS },
-        { 0x000D, 0x0000, NEUTRAL_B },
-        { 0x000E, 0x001B, WEAK_BN },
-        { 0x001C, 0x001E, NEUTRAL_B },
-        { 0x001F, 0x0000, NEUTRAL_S },
-        { 0x0020, 0x0000, NEUTRAL_WS },
-        { 0x0021, 0x0022, NEUTRAL_ON },
-        { 0x0023, 0x0025, WEAK_ET },
-        { 0x0026, 0x002A, NEUTRAL_ON },
-        { 0x002B, 0x0000, WEAK_ES },
-        { 0x002C, 0x0000, WEAK_CS },
-        { 0x002D, 0x0000, WEAK_ES },
-        { 0x002E, 0x002F, WEAK_CS },
-        { 0x0030, 0x0039, WEAK_EN },
-        { 0x003A, 0x0000, WEAK_CS },
-        { 0x003B, 0x0040, NEUTRAL_ON },
-        { 0x005B, 0x0060, NEUTRAL_ON },
-        { 0x007B, 0x007E, NEUTRAL_ON },
-        { 0x007F, 0x0084, WEAK_BN },
-        { 0x0085, 0x0000, NEUTRAL_B },
-        { 0x0086, 0x009F, WEAK_BN },
-        { 0x00A0, 0x0000, WEAK_CS },
-        { 0x00A1, 0x0000, NEUTRAL_ON },
-        { 0x00A2, 0x00A5, WEAK_ET },
-        { 0x00A6, 0x00A9, NEUTRAL_ON },
-        { 0x00AB, 0x00AC, NEUTRAL_ON },
-        { 0x00AD, 0x0000, WEAK_BN },
-        { 0x00AE, 0x00Af, NEUTRAL_ON },
-        { 0x00B0, 0x00B1, WEAK_ET },
-        { 0x00B2, 0x00B3, WEAK_EN },
-        { 0x00B4, 0x0000, NEUTRAL_ON },
-        { 0x00B6, 0x00B8, NEUTRAL_ON },
-        { 0x00B9, 0x0000, WEAK_EN },
-        { 0x00BB, 0x00BF, NEUTRAL_ON },
-        { 0x00D7, 0x0000, NEUTRAL_ON },
-        { 0x00F7, 0x0000, NEUTRAL_ON },
-        { 0x02B9, 0x02BA, NEUTRAL_ON },
-        { 0x02C2, 0x02CF, NEUTRAL_ON },
-        { 0x02D2, 0x02DF, NEUTRAL_ON },
-        { 0x02E5, 0x02ED, NEUTRAL_ON },
-        { 0x0300, 0x036F, WEAK_NSM },
-        { 0x0374, 0x0375, NEUTRAL_ON },
-        { 0x037E, 0x0385, NEUTRAL_ON },
-        { 0x0387, 0x0000, NEUTRAL_ON },
-        { 0x03F6, 0x0000, NEUTRAL_ON },
-        { 0x0483, 0x0489, WEAK_NSM },
-        { 0x058A, 0x0000, NEUTRAL_ON },
-        { 0x0591, 0x05BD, WEAK_NSM },
-        { 0x05BE, 0x0000, STRONG_R },
-        { 0x05BF, 0x0000, WEAK_NSM },
-        { 0x05C0, 0x0000, STRONG_R },
-        { 0x05C1, 0x05C2, WEAK_NSM },
-        { 0x05C3, 0x0000, STRONG_R },
-        { 0x05C4, 0x05C5, WEAK_NSM },
-        { 0x05C6, 0x0000, STRONG_R },
-        { 0x05C7, 0x0000, WEAK_NSM },
-        { 0x05D0, 0x05F4, STRONG_R },
-        { 0x060C, 0x0000, WEAK_CS },
-        { 0x061B, 0x064A, STRONG_AL },
-        { 0x064B, 0x0655, WEAK_NSM },
-        { 0x0660, 0x0669, WEAK_AN },
-        { 0x066A, 0x0000, WEAK_ET },
-        { 0x066B, 0x066C, WEAK_AN },
-        { 0x066D, 0x066F, STRONG_AL },
-        { 0x0670, 0x0000, WEAK_NSM },
-        { 0x0671, 0x06D5, STRONG_AL },
-        { 0x06D6, 0x06DC, WEAK_NSM },
-        { 0x06DD, 0x0000, STRONG_AL },
-        { 0x06DE, 0x06E4, WEAK_NSM },
-        { 0x06E5, 0x06E6, STRONG_AL },
-        { 0x06E7, 0x06E8, WEAK_NSM },
-        { 0x06E9, 0x0000, NEUTRAL_ON },
-        { 0x06EA, 0x06ED, WEAK_NSM },
-        { 0x06F0, 0x06F9, WEAK_EN },
-        { 0x06FA, 0x070D, STRONG_AL },
-        { 0x070F, 0x0000, WEAK_BN },
-        { 0x0710, 0x0000, STRONG_AL },
-        { 0x0711, 0x0000, WEAK_NSM },
-        { 0x0712, 0x072C, STRONG_AL },
-        { 0x0730, 0x074A, WEAK_NSM },
-        { 0x0780, 0x07A5, STRONG_AL },
-        { 0x07A6, 0x07B0, WEAK_NSM },
-        { 0x07B1, 0x0000, STRONG_AL },
-        { 0x0901, 0x0902, WEAK_NSM },
-        { 0x093C, 0x0000, WEAK_NSM },
-        { 0x0941, 0x0948, WEAK_NSM },
-        { 0x094D, 0x0000, WEAK_NSM },
-        { 0x0951, 0x0954, WEAK_NSM },
-        { 0x0962, 0x0963, WEAK_NSM },
-        { 0x0981, 0x0000, WEAK_NSM },
-        { 0x09BC, 0x0000, WEAK_NSM },
-        { 0x09C1, 0x09C4, WEAK_NSM },
-        { 0x09CD, 0x0000, WEAK_NSM },
-        { 0x09E2, 0x09E3, WEAK_NSM },
-        { 0x09F2, 0x09F3, WEAK_ET },
-        { 0x0A02, 0x0000, WEAK_NSM },
-        { 0x0A3C, 0x0000, WEAK_NSM },
-        { 0x0A41, 0x0A4D, WEAK_NSM },
-        { 0x0A70, 0x0A71, WEAK_NSM },
-        { 0x0A81, 0x0A82, WEAK_NSM },
-        { 0x0ABC, 0x0000, WEAK_NSM },
-        { 0x0AC1, 0x0AC8, WEAK_NSM },
-        { 0x0ACD, 0x0000, WEAK_NSM },
-        { 0x0B01, 0x0000, WEAK_NSM },
-        { 0x0B3C, 0x0000, WEAK_NSM },
-        { 0x0B3F, 0x0000, WEAK_NSM },
-        { 0x0B41, 0x0B43, WEAK_NSM },
-        { 0x0B4D, 0x0B56, WEAK_NSM },
-        { 0x0B82, 0x0000, WEAK_NSM },
-        { 0x0BC0, 0x0000, WEAK_NSM },
-        { 0x0BCD, 0x0000, WEAK_NSM },
-        { 0x0C3E, 0x0C40, WEAK_NSM },
-        { 0x0C46, 0x0C56, WEAK_NSM },
-        { 0x0CBF, 0x0000, WEAK_NSM },
-        { 0x0CC6, 0x0000, WEAK_NSM },
-        { 0x0CCC, 0x0CCD, WEAK_NSM },
-        { 0x0D41, 0x0D43, WEAK_NSM },
-        { 0x0D4D, 0x0000, WEAK_NSM },
-        { 0x0DCA, 0x0000, WEAK_NSM },
-        { 0x0DD2, 0x0DD6, WEAK_NSM },
-        { 0x0E31, 0x0000, WEAK_NSM },
-        { 0x0E34, 0x0E3A, WEAK_NSM },
-        { 0x0E3F, 0x0000, WEAK_ET },
-        { 0x0E47, 0x0E4E, WEAK_NSM },
-        { 0x0EB1, 0x0000, WEAK_NSM },
-        { 0x0EB4, 0x0EBC, WEAK_NSM },
-        { 0x0EC8, 0x0ECD, WEAK_NSM },
-        { 0x0F18, 0x0F19, WEAK_NSM },
-        { 0x0F35, 0x0000, WEAK_NSM },
-        { 0x0F37, 0x0000, WEAK_NSM },
-        { 0x0F39, 0x0000, WEAK_NSM },
-        { 0x0F3A, 0x0F3D, NEUTRAL_ON },
-        { 0x0F71, 0x0F7E, WEAK_NSM },
-        { 0x0F80, 0x0F84, WEAK_NSM },
-        { 0x0F86, 0x0F87, WEAK_NSM },
-        { 0x0F90, 0x0FBC, WEAK_NSM },
-        { 0x0FC6, 0x0000, WEAK_NSM },
-        { 0x102D, 0x1030, WEAK_NSM },
-        { 0x1032, 0x1037, WEAK_NSM },
-        { 0x1039, 0x0000, WEAK_NSM },
-        { 0x1058, 0x1059, WEAK_NSM },
-        { 0x1680, 0x0000, NEUTRAL_WS },
-        { 0x169B, 0x169C, NEUTRAL_ON },
-        { 0x1712, 0x1714, WEAK_NSM },
-        { 0x1732, 0x1734, WEAK_NSM },
-        { 0x1752, 0x1753, WEAK_NSM },
-        { 0x1772, 0x1773, WEAK_NSM },
-        { 0x17B7, 0x17BD, WEAK_NSM },
-        { 0x17C6, 0x0000, WEAK_NSM },
-        { 0x17C9, 0x17D3, WEAK_NSM },
-        { 0x17DB, 0x0000, WEAK_ET },
-        { 0x1800, 0x180A, NEUTRAL_ON },
-        { 0x180B, 0x180D, WEAK_NSM },
-        { 0x180E, 0x0000, WEAK_BN },
-        { 0x18A9, 0x0000, WEAK_NSM },
-        { 0x1FBD, 0x0000, NEUTRAL_ON },
-        { 0x1FBF, 0x1FC1, NEUTRAL_ON },
-        { 0x1FCD, 0x1FCF, NEUTRAL_ON },
-        { 0x1FDD, 0x1FDF, NEUTRAL_ON },
-        { 0x1FED, 0x1FEF, NEUTRAL_ON },
-        { 0x1FFD, 0x1FFE, NEUTRAL_ON },
-        { 0x2000, 0x200A, NEUTRAL_WS },
-        { 0x200B, 0x200D, WEAK_BN },
-        { 0x200F, 0x0000, STRONG_R },
-        { 0x2010, 0x2027, NEUTRAL_ON },
-        { 0x2028, 0x0000, NEUTRAL_WS },
-        { 0x2029, 0x0000, NEUTRAL_B },
-        { 0x202A, 0x0000, LRE },
-        { 0x202B, 0x0000, RLE },
-        { 0x202C, 0x0000, PDF },
-        { 0x202D, 0x0000, LRO },
-        { 0x202E, 0x0000, RLO },
-        { 0x202F, 0x0000, NEUTRAL_WS },
-        { 0x2030, 0x2034, WEAK_ET },
-        { 0x2035, 0x2057, NEUTRAL_ON },
-        { 0x205F, 0x0000, NEUTRAL_WS },
-        { 0x2060, 0x206F, WEAK_BN },
-        { 0x2070, 0x0000, WEAK_EN },
-        { 0x2074, 0x2079, WEAK_EN },
-        { 0x207A, 0x207B, WEAK_ET },
-        { 0x207C, 0x207E, NEUTRAL_ON },
-        { 0x2080, 0x2089, WEAK_EN },
-        { 0x208A, 0x208B, WEAK_ET },
-        { 0x208C, 0x208E, NEUTRAL_ON },
-        { 0x20A0, 0x20B1, WEAK_ET },
-        { 0x20D0, 0x20EA, WEAK_NSM },
-        { 0x2100, 0x2101, NEUTRAL_ON },
-        { 0x2103, 0x2106, NEUTRAL_ON },
-        { 0x2108, 0x2109, NEUTRAL_ON },
-        { 0x2114, 0x0000, NEUTRAL_ON },
-        { 0x2116, 0x2118, NEUTRAL_ON },
-        { 0x211E, 0x2123, NEUTRAL_ON },
-        { 0x2125, 0x0000, NEUTRAL_ON },
-        { 0x2127, 0x0000, NEUTRAL_ON },
-        { 0x2129, 0x0000, NEUTRAL_ON },
-        { 0x212E, 0x0000, WEAK_ET },
-        { 0x2132, 0x0000, NEUTRAL_ON },
-        { 0x213A, 0x0000, NEUTRAL_ON },
-        { 0x2140, 0x2144, NEUTRAL_ON },
-        { 0x214A, 0x215F, NEUTRAL_ON },
-        { 0x2190, 0x2211, NEUTRAL_ON },
-        { 0x2212, 0x2213, WEAK_ET },
-        { 0x2214, 0x2335, NEUTRAL_ON },
-        { 0x237B, 0x2394, NEUTRAL_ON },
-        { 0x2396, 0x244A, NEUTRAL_ON },
-        { 0x2460, 0x249B, WEAK_EN },
-        { 0x24EA, 0x0000, WEAK_EN },
-        { 0x24EB, 0x2FFB, NEUTRAL_ON },
-        { 0x3000, 0x0000, NEUTRAL_WS },
-        { 0x3001, 0x3004, NEUTRAL_ON },
-        { 0x3008, 0x3020, NEUTRAL_ON },
-        { 0x302A, 0x302F, WEAK_NSM },
-        { 0x3030, 0x0000, NEUTRAL_ON },
-        { 0x3036, 0x3037, NEUTRAL_ON },
-        { 0x303D, 0x303F, NEUTRAL_ON },
-        { 0x3099, 0x309A, WEAK_NSM },
-        { 0x309B, 0x309C, NEUTRAL_ON },
-        { 0x30A0, 0x0000, NEUTRAL_ON },
-        { 0x30FB, 0x0000, NEUTRAL_ON },
-        { 0x3251, 0x325F, NEUTRAL_ON },
-        { 0x32B1, 0x32BF, NEUTRAL_ON },
-        { 0xA490, 0xA4C6, NEUTRAL_ON },
-        { 0xFB1D, 0x0000, STRONG_R },
-        { 0xFB1E, 0x0000, WEAK_NSM },
-        { 0xFB1F, 0xFB28, STRONG_R },
-        { 0xFB29, 0x0000, WEAK_ET },
-        { 0xFB2A, 0xFB4F, STRONG_R },
-        { 0xFB50, 0xFD3D, STRONG_AL },
-        { 0xFD3E, 0xFD3F, NEUTRAL_ON },
-        { 0xFD50, 0xFDFC, STRONG_AL },
-        { 0xFE00, 0xFE23, WEAK_NSM },
-        { 0xFE30, 0xFE4F, NEUTRAL_ON },
-        { 0xFE50, 0x0000, WEAK_CS },
-        { 0xFE51, 0x0000, NEUTRAL_ON },
-        { 0xFE52, 0x0000, WEAK_CS },
-        { 0xFE54, 0x0000, NEUTRAL_ON },
-        { 0xFE55, 0x0000, WEAK_CS },
-        { 0xFE56, 0xFE5E, NEUTRAL_ON },
-        { 0xFE5F, 0x0000, WEAK_ET },
-        { 0xFE60, 0xFE61, NEUTRAL_ON },
-        { 0xFE62, 0xFE63, WEAK_ET },
-        { 0xFE64, 0xFE68, NEUTRAL_ON },
-        { 0xFE69, 0xFE6A, WEAK_ET },
-        { 0xFE6B, 0x0000, NEUTRAL_ON },
-        { 0xFE70, 0xFEFC, STRONG_AL },
-        { 0xFEFF, 0x0000, WEAK_BN },
-        { 0xFF01, 0xFF02, NEUTRAL_ON },
-        { 0xFF03, 0xFF05, WEAK_ET },
-        { 0xFF06, 0xFF0A, NEUTRAL_ON },
-        { 0xFF0B, 0x0000, WEAK_ET },
-        { 0xFF0C, 0x0000, WEAK_CS },
-        { 0xFF0D, 0x0000, WEAK_ET },
-        { 0xFF0E, 0x0000, WEAK_CS },
-        { 0xFF0F, 0x0000, WEAK_ES },
-        { 0xFF10, 0xFF19, WEAK_EN },
-        { 0xFF1A, 0x0000, WEAK_CS },
-        { 0xFF1B, 0xFF20, NEUTRAL_ON },
-        { 0xFF3B, 0xFF40, NEUTRAL_ON },
-        { 0xFF5B, 0xFF65, NEUTRAL_ON },
-        { 0xFFE0, 0xFFE1, WEAK_ET },
-        { 0xFFE2, 0xFFE4, NEUTRAL_ON },
-        { 0xFFE5, 0xFFE6, WEAK_ET },
-        { 0xFFE8, 0xFFEE, NEUTRAL_ON },
-        { 0xFFF9, 0xFFFB, WEAK_BN },
-        { 0xFFFC, 0xFFFD, NEUTRAL_ON },
-        { 0x1D167, 0x1D169, WEAK_NSM },
-        { 0x1D173, 0x1D17A, WEAK_BN },
-        { 0x1D17B, 0x1D182, WEAK_NSM },
-        { 0x1D185, 0x1D18B, WEAK_NSM },
-        { 0x1D1AA, 0x1D1AD, WEAK_NSM },
-        { 0x1D7CE, 0x1D7FF, WEAK_EN },
-        { 0xE0001, 0xE007F, WEAK_BN } };
  int i;
  bidi_type_table = Fmake_char_table (Qnil, make_number (STRONG_L));
  staticpro (&bidi_type_table);
  for (i = 0; i < sizeof bidi_type / sizeof bidi_type[0]; i++)
-    char_table_set_range (bidi_type_table, bidi_type[i].from,
+    char_table_set_range (bidi_type_table, bidi_type[i].from, bidi_type[i].to,
-                          bidi_type[i].to ? bidi_type[i].to : bidi_type[i].from,
                          make_number (bidi_type[i].type));
  Qparagraph_start = intern ("paragraph-start");
author	Eli Zaretskii	2010-06-12 17:15:25 +0300
committer	Eli Zaretskii	2010-06-12 17:15:25 +0300
commit	317fbf3360f9b1163bc371d8d66c67994cb238e9 (patch)
tree	9a86894ea0180bd8282e8076becd63865f32bded /src
parent	6e6e5760b3bafc41e425aad03ec61e59731713d5 (diff)
download	emacs-317fbf3360f9b1163bc371d8d66c67994cb238e9.tar.gz emacs-317fbf3360f9b1163bc371d8d66c67994cb238e9.zip

diff --git a/src/ChangeLog b/src/ChangeLog index 5036910751c..19615190b62 100644 --- a/src/ChangeLog +++ b/src/ChangeLog
@@ -1,5 +1,11 @@
1	2010-06-12 Eli Zaretskii <eliz@gnu.org>	1	2010-06-12 Eli Zaretskii <eliz@gnu.org>
2		2
		3	* bidi.c (bidi_initialize): Remove explicit initialization of
		4	bidi_type_table; include biditype.h instead. Don't support
		5	entries whose second codepoint is zero.
		6
		7	* biditype.h: New file.
		8
3	* window.c (syms_of_window): Doc fix (bug#6409).	9	* window.c (syms_of_window): Doc fix (bug#6409).
4		10
5	2010-06-12 Romain Francoise <romain@orebokech.com>	11	2010-06-12 Romain Francoise <romain@orebokech.com>


diff --git a/src/bidi.c b/src/bidi.c index a25976dcc01..190320bbe0e 100644 --- a/src/bidi.c +++ b/src/bidi.c
@@ -108,295 +108,16 @@ static Lisp_Object Qparagraph_start, Qparagraph_separate;
108	static void	108	static void
109	bidi_initialize ()	109	bidi_initialize ()
110	{	110	{
111	/* FIXME: This should come from the Unicode Database. */	111
112	struct {	112	#include "biditype.h"
113	int from, to;	113
114	bidi_type_t type;
115	} bidi_type[] =
116	{ { 0x0000, 0x0008, WEAK_BN },
117	{ 0x0009, 0x0000, NEUTRAL_S },
118	{ 0x000A, 0x0000, NEUTRAL_B },
119	{ 0x000B, 0x0000, NEUTRAL_S },
120	{ 0x000C, 0x0000, NEUTRAL_WS },
121	{ 0x000D, 0x0000, NEUTRAL_B },
122	{ 0x000E, 0x001B, WEAK_BN },
123	{ 0x001C, 0x001E, NEUTRAL_B },
124	{ 0x001F, 0x0000, NEUTRAL_S },
125	{ 0x0020, 0x0000, NEUTRAL_WS },
126	{ 0x0021, 0x0022, NEUTRAL_ON },
127	{ 0x0023, 0x0025, WEAK_ET },
128	{ 0x0026, 0x002A, NEUTRAL_ON },
129	{ 0x002B, 0x0000, WEAK_ES },
130	{ 0x002C, 0x0000, WEAK_CS },
131	{ 0x002D, 0x0000, WEAK_ES },
132	{ 0x002E, 0x002F, WEAK_CS },
133	{ 0x0030, 0x0039, WEAK_EN },
134	{ 0x003A, 0x0000, WEAK_CS },
135	{ 0x003B, 0x0040, NEUTRAL_ON },
136	{ 0x005B, 0x0060, NEUTRAL_ON },
137	{ 0x007B, 0x007E, NEUTRAL_ON },
138	{ 0x007F, 0x0084, WEAK_BN },
139	{ 0x0085, 0x0000, NEUTRAL_B },
140	{ 0x0086, 0x009F, WEAK_BN },
141	{ 0x00A0, 0x0000, WEAK_CS },
142	{ 0x00A1, 0x0000, NEUTRAL_ON },
143	{ 0x00A2, 0x00A5, WEAK_ET },
144	{ 0x00A6, 0x00A9, NEUTRAL_ON },
145	{ 0x00AB, 0x00AC, NEUTRAL_ON },
146	{ 0x00AD, 0x0000, WEAK_BN },
147	{ 0x00AE, 0x00Af, NEUTRAL_ON },
148	{ 0x00B0, 0x00B1, WEAK_ET },
149	{ 0x00B2, 0x00B3, WEAK_EN },
150	{ 0x00B4, 0x0000, NEUTRAL_ON },
151	{ 0x00B6, 0x00B8, NEUTRAL_ON },
152	{ 0x00B9, 0x0000, WEAK_EN },
153	{ 0x00BB, 0x00BF, NEUTRAL_ON },
154	{ 0x00D7, 0x0000, NEUTRAL_ON },
155	{ 0x00F7, 0x0000, NEUTRAL_ON },
156	{ 0x02B9, 0x02BA, NEUTRAL_ON },
157	{ 0x02C2, 0x02CF, NEUTRAL_ON },
158	{ 0x02D2, 0x02DF, NEUTRAL_ON },
159	{ 0x02E5, 0x02ED, NEUTRAL_ON },
160	{ 0x0300, 0x036F, WEAK_NSM },
161	{ 0x0374, 0x0375, NEUTRAL_ON },
162	{ 0x037E, 0x0385, NEUTRAL_ON },
163	{ 0x0387, 0x0000, NEUTRAL_ON },
164	{ 0x03F6, 0x0000, NEUTRAL_ON },
165	{ 0x0483, 0x0489, WEAK_NSM },
166	{ 0x058A, 0x0000, NEUTRAL_ON },
167	{ 0x0591, 0x05BD, WEAK_NSM },
168	{ 0x05BE, 0x0000, STRONG_R },
169	{ 0x05BF, 0x0000, WEAK_NSM },
170	{ 0x05C0, 0x0000, STRONG_R },
171	{ 0x05C1, 0x05C2, WEAK_NSM },
172	{ 0x05C3, 0x0000, STRONG_R },
173	{ 0x05C4, 0x05C5, WEAK_NSM },
174	{ 0x05C6, 0x0000, STRONG_R },
175	{ 0x05C7, 0x0000, WEAK_NSM },
176	{ 0x05D0, 0x05F4, STRONG_R },
177	{ 0x060C, 0x0000, WEAK_CS },
178	{ 0x061B, 0x064A, STRONG_AL },
179	{ 0x064B, 0x0655, WEAK_NSM },
180	{ 0x0660, 0x0669, WEAK_AN },
181	{ 0x066A, 0x0000, WEAK_ET },
182	{ 0x066B, 0x066C, WEAK_AN },
183	{ 0x066D, 0x066F, STRONG_AL },
184	{ 0x0670, 0x0000, WEAK_NSM },
185	{ 0x0671, 0x06D5, STRONG_AL },
186	{ 0x06D6, 0x06DC, WEAK_NSM },
187	{ 0x06DD, 0x0000, STRONG_AL },
188	{ 0x06DE, 0x06E4, WEAK_NSM },
189	{ 0x06E5, 0x06E6, STRONG_AL },
190	{ 0x06E7, 0x06E8, WEAK_NSM },
191	{ 0x06E9, 0x0000, NEUTRAL_ON },
192	{ 0x06EA, 0x06ED, WEAK_NSM },
193	{ 0x06F0, 0x06F9, WEAK_EN },
194	{ 0x06FA, 0x070D, STRONG_AL },
195	{ 0x070F, 0x0000, WEAK_BN },
196	{ 0x0710, 0x0000, STRONG_AL },
197	{ 0x0711, 0x0000, WEAK_NSM },
198	{ 0x0712, 0x072C, STRONG_AL },
199	{ 0x0730, 0x074A, WEAK_NSM },
200	{ 0x0780, 0x07A5, STRONG_AL },
201	{ 0x07A6, 0x07B0, WEAK_NSM },
202	{ 0x07B1, 0x0000, STRONG_AL },
203	{ 0x0901, 0x0902, WEAK_NSM },
204	{ 0x093C, 0x0000, WEAK_NSM },
205	{ 0x0941, 0x0948, WEAK_NSM },
206	{ 0x094D, 0x0000, WEAK_NSM },
207	{ 0x0951, 0x0954, WEAK_NSM },
208	{ 0x0962, 0x0963, WEAK_NSM },
209	{ 0x0981, 0x0000, WEAK_NSM },
210	{ 0x09BC, 0x0000, WEAK_NSM },
211	{ 0x09C1, 0x09C4, WEAK_NSM },
212	{ 0x09CD, 0x0000, WEAK_NSM },
213	{ 0x09E2, 0x09E3, WEAK_NSM },
214	{ 0x09F2, 0x09F3, WEAK_ET },
215	{ 0x0A02, 0x0000, WEAK_NSM },
216	{ 0x0A3C, 0x0000, WEAK_NSM },
217	{ 0x0A41, 0x0A4D, WEAK_NSM },
218	{ 0x0A70, 0x0A71, WEAK_NSM },
219	{ 0x0A81, 0x0A82, WEAK_NSM },
220	{ 0x0ABC, 0x0000, WEAK_NSM },
221	{ 0x0AC1, 0x0AC8, WEAK_NSM },
222	{ 0x0ACD, 0x0000, WEAK_NSM },
223	{ 0x0B01, 0x0000, WEAK_NSM },
224	{ 0x0B3C, 0x0000, WEAK_NSM },
225	{ 0x0B3F, 0x0000, WEAK_NSM },
226	{ 0x0B41, 0x0B43, WEAK_NSM },
227	{ 0x0B4D, 0x0B56, WEAK_NSM },
228	{ 0x0B82, 0x0000, WEAK_NSM },
229	{ 0x0BC0, 0x0000, WEAK_NSM },
230	{ 0x0BCD, 0x0000, WEAK_NSM },
231	{ 0x0C3E, 0x0C40, WEAK_NSM },
232	{ 0x0C46, 0x0C56, WEAK_NSM },
233	{ 0x0CBF, 0x0000, WEAK_NSM },
234	{ 0x0CC6, 0x0000, WEAK_NSM },
235	{ 0x0CCC, 0x0CCD, WEAK_NSM },
236	{ 0x0D41, 0x0D43, WEAK_NSM },
237	{ 0x0D4D, 0x0000, WEAK_NSM },
238	{ 0x0DCA, 0x0000, WEAK_NSM },
239	{ 0x0DD2, 0x0DD6, WEAK_NSM },
240	{ 0x0E31, 0x0000, WEAK_NSM },
241	{ 0x0E34, 0x0E3A, WEAK_NSM },
242	{ 0x0E3F, 0x0000, WEAK_ET },
243	{ 0x0E47, 0x0E4E, WEAK_NSM },
244	{ 0x0EB1, 0x0000, WEAK_NSM },
245	{ 0x0EB4, 0x0EBC, WEAK_NSM },
246	{ 0x0EC8, 0x0ECD, WEAK_NSM },
247	{ 0x0F18, 0x0F19, WEAK_NSM },
248	{ 0x0F35, 0x0000, WEAK_NSM },
249	{ 0x0F37, 0x0000, WEAK_NSM },
250	{ 0x0F39, 0x0000, WEAK_NSM },
251	{ 0x0F3A, 0x0F3D, NEUTRAL_ON },
252	{ 0x0F71, 0x0F7E, WEAK_NSM },
253	{ 0x0F80, 0x0F84, WEAK_NSM },
254	{ 0x0F86, 0x0F87, WEAK_NSM },
255	{ 0x0F90, 0x0FBC, WEAK_NSM },
256	{ 0x0FC6, 0x0000, WEAK_NSM },
257	{ 0x102D, 0x1030, WEAK_NSM },
258	{ 0x1032, 0x1037, WEAK_NSM },
259	{ 0x1039, 0x0000, WEAK_NSM },
260	{ 0x1058, 0x1059, WEAK_NSM },
261	{ 0x1680, 0x0000, NEUTRAL_WS },
262	{ 0x169B, 0x169C, NEUTRAL_ON },
263	{ 0x1712, 0x1714, WEAK_NSM },
264	{ 0x1732, 0x1734, WEAK_NSM },
265	{ 0x1752, 0x1753, WEAK_NSM },
266	{ 0x1772, 0x1773, WEAK_NSM },
267	{ 0x17B7, 0x17BD, WEAK_NSM },
268	{ 0x17C6, 0x0000, WEAK_NSM },
269	{ 0x17C9, 0x17D3, WEAK_NSM },
270	{ 0x17DB, 0x0000, WEAK_ET },
271	{ 0x1800, 0x180A, NEUTRAL_ON },
272	{ 0x180B, 0x180D, WEAK_NSM },
273	{ 0x180E, 0x0000, WEAK_BN },
274	{ 0x18A9, 0x0000, WEAK_NSM },
275	{ 0x1FBD, 0x0000, NEUTRAL_ON },
276	{ 0x1FBF, 0x1FC1, NEUTRAL_ON },
277	{ 0x1FCD, 0x1FCF, NEUTRAL_ON },
278	{ 0x1FDD, 0x1FDF, NEUTRAL_ON },
279	{ 0x1FED, 0x1FEF, NEUTRAL_ON },
280	{ 0x1FFD, 0x1FFE, NEUTRAL_ON },
281	{ 0x2000, 0x200A, NEUTRAL_WS },
282	{ 0x200B, 0x200D, WEAK_BN },
283	{ 0x200F, 0x0000, STRONG_R },
284	{ 0x2010, 0x2027, NEUTRAL_ON },
285	{ 0x2028, 0x0000, NEUTRAL_WS },
286	{ 0x2029, 0x0000, NEUTRAL_B },
287	{ 0x202A, 0x0000, LRE },
288	{ 0x202B, 0x0000, RLE },
289	{ 0x202C, 0x0000, PDF },
290	{ 0x202D, 0x0000, LRO },
291	{ 0x202E, 0x0000, RLO },
292	{ 0x202F, 0x0000, NEUTRAL_WS },
293	{ 0x2030, 0x2034, WEAK_ET },
294	{ 0x2035, 0x2057, NEUTRAL_ON },
295	{ 0x205F, 0x0000, NEUTRAL_WS },
296	{ 0x2060, 0x206F, WEAK_BN },
297	{ 0x2070, 0x0000, WEAK_EN },
298	{ 0x2074, 0x2079, WEAK_EN },
299	{ 0x207A, 0x207B, WEAK_ET },
300	{ 0x207C, 0x207E, NEUTRAL_ON },
301	{ 0x2080, 0x2089, WEAK_EN },
302	{ 0x208A, 0x208B, WEAK_ET },
303	{ 0x208C, 0x208E, NEUTRAL_ON },
304	{ 0x20A0, 0x20B1, WEAK_ET },
305	{ 0x20D0, 0x20EA, WEAK_NSM },
306	{ 0x2100, 0x2101, NEUTRAL_ON },
307	{ 0x2103, 0x2106, NEUTRAL_ON },
308	{ 0x2108, 0x2109, NEUTRAL_ON },
309	{ 0x2114, 0x0000, NEUTRAL_ON },
310	{ 0x2116, 0x2118, NEUTRAL_ON },
311	{ 0x211E, 0x2123, NEUTRAL_ON },
312	{ 0x2125, 0x0000, NEUTRAL_ON },
313	{ 0x2127, 0x0000, NEUTRAL_ON },
314	{ 0x2129, 0x0000, NEUTRAL_ON },
315	{ 0x212E, 0x0000, WEAK_ET },
316	{ 0x2132, 0x0000, NEUTRAL_ON },
317	{ 0x213A, 0x0000, NEUTRAL_ON },
318	{ 0x2140, 0x2144, NEUTRAL_ON },
319	{ 0x214A, 0x215F, NEUTRAL_ON },
320	{ 0x2190, 0x2211, NEUTRAL_ON },
321	{ 0x2212, 0x2213, WEAK_ET },
322	{ 0x2214, 0x2335, NEUTRAL_ON },
323	{ 0x237B, 0x2394, NEUTRAL_ON },
324	{ 0x2396, 0x244A, NEUTRAL_ON },
325	{ 0x2460, 0x249B, WEAK_EN },
326	{ 0x24EA, 0x0000, WEAK_EN },
327	{ 0x24EB, 0x2FFB, NEUTRAL_ON },
328	{ 0x3000, 0x0000, NEUTRAL_WS },
329	{ 0x3001, 0x3004, NEUTRAL_ON },
330	{ 0x3008, 0x3020, NEUTRAL_ON },
331	{ 0x302A, 0x302F, WEAK_NSM },
332	{ 0x3030, 0x0000, NEUTRAL_ON },
333	{ 0x3036, 0x3037, NEUTRAL_ON },
334	{ 0x303D, 0x303F, NEUTRAL_ON },
335	{ 0x3099, 0x309A, WEAK_NSM },
336	{ 0x309B, 0x309C, NEUTRAL_ON },
337	{ 0x30A0, 0x0000, NEUTRAL_ON },
338	{ 0x30FB, 0x0000, NEUTRAL_ON },
339	{ 0x3251, 0x325F, NEUTRAL_ON },
340	{ 0x32B1, 0x32BF, NEUTRAL_ON },
341	{ 0xA490, 0xA4C6, NEUTRAL_ON },
342	{ 0xFB1D, 0x0000, STRONG_R },
343	{ 0xFB1E, 0x0000, WEAK_NSM },
344	{ 0xFB1F, 0xFB28, STRONG_R },
345	{ 0xFB29, 0x0000, WEAK_ET },
346	{ 0xFB2A, 0xFB4F, STRONG_R },
347	{ 0xFB50, 0xFD3D, STRONG_AL },
348	{ 0xFD3E, 0xFD3F, NEUTRAL_ON },
349	{ 0xFD50, 0xFDFC, STRONG_AL },
350	{ 0xFE00, 0xFE23, WEAK_NSM },
351	{ 0xFE30, 0xFE4F, NEUTRAL_ON },
352	{ 0xFE50, 0x0000, WEAK_CS },
353	{ 0xFE51, 0x0000, NEUTRAL_ON },
354	{ 0xFE52, 0x0000, WEAK_CS },
355	{ 0xFE54, 0x0000, NEUTRAL_ON },
356	{ 0xFE55, 0x0000, WEAK_CS },
357	{ 0xFE56, 0xFE5E, NEUTRAL_ON },
358	{ 0xFE5F, 0x0000, WEAK_ET },
359	{ 0xFE60, 0xFE61, NEUTRAL_ON },
360	{ 0xFE62, 0xFE63, WEAK_ET },
361	{ 0xFE64, 0xFE68, NEUTRAL_ON },
362	{ 0xFE69, 0xFE6A, WEAK_ET },
363	{ 0xFE6B, 0x0000, NEUTRAL_ON },
364	{ 0xFE70, 0xFEFC, STRONG_AL },
365	{ 0xFEFF, 0x0000, WEAK_BN },
366	{ 0xFF01, 0xFF02, NEUTRAL_ON },
367	{ 0xFF03, 0xFF05, WEAK_ET },
368	{ 0xFF06, 0xFF0A, NEUTRAL_ON },
369	{ 0xFF0B, 0x0000, WEAK_ET },
370	{ 0xFF0C, 0x0000, WEAK_CS },
371	{ 0xFF0D, 0x0000, WEAK_ET },
372	{ 0xFF0E, 0x0000, WEAK_CS },
373	{ 0xFF0F, 0x0000, WEAK_ES },
374	{ 0xFF10, 0xFF19, WEAK_EN },
375	{ 0xFF1A, 0x0000, WEAK_CS },
376	{ 0xFF1B, 0xFF20, NEUTRAL_ON },
377	{ 0xFF3B, 0xFF40, NEUTRAL_ON },
378	{ 0xFF5B, 0xFF65, NEUTRAL_ON },
379	{ 0xFFE0, 0xFFE1, WEAK_ET },
380	{ 0xFFE2, 0xFFE4, NEUTRAL_ON },
381	{ 0xFFE5, 0xFFE6, WEAK_ET },
382	{ 0xFFE8, 0xFFEE, NEUTRAL_ON },
383	{ 0xFFF9, 0xFFFB, WEAK_BN },
384	{ 0xFFFC, 0xFFFD, NEUTRAL_ON },
385	{ 0x1D167, 0x1D169, WEAK_NSM },
386	{ 0x1D173, 0x1D17A, WEAK_BN },
387	{ 0x1D17B, 0x1D182, WEAK_NSM },
388	{ 0x1D185, 0x1D18B, WEAK_NSM },
389	{ 0x1D1AA, 0x1D1AD, WEAK_NSM },
390	{ 0x1D7CE, 0x1D7FF, WEAK_EN },
391	{ 0xE0001, 0xE007F, WEAK_BN } };
392	int i;	114	int i;
393		115
394	bidi_type_table = Fmake_char_table (Qnil, make_number (STRONG_L));	116	bidi_type_table = Fmake_char_table (Qnil, make_number (STRONG_L));
395	staticpro (&bidi_type_table);	117	staticpro (&bidi_type_table);
396		118
397	for (i = 0; i < sizeof bidi_type / sizeof bidi_type[0]; i++)	119	for (i = 0; i < sizeof bidi_type / sizeof bidi_type[0]; i++)
398	char_table_set_range (bidi_type_table, bidi_type[i].from,	120	char_table_set_range (bidi_type_table, bidi_type[i].from, bidi_type[i].to,
399	bidi_type[i].to ? bidi_type[i].to : bidi_type[i].from,
400	make_number (bidi_type[i].type));	121	make_number (bidi_type[i].type));
401		122
402	Qparagraph_start = intern ("paragraph-start");	123	Qparagraph_start = intern ("paragraph-start");