annotate src/bidi.c @ 107587:0ff1b8888f6b

Retrospective commit from 2009-08-12. An (unsuccessful) attempt to solve the issue with row->start and row->end. xdisp.c (set_iterator_to_next, reseat, reseat_1) (reseat_at_next_visible_line_start): Accept additional argument force_logical_p; all callers changed. If force_logical_p is non-zero, force iteration in buffer's logical order even in bidi buffers. dispnew.c (direct_output_for_insert): Call set_iterator_to_next with additional argument zero. dispextern.h (set_iterator_to_next): Now accepts an additional argument.
author Eli Zaretskii <eliz@gnu.org>
date Thu, 31 Dec 2009 16:09:28 -0500
parents cbca7f94b057
children 84267baa779b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1 /* Low-level bidirectional buffer-scanning functions for GNU Emacs.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2 Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
3
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
4 This file is part of GNU Emacs.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
5
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
6 GNU Emacs is free software; you can redistribute it and/or modify
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
8 the Free Software Foundation; either version 2, or (at your option)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
9 any later version.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
10
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
11 GNU Emacs is distributed in the hope that it will be useful,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
14 GNU General Public License for more details.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
15
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
16
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
20 Boston, MA 02110-1301, USA. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
21
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
22 /* Written by Eli Zaretskii <eliz@gnu.org>.
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
23
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
24 A sequential implementation of the Unicode Bidirectional algorithm,
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
25 as per UAX#9, a part of the Unicode Standard.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
26
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
27 Unlike the reference and most other implementations, this one is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
28 designed to be called once for every character in the buffer.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
29
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
30 The main entry point is bidi_get_next_char_visually. Each time it
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
31 is called, it finds the next character in the visual order, and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
32 returns its information in a special structure. The caller is then
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
33 expected to process this character for display or any other
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
34 purposes, and call bidi_get_next_char_visually for the next
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
35 character. See the comments in bidi_get_next_char_visually for
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
36 more details about its algorithm that finds the next visual-order
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
37 character by resolving their levels on the fly.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
38
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
39 A note about references to UAX#9 rules: if the reference says
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
40 something like "X9/Retaining", it means that you need to refer to
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
41 rule X9 and to its modifications decribed in the "Implementation
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
42 Notes" section of UAX#9, under "Retaining Format Codes". */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
43
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
44 #ifdef HAVE_CONFIG_H
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
45 #include <config.h>
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
46 #endif
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
47
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
48 #include <stdio.h>
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
49
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
50 #ifdef HAVE_STRING_H
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
51 #include <string.h>
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
52 #endif
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
53
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
54 #include "lisp.h"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
55 #include "buffer.h"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
56 #include "character.h"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
57 #include "dispextern.h"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
58
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
59 static int bidi_initialized = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
60
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
61 static Lisp_Object bidi_type_table;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
62
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
63 #define LRM_CHAR 0x200E
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
64 #define RLM_CHAR 0x200F
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
65 #define LRE_CHAR 0x202A
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
66 #define RLE_CHAR 0x202B
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
67 #define PDF_CHAR 0x202C
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
68 #define LRO_CHAR 0x202D
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
69 #define RLO_CHAR 0x202E
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
70
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
71 #define CHARSET_HEBREW 0x88
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
72 #define CHARSET_ARABIC 0x87
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
73 #define CHARSET_SYRIAC -1 /* these are undefined yet, -1 is invalid */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
74 #define CHARSET_THAANA -1
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
75
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
76 /* FIXME: need to define wrappers for FETCH_CHAR etc. that return
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
77 BIDI_EOB when they hit ZV. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
78 #define BIDI_EOB -1
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
79 #define BIDI_BOB -2
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
80
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
81 #ifdef TEST_STANDALONE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
82 /* Testing. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
83
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
84 static unsigned char *input_buf;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
85 static size_t input_buf_size;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
86
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
87 int _fetch_multibyte_char_len, _c_c_;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
88
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
89 #undef FETCH_CHAR_ADVANCE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
90 #define FETCH_CHAR_ADVANCE(ch, cp, bp) \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
91 do { \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
92 ch = input_buf[cp]; \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
93 (cp)++; \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
94 (bp)++; \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
95 if (ch == '\0') \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
96 ch = BIDI_EOB; \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
97 } while (0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
98
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
99 #undef FETCH_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
100 #define FETCH_CHAR(n) ((_c_c_ = input_buf[n]) ? _c_c_ : BIDI_EOB)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
101
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
102 #undef CHAR_CHARSET
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
103 #define CHAR_CHARSET(c) \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
104 (((c) >= 128 || ((c) < 8 && (c)) || ((c) >= 'A' && (c) < 'X')) \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
105 ? CHARSET_HEBREW \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
106 : ((((c) >= 'X' && (c) <= 'Z') || ((c) >= '6' && (c) <= '9')) \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
107 ? CHARSET_ARABIC \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
108 : CHARSET_ASCII))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
109
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
110 #undef CHAR_TO_BYTE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
111 #define CHAR_TO_BYTE(pos) (pos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
112
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
113 #define char_bytes(ch) 1
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
114
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
115 #undef LRE_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
116 #undef LRO_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
117 #undef RLE_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
118 #undef RLO_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
119 #undef PDF_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
120 #undef RLM_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
121 #undef LRM_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
122
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
123 #define LRE_CHAR 1
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
124 #define LRO_CHAR 2
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
125 #define RLE_CHAR 3
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
126 #define RLO_CHAR 4
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
127 #define PDF_CHAR 5
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
128 #define RLM_CHAR 6
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
129 #define LRM_CHAR 7
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
130
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
131 static const char *bidi_name[] =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
132 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
133 "[???]", "[LRE]", "[LRO]", "[RLE]", "[RLO]", "[PDF]", "[RLM]", "[LRM]"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
134 };
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
135
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
136 #endif /* TEST_STANDALONE */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
137
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
138 /* Local data structures. (Look in dispextern.h for the rest.) */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
139
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
140 /* What we need to know about the current paragraph. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
141 struct bidi_paragraph_info {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
142 int start_bytepos; /* byte position where it begins */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
143 int end_bytepos; /* byte position where it ends */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
144 int embedding_level; /* its basic embedding level */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
145 bidi_dir_t base_dir; /* its base direction */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
146 };
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
147
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
148 /* Data type for describing the bidirectional character categories. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
149 typedef enum {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
150 UNKNOWN_BC,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
151 NEUTRAL,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
152 WEAK,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
153 STRONG
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
154 } bidi_category_t;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
155
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
156 int bidi_ignore_explicit_marks_for_paragraph_level = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
157
107586
cbca7f94b057 Retrospective commit from 2009-08-29.
Eli Zaretskii <eliz@gnu.org>
parents: 107585
diff changeset
158 /* FIXME: Should be user-definable. */
cbca7f94b057 Retrospective commit from 2009-08-29.
Eli Zaretskii <eliz@gnu.org>
parents: 107585
diff changeset
159 bidi_dir_t bidi_overriding_paragraph_direction = L2R;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
160
107584
e0df0337f248 Retrospective commit from 2009-08-15.
Eli Zaretskii <eliz@gnu.org>
parents: 107583
diff changeset
161 /* FIXME: Unused? */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
162 #define ASCII_BIDI_TYPE_SET(STR, TYPE) \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
163 do { \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
164 unsigned char *p; \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
165 for (p = (STR); *p; p++) \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
166 CHAR_TABLE_SET (bidi_type_table, *p, (TYPE)); \
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
167 } while (0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
168
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
169 static void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
170 bidi_initialize ()
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
171 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
172 /* FIXME: This should come from the Unicode Database. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
173 struct {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
174 int from, to;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
175 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
176 } bidi_type[] =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
177 { { 0x0000, 0x0008, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
178 { 0x0009, 0x0000, NEUTRAL_S },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
179 { 0x000A, 0x0000, NEUTRAL_B },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
180 { 0x000B, 0x0000, NEUTRAL_S },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
181 { 0x000C, 0x0000, NEUTRAL_WS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
182 { 0x000D, 0x0000, NEUTRAL_B },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
183 { 0x000E, 0x001B, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
184 { 0x001C, 0x001E, NEUTRAL_B },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
185 { 0x001F, 0x0000, NEUTRAL_S },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
186 { 0x0020, 0x0000, NEUTRAL_WS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
187 { 0x0021, 0x0022, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
188 { 0x0023, 0x0025, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
189 { 0x0026, 0x002A, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
190 { 0x002B, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
191 { 0x002C, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
192 { 0x002D, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
193 { 0x002E, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
194 { 0x002F, 0x0000, WEAK_ES },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
195 { 0x0030, 0x0039, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
196 { 0x003A, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
197 { 0x003B, 0x0040, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
198 { 0x005B, 0x0060, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
199 { 0x007B, 0x007E, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
200 { 0x007F, 0x0084, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
201 { 0x0085, 0x0000, NEUTRAL_B },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
202 { 0x0086, 0x009F, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
203 { 0x00A0, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
204 { 0x00A1, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
205 { 0x00A2, 0x00A5, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
206 { 0x00A6, 0x00A9, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
207 { 0x00AB, 0x00AF, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
208 { 0x00B0, 0x00B1, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
209 { 0x00B2, 0x00B3, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
210 { 0x00B4, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
211 { 0x00B6, 0x00B8, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
212 { 0x00B9, 0x0000, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
213 { 0x00BB, 0x00BF, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
214 { 0x00D7, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
215 { 0x00F7, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
216 { 0x02B9, 0x02BA, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
217 { 0x02C2, 0x02CF, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
218 { 0x02D2, 0x02DF, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
219 { 0x02E5, 0x02ED, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
220 { 0x0300, 0x036F, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
221 { 0x0374, 0x0375, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
222 { 0x037E, 0x0385, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
223 { 0x0387, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
224 { 0x03F6, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
225 { 0x0483, 0x0489, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
226 { 0x058A, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
227 { 0x0591, 0x05BD, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
228 { 0x05BE, 0x0000, STRONG_R },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
229 { 0x05BF, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
230 { 0x05C0, 0x0000, STRONG_R },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
231 { 0x05C1, 0x05C2, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
232 { 0x05C3, 0x0000, STRONG_R },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
233 { 0x05C4, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
234 { 0x05D0, 0x05F4, STRONG_R },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
235 { 0x060C, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
236 { 0x061B, 0x064A, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
237 { 0x064B, 0x0655, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
238 { 0x0660, 0x0669, WEAK_AN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
239 { 0x066A, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
240 { 0x066B, 0x066C, WEAK_AN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
241 { 0x066D, 0x066F, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
242 { 0x0670, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
243 { 0x0671, 0x06D5, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
244 { 0x06D6, 0x06DC, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
245 { 0x06DD, 0x0000, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
246 { 0x06DE, 0x06E4, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
247 { 0x06E5, 0x06E6, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
248 { 0x06E7, 0x06E8, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
249 { 0x06E9, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
250 { 0x06EA, 0x06ED, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
251 { 0x06F0, 0x06F9, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
252 { 0x06FA, 0x070D, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
253 { 0x070F, 0x0000, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
254 { 0x0710, 0x0000, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
255 { 0x0711, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
256 { 0x0712, 0x072C, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
257 { 0x0730, 0x074A, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
258 { 0x0780, 0x07A5, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
259 { 0x07A6, 0x07B0, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
260 { 0x07B1, 0x0000, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
261 { 0x0901, 0x0902, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
262 { 0x093C, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
263 { 0x0941, 0x0948, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
264 { 0x094D, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
265 { 0x0951, 0x0954, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
266 { 0x0962, 0x0963, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
267 { 0x0981, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
268 { 0x09BC, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
269 { 0x09C1, 0x09C4, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
270 { 0x09CD, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
271 { 0x09E2, 0x09E3, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
272 { 0x09F2, 0x09F3, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
273 { 0x0A02, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
274 { 0x0A3C, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
275 { 0x0A41, 0x0A4D, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
276 { 0x0A70, 0x0A71, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
277 { 0x0A81, 0x0A82, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
278 { 0x0ABC, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
279 { 0x0AC1, 0x0AC8, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
280 { 0x0ACD, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
281 { 0x0B01, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
282 { 0x0B3C, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
283 { 0x0B3F, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
284 { 0x0B41, 0x0B43, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
285 { 0x0B4D, 0x0B56, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
286 { 0x0B82, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
287 { 0x0BC0, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
288 { 0x0BCD, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
289 { 0x0C3E, 0x0C40, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
290 { 0x0C46, 0x0C56, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
291 { 0x0CBF, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
292 { 0x0CC6, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
293 { 0x0CCC, 0x0CCD, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
294 { 0x0D41, 0x0D43, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
295 { 0x0D4D, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
296 { 0x0DCA, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
297 { 0x0DD2, 0x0DD6, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
298 { 0x0E31, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
299 { 0x0E34, 0x0E3A, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
300 { 0x0E3F, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
301 { 0x0E47, 0x0E4E, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
302 { 0x0EB1, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
303 { 0x0EB4, 0x0EBC, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
304 { 0x0EC8, 0x0ECD, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
305 { 0x0F18, 0x0F19, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
306 { 0x0F35, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
307 { 0x0F37, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
308 { 0x0F39, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
309 { 0x0F3A, 0x0F3D, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
310 { 0x0F71, 0x0F7E, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
311 { 0x0F80, 0x0F84, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
312 { 0x0F86, 0x0F87, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
313 { 0x0F90, 0x0FBC, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
314 { 0x0FC6, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
315 { 0x102D, 0x1030, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
316 { 0x1032, 0x1037, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
317 { 0x1039, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
318 { 0x1058, 0x1059, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
319 { 0x1680, 0x0000, NEUTRAL_WS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
320 { 0x169B, 0x169C, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
321 { 0x1712, 0x1714, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
322 { 0x1732, 0x1734, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
323 { 0x1752, 0x1753, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
324 { 0x1772, 0x1773, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
325 { 0x17B7, 0x17BD, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
326 { 0x17C6, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
327 { 0x17C9, 0x17D3, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
328 { 0x17DB, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
329 { 0x1800, 0x180A, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
330 { 0x180B, 0x180D, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
331 { 0x180E, 0x0000, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
332 { 0x18A9, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
333 { 0x1FBD, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
334 { 0x1FBF, 0x1FC1, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
335 { 0x1FCD, 0x1FCF, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
336 { 0x1FDD, 0x1FDF, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
337 { 0x1FED, 0x1FEF, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
338 { 0x1FFD, 0x1FFE, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
339 { 0x2000, 0x200A, NEUTRAL_WS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
340 { 0x200B, 0x200D, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
341 { 0x200F, 0x0000, STRONG_R },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
342 { 0x2010, 0x2027, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
343 { 0x2028, 0x0000, NEUTRAL_WS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
344 { 0x2029, 0x0000, NEUTRAL_B },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
345 { 0x202A, 0x0000, LRE },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
346 { 0x202B, 0x0000, RLE },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
347 { 0x202C, 0x0000, PDF },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
348 { 0x202D, 0x0000, LRO },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
349 { 0x202E, 0x0000, RLO },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
350 { 0x202F, 0x0000, NEUTRAL_WS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
351 { 0x2030, 0x2034, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
352 { 0x2035, 0x2057, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
353 { 0x205F, 0x0000, NEUTRAL_WS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
354 { 0x2060, 0x206F, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
355 { 0x2070, 0x0000, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
356 { 0x2074, 0x2079, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
357 { 0x207A, 0x207B, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
358 { 0x207C, 0x207E, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
359 { 0x2080, 0x2089, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
360 { 0x208A, 0x208B, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
361 { 0x208C, 0x208E, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
362 { 0x20A0, 0x20B1, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
363 { 0x20D0, 0x20EA, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
364 { 0x2100, 0x2101, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
365 { 0x2103, 0x2106, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
366 { 0x2108, 0x2109, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
367 { 0x2114, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
368 { 0x2116, 0x2118, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
369 { 0x211E, 0x2123, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
370 { 0x2125, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
371 { 0x2127, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
372 { 0x2129, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
373 { 0x212E, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
374 { 0x2132, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
375 { 0x213A, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
376 { 0x2140, 0x2144, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
377 { 0x214A, 0x215F, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
378 { 0x2190, 0x2211, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
379 { 0x2212, 0x2213, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
380 { 0x2214, 0x2335, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
381 { 0x237B, 0x2394, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
382 { 0x2396, 0x244A, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
383 { 0x2460, 0x249B, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
384 { 0x24EA, 0x0000, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
385 { 0x24EB, 0x2FFB, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
386 { 0x3000, 0x0000, NEUTRAL_WS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
387 { 0x3001, 0x3004, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
388 { 0x3008, 0x3020, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
389 { 0x302A, 0x302F, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
390 { 0x3030, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
391 { 0x3036, 0x3037, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
392 { 0x303D, 0x303F, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
393 { 0x3099, 0x309A, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
394 { 0x309B, 0x309C, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
395 { 0x30A0, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
396 { 0x30FB, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
397 { 0x3251, 0x325F, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
398 { 0x32B1, 0x32BF, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
399 { 0xA490, 0xA4C6, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
400 { 0xFB1D, 0x0000, STRONG_R },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
401 { 0xFB1E, 0x0000, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
402 { 0xFB1F, 0xFB28, STRONG_R },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
403 { 0xFB29, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
404 { 0xFB2A, 0xFB4F, STRONG_R },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
405 { 0xFB50, 0xFD3D, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
406 { 0xFD3E, 0xFD3F, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
407 { 0xFD50, 0xFDFC, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
408 { 0xFE00, 0xFE23, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
409 { 0xFE30, 0xFE4F, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
410 { 0xFE50, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
411 { 0xFE51, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
412 { 0xFE52, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
413 { 0xFE54, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
414 { 0xFE55, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
415 { 0xFE56, 0xFE5E, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
416 { 0xFE5F, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
417 { 0xFE60, 0xFE61, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
418 { 0xFE62, 0xFE63, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
419 { 0xFE64, 0xFE68, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
420 { 0xFE69, 0xFE6A, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
421 { 0xFE6B, 0x0000, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
422 { 0xFE70, 0xFEFC, STRONG_AL },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
423 { 0xFEFF, 0x0000, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
424 { 0xFF01, 0xFF02, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
425 { 0xFF03, 0xFF05, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
426 { 0xFF06, 0xFF0A, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
427 { 0xFF0B, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
428 { 0xFF0C, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
429 { 0xFF0D, 0x0000, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
430 { 0xFF0E, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
431 { 0xFF0F, 0x0000, WEAK_ES },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
432 { 0xFF10, 0xFF19, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
433 { 0xFF1A, 0x0000, WEAK_CS },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
434 { 0xFF1B, 0xFF20, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
435 { 0xFF3B, 0xFF40, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
436 { 0xFF5B, 0xFF65, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
437 { 0xFFE0, 0xFFE1, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
438 { 0xFFE2, 0xFFE4, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
439 { 0xFFE5, 0xFFE6, WEAK_ET },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
440 { 0xFFE8, 0xFFEE, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
441 { 0xFFF9, 0xFFFB, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
442 { 0xFFFC, 0xFFFD, NEUTRAL_ON },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
443 { 0x1D167, 0x1D169, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
444 { 0x1D173, 0x1D17A, WEAK_BN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
445 { 0x1D17B, 0x1D182, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
446 { 0x1D185, 0x1D18B, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
447 { 0x1D1AA, 0x1D1AD, WEAK_NSM },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
448 { 0x1D7CE, 0x1D7FF, WEAK_EN },
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
449 { 0xE0001, 0xE007F, WEAK_BN } };
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
450 int i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
451
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
452 bidi_type_table = Fmake_char_table (Qnil, make_number (STRONG_L));
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
453 staticpro (&bidi_type_table);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
454
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
455 for (i = 0; i < sizeof bidi_type / sizeof bidi_type[0]; i++)
107584
e0df0337f248 Retrospective commit from 2009-08-15.
Eli Zaretskii <eliz@gnu.org>
parents: 107583
diff changeset
456 char_table_set_range (bidi_type_table, bidi_type[i].from,
e0df0337f248 Retrospective commit from 2009-08-15.
Eli Zaretskii <eliz@gnu.org>
parents: 107583
diff changeset
457 bidi_type[i].to ? bidi_type[i].to : bidi_type[i].from,
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
458 make_number (bidi_type[i].type));
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
459 bidi_initialized = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
460 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
461
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
462 static int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
463 bidi_is_arabic_number (int ch)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
464 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
465 #ifdef TEST_STANDALONE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
466 return ch >= '6' && ch <= '9';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
467 #else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
468 return 0; /* FIXME! */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
469 #endif
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
470 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
471
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
472 /* Return the bidi type of a character CH. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
473 bidi_type_t
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
474 bidi_get_type (int ch)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
475 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
476 return (bidi_type_t) XINT (CHAR_TABLE_REF (bidi_type_table, ch));
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
477 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
478
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
479 void
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
480 bidi_check_type (bidi_type_t type)
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
481 {
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
482 if (type < UNKNOWN_BT || type > NEUTRAL_ON)
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
483 abort ();
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
484 }
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
485
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
486 /* Given a bidi TYPE of a character, return its category. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
487 bidi_category_t
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
488 bidi_get_category (bidi_type_t type)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
489 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
490 switch (type)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
491 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
492 case UNKNOWN_BT:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
493 return UNKNOWN_BC;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
494 case STRONG_L:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
495 case STRONG_R:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
496 case STRONG_AL:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
497 case LRE:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
498 case LRO:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
499 case RLE:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
500 case RLO:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
501 return STRONG;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
502 case PDF: /* ??? really?? */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
503 case WEAK_EN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
504 case WEAK_ES:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
505 case WEAK_ET:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
506 case WEAK_AN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
507 case WEAK_CS:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
508 case WEAK_NSM:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
509 case WEAK_BN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
510 return WEAK;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
511 case NEUTRAL_B:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
512 case NEUTRAL_S:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
513 case NEUTRAL_WS:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
514 case NEUTRAL_ON:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
515 return NEUTRAL;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
516 default:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
517 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
518 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
519 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
520
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
521 /* FIXME: exceedingly temporary! Should consult the Unicode database
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
522 of character properties. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
523 int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
524 bidi_mirror_char (int c)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
525 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
526 static const char mirrored_pairs[] = "()<>[]{}";
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
527 const char *p = strchr (mirrored_pairs, c);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
528
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
529 if (p)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
530 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
531 size_t i = p - mirrored_pairs;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
532
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
533 if ((i & 1) == 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
534 return mirrored_pairs[i + 1];
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
535 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
536 return mirrored_pairs[i - 1];
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
537 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
538 return c;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
539 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
540
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
541 /* Copy the bidi iterator from FROM to TO. To save cycles, this only
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
542 copies the part of the level stack that is actually in use. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
543 static inline void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
544 bidi_copy_it (struct bidi_it *to, struct bidi_it *from)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
545 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
546 int i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
547
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
548 /* Copy everything except the level stack. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
549 memcpy (to, from, ((int)&((struct bidi_it *)0)->level_stack[0]));
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
550
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
551 /* Copy the active part of the level stack. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
552 to->level_stack[0] = from->level_stack[0]; /* level zero is always in use */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
553 for (i = 1; i <= from->stack_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
554 to->level_stack[i] = from->level_stack[i];
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
555 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
556
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
557 /* Caching the bidi iterator states. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
558
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
559 static struct bidi_it bidi_cache[1000]; /* FIXME: make this dynamically allocated! */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
560 static int bidi_cache_idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
561 static int bidi_cache_last_idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
562
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
563 static inline void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
564 bidi_cache_reset (void)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
565 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
566 bidi_cache_idx = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
567 bidi_cache_last_idx = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
568 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
569
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
570 static inline void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
571 bidi_cache_fetch_state (int idx, struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
572 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
573 int current_scan_dir = bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
574
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
575 if (idx < 0 || idx >= bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
576 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
577
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
578 bidi_copy_it (bidi_it, &bidi_cache[idx]);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
579 bidi_it->scan_dir = current_scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
580 bidi_cache_last_idx = idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
581 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
582
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
583 /* Find a cached state with a given CHARPOS and resolved embedding
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
584 level less or equal to LEVEL. if LEVEL is -1, disregard the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
585 resolved levels in cached states. DIR, if non-zero, means search
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
586 in that direction from the last cache hit. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
587 static inline int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
588 bidi_cache_search (int charpos, int level, int dir)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
589 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
590 int i, i_start;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
591
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
592 if (bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
593 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
594 if (charpos < bidi_cache[bidi_cache_last_idx].charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
595 dir = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
596 else if (charpos > bidi_cache[bidi_cache_last_idx].charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
597 dir = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
598 if (dir)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
599 i_start = bidi_cache_last_idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
600 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
601 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
602 dir = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
603 i_start = bidi_cache_idx - 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
604 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
605
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
606 if (dir < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
607 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
608 /* Linear search for now; FIXME! */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
609 for (i = i_start; i >= 0; i--)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
610 if (bidi_cache[i].charpos == charpos
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
611 && (level == -1 || bidi_cache[i].resolved_level <= level))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
612 return i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
613 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
614 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
615 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
616 for (i = i_start; i < bidi_cache_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
617 if (bidi_cache[i].charpos == charpos
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
618 && (level == -1 || bidi_cache[i].resolved_level <= level))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
619 return i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
620 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
621 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
622
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
623 return -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
624 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
625
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
626 /* Find a cached state where the resolved level changes to a value
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
627 that is lower than LEVEL, and return its cache slot index. DIR is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
628 the direction to search, starting with the last used cache slot.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
629 BEFORE, if non-zero, means return the index of the slot that is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
630 ``before'' the level change in the search direction. That is,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
631 given the cached levels like this:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
632
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
633 1122333442211
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
634 AB C
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
635
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
636 and assuming we are at the position cached at the slot marked with
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
637 C, searching backwards (DIR = -1) for LEVEL = 2 will return the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
638 index of slot B or A, depending whether BEFORE is, respectively,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
639 non-zero or zero. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
640 static int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
641 bidi_cache_find_level_change (int level, int dir, int before)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
642 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
643 if (bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
644 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
645 int i = dir ? bidi_cache_last_idx : bidi_cache_idx - 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
646 int incr = before ? 1 : 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
647
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
648 if (!dir)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
649 dir = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
650 else if (!incr)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
651 i += dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
652
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
653 if (dir < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
654 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
655 while (i >= incr)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
656 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
657 if (bidi_cache[i - incr].resolved_level >= 0
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
658 && bidi_cache[i - incr].resolved_level < level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
659 return i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
660 i--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
661 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
662 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
663 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
664 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
665 while (i < bidi_cache_idx - incr)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
666 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
667 if (bidi_cache[i + incr].resolved_level >= 0
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
668 && bidi_cache[i + incr].resolved_level < level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
669 return i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
670 i++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
671 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
672 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
673 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
674
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
675 return -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
676 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
677
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
678 static inline void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
679 bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
680 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
681 int idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
682
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
683 /* We should never cache on backward scans. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
684 if (bidi_it->scan_dir == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
685 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
686 idx = bidi_cache_search (bidi_it->charpos, -1, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
687
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
688 if (idx < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
689 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
690 idx = bidi_cache_idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
691 if (idx > sizeof (bidi_cache) / sizeof (bidi_cache[0]) - 1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
692 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
693 bidi_copy_it (&bidi_cache[idx], bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
694 if (!resolved)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
695 bidi_cache[idx].resolved_level = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
696 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
697 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
698 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
699 /* Copy only the members which could have changed, to avoid
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
700 costly copying of the entire struct. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
701 bidi_cache[idx].type = bidi_it->type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
702 bidi_check_type (bidi_it->type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
703 bidi_cache[idx].orig_type = bidi_it->orig_type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
704 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
705 if (resolved)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
706 bidi_cache[idx].resolved_level = bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
707 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
708 bidi_cache[idx].resolved_level = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
709 bidi_cache[idx].invalid_levels = bidi_it->invalid_levels;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
710 bidi_cache[idx].invalid_rl_levels = bidi_it->invalid_rl_levels;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
711 bidi_cache[idx].next_for_neutral = bidi_it->next_for_neutral;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
712 bidi_cache[idx].next_for_ws = bidi_it->next_for_ws;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
713 bidi_cache[idx].ignore_bn_limit = bidi_it->ignore_bn_limit;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
714 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
715
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
716 bidi_cache_last_idx = idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
717 if (idx >= bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
718 bidi_cache_idx = idx + 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
719 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
720
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
721 static inline bidi_type_t
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
722 bidi_cache_find (int charpos, int level, struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
723 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
724 int i = bidi_cache_search (charpos, level, bidi_it->scan_dir);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
725
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
726 if (i >= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
727 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
728 bidi_dir_t current_scan_dir = bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
729
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
730 *bidi_it = bidi_cache[i];
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
731 bidi_cache_last_idx = i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
732 /* Don't let scan direction from from the cached state override
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
733 the current scan direction. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
734 bidi_it->scan_dir = current_scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
735 return bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
736 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
737
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
738 return UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
739 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
740
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
741 static inline int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
742 bidi_peek_at_next_level (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
743 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
744 if (bidi_cache_idx == 0 || bidi_cache_last_idx == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
745 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
746 return bidi_cache[bidi_cache_last_idx + bidi_it->scan_dir].resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
747 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
748
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
749 /* Return non-zero if buffer's byte position POS is the last character
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
750 of a paragraph. THIS_CH is the character preceding the one at POS in
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
751 the buffer. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
752 int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
753 bidi_at_paragraph_end (int this_ch, int pos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
754 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
755 int next_ch = FETCH_CHAR (pos);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
756
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
757 /* FIXME: This should support all Unicode characters that can end a
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
758 paragraph. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
759 return (this_ch == '\n' && next_ch == '\n') || this_ch == BIDI_EOB;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
760 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
761
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
762 /* Determine the start-of-run (sor) directional type given the two
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
763 embedding levels on either side of the run boundary. Also, update
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
764 the saved info about previously seen characters, since that info is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
765 generally valid for a single level run. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
766 static inline void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
767 bidi_set_sor_type (struct bidi_it *bidi_it, int level_before, int level_after)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
768 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
769 int higher_level = level_before > level_after ? level_before : level_after;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
770
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
771 /* The prev_was_pdf gork is required for when we have several PDFs
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
772 in a row. In that case, we want to compute the sor type for the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
773 next level run only once: when we see the first PDF. That's
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
774 because the sor type depends only on the higher of the two levels
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
775 that we find on the two sides of the level boundary (see UAX#9,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
776 clause X10), and so we don't need to know the final embedding
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
777 level to which we descend after processing all the PDFs. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
778 if (level_before < level_after || !bidi_it->prev_was_pdf)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
779 /* FIXME: should the default sor direction be user selectable? */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
780 bidi_it->sor = (higher_level & 1) != 0 ? R2L : L2R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
781 if (level_before > level_after)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
782 bidi_it->prev_was_pdf = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
783
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
784 bidi_it->prev.type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
785 bidi_it->last_strong.type = bidi_it->last_strong.orig_type =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
786 bidi_it->last_strong.pristine_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
787 bidi_it->prev_for_neutral.type = bidi_it->sor == R2L ? STRONG_R : STRONG_L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
788 bidi_it->prev_for_neutral.charpos = bidi_it->charpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
789 bidi_it->prev_for_neutral.bytepos = bidi_it->bytepos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
790 bidi_it->next_for_neutral.type = bidi_it->next_for_neutral.orig_type =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
791 bidi_it->next_for_neutral.pristine_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
792 bidi_it->ignore_bn_limit = 0; /* meaning it's unknown */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
793 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
794
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
795 void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
796 bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
797 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
798 bidi_it->level_stack[0].level = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
799 if (dir == R2L)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
800 bidi_it->level_stack[0].level = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
801 else if (dir == NEUTRAL_DIR) /* P2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
802 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
803 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
804 int pos = bidi_it->charpos, bytepos = bidi_it->bytepos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
805 int ch;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
806
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
807 if (pos < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
808 pos = bytepos = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
809 else if (bidi_it->ch != BIDI_EOB)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
810 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
811 pos++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
812 bytepos += bidi_it->ch_len;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
813 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
814
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
815 ch = FETCH_CHAR (bytepos);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
816 pos++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
817 bytepos += CHAR_BYTES (ch);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
818
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
819 /* FIXME: should actually go to where the paragraph begins and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
820 start the loop below from there, since UAX#9 says to find the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
821 first strong directional character in the paragraph. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
822
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
823 for (type = bidi_get_type (ch);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
824 /* NOTE: UAX#9 says to search only for L, AL, or R types of
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
825 characters, and ignore RLE, RLO, LRE, and LRO. However,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
826 I'm not sure it makes sense to omit those 4; should try
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
827 with and without that to see the effect. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
828 (bidi_get_category (type) != STRONG)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
829 || (bidi_ignore_explicit_marks_for_paragraph_level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
830 && (type == RLE || type == RLO
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
831 || type == LRE || type == LRO));
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
832 type = bidi_get_type (ch))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
833 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
834 if (type == NEUTRAL_B || bidi_at_paragraph_end (ch, bytepos))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
835 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
836 FETCH_CHAR_ADVANCE (ch, pos, bytepos);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
837 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
838 if (type == STRONG_R || type == STRONG_AL) /* P3 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
839 bidi_it->level_stack[0].level = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
840 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
841 bidi_it->scan_dir = 1; /* FIXME: do we need to have control on this? */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
842 bidi_it->resolved_level = bidi_it->level_stack[0].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
843 bidi_it->level_stack[0].override = NEUTRAL_DIR; /* X1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
844 bidi_it->invalid_levels = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
845 bidi_it->invalid_rl_levels = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
846 bidi_it->new_paragraph = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
847 bidi_it->next_en_pos = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
848 bidi_it->next_for_ws.type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
849 bidi_set_sor_type (bidi_it, bidi_it->level_stack[0].level, 0); /* X10 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
850
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
851 bidi_cache_reset ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
852 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
853
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
854 /* Do whatever UAX#9 clause X8 says should be done at paragraph's end,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
855 and set the new paragraph flag in the iterator. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
856 static inline void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
857 bidi_set_paragraph_end (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
858 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
859 bidi_it->invalid_levels = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
860 bidi_it->invalid_rl_levels = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
861 bidi_it->stack_idx = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
862 bidi_it->resolved_level = bidi_it->level_stack[0].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
863 bidi_it->new_paragraph = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
864 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
865
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
866 /* Initialize the bidi iterator from buffer position POS for paragraph
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
867 direction DIR. Return the embedding level at POS. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
868 void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
869 bidi_init_it (int pos, bidi_dir_t dir, struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
870 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
871 if (! bidi_initialized)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
872 bidi_initialize ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
873 bidi_set_paragraph_end (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
874 bidi_it->charpos = pos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
875 if (pos <= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
876 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
877 bidi_it->bytepos = bidi_it->charpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
878 bidi_it->ch_len = 1; /* so that incrementing bytepos works */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
879 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
880 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
881 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
882 bidi_it->bytepos = CHAR_TO_BYTE (pos);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
883 bidi_it->ch_len
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
884 = MULTIBYTE_FORM_LENGTH (BYTE_POS_ADDR (bidi_it->bytepos),
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
885 MAX_MULTIBYTE_LENGTH);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
886 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
887 bidi_it->ch = '\x1d'; /* FIXME: should be U+2029 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
888 bidi_it->type = NEUTRAL_B;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
889 bidi_it->orig_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
890 bidi_it->pristine_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
891 bidi_it->prev_was_pdf = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
892 bidi_it->prev.type = bidi_it->prev.orig_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
893 bidi_it->last_strong.type = bidi_it->last_strong.orig_type =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
894 bidi_it->last_strong.pristine_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
895 bidi_it->next_for_neutral.charpos = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
896 bidi_it->next_for_neutral.type =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
897 bidi_it->next_for_neutral.orig_type =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
898 bidi_it->next_for_neutral.pristine_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
899 bidi_it->prev_for_neutral.charpos = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
900 bidi_it->prev_for_neutral.type =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
901 bidi_it->prev_for_neutral.orig_type =
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
902 bidi_it->prev_for_neutral.pristine_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
903 bidi_it->sor = L2R; /* FIXME: should it be user-selectable? */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
904 bidi_paragraph_init (dir, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
905 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
906
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
907 /* Push the current embedding level and override status; reset the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
908 current level to LEVEL and the current override status to OVERRIDE. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
909 static inline void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
910 bidi_push_embedding_level (struct bidi_it *bidi_it,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
911 int level, bidi_dir_t override)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
912 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
913 bidi_it->stack_idx++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
914 if (bidi_it->stack_idx >= BIDI_MAXLEVEL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
915 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
916 bidi_it->level_stack[bidi_it->stack_idx].level = level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
917 bidi_it->level_stack[bidi_it->stack_idx].override = override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
918 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
919
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
920 /* Pop the embedding level and directional override status from the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
921 stack, and return the new level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
922 static inline int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
923 bidi_pop_embedding_level (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
924 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
925 /* UAX#9 says to ignore invalid PDFs. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
926 if (bidi_it->stack_idx > 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
927 bidi_it->stack_idx--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
928 return bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
929 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
930
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
931 /* Record in SAVED_INFO the information about the current character. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
932 static inline void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
933 bidi_remember_char (struct bidi_saved_info *saved_info,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
934 struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
935 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
936 saved_info->charpos = bidi_it->charpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
937 saved_info->bytepos = bidi_it->bytepos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
938 saved_info->type = bidi_it->type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
939 bidi_check_type (bidi_it->type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
940 saved_info->orig_type = bidi_it->orig_type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
941 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
942 saved_info->pristine_type = bidi_it->pristine_type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
943 bidi_check_type (bidi_it->pristine_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
944 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
945
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
946 /* Resolve the type of a neutral character according to the type of
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
947 surrounding strong text and the current embedding level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
948 static inline bidi_type_t
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
949 bidi_resolve_neutral_1 (bidi_type_t prev_type, bidi_type_t next_type, int lev)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
950 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
951 /* N1: European and Arabic numbers are treated as though they were R. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
952 if (next_type == WEAK_EN || next_type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
953 next_type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
954 if (prev_type == WEAK_EN || prev_type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
955 prev_type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
956
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
957 if (next_type == prev_type) /* N1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
958 return next_type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
959 else if ((lev & 1) == 0) /* N2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
960 return STRONG_L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
961 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
962 return STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
963 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
964
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
965 static inline int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
966 bidi_explicit_dir_char (int c)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
967 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
968 /* FIXME: this should be replaced with a lookup table with suitable
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
969 bits set, like standard C ctype macros do. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
970 return (c == LRE_CHAR || c == LRO_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
971 || c == RLE_CHAR || c == RLO_CHAR || c == PDF_CHAR);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
972 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
973
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
974 /* A helper function for bidi_resolve_explicit. It advances to the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
975 next character in logical order and determines the new embedding
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
976 level and directional override, but does not take into account
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
977 empty embeddings. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
978 static int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
979 bidi_resolve_explicit_1 (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
980 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
981 int curchar;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
982 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
983 int current_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
984 int new_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
985 bidi_dir_t override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
986
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
987 if (bidi_it->charpos < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
988 bidi_it->charpos = bidi_it->bytepos = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
989 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
990 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
991 bidi_it->charpos++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
992 bidi_it->bytepos += bidi_it->ch_len;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
993 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
994
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
995 current_level = bidi_it->level_stack[bidi_it->stack_idx].level; /* X1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
996 override = bidi_it->level_stack[bidi_it->stack_idx].override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
997 new_level = current_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
998
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
999 /* in case it is a unibyte character (not yet implemented) */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1000 /* _fetch_multibyte_char_len = 1; */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1001 curchar = FETCH_CHAR (bidi_it->bytepos);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1002 bidi_it->ch = curchar;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1003 bidi_it->ch_len = CHAR_BYTES (curchar);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1004
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1005 type = bidi_get_type (curchar);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1006 bidi_it->pristine_type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1007 bidi_check_type (bidi_it->pristine_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1008
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1009 if (type != PDF)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1010 bidi_it->prev_was_pdf = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1011
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1012 bidi_it->orig_type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1013
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1014 switch (type)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1015 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1016 case RLE: /* X2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1017 case RLO: /* X4 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1018 bidi_it->orig_type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1019 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1020 type = WEAK_BN; /* X9/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1021 if (bidi_it->ignore_bn_limit <= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1022 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1023 if (current_level <= BIDI_MAXLEVEL - 4)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1024 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1025 /* Compute the least odd embedding level greater than
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1026 the current level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1027 new_level = ((current_level + 1) & ~1) + 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1028 if (bidi_it->orig_type == RLE)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1029 override = NEUTRAL_DIR;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1030 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1031 override = R2L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1032 if (current_level == BIDI_MAXLEVEL - 4)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1033 bidi_it->invalid_rl_levels = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1034 bidi_push_embedding_level (bidi_it, new_level, override);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1035 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1036 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1037 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1038 bidi_it->invalid_levels++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1039 /* See the commentary about invalid_rl_levels below. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1040 if (bidi_it->invalid_rl_levels < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1041 bidi_it->invalid_rl_levels = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1042 bidi_it->invalid_rl_levels++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1043 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1044 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1045 else if (bidi_it->prev.orig_type == WEAK_EN /* W5/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1046 || bidi_it->next_en_pos > bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1047 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1048 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1049 case LRE: /* X3 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1050 case LRO: /* X5 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1051 bidi_it->orig_type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1052 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1053 type = WEAK_BN; /* X9/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1054 if (bidi_it->ignore_bn_limit <= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1055 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1056 if (current_level <= BIDI_MAXLEVEL - 5)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1057 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1058 /* Compute the least even embedding level greater than
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1059 the current level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1060 new_level = ((current_level + 2) & ~1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1061 if (bidi_it->orig_type == LRE)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1062 override = NEUTRAL_DIR;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1063 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1064 override = L2R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1065 bidi_push_embedding_level (bidi_it, new_level, override);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1066 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1067 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1068 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1069 bidi_it->invalid_levels++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1070 /* invalid_rl_levels counts invalid levels encountered
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1071 while the embedding level was already too high for
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1072 LRE/LRO, but not for RLE/RLO. That is because
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1073 there may be exactly one PDF which we should not
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1074 ignore even though invalid_levels is non-zero.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1075 invalid_rl_levels helps to know what PDF is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1076 that. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1077 if (bidi_it->invalid_rl_levels >= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1078 bidi_it->invalid_rl_levels++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1079 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1080 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1081 else if (bidi_it->prev.orig_type == WEAK_EN /* W5/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1082 || bidi_it->next_en_pos > bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1083 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1084 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1085 case PDF: /* X7 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1086 bidi_it->orig_type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1087 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1088 type = WEAK_BN; /* X9/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1089 if (bidi_it->ignore_bn_limit <= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1090 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1091 if (!bidi_it->invalid_rl_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1092 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1093 new_level = bidi_pop_embedding_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1094 bidi_it->invalid_rl_levels = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1095 if (bidi_it->invalid_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1096 bidi_it->invalid_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1097 /* else nothing: UAX#9 says to ignore invalid PDFs */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1098 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1099 if (!bidi_it->invalid_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1100 new_level = bidi_pop_embedding_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1101 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1102 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1103 bidi_it->invalid_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1104 bidi_it->invalid_rl_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1105 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1106 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1107 else if (bidi_it->prev.orig_type == WEAK_EN /* W5/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1108 || bidi_it->next_en_pos > bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1109 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1110 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1111 default:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1112 /* Nothing. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1113 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1114 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1115
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1116 bidi_it->type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1117 bidi_check_type (bidi_it->type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1118
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1119 return new_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1120 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1121
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1122 /* Given an iterator state in BIDI_IT, advance one character position
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1123 in the buffer to the next character (in the logical order), resolve
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1124 any explicit embeddings and directional overrides, and return the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1125 embedding level of the character after resolving explicit
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1126 directives and ignoring empty embeddings. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1127 static int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1128 bidi_resolve_explicit (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1129 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1130 int prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1131 int new_level = bidi_resolve_explicit_1 (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1132
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1133 if (prev_level < new_level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1134 && bidi_it->type == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1135 && bidi_it->ignore_bn_limit == 0 /* only if not already known */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1136 && bidi_explicit_dir_char (FETCH_CHAR (bidi_it->bytepos
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1137 + bidi_it->ch_len)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1138 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1139 /* Avoid pushing and popping embedding levels if the level run
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1140 is empty, as this breaks level runs where it shouldn't.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1141 UAX#9 removes all the explicit embedding and override codes,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1142 so empty embeddings disappear without a trace. We need to
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1143 behave as if we did the same. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1144 struct bidi_it saved_it;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1145 int level = prev_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1146
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1147 bidi_copy_it (&saved_it, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1148
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1149 while (bidi_explicit_dir_char (FETCH_CHAR (bidi_it->bytepos
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1150 + bidi_it->ch_len)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1151 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1152 level = bidi_resolve_explicit_1 (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1153 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1154
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1155 if (level == prev_level) /* empty embedding */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1156 saved_it.ignore_bn_limit = bidi_it->charpos + 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1157 else /* this embedding is non-empty */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1158 saved_it.ignore_bn_limit = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1159
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1160 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1161 if (bidi_it->ignore_bn_limit > 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1162 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1163 /* We pushed a level, but we shouldn't have. Undo that. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1164 if (!bidi_it->invalid_rl_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1165 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1166 new_level = bidi_pop_embedding_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1167 bidi_it->invalid_rl_levels = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1168 if (bidi_it->invalid_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1169 bidi_it->invalid_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1170 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1171 if (!bidi_it->invalid_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1172 new_level = bidi_pop_embedding_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1173 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1174 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1175 bidi_it->invalid_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1176 bidi_it->invalid_rl_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1177 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1178 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1179 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1180
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1181 /* For when the paragraph end is defined by anything other than a
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1182 special Unicode character (a.k.a. ``higher protocols''). */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1183 if (bidi_it->type != NEUTRAL_B)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1184 if (bidi_at_paragraph_end (bidi_it->ch,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1185 bidi_it->bytepos + bidi_it->ch_len))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1186 bidi_it->type = NEUTRAL_B;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1187
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1188 if (bidi_it->type == NEUTRAL_B) /* X8 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1189 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1190 bidi_set_paragraph_end (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1191 bidi_it->orig_type = bidi_it->type; /* needed below and in L1 */
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1192 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1193 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1194
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1195 return new_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1196 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1197
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1198 /* Advance in the buffer, resolve weak types and return the type of
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1199 the next character after weak type resolution. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1200 bidi_type_t
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1201 bidi_resolve_weak (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1202 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1203 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1204 bidi_dir_t override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1205 int prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1206 int new_level = bidi_resolve_explicit (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1207 int next_char;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1208 bidi_type_t type_of_next;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1209 struct bidi_it saved_it;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1210
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1211 type = bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1212 override = bidi_it->level_stack[bidi_it->stack_idx].override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1213
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1214 if (type == UNKNOWN_BT
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1215 || type == LRE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1216 || type == LRO
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1217 || type == RLE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1218 || type == RLO
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1219 || type == PDF)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1220 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1221
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1222 if (new_level != prev_level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1223 || bidi_it->type == NEUTRAL_B)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1224 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1225 /* We've got a new embedding level run, compute the directional
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1226 type of sor and initialize per-run variables (UAX#9, clause
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1227 X10). */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1228 bidi_set_sor_type (bidi_it, prev_level, new_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1229 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1230 else if (type == NEUTRAL_S || type == NEUTRAL_WS
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1231 || type == WEAK_BN || type == STRONG_AL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1232 bidi_it->orig_type = type; /* needed in L1 */
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1233 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1234
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1235 /* Level and directional override status are already recorded in
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1236 bidi_it, and do not need any change; see X6. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1237 if (override == R2L) /* X6 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1238 type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1239 else if (override == L2R)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1240 type = STRONG_L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1241 else if (type == STRONG_AL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1242 type = STRONG_R; /* W3 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1243 else if (type == WEAK_NSM) /* W1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1244 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1245 /* Note that we don't need to consider the case where the prev
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1246 character has its type overridden by an RLO or LRO: such
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1247 characters are outside the current level run, and thus not
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1248 relevant to this NSM. Thus, NSM gets the pristine_type of
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1249 the previous character. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1250 if (bidi_it->prev.type != UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1251 type = bidi_it->prev.pristine_type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1252 else if (bidi_it->sor == R2L)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1253 type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1254 else if (bidi_it->sor == L2R)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1255 type = STRONG_L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1256 else /* shouldn't happen! */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1257 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1258 if (type == WEAK_EN /* W2 after W1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1259 && bidi_it->last_strong.orig_type == STRONG_AL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1260 type = WEAK_AN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1261 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1262 else if (type == WEAK_EN /* W2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1263 && bidi_it->last_strong.orig_type == STRONG_AL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1264 type = WEAK_AN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1265 else if ((type == WEAK_ES
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1266 && (bidi_it->prev.orig_type == WEAK_EN /* W4 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1267 && (bidi_it->prev.pristine_type == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1268 || bidi_it->prev.pristine_type == WEAK_NSM))) /* aft W1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1269 || (type == WEAK_CS
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1270 && ((bidi_it->prev.orig_type == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1271 && (bidi_it->prev.pristine_type == WEAK_EN /* W4 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1272 || bidi_it->prev.pristine_type == WEAK_NSM)) /* a/W1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1273 || bidi_it->prev.orig_type == WEAK_AN))) /* W4 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1274 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1275 next_char = FETCH_CHAR (bidi_it->bytepos + bidi_it->ch_len);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1276 type_of_next = bidi_get_type (next_char);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1277
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1278 if (type_of_next == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1279 || bidi_explicit_dir_char (next_char))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1280 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1281 bidi_copy_it (&saved_it, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1282 while (bidi_resolve_explicit (bidi_it) == new_level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1283 && bidi_it->type == WEAK_BN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1284 ;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1285 type_of_next = bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1286 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1287 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1288
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1289 /* If the next character is EN, but the last strong-type
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1290 character is AL, that next EN will be changed to AN when we
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1291 process it in W2 above. So in that case, this ES should not
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1292 be changed into EN. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1293 if (type == WEAK_ES
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1294 && type_of_next == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1295 && bidi_it->last_strong.orig_type != STRONG_AL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1296 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1297 else if (type == WEAK_CS)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1298 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1299 if (bidi_it->prev.orig_type == WEAK_AN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1300 && (type_of_next == WEAK_AN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1301 /* If the next character is EN, but the last
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1302 strong-type character is AL, EN will be later
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1303 changed to AN when we process it in W2 above. So
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1304 in that case, this ES should not be changed into
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1305 EN. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1306 || (type_of_next == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1307 && bidi_it->last_strong.orig_type == STRONG_AL)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1308 type = WEAK_AN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1309 else if (bidi_it->prev.orig_type == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1310 && type_of_next == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1311 && bidi_it->last_strong.orig_type != STRONG_AL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1312 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1313 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1314 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1315 else if (type == WEAK_ET /* W5: ET with EN before or after it */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1316 || type == WEAK_BN) /* W5/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1317 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1318 if (bidi_it->prev.orig_type == WEAK_EN /* ET/BN with EN before it */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1319 || bidi_it->next_en_pos > bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1320 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1321 /* W5: ET with EN after it. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1322 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1323 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1324 int en_pos = bidi_it->charpos + 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1325
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1326 next_char = FETCH_CHAR (bidi_it->bytepos + bidi_it->ch_len);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1327 type_of_next = bidi_get_type (next_char);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1328
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1329 if (type_of_next == WEAK_ET
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1330 || type_of_next == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1331 || bidi_explicit_dir_char (next_char))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1332 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1333 bidi_copy_it (&saved_it, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1334 while (bidi_resolve_explicit (bidi_it) == new_level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1335 && (bidi_it->type == WEAK_BN || bidi_it->type == WEAK_ET))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1336 ;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1337 type_of_next = bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1338 en_pos = bidi_it->charpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1339 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1340 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1341 if (type_of_next == WEAK_EN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1342 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1343 /* If the last strong character is AL, the EN we've
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1344 found will become AN when we get to it (W2). */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1345 if (bidi_it->last_strong.orig_type != STRONG_AL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1346 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1347 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1348 /* Remember this EN position, to speed up processing
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1349 of the next ETs. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1350 bidi_it->next_en_pos = en_pos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1351 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1352 else if (type == WEAK_BN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1353 type = NEUTRAL_ON; /* W6/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1354 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1355 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1356 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1357
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1358 if (type == WEAK_ES || type == WEAK_ET || type == WEAK_CS /* W6 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1359 || (type == WEAK_BN && (bidi_it->prev.orig_type == WEAK_CS /* W6/Ret. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1360 || bidi_it->prev.orig_type == WEAK_ES
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1361 || bidi_it->prev.orig_type == WEAK_ET)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1362 type = NEUTRAL_ON;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1363
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1364 /* Store the type we've got so far, before we clobber it with strong
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1365 types in W7 and while resolving neutral types. But leave alone
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1366 the original types that were recorded above, because we will need
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1367 them for the L1 clause. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1368 if (bidi_it->orig_type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1369 bidi_it->orig_type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1370 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1371
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1372 if (type == WEAK_EN) /* W7 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1373 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1374 if ((bidi_it->last_strong.orig_type == STRONG_L)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1375 || (bidi_it->last_strong.type == UNKNOWN_BT && bidi_it->sor == L2R))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1376 type = STRONG_L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1377 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1378
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1379 bidi_it->type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1380 bidi_check_type (bidi_it->type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1381 return type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1382 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1383
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1384 bidi_type_t
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1385 bidi_resolve_neutral (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1386 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1387 int prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1388 bidi_type_t type = bidi_resolve_weak (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1389 int current_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1390
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1391 if (!(type == STRONG_R
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1392 || type == STRONG_L
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1393 || type == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1394 || type == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1395 || type == WEAK_AN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1396 || type == NEUTRAL_B
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1397 || type == NEUTRAL_S
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1398 || type == NEUTRAL_WS
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1399 || type == NEUTRAL_ON))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1400 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1401
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1402 if (bidi_get_category (type) == NEUTRAL
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1403 || (type == WEAK_BN && prev_level == current_level))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1404 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1405 if (bidi_it->next_for_neutral.type != UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1406 type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1407 bidi_it->next_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1408 current_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1409 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1410 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1411 /* Arrrgh!! The UAX#9 algorithm is too deeply entrenched in
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1412 the assumption of batch-style processing; see clauses W4,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1413 W5, and especially N1, which require to look far forward
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1414 (as well as back) in the buffer. May the fleas of a
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1415 thousand camels infest the armpits of those who design
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1416 supposedly general-purpose algorithms by looking at their
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1417 own implementations, and fail to consider other possible
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1418 implementations! */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1419 struct bidi_it saved_it;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1420 bidi_type_t next_type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1421
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1422 if (bidi_it->scan_dir == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1423 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1424
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1425 bidi_copy_it (&saved_it, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1426 /* Scan the text forward until we find the first non-neutral
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1427 character, and then use that to resolve the neutral we
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1428 are dealing with now. We also cache the scanned iterator
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1429 states, to salvage some of the effort later. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1430 bidi_cache_iterator_state (bidi_it, 0);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1431 do {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1432 /* Record the info about the previous character, so that
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1433 it will be cached below with this state. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1434 if (bidi_it->orig_type != WEAK_BN /* W1/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1435 && bidi_it->type != WEAK_BN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1436 bidi_remember_char (&bidi_it->prev, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1437 type = bidi_resolve_weak (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1438 /* Paragraph separators have their levels fully resolved
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1439 at this point, so cache them as resolved. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1440 bidi_cache_iterator_state (bidi_it, type == NEUTRAL_B);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1441 /* FIXME: implement L1 here, by testing for a newline and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1442 resetting the level for any sequence of whitespace
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1443 characters adjacent to it. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1444 } while (!(type == NEUTRAL_B
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1445 || (type != WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1446 && bidi_get_category (type) != NEUTRAL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1447 /* This is all per level run, so stop when we
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1448 reach the end of this level run. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1449 || bidi_it->level_stack[bidi_it->stack_idx].level !=
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1450 current_level));
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1451
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1452 bidi_remember_char (&saved_it.next_for_neutral, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1453
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1454 switch (type)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1455 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1456 case STRONG_L:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1457 case STRONG_R:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1458 case STRONG_AL:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1459 next_type = type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1460 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1461 case WEAK_EN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1462 case WEAK_AN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1463 /* N1: ``European and Arabic numbers are treated as
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1464 though they were R.'' */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1465 next_type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1466 saved_it.next_for_neutral.type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1467 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1468 case WEAK_BN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1469 if (!bidi_explicit_dir_char (bidi_it->ch))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1470 abort (); /* can't happen: BNs are skipped */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1471 /* FALLTHROUGH */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1472 case NEUTRAL_B:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1473 /* Marched all the way to the end of this level run.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1474 We need to use the eor type, whose information is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1475 stored by bidi_set_sor_type in the prev_for_neutral
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1476 member. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1477 if (saved_it.type != WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1478 || bidi_get_category (bidi_it->prev.orig_type) == NEUTRAL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1479 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1480 next_type = bidi_it->prev_for_neutral.type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1481 saved_it.next_for_neutral.type = next_type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1482 bidi_check_type (next_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1483 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1484 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1485 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1486 /* This is a BN which does not adjoin neutrals.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1487 Leave its type alone. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1488 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1489 return bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1490 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1491 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1492 default:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1493 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1494 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1495 type = bidi_resolve_neutral_1 (saved_it.prev_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1496 next_type, current_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1497 saved_it.type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1498 bidi_check_type (type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1499 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1500 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1501 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1502 return type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1503 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1504
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1505 /* Given an iterator state in BIDI_IT, advance one character position
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1506 in the buffer to the next character (in the logical order), resolve
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1507 the bidi type of that next character, and return that type. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1508 bidi_type_t
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1509 bidi_type_of_next_char (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1510 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1511 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1512
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1513 /* This should always be called during a forward scan. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1514 if (bidi_it->scan_dir != 1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1515 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1516
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1517 /* Reset the limit until which to ignore BNs if we step out of the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1518 area where we found only empty levels. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1519 if ((bidi_it->ignore_bn_limit > 0
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1520 && bidi_it->ignore_bn_limit <= bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1521 || (bidi_it->ignore_bn_limit == -1
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1522 && !bidi_explicit_dir_char (bidi_it->ch)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1523 bidi_it->ignore_bn_limit = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1524
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1525 type = bidi_resolve_neutral (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1526
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1527 return type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1528 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1529
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1530 /* Given an iterator state BIDI_IT, advance one character position in
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1531 the buffer to the next character (in the logical order), resolve
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1532 the embedding and implicit levels of that next character, and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1533 return the resulting level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1534 int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1535 bidi_level_of_next_char (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1536 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1537 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1538 int level, prev_level = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1539 struct bidi_saved_info next_for_neutral;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1540
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1541 if (bidi_it->scan_dir == 1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1542 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1543 /* There's no sense in trying to advance if we hit end of text. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1544 if (bidi_it->ch == BIDI_EOB)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1545 return bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1546
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1547 /* Record the info about the previous character. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1548 if (bidi_it->orig_type != WEAK_BN /* W1/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1549 && bidi_it->type != WEAK_BN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1550 bidi_remember_char (&bidi_it->prev, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1551 if (bidi_it->orig_type == STRONG_R || bidi_it->orig_type == STRONG_L
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1552 || bidi_it->orig_type == STRONG_AL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1553 bidi_remember_char (&bidi_it->last_strong, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1554 /* FIXME: it sounds like we don't need both prev and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1555 prev_for_neutral members, but I'm leaving them both for now. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1556 if (bidi_it->type == STRONG_R || bidi_it->type == STRONG_L
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1557 || bidi_it->type == WEAK_EN || bidi_it->type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1558 bidi_remember_char (&bidi_it->prev_for_neutral, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1559
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1560 /* If we overstepped the characters used for resolving neutrals
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1561 and whitespace, invalidate their info in the iterator. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1562 if (bidi_it->charpos >= bidi_it->next_for_neutral.charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1563 bidi_it->next_for_neutral.type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1564 if (bidi_it->next_en_pos >= 0
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1565 && bidi_it->charpos >= bidi_it->next_en_pos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1566 bidi_it->next_en_pos = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1567 if (bidi_it->next_for_ws.type != UNKNOWN_BT
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1568 && bidi_it->charpos >= bidi_it->next_for_ws.charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1569 bidi_it->next_for_ws.type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1570
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1571 /* This must be taken before we fill the iterator with the info
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1572 about the next char. If we scan backwards, the iterator
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1573 state must be already cached, so there's no need to know the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1574 embedding level of the previous character, since we will be
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1575 returning to our caller shortly. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1576 prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1577 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1578 next_for_neutral = bidi_it->next_for_neutral;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1579
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1580 /* Perhaps it is already cached. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1581 type = bidi_cache_find (bidi_it->charpos + bidi_it->scan_dir, -1, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1582 if (type != UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1583 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1584 /* Don't lose the information for resolving neutrals! The
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1585 cached states could have been cached before their
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1586 next_for_neutral member was computed. If we are on our way
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1587 forward, we can simply take the info from the previous
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1588 state. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1589 if (bidi_it->scan_dir == 1
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1590 && bidi_it->next_for_neutral.type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1591 bidi_it->next_for_neutral = next_for_neutral;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1592
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1593 /* If resolved_level is -1, it means this state was cached
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1594 before it was completely resolved, so we cannot return
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1595 it. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1596 if (bidi_it->resolved_level != -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1597 return bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1598 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1599 if (bidi_it->scan_dir == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1600 /* If we are going backwards, the iterator state is already cached
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1601 from previous scans, and should be fully resolved. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1602 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1603
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1604 if (type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1605 type = bidi_type_of_next_char (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1606
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1607 if (type == NEUTRAL_B)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1608 return bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1609
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1610 level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1611 if ((bidi_get_category (type) == NEUTRAL /* && type != NEUTRAL_B */)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1612 || (type == WEAK_BN && prev_level == level))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1613 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1614 if (bidi_it->next_for_neutral.type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1615 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1616
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1617 /* If the cached state shows a neutral character, it was not
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1618 resolved by bidi_resolve_neutral, so do it now. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1619 type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1620 bidi_it->next_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1621 level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1622 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1623
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1624 if (!(type == STRONG_R
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1625 || type == STRONG_L
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1626 || type == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1627 || type == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1628 || type == WEAK_AN))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1629 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1630 bidi_it->type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1631 bidi_check_type (bidi_it->type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1632
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1633 /* For L1 below, we need to know, for each WS character, whether
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1634 it belongs to a sequence of WS characters preceeding a newline
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1635 or a TAB or a paragraph separator. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1636 if (bidi_it->pristine_type == NEUTRAL_WS
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1637 && bidi_it->next_for_ws.type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1638 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1639 int ch;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1640 int clen = bidi_it->ch_len;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1641 int bpos = bidi_it->bytepos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1642 int cpos = bidi_it->charpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1643 bidi_type_t chtype;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1644
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1645 do {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1646 /*_fetch_multibyte_char_len = 1;*/
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1647 ch = FETCH_CHAR (bpos + clen);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1648 bpos += clen;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1649 cpos++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1650 clen = CHAR_BYTES (ch);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1651 if (ch == '\n' /* || ch == LINESEP_CHAR */)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1652 chtype = NEUTRAL_B;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1653 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1654 chtype = bidi_get_type (ch);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1655 } while (chtype == NEUTRAL_WS || chtype == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1656 || bidi_explicit_dir_char (ch)); /* L1/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1657 bidi_it->next_for_ws.type = chtype;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1658 bidi_check_type (bidi_it->next_for_ws.type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1659 bidi_it->next_for_ws.charpos = cpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1660 bidi_it->next_for_ws.bytepos = bpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1661 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1662
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1663 /* Resolve implicit levels, with a twist: PDFs get the embedding
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1664 level of the enbedding they terminate. See below for the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1665 reason. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1666 if (bidi_it->pristine_type == PDF
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1667 /* Don't do this if this formatting code didn't change the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1668 embedding level due to invalid or empty embeddings. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1669 && prev_level != level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1670 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1671 /* Don't look in UAX#9 for the reason for this: it's our own
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1672 private quirk. The reason is that we want the formatting
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1673 codes to be delivered so that they bracket the text of their
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1674 embedding. For example, given the text
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1675
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1676 {RLO}teST{PDF}
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1677
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1678 we want it to be displayed as
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1679
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1680 {RLO}STet{PDF}
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1681
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1682 not as
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1683
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1684 STet{RLO}{PDF}
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1685
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1686 which will result because we bump up the embedding level as
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1687 soon as we see the RLO and pop it as soon as we see the PDF,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1688 so RLO itself has the same embedding level as "teST", and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1689 thus would be normally delivered last, just before the PDF.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1690 The switch below fiddles with the level of PDF so that this
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1691 ugly side effect does not happen.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1692
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1693 (This is, of course, only important if the formatting codes
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1694 are actually displayed, but Emacs does display them if the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1695 user wants to.) */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1696 level = prev_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1697 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1698 else if (bidi_it->pristine_type == NEUTRAL_B /* L1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1699 || bidi_it->pristine_type == NEUTRAL_S
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1700 || bidi_it->ch == '\n' /* || bidi_it->ch == LINESEP_CHAR */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1701 || (bidi_it->pristine_type == NEUTRAL_WS
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1702 && (bidi_it->next_for_ws.type == NEUTRAL_B
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1703 || bidi_it->next_for_ws.type == NEUTRAL_S)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1704 level = bidi_it->level_stack[0].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1705 else if ((level & 1) == 0) /* I1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1706 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1707 if (type == STRONG_R)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1708 level++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1709 else if (type == WEAK_EN || type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1710 level += 2;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1711 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1712 else /* I2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1713 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1714 if (type == STRONG_L || type == WEAK_EN || type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1715 level++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1716 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1717
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1718 bidi_it->resolved_level = level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1719 return level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1720 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1721
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1722 /* Move to the other edge of a level given by LEVEL. If END_FLAG is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1723 non-zero, we are at the end of a level, and we need to prepare to
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1724 resume the scan of the lower level.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1725
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1726 If this level's other edge is cached, we simply jump to it, filling
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1727 the iterator structure with the iterator state on the other edge.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1728 Otherwise, we walk the buffer until we come back to the same level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1729 as LEVEL.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1730
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1731 Note: we are not talking here about a ``level run'' in the UAX#9
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1732 sense of the term, but rather about a ``level'' which includes
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1733 all the levels higher than it. In other words, given the levels
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1734 like this:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1735
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1736 11111112222222333333334443343222222111111112223322111
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1737 A B C
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1738
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1739 and assuming we are at point A scanning left to right, this
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1740 function moves to point C, whereas the UAX#9 ``level 2 run'' ends
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1741 at point B. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1742 static void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1743 bidi_find_other_level_edge (struct bidi_it *bidi_it, int level, int end_flag)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1744 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1745 int dir = end_flag ? -bidi_it->scan_dir : bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1746 int idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1747
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1748 /* Try the cache first. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1749 if ((idx = bidi_cache_find_level_change (level, dir, end_flag)) >= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1750 bidi_cache_fetch_state (idx, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1751 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1752 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1753 int new_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1754
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1755 if (end_flag)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1756 abort (); /* if we are at end of level, its edges must be cached */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1757
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1758 bidi_cache_iterator_state (bidi_it, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1759 do {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1760 new_level = bidi_level_of_next_char (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1761 bidi_cache_iterator_state (bidi_it, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1762 } while (new_level >= level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1763 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1764 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1765
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1766 void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1767 bidi_get_next_char_visually (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1768 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1769 int old_level, new_level, next_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1770 struct bidi_it prev_bidi_it;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1771
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1772 if (bidi_it->scan_dir == 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1773 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1774 bidi_it->scan_dir = 1; /* default to logical order */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1775 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1776
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1777 if (bidi_it->new_paragraph)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1778 bidi_paragraph_init (bidi_overriding_paragraph_direction, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1779 if (bidi_cache_idx == 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1780 bidi_copy_it (&prev_bidi_it, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1781
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1782 old_level = bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1783 new_level = bidi_level_of_next_char (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1784 if (bidi_it->ch == BIDI_EOB)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1785 return;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1786
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1787 /* Reordering of resolved levels (clause L2) is implemented by
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1788 jumping to the other edge of the level and flipping direction of
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1789 scanning the buffer whenever we find a level change. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1790 if (new_level != old_level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1791 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1792 int ascending = new_level > old_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1793 int level_to_search = ascending ? old_level + 1 : old_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1794 int incr = ascending ? 1 : -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1795 int expected_next_level = old_level + incr;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1796
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1797 /* If we don't have anything cached yet, we need to cache the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1798 previous character we've seen, since we'll need it to record
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1799 where to jump when the last non-base level is exhausted. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1800 if (bidi_cache_idx == 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1801 bidi_cache_iterator_state (&prev_bidi_it, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1802 /* Jump (or walk) to the other edge of this level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1803 bidi_find_other_level_edge (bidi_it, level_to_search, !ascending);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1804 /* Switch scan direction and peek at the next character in the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1805 new direction. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1806 bidi_it->scan_dir = -bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1807
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1808 /* The following loop handles the case where the resolved level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1809 jumps by more than one. This is typical for numbers inside a
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1810 run of text with left-to-right embedding direction, but can
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1811 also happen in other situations. In those cases the decision
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1812 where to continue after a level change, and in what direction,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1813 is tricky. For example, given a text like below:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1814
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1815 abcdefgh
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1816 11336622
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1817
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1818 (where the numbers below the text show the resolved levels),
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1819 the result of reordering according to UAX#9 should be this:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1820
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1821 efdcghba
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1822
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1823 This is implemented by the loop below which flips direction
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1824 and jumps to the other edge of the level each time it finds
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1825 the new level not to be the expected one. The expected level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1826 is always one more or one less than the previous one. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1827 next_level = bidi_peek_at_next_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1828 while (next_level != expected_next_level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1829 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1830 expected_next_level += incr;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1831 level_to_search += incr;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1832 bidi_find_other_level_edge (bidi_it, level_to_search, !ascending);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1833 bidi_it->scan_dir = -bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1834 next_level = bidi_peek_at_next_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1835 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1836
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1837 /* Finally, deliver the next character in the new direction. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1838 next_level = bidi_level_of_next_char (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1839 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1840
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1841 if (bidi_it->scan_dir == 1 && bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1842 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1843 /* If we are at paragraph's base embedding level and beyond the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1844 last cached position, the cache's job is done and we can
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1845 discard it. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1846 if (bidi_it->resolved_level == bidi_it->level_stack[0].level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1847 && bidi_it->charpos > bidi_cache[bidi_cache_idx - 1].charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1848 bidi_cache_reset ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1849 /* But as long as we are caching during forward scan, we must
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1850 cache each state, or else the cache integrity will be
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1851 compromised: it assumes cached states correspond to buffer
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1852 positions 1:1. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1853 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1854 bidi_cache_iterator_state (bidi_it, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1855 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1856 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1857
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1858 /* This is meant to be called from within the debugger, whenever you
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1859 wish to examine the cache contents. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1860 void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1861 bidi_dump_cached_states (void)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1862 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1863 int i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1864 int ndigits = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1865
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1866 if (bidi_cache_idx == 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1867 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1868 fprintf (stderr, "The cache is empty.\n");
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1869 return;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1870 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1871 fprintf (stderr, "Total of %d state%s in cache:\n",
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1872 bidi_cache_idx, bidi_cache_idx == 1 ? "" : "s");
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1873
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1874 for (i = bidi_cache[bidi_cache_idx - 1].charpos; i > 0; i /= 10)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1875 ndigits++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1876 fputs ("ch ", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1877 for (i = 0; i < bidi_cache_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1878 fprintf (stderr, "%*c", ndigits, bidi_cache[i].ch);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1879 fputs ("\n", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1880 fputs ("lvl ", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1881 for (i = 0; i < bidi_cache_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1882 fprintf (stderr, "%*d", ndigits, bidi_cache[i].resolved_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1883 fputs ("\n", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1884 fputs ("pos ", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1885 for (i = 0; i < bidi_cache_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1886 fprintf (stderr, "%*d", ndigits, bidi_cache[i].charpos);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1887 fputs ("\n", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1888 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1889
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1890 #ifdef TEST_STANDALONE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1891
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1892 #include <sys/stat.h>
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1893 #include <signal.h>
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1894
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1895 static char display_line[80];
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1896 static int simulate_display;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1897 static int incr = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1898
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1899 void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1900 signal_catcher (int sig)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1901 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1902 if (simulate_display)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1903 puts (display_line);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1904 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1905 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1906 puts ("<");
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1907 fflush (stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1908 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1909 signal (sig, SIG_DFL);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1910 raise (sig);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1911 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1912
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1913 void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1914 put_line (char *p)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1915 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1916 if (simulate_display)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1917 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1918 if (incr == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1919 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1920 if (p >= display_line)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1921 memset (display_line, ' ', p - display_line + 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1922 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1923 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1924 *p = '\0';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1925 fputs (display_line, stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1926 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1927 fflush (stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1928 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1929
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1930 char *
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1931 init_display_direction (bidi_dir_t default_dir, int base_level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1932 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1933 char *p;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1934
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1935 /* To which display margin should we flush the lines? */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1936 switch (default_dir)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1937 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1938 case NEUTRAL_DIR:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1939 if ((base_level & 1) == 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1940 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1941 p = display_line;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1942 incr = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1943 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1944 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1945 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1946 p = display_line + sizeof (display_line) - 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1947 *p-- = '\0';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1948 incr = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1949 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1950 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1951 case L2R:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1952 p = display_line;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1953 incr = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1954 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1955 case R2L:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1956 p = display_line + sizeof (display_line) - 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1957 *p-- = '\0';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1958 incr = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1959 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1960 default:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1961 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1962 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1963
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1964 return p;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1965 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1966
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1967 static char *
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1968 continuation_line (char *p, int need)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1969 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1970 if (incr == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1971 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1972 if (p < display_line + need)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1973 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1974 *p-- = '/';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1975 put_line (p);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1976 putc ('\n', stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1977 memset (display_line, '>', sizeof(display_line) - 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1978 p = display_line + sizeof (display_line) - 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1979 *p-- = '\0';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1980 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1981 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1982 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1983 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1984 if (p > display_line + sizeof(display_line) - need - 2)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1985 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1986 *p++ = '\\';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1987 put_line (p);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1988 putc ('\n', stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1989 memset (display_line, '<', sizeof(display_line) - 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1990 p = display_line;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1991 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1992 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1993
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1994 return p;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1995 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1996
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1997 int main (int argc, char *argv[])
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1998 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1999 bidi_dir_t default_dir = NEUTRAL_DIR;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2000 char lots_of_equals[] = "\n===============================================================================\n";
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2001
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2002
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2003 if (argc > 1 && argv[1][0] == '-')
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2004 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2005 switch (argv[1][1])
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2006 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2007 case 'R':
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2008 default_dir = R2L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2009 simulate_display = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2010 ++argv;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2011 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2012 case 'L':
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2013 default_dir = L2R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2014 simulate_display = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2015 ++argv;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2016 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2017 case 'N':
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2018 simulate_display = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2019 ++argv;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2020 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2021 default:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2022 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2023 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2024 bidi_overriding_paragraph_direction = default_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2025 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2026
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2027 for (argv++; *argv; argv++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2028 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2029 FILE *in = fopen (*argv, "rb");
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2030 struct stat stat_buf;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2031 struct bidi_it iterator;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2032 size_t i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2033 char *p = display_line;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2034 int base_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2035 unsigned char *s, *d, *s_end;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2036
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2037 if (!in || stat (*argv, &stat_buf))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2038 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2039 perror (*argv);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2040 continue;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2041 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2042
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2043 if (stat_buf.st_size > input_buf_size)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2044 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2045 input_buf = realloc (input_buf, stat_buf.st_size + 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2046 if (!input_buf)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2047 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2048 perror ("realloc input buffer");
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2049 continue;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2050 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2051 input_buf_size = stat_buf.st_size;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2052 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2053 if (fread (input_buf, 1, stat_buf.st_size, in) != stat_buf.st_size)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2054 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2055 perror ("reading input");
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2056 continue;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2057 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2058 input_buf[stat_buf.st_size] = '\0';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2059 for (d = s = input_buf, s_end = s + stat_buf.st_size - 1; *s; s++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2060 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2061 if (*s != '\r' || s >= s_end || s[1] != '\n')
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2062 *d++ = *s;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2063 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2064 stat_buf.st_size = d - input_buf;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2065 input_buf[stat_buf.st_size] = '\0';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2066
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2067 /* Done with administrivia, now for some real work... */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2068 signal (SIGABRT, signal_catcher);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2069 signal (SIGINT, signal_catcher);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2070 bidi_init_it (-1, default_dir, &iterator);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2071 if (simulate_display)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2072 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2073 p = init_display_direction (default_dir,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2074 iterator.level_stack[0].level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2075 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2076
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2077 memset (display_line, incr == -1 ? '>' : '<', sizeof (display_line) - 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2078 display_line[sizeof (display_line) - 1] = '\0';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2079 base_level = iterator.level_stack[0].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2080
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2081 for (i = 0; i <= stat_buf.st_size; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2082 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2083 int c;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2084
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2085 bidi_get_next_char_visually (&iterator);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2086 c = iterator.ch;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2087
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2088 if (c == '\n' || c == BIDI_EOB)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2089 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2090 if (simulate_display)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2091 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2092 put_line (p);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2093 /* FIXME: if -R or -L, need to init paragraph here. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2094 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2095 if (c == BIDI_EOB)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2096 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2097 putc (c, stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2098 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2099 else if (c >= LRE_CHAR && c <= LRM_CHAR)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2100 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2101 if (simulate_display)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2102 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2103 p = continuation_line (p, 5);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2104 if (incr == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2105 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2106 memcpy (p - 4, bidi_name[c], 5);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2107 p -= 5;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2108 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2109 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2110 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2111 memcpy (p, bidi_name[c], 5);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2112 p += 5;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2113 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2114 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2115 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2116 fputs (bidi_name[c], stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2117 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2118 else if (c < ' ')
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2119 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2120 if (simulate_display)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2121 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2122 p = continuation_line (p, 2);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2123 if (incr == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2124 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2125 *p-- = '@' + c;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2126 *p-- = '^';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2127 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2128 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2129 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2130 *p++ = '^';
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2131 *p++ = '@' + c;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2132 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2133 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2134 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2135 printf ("^%c", (c | 0x40));
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2136 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2137 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2138 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2139 int c1 = (iterator.type == STRONG_R) ? bidi_mirror_char (c) : c;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2140
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2141 if (simulate_display)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2142 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2143 p = continuation_line (p, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2144 *p = c1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2145 p += incr;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2146 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2147 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2148 putc (c1, stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2149 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2150
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2151 if (iterator.ch == '\n')
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2152 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2153 if (base_level != iterator.level_stack[0].level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2154 base_level = iterator.level_stack[0].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2155 p = init_display_direction (default_dir, base_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2156 memset (display_line, incr == -1 ? '>' : '<',
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2157 sizeof (display_line) - 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2158 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2159 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2160 fputs (lots_of_equals, stdout);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2161 fclose (in);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2162 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2163 return 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2164 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2165 #endif