annotate src/bidi.c @ 108179:8bcf1c901e9a

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