annotate src/bidi.c @ 111137:1b078a586243

Try to use "gpg2" if "gpg" isn't available. * epg-config.el (epg-gpg-program): Try to use "gpg2" if "gpg" executable is not available on the system (Bug#7268).
author Daiki Ueno <ueno@unixuser.org>
date Sun, 24 Oct 2010 12:12:17 +0900
parents 55c8c3ca3d48
children 6378d1b57038
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
108571
a476fd5a6f42 Rename bidi_get_next_char_visually to bidi_move_to_visually_next.
Eli Zaretskii <eliz@gnu.org>
parents: 108030
diff changeset
29 The main entry point is bidi_move_to_visually_next. Each time it
107583
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
108571
a476fd5a6f42 Rename bidi_get_next_char_visually to bidi_move_to_visually_next.
Eli Zaretskii <eliz@gnu.org>
parents: 108030
diff changeset
33 purposes, and call bidi_move_to_visually_next for the next
a476fd5a6f42 Rename bidi_get_next_char_visually to bidi_move_to_visually_next.
Eli Zaretskii <eliz@gnu.org>
parents: 108030
diff changeset
34 character. See the comments in bidi_move_to_visually_next for more
a476fd5a6f42 Rename bidi_get_next_char_visually to bidi_move_to_visually_next.
Eli Zaretskii <eliz@gnu.org>
parents: 108030
diff changeset
35 details about its algorithm that finds the next visual-order
107583
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 #include <config.h>
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
53 #include <stdio.h>
107599
23f8a579b56e Retrospective commit from 2009-10-24.
Eli Zaretskii <eliz@gnu.org>
parents: 107598
diff changeset
54 #include <setjmp.h>
23f8a579b56e Retrospective commit from 2009-10-24.
Eli Zaretskii <eliz@gnu.org>
parents: 107598
diff changeset
55
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
56 #include "lisp.h"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
57 #include "buffer.h"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
58 #include "character.h"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
59 #include "dispextern.h"
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
60
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
61 static int bidi_initialized = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
62
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
63 static Lisp_Object bidi_type_table, bidi_mirror_table;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
64
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
65 /* FIXME: Remove these when bidi_explicit_dir_char uses a lookup table. */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
66 #define LRM_CHAR 0x200E
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
67 #define RLM_CHAR 0x200F
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
68 #define LRE_CHAR 0x202A
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
69 #define RLE_CHAR 0x202B
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
70 #define PDF_CHAR 0x202C
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
71 #define LRO_CHAR 0x202D
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
72 #define RLO_CHAR 0x202E
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
73
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
74 #define BIDI_EOB -1
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
75 #define BIDI_BOB -2 /* FIXME: Is this needed? */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
76
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
77 /* Local data structures. (Look in dispextern.h for the rest.) */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
78
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
79 /* What we need to know about the current paragraph. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
80 struct bidi_paragraph_info {
110546
446e46eafccb Really fix int/EMACS_INT use in bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110412
diff changeset
81 EMACS_INT start_bytepos; /* byte position where it begins */
446e46eafccb Really fix int/EMACS_INT use in bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110412
diff changeset
82 EMACS_INT end_bytepos; /* byte position where it ends */
446e46eafccb Really fix int/EMACS_INT use in bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110412
diff changeset
83 int embedding_level; /* its basic embedding level */
446e46eafccb Really fix int/EMACS_INT use in bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110412
diff changeset
84 bidi_dir_t base_dir; /* its base direction */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
85 };
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
86
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
87 /* Data type for describing the bidirectional character categories. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
88 typedef enum {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
89 UNKNOWN_BC,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
90 NEUTRAL,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
91 WEAK,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
92 STRONG
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
93 } bidi_category_t;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
94
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
95 int bidi_ignore_explicit_marks_for_paragraph_level = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
96
108030
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
97 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
98 static Lisp_Object Qparagraph_start, Qparagraph_separate;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
99
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
100 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108985
diff changeset
101 bidi_initialize (void)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
102 {
108982
99288c087e4b Derive bidi type table from UnicodeData.txt.
Eli Zaretskii <eliz@gnu.org>
parents: 108833
diff changeset
103
99288c087e4b Derive bidi type table from UnicodeData.txt.
Eli Zaretskii <eliz@gnu.org>
parents: 108833
diff changeset
104 #include "biditype.h"
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
105 #include "bidimirror.h"
108982
99288c087e4b Derive bidi type table from UnicodeData.txt.
Eli Zaretskii <eliz@gnu.org>
parents: 108833
diff changeset
106
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
107 int i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
108
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
109 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
110 staticpro (&bidi_type_table);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
111
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
112 for (i = 0; i < sizeof bidi_type / sizeof bidi_type[0]; i++)
108982
99288c087e4b Derive bidi type table from UnicodeData.txt.
Eli Zaretskii <eliz@gnu.org>
parents: 108833
diff changeset
113 char_table_set_range (bidi_type_table, bidi_type[i].from, bidi_type[i].to,
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
114 make_number (bidi_type[i].type));
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
115
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
116 bidi_mirror_table = Fmake_char_table (Qnil, Qnil);
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
117 staticpro (&bidi_mirror_table);
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
118
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
119 for (i = 0; i < sizeof bidi_mirror / sizeof bidi_mirror[0]; i++)
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
120 char_table_set (bidi_mirror_table, bidi_mirror[i].from,
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
121 make_number (bidi_mirror[i].to));
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
122
108003
4b71850034e6 * buffer.h (struct buffer): Remove unused var `direction_reversed'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107984
diff changeset
123 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
124 staticpro (&Qparagraph_start);
108030
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
125 paragraph_start_re = Fsymbol_value (Qparagraph_start);
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
126 if (!STRINGP (paragraph_start_re))
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
127 paragraph_start_re = build_string ("\f\\|[ \t]*$");
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
128 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
129 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
130 staticpro (&Qparagraph_separate);
108030
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
131 paragraph_separate_re = Fsymbol_value (Qparagraph_separate);
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
132 if (!STRINGP (paragraph_separate_re))
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
133 paragraph_separate_re = build_string ("[ \t\f]*$");
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
134 staticpro (&paragraph_separate_re);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
135 bidi_initialized = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
136 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
137
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
138 /* 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
139 directional OVERRIDE. */
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
140 static INLINE bidi_type_t
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
141 bidi_get_type (int ch, bidi_dir_t override)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
142 {
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
143 bidi_type_t default_type;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
144
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
145 if (ch == BIDI_EOB)
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
146 return NEUTRAL_B;
107592
e6df672626c1 Retrospective commit from 2009-09-27.
Eli Zaretskii <eliz@gnu.org>
parents: 107591
diff changeset
147 if (ch < 0 || ch > MAX_CHAR)
e6df672626c1 Retrospective commit from 2009-09-27.
Eli Zaretskii <eliz@gnu.org>
parents: 107591
diff changeset
148 abort ();
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
149
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
150 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
151
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
152 if (override == NEUTRAL_DIR)
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
153 return default_type;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
154
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
155 switch (default_type)
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
156 {
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
157 /* 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
158 override NEUTRAL_B and LRM/RLM characters. */
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
159 case NEUTRAL_B:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
160 case LRE:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
161 case LRO:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
162 case RLE:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
163 case RLO:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
164 case PDF:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
165 return default_type;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
166 default:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
167 switch (ch)
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
168 {
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
169 case LRM_CHAR:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
170 case RLM_CHAR:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
171 return default_type;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
172 default:
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
173 if (override == L2R) /* X6 */
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
174 return STRONG_L;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
175 else if (override == R2L)
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
176 return STRONG_R;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
177 else
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
178 abort (); /* can't happen: handled above */
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
179 }
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
180 }
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
181 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
182
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
183 void
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
184 bidi_check_type (bidi_type_t type)
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
185 {
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
186 if (type < UNKNOWN_BT || type > NEUTRAL_ON)
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
187 abort ();
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
188 }
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
189
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
190 /* 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
191 static INLINE bidi_category_t
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
192 bidi_get_category (bidi_type_t type)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
193 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
194 switch (type)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
195 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
196 case UNKNOWN_BT:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
197 return UNKNOWN_BC;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
198 case STRONG_L:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
199 case STRONG_R:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
200 case STRONG_AL:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
201 case LRE:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
202 case LRO:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
203 case RLE:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
204 case RLO:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
205 return STRONG;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
206 case PDF: /* ??? really?? */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
207 case WEAK_EN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
208 case WEAK_ES:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
209 case WEAK_ET:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
210 case WEAK_AN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
211 case WEAK_CS:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
212 case WEAK_NSM:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
213 case WEAK_BN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
214 return WEAK;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
215 case NEUTRAL_B:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
216 case NEUTRAL_S:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
217 case NEUTRAL_WS:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
218 case NEUTRAL_ON:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
219 return NEUTRAL;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
220 default:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
221 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
222 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
223 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
224
108985
f2d0b93e668c bidi.c (bidi_mirror_char): Fix commentary.
Eli Zaretskii <eliz@gnu.org>
parents: 108983
diff changeset
225 /* Return the mirrored character of C, if it has one. If C has no
f2d0b93e668c bidi.c (bidi_mirror_char): Fix commentary.
Eli Zaretskii <eliz@gnu.org>
parents: 108983
diff changeset
226 mirrored counterpart, return C.
f2d0b93e668c bidi.c (bidi_mirror_char): Fix commentary.
Eli Zaretskii <eliz@gnu.org>
parents: 108983
diff changeset
227 Note: The conditions in UAX#9 clause L4 regarding the surrounding
f2d0b93e668c bidi.c (bidi_mirror_char): Fix commentary.
Eli Zaretskii <eliz@gnu.org>
parents: 108983
diff changeset
228 context must be tested by the caller. */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
229 int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
230 bidi_mirror_char (int c)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
231 {
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
232 Lisp_Object val;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
233
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
234 if (c == BIDI_EOB)
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
235 return c;
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
236 if (c < 0 || c > MAX_CHAR)
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
237 abort ();
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
238
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
239 val = CHAR_TABLE_REF (bidi_mirror_table, c);
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
240 if (INTEGERP (val))
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
241 {
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
242 int v = XINT (val);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
243
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
244 if (v < 0 || v > MAX_CHAR)
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
245 abort ();
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
246
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
247 return v;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
248 }
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
249
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
250 return c;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
251 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
252
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
253 /* Copy the bidi iterator from FROM to TO. To save cycles, this only
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
254 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
255 static INLINE void
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
256 bidi_copy_it (struct bidi_it *to, struct bidi_it *from)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
257 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
258 int i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
259
107604
9e8415b885ee Retrospective commit from 2009-12-12.
Eli Zaretskii <eliz@gnu.org>
parents: 107601
diff changeset
260 /* Copy everything except the level stack and beyond. */
9e8415b885ee Retrospective commit from 2009-12-12.
Eli Zaretskii <eliz@gnu.org>
parents: 107601
diff changeset
261 memcpy (to, from, ((size_t)&((struct bidi_it *)0)->level_stack[0]));
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
262
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
263 /* Copy the active part of the level stack. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
264 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
265 for (i = 1; i <= from->stack_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
266 to->level_stack[i] = from->level_stack[i];
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
267 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
268
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
269 /* Caching the bidi iterator states. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
270
108573
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
271 #define BIDI_CACHE_CHUNK 200
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
272 static struct bidi_it *bidi_cache;
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
273 static size_t bidi_cache_size = 0;
108657
7e4a23f2f3ea Completed initial debugging and testing of reimplemented cursor motion.
Eli Zaretskii <eliz@gnu.org>
parents: 108600
diff changeset
274 static size_t elsz = sizeof (struct bidi_it);
108573
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
275 static int bidi_cache_idx; /* next unused cache slot */
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
276 static int bidi_cache_last_idx; /* slot of last cache hit */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
277
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
278 static INLINE void
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
279 bidi_cache_reset (void)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
280 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
281 bidi_cache_idx = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
282 bidi_cache_last_idx = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
283 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
284
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
285 static INLINE void
108573
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
286 bidi_cache_shrink (void)
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
287 {
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
288 if (bidi_cache_size > BIDI_CACHE_CHUNK)
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
289 {
108657
7e4a23f2f3ea Completed initial debugging and testing of reimplemented cursor motion.
Eli Zaretskii <eliz@gnu.org>
parents: 108600
diff changeset
290 bidi_cache_size = BIDI_CACHE_CHUNK;
7e4a23f2f3ea Completed initial debugging and testing of reimplemented cursor motion.
Eli Zaretskii <eliz@gnu.org>
parents: 108600
diff changeset
291 bidi_cache =
7e4a23f2f3ea Completed initial debugging and testing of reimplemented cursor motion.
Eli Zaretskii <eliz@gnu.org>
parents: 108600
diff changeset
292 (struct bidi_it *) xrealloc (bidi_cache, bidi_cache_size * elsz);
108573
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
293 }
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
294 bidi_cache_reset ();
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
295 }
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
296
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
297 static INLINE void
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
298 bidi_cache_fetch_state (int idx, struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
299 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
300 int current_scan_dir = bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
301
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
302 if (idx < 0 || idx >= bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
303 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
304
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
305 bidi_copy_it (bidi_it, &bidi_cache[idx]);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
306 bidi_it->scan_dir = current_scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
307 bidi_cache_last_idx = idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
308 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
309
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
310 /* Find a cached state with a given CHARPOS and resolved embedding
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
311 level less or equal to LEVEL. if LEVEL is -1, disregard the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
312 resolved levels in cached states. DIR, if non-zero, means search
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
313 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
314 static INLINE int
110546
446e46eafccb Really fix int/EMACS_INT use in bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110412
diff changeset
315 bidi_cache_search (EMACS_INT charpos, int level, int dir)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
316 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
317 int i, i_start;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
318
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
319 if (bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
320 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
321 if (charpos < bidi_cache[bidi_cache_last_idx].charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
322 dir = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
323 else if (charpos > bidi_cache[bidi_cache_last_idx].charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
324 dir = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
325 if (dir)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
326 i_start = bidi_cache_last_idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
327 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
328 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
329 dir = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
330 i_start = bidi_cache_idx - 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
331 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
332
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
333 if (dir < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
334 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
335 /* Linear search for now; FIXME! */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
336 for (i = i_start; i >= 0; i--)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
337 if (bidi_cache[i].charpos == charpos
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
338 && (level == -1 || bidi_cache[i].resolved_level <= level))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
339 return i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
340 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
341 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
342 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
343 for (i = i_start; i < bidi_cache_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
344 if (bidi_cache[i].charpos == charpos
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
345 && (level == -1 || bidi_cache[i].resolved_level <= level))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
346 return i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
347 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
348 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
349
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
350 return -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
351 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
352
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
353 /* Find a cached state where the resolved level changes to a value
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
354 that is lower than LEVEL, and return its cache slot index. DIR is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
355 the direction to search, starting with the last used cache slot.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
356 BEFORE, if non-zero, means return the index of the slot that is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
357 ``before'' the level change in the search direction. That is,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
358 given the cached levels like this:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
359
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
360 1122333442211
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
361 AB C
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
362
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
363 and assuming we are at the position cached at the slot marked with
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
364 C, searching backwards (DIR = -1) for LEVEL = 2 will return the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
365 index of slot B or A, depending whether BEFORE is, respectively,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
366 non-zero or zero. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
367 static int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
368 bidi_cache_find_level_change (int level, int dir, int before)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
369 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
370 if (bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
371 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
372 int i = dir ? bidi_cache_last_idx : bidi_cache_idx - 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
373 int incr = before ? 1 : 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
374
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
375 if (!dir)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
376 dir = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
377 else if (!incr)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
378 i += dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
379
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
380 if (dir < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
381 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
382 while (i >= incr)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
383 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
384 if (bidi_cache[i - incr].resolved_level >= 0
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
385 && bidi_cache[i - incr].resolved_level < level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
386 return i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
387 i--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
388 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
389 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
390 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
391 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
392 while (i < bidi_cache_idx - incr)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
393 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
394 if (bidi_cache[i + incr].resolved_level >= 0
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
395 && bidi_cache[i + incr].resolved_level < level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
396 return i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
397 i++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
398 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
399 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
400 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
401
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
402 return -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
403 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
404
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
405 static INLINE void
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
406 bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
407 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
408 int idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
409
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
410 /* We should never cache on backward scans. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
411 if (bidi_it->scan_dir == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
412 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
413 idx = bidi_cache_search (bidi_it->charpos, -1, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
414
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
415 if (idx < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
416 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
417 idx = bidi_cache_idx;
108573
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
418 /* Enlarge the cache as needed. */
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
419 if (idx >= bidi_cache_size)
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
420 {
108657
7e4a23f2f3ea Completed initial debugging and testing of reimplemented cursor motion.
Eli Zaretskii <eliz@gnu.org>
parents: 108600
diff changeset
421 bidi_cache_size += BIDI_CACHE_CHUNK;
108573
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
422 bidi_cache =
108657
7e4a23f2f3ea Completed initial debugging and testing of reimplemented cursor motion.
Eli Zaretskii <eliz@gnu.org>
parents: 108600
diff changeset
423 (struct bidi_it *) xrealloc (bidi_cache, bidi_cache_size * elsz);
108573
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
424 }
107655
0958f6c3f7c6 Fix a crash of I-search in a bidi-reordered buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 107650
diff changeset
425 /* 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
426 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
427 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
428 if (idx > 0 &&
0958f6c3f7c6 Fix a crash of I-search in a bidi-reordered buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 107650
diff changeset
429 (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
430 || 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
431 {
0958f6c3f7c6 Fix a crash of I-search in a bidi-reordered buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 107650
diff changeset
432 bidi_cache_reset ();
0958f6c3f7c6 Fix a crash of I-search in a bidi-reordered buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 107650
diff changeset
433 idx = 0;
0958f6c3f7c6 Fix a crash of I-search in a bidi-reordered buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 107650
diff changeset
434 }
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
435 bidi_copy_it (&bidi_cache[idx], bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
436 if (!resolved)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
437 bidi_cache[idx].resolved_level = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
438 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
439 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
440 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
441 /* Copy only the members which could have changed, to avoid
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
442 costly copying of the entire struct. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
443 bidi_cache[idx].type = bidi_it->type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
444 bidi_check_type (bidi_it->type);
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
445 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
446 bidi_check_type (bidi_it->type_after_w1);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
447 if (resolved)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
448 bidi_cache[idx].resolved_level = bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
449 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
450 bidi_cache[idx].resolved_level = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
451 bidi_cache[idx].invalid_levels = bidi_it->invalid_levels;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
452 bidi_cache[idx].invalid_rl_levels = bidi_it->invalid_rl_levels;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
453 bidi_cache[idx].next_for_neutral = bidi_it->next_for_neutral;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
454 bidi_cache[idx].next_for_ws = bidi_it->next_for_ws;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
455 bidi_cache[idx].ignore_bn_limit = bidi_it->ignore_bn_limit;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
456 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
457
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
458 bidi_cache_last_idx = idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
459 if (idx >= bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
460 bidi_cache_idx = idx + 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
461 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
462
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
463 static INLINE bidi_type_t
110546
446e46eafccb Really fix int/EMACS_INT use in bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110412
diff changeset
464 bidi_cache_find (EMACS_INT charpos, int level, struct bidi_it *bidi_it)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
465 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
466 int i = bidi_cache_search (charpos, level, bidi_it->scan_dir);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
467
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
468 if (i >= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
469 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
470 bidi_dir_t current_scan_dir = bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
471
107624
552007beee69 Finish and debug display of invisible text.
Eli Zaretskii <eliz@gnu.org>
parents: 107606
diff changeset
472 bidi_copy_it (bidi_it, &bidi_cache[i]);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
473 bidi_cache_last_idx = i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
474 /* Don't let scan direction from from the cached state override
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
475 the current scan direction. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
476 bidi_it->scan_dir = current_scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
477 return bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
478 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
479
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
480 return UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
481 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
482
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
483 static INLINE int
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
484 bidi_peek_at_next_level (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
485 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
486 if (bidi_cache_idx == 0 || bidi_cache_last_idx == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
487 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
488 return bidi_cache[bidi_cache_last_idx + bidi_it->scan_dir].resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
489 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
490
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
491 /* 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
492 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
493 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
494 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
495 at end of a paragraph. */
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
496 static EMACS_INT
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
497 bidi_at_paragraph_end (EMACS_INT charpos, EMACS_INT bytepos)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
498 {
108030
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
499 Lisp_Object sep_re;
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
500 Lisp_Object start_re;
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
501 EMACS_INT val;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
502
108030
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
503 sep_re = paragraph_separate_re;
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
504 start_re = paragraph_start_re;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
505
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
506 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
507 if (val < 0)
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
508 {
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
509 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
510 val = -1;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
511 else
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
512 val = -2;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
513 }
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
514
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
515 return val;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
516 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
517
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
518 /* Determine the start-of-run (sor) directional type given the two
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
519 embedding levels on either side of the run boundary. Also, update
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
520 the saved info about previously seen characters, since that info is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
521 generally valid for a single level run. */
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
522 static INLINE void
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
523 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
524 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
525 int higher_level = level_before > level_after ? level_before : level_after;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
526
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
527 /* The prev_was_pdf gork is required for when we have several PDFs
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
528 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
529 next level run only once: when we see the first PDF. That's
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
530 because the sor type depends only on the higher of the two levels
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
531 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
532 clause X10), and so we don't need to know the final embedding
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
533 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
534 if (!bidi_it->prev_was_pdf || level_before < level_after)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
535 /* FIXME: should the default sor direction be user selectable? */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
536 bidi_it->sor = (higher_level & 1) != 0 ? R2L : L2R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
537 if (level_before > level_after)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
538 bidi_it->prev_was_pdf = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
539
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
540 bidi_it->prev.type = UNKNOWN_BT;
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
541 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
542 bidi_it->last_strong.orig_type = UNKNOWN_BT;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
543 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
544 bidi_it->prev_for_neutral.charpos = bidi_it->charpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
545 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
546 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
547 bidi_it->next_for_neutral.orig_type = UNKNOWN_BT;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
548 bidi_it->ignore_bn_limit = 0; /* meaning it's unknown */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
549 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
550
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
551 static void
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
552 bidi_line_init (struct bidi_it *bidi_it)
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
553 {
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
554 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
555 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
556 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
557 bidi_it->invalid_levels = 0;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
558 bidi_it->invalid_rl_levels = -1;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
559 bidi_it->next_en_pos = -1;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
560 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
561 bidi_set_sor_type (bidi_it,
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
562 bidi_it->paragraph_dir == R2L ? 1 : 0,
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
563 bidi_it->level_stack[0].level); /* X10 */
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
564
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
565 bidi_cache_reset ();
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
566 }
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
567
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
568 /* 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
569 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
570 static EMACS_INT
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
571 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
572 {
108030
c964c5fcf1f2 Fix bug #5992.
Eli Zaretskii <eliz@gnu.org>
parents: 108003
diff changeset
573 Lisp_Object re = paragraph_start_re;
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
574 EMACS_INT limit = ZV, limit_byte = ZV_BYTE;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
575
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
576 while (pos_byte > BEGV_BYTE
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
577 && 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
578 {
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
579 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
580 pos_byte = CHAR_TO_BYTE (pos);
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
581 }
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
582 return pos_byte;
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
583 }
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
584
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
585 /* Determine the base 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
586 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
587 R2L, just use that. Otherwise, determine the paragraph direction
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
588 from the first strong directional character of the paragraph.
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
589
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
590 NO_DEFAULT_P non-nil means don't default to L2R if the paragraph
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
591 has no strong directional characters and both DIR and
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
592 bidi_it->paragraph_dir are NEUTRAL_DIR. In that case, search back
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
593 in the buffer until a paragraph is found with a strong character,
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
594 or until hitting BEGV. In the latter case, fall back to L2R. This
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
595 flag is used in current-bidi-paragraph-direction.
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
596
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
597 Note that this function gives the paragraph separator the same
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
598 direction as the preceding paragraph, even though Emacs generally
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
599 views the separartor as not belonging to any paragraph. */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
600 void
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
601 bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it, int no_default_p)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
602 {
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
603 EMACS_INT bytepos = bidi_it->bytepos;
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
604 EMACS_INT pstartbyte;
107591
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
605
107598
4bad2c6338cc Retrospective commit from 2009-10-17.
Eli Zaretskii <eliz@gnu.org>
parents: 107597
diff changeset
606 /* Special case for an empty buffer. */
4bad2c6338cc Retrospective commit from 2009-10-17.
Eli Zaretskii <eliz@gnu.org>
parents: 107597
diff changeset
607 if (bytepos == BEGV_BYTE && bytepos == ZV_BYTE)
4bad2c6338cc Retrospective commit from 2009-10-17.
Eli Zaretskii <eliz@gnu.org>
parents: 107597
diff changeset
608 dir = L2R;
107591
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
609 /* 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
610 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
611 abort ();
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
612
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
613 if (dir == L2R)
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
614 {
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
615 bidi_it->paragraph_dir = L2R;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
616 bidi_it->new_paragraph = 0;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
617 }
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
618 else if (dir == R2L)
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
619 {
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
620 bidi_it->paragraph_dir = R2L;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
621 bidi_it->new_paragraph = 0;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
622 }
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
623 else if (dir == NEUTRAL_DIR) /* P2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
624 {
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
625 int ch, ch_len;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
626 EMACS_INT pos;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
627 bidi_type_t type;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
628
108596
cd5442b2826b Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents: 108573
diff changeset
629 if (!bidi_initialized)
cd5442b2826b Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents: 108573
diff changeset
630 bidi_initialize ();
cd5442b2826b Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents: 108573
diff changeset
631
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
632 /* 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
633 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
634 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
635 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
636 if (!bidi_it->first_elt
7361a2f37d8e Retrospective commit from 2009-10-10.
Eli Zaretskii <eliz@gnu.org>
parents: 107596
diff changeset
637 && bidi_it->charpos < bidi_it->separator_limit)
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
638 return;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
639
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
640 /* 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
641 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
642 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
643 exist. */
107596
866e76f8ad75 Retrospective commit from 2009-10-08.
Eli Zaretskii <eliz@gnu.org>
parents: 107595
diff changeset
644 pos = bidi_it->charpos;
107598
4bad2c6338cc Retrospective commit from 2009-10-17.
Eli Zaretskii <eliz@gnu.org>
parents: 107597
diff changeset
645 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
646 {
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
647 bytepos++;
107596
866e76f8ad75 Retrospective commit from 2009-10-08.
Eli Zaretskii <eliz@gnu.org>
parents: 107595
diff changeset
648 pos++;
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
649 }
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
650
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
651 /* 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
652 middle of it. Find where this paragraph starts. */
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
653 pstartbyte = bidi_find_paragraph_start (pos, bytepos);
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
654 bidi_it->separator_limit = -1;
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
655 bidi_it->new_paragraph = 0;
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
656
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
657 /* The following loop is run more than once only if NO_DEFAULT_P
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
658 is non-zero. */
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
659 do {
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
660 bytepos = pstartbyte;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
661 ch = FETCH_CHAR (bytepos);
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
662 ch_len = CHAR_BYTES (ch);
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
663 pos = BYTE_TO_CHAR (bytepos);
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
664 type = bidi_get_type (ch, NEUTRAL_DIR);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
665
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
666 for (pos++, bytepos += ch_len;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
667 /* NOTE: UAX#9 says to search only for L, AL, or R types
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
668 of characters, and ignore RLE, RLO, LRE, and LRO.
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
669 However, I'm not sure it makes sense to omit those 4;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
670 should try with and without that to see the effect. */
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
671 (bidi_get_category (type) != STRONG)
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
672 || (bidi_ignore_explicit_marks_for_paragraph_level
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
673 && (type == RLE || type == RLO
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
674 || type == LRE || type == LRO));
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
675 type = bidi_get_type (ch, NEUTRAL_DIR))
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
676 {
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
677 if (type == NEUTRAL_B && bidi_at_paragraph_end (pos, bytepos) >= -1)
107601
ee023eee6207 Retrospective commit from 2009-11-07.
Eli Zaretskii <eliz@gnu.org>
parents: 107599
diff changeset
678 break;
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
679 if (bytepos >= ZV_BYTE)
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
680 {
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
681 /* Pretend there's a paragraph separator at end of
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
682 buffer. */
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
683 type = NEUTRAL_B;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
684 break;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
685 }
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
686 FETCH_CHAR_ADVANCE (ch, pos, bytepos);
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
687 }
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
688 if (type == STRONG_R || type == STRONG_AL) /* P3 */
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
689 bidi_it->paragraph_dir = R2L;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
690 else if (type == STRONG_L)
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
691 bidi_it->paragraph_dir = L2R;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
692 if (no_default_p && bidi_it->paragraph_dir == NEUTRAL_DIR)
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
693 {
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
694 /* If this paragraph is at BEGV, default to L2R. */
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
695 if (pstartbyte == BEGV_BYTE)
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
696 bidi_it->paragraph_dir = L2R; /* P3 and HL1 */
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
697 else
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
698 {
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
699 EMACS_INT prevpbyte = pstartbyte;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
700 EMACS_INT p = BYTE_TO_CHAR (pstartbyte), pbyte = pstartbyte;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
701
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
702 /* Find the beginning of the previous paragraph, if any. */
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
703 while (pbyte > BEGV_BYTE && prevpbyte >= pstartbyte)
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
704 {
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
705 p--;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
706 pbyte = CHAR_TO_BYTE (p);
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
707 prevpbyte = bidi_find_paragraph_start (p, pbyte);
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
708 }
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
709 pstartbyte = prevpbyte;
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
710 }
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
711 }
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
712 } while (no_default_p && bidi_it->paragraph_dir == NEUTRAL_DIR);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
713 }
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
714 else
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
715 abort ();
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
716
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
717 /* 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
718 direction to L2R if we have no previous usable paragraph
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
719 direction. This is allowed by the HL1 clause. */
108596
cd5442b2826b Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents: 108573
diff changeset
720 if (bidi_it->paragraph_dir != L2R && bidi_it->paragraph_dir != R2L)
110412
f67e6d84ff96 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
Eli Zaretskii <eliz@gnu.org>
parents: 109844
diff changeset
721 bidi_it->paragraph_dir = L2R; /* P3 and HL1 ``higher-level protocols'' */
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
722 if (bidi_it->paragraph_dir == R2L)
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
723 bidi_it->level_stack[0].level = 1;
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
724 else
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
725 bidi_it->level_stack[0].level = 0;
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
726
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
727 bidi_line_init (bidi_it);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
728 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
729
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
730 /* 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
731 end. */
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
732 static INLINE void
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
733 bidi_set_paragraph_end (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
734 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
735 bidi_it->invalid_levels = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
736 bidi_it->invalid_rl_levels = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
737 bidi_it->stack_idx = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
738 bidi_it->resolved_level = bidi_it->level_stack[0].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
739 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
740
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
741 /* Initialize the bidi iterator from buffer position CHARPOS. */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
742 void
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
743 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
744 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
745 if (! bidi_initialized)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
746 bidi_initialize ();
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
747 bidi_it->charpos = charpos;
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
748 bidi_it->bytepos = bytepos;
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
749 bidi_it->first_elt = 1;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
750 bidi_set_paragraph_end (bidi_it);
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
751 bidi_it->new_paragraph = 1;
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
752 bidi_it->separator_limit = -1;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
753 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
754 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
755 bidi_it->orig_type = NEUTRAL_B;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
756 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
757 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
758 bidi_it->prev.orig_type = UNKNOWN_BT;
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
759 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
760 bidi_it->last_strong.orig_type = UNKNOWN_BT;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
761 bidi_it->next_for_neutral.charpos = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
762 bidi_it->next_for_neutral.type =
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
763 bidi_it->next_for_neutral.type_after_w1 =
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
764 bidi_it->next_for_neutral.orig_type = UNKNOWN_BT;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
765 bidi_it->prev_for_neutral.charpos = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
766 bidi_it->prev_for_neutral.type =
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
767 bidi_it->prev_for_neutral.type_after_w1 =
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
768 bidi_it->prev_for_neutral.orig_type = UNKNOWN_BT;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
769 bidi_it->sor = L2R; /* FIXME: should it be user-selectable? */
108573
77c3f2ebea52 Make the cache of bidi iterator states dynamically allocated.
Eli Zaretskii <eliz@gnu.org>
parents: 108571
diff changeset
770 bidi_cache_shrink ();
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 /* Push the current embedding level and override status; reset the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
774 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
775 static INLINE void
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
776 bidi_push_embedding_level (struct bidi_it *bidi_it,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
777 int level, bidi_dir_t override)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
778 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
779 bidi_it->stack_idx++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
780 if (bidi_it->stack_idx >= BIDI_MAXLEVEL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
781 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
782 bidi_it->level_stack[bidi_it->stack_idx].level = level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
783 bidi_it->level_stack[bidi_it->stack_idx].override = override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
784 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
785
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
786 /* Pop the embedding level and directional override status from the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
787 stack, and return the new level. */
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
788 static INLINE int
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
789 bidi_pop_embedding_level (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
790 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
791 /* UAX#9 says to ignore invalid PDFs. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
792 if (bidi_it->stack_idx > 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
793 bidi_it->stack_idx--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
794 return bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
795 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
796
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
797 /* 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
798 static INLINE void
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
799 bidi_remember_char (struct bidi_saved_info *saved_info,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
800 struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
801 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
802 saved_info->charpos = bidi_it->charpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
803 saved_info->bytepos = bidi_it->bytepos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
804 saved_info->type = bidi_it->type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
805 bidi_check_type (bidi_it->type);
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
806 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
807 bidi_check_type (bidi_it->type_after_w1);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
808 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
809 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
810 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
811
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
812 /* Resolve the type of a neutral character according to the type of
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
813 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
814 static INLINE bidi_type_t
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
815 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
816 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
817 /* N1: European and Arabic numbers are treated as though they were R. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
818 if (next_type == WEAK_EN || next_type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
819 next_type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
820 if (prev_type == WEAK_EN || prev_type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
821 prev_type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
822
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
823 if (next_type == prev_type) /* N1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
824 return next_type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
825 else if ((lev & 1) == 0) /* N2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
826 return STRONG_L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
827 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
828 return STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
829 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
830
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
831 static INLINE int
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
832 bidi_explicit_dir_char (int c)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
833 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
834 /* FIXME: this should be replaced with a lookup table with suitable
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
835 bits set, like standard C ctype macros do. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
836 return (c == LRE_CHAR || c == LRO_CHAR
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
837 || c == RLE_CHAR || c == RLO_CHAR || c == PDF_CHAR);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
838 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
839
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
840 /* A helper function for bidi_resolve_explicit. It advances to the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
841 next character in logical order and determines the new embedding
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
842 level and directional override, but does not take into account
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
843 empty embeddings. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
844 static int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
845 bidi_resolve_explicit_1 (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
846 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
847 int curchar;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
848 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
849 int current_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
850 int new_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
851 bidi_dir_t override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
852
107591
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
853 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
854 || bidi_it->first_elt)
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
855 {
107591
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
856 bidi_it->first_elt = 0;
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
857 if (bidi_it->charpos < BEGV)
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
858 bidi_it->charpos = BEGV;
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
859 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
860 }
107591
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
861 else if (bidi_it->bytepos < ZV_BYTE) /* don't move at ZV */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
862 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
863 bidi_it->charpos++;
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
864 if (bidi_it->ch_len == 0)
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
865 abort ();
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
866 bidi_it->bytepos += bidi_it->ch_len;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
867 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
868
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
869 current_level = bidi_it->level_stack[bidi_it->stack_idx].level; /* X1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
870 override = bidi_it->level_stack[bidi_it->stack_idx].override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
871 new_level = current_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
872
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
873 /* in case it is a unibyte character (not yet implemented) */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
874 /* _fetch_multibyte_char_len = 1; */
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
875 if (bidi_it->bytepos >= ZV_BYTE)
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
876 {
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
877 curchar = BIDI_EOB;
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
878 bidi_it->ch_len = 1;
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
879 }
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
880 else
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
881 {
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
882 curchar = FETCH_CHAR (bidi_it->bytepos);
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
883 bidi_it->ch_len = CHAR_BYTES (curchar);
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
884 }
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
885 bidi_it->ch = curchar;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
886
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
887 /* 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
888 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
889 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
890 bidi_resolve_weak. */
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
891 type = bidi_get_type (curchar, NEUTRAL_DIR);
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
892 bidi_it->orig_type = type;
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
893 bidi_check_type (bidi_it->orig_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
894
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
895 if (type != PDF)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
896 bidi_it->prev_was_pdf = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
897
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
898 bidi_it->type_after_w1 = UNKNOWN_BT;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
899
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
900 switch (type)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
901 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
902 case RLE: /* X2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
903 case RLO: /* X4 */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
904 bidi_it->type_after_w1 = type;
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
905 bidi_check_type (bidi_it->type_after_w1);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
906 type = WEAK_BN; /* X9/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
907 if (bidi_it->ignore_bn_limit <= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
908 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
909 if (current_level <= BIDI_MAXLEVEL - 4)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
910 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
911 /* Compute the least odd embedding level greater than
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
912 the current level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
913 new_level = ((current_level + 1) & ~1) + 1;
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
914 if (bidi_it->type_after_w1 == RLE)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
915 override = NEUTRAL_DIR;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
916 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
917 override = R2L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
918 if (current_level == BIDI_MAXLEVEL - 4)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
919 bidi_it->invalid_rl_levels = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
920 bidi_push_embedding_level (bidi_it, new_level, override);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
921 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
922 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
923 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
924 bidi_it->invalid_levels++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
925 /* See the commentary about invalid_rl_levels below. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
926 if (bidi_it->invalid_rl_levels < 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
927 bidi_it->invalid_rl_levels = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
928 bidi_it->invalid_rl_levels++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
929 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
930 }
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
931 else if (bidi_it->prev.type_after_w1 == WEAK_EN /* W5/Retaining */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
932 || bidi_it->next_en_pos > bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
933 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
934 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
935 case LRE: /* X3 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
936 case LRO: /* X5 */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
937 bidi_it->type_after_w1 = type;
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
938 bidi_check_type (bidi_it->type_after_w1);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
939 type = WEAK_BN; /* X9/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
940 if (bidi_it->ignore_bn_limit <= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
941 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
942 if (current_level <= BIDI_MAXLEVEL - 5)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
943 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
944 /* Compute the least even embedding level greater than
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
945 the current level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
946 new_level = ((current_level + 2) & ~1);
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
947 if (bidi_it->type_after_w1 == LRE)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
948 override = NEUTRAL_DIR;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
949 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
950 override = L2R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
951 bidi_push_embedding_level (bidi_it, new_level, override);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
952 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
953 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
954 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
955 bidi_it->invalid_levels++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
956 /* invalid_rl_levels counts invalid levels encountered
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
957 while the embedding level was already too high for
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
958 LRE/LRO, but not for RLE/RLO. That is because
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
959 there may be exactly one PDF which we should not
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
960 ignore even though invalid_levels is non-zero.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
961 invalid_rl_levels helps to know what PDF is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
962 that. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
963 if (bidi_it->invalid_rl_levels >= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
964 bidi_it->invalid_rl_levels++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
965 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
966 }
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
967 else if (bidi_it->prev.type_after_w1 == WEAK_EN /* W5/Retaining */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
968 || bidi_it->next_en_pos > bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
969 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
970 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
971 case PDF: /* X7 */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
972 bidi_it->type_after_w1 = type;
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
973 bidi_check_type (bidi_it->type_after_w1);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
974 type = WEAK_BN; /* X9/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
975 if (bidi_it->ignore_bn_limit <= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
976 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
977 if (!bidi_it->invalid_rl_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
978 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
979 new_level = bidi_pop_embedding_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
980 bidi_it->invalid_rl_levels = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
981 if (bidi_it->invalid_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
982 bidi_it->invalid_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
983 /* else nothing: UAX#9 says to ignore invalid PDFs */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
984 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
985 if (!bidi_it->invalid_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
986 new_level = bidi_pop_embedding_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
987 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
988 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
989 bidi_it->invalid_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
990 bidi_it->invalid_rl_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
991 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
992 }
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
993 else if (bidi_it->prev.type_after_w1 == WEAK_EN /* W5/Retaining */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
994 || bidi_it->next_en_pos > bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
995 type = WEAK_EN;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
996 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
997 default:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
998 /* Nothing. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
999 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1000 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1001
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1002 bidi_it->type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1003 bidi_check_type (bidi_it->type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1004
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1005 return new_level;
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 /* Given an iterator state in BIDI_IT, advance one character position
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1009 in the buffer to the next character (in the logical order), resolve
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1010 any explicit embeddings and directional overrides, and return the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1011 embedding level of the character after resolving explicit
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1012 directives and ignoring empty embeddings. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1013 static int
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1014 bidi_resolve_explicit (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1015 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1016 int prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1017 int new_level = bidi_resolve_explicit_1 (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1018
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1019 if (prev_level < new_level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1020 && bidi_it->type == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1021 && 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
1022 && bidi_it->bytepos < ZV_BYTE /* not already at EOB */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1023 && bidi_explicit_dir_char (FETCH_CHAR (bidi_it->bytepos
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1024 + bidi_it->ch_len)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1025 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1026 /* Avoid pushing and popping embedding levels if the level run
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1027 is empty, as this breaks level runs where it shouldn't.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1028 UAX#9 removes all the explicit embedding and override codes,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1029 so empty embeddings disappear without a trace. We need to
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1030 behave as if we did the same. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1031 struct bidi_it saved_it;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1032 int level = prev_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1033
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1034 bidi_copy_it (&saved_it, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1035
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1036 while (bidi_explicit_dir_char (FETCH_CHAR (bidi_it->bytepos
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1037 + bidi_it->ch_len)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1038 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1039 level = bidi_resolve_explicit_1 (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1040 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1041
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1042 if (level == prev_level) /* empty embedding */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1043 saved_it.ignore_bn_limit = bidi_it->charpos + 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1044 else /* this embedding is non-empty */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1045 saved_it.ignore_bn_limit = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1046
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1047 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1048 if (bidi_it->ignore_bn_limit > 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1049 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1050 /* We pushed a level, but we shouldn't have. Undo that. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1051 if (!bidi_it->invalid_rl_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1052 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1053 new_level = bidi_pop_embedding_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1054 bidi_it->invalid_rl_levels = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1055 if (bidi_it->invalid_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1056 bidi_it->invalid_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1057 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1058 if (!bidi_it->invalid_levels)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1059 new_level = bidi_pop_embedding_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1060 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1061 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1062 bidi_it->invalid_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1063 bidi_it->invalid_rl_levels--;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1064 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1065 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1066 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1067
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1068 if (bidi_it->type == NEUTRAL_B) /* X8 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1069 {
107601
ee023eee6207 Retrospective commit from 2009-11-07.
Eli Zaretskii <eliz@gnu.org>
parents: 107599
diff changeset
1070 bidi_set_paragraph_end (bidi_it);
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
1071 /* 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
1072 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
1073 bidi_check_type (bidi_it->type_after_w1);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1074 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1075
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1076 return new_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1077 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1078
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1079 /* Advance in the buffer, resolve weak types and return the type of
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1080 the next character after weak type resolution. */
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
1081 static bidi_type_t
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1082 bidi_resolve_weak (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1083 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1084 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1085 bidi_dir_t override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1086 int prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1087 int new_level = bidi_resolve_explicit (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1088 int next_char;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1089 bidi_type_t type_of_next;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1090 struct bidi_it saved_it;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1091
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1092 type = bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1093 override = bidi_it->level_stack[bidi_it->stack_idx].override;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1094
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1095 if (type == UNKNOWN_BT
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1096 || type == LRE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1097 || type == LRO
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1098 || type == RLE
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1099 || type == RLO
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1100 || type == PDF)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1101 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1102
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1103 if (new_level != prev_level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1104 || bidi_it->type == NEUTRAL_B)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1105 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1106 /* We've got a new embedding level run, compute the directional
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1107 type of sor and initialize per-run variables (UAX#9, clause
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1108 X10). */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1109 bidi_set_sor_type (bidi_it, prev_level, new_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1110 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1111 else if (type == NEUTRAL_S || type == NEUTRAL_WS
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1112 || type == WEAK_BN || type == STRONG_AL)
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1113 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
1114 bidi_check_type (bidi_it->type_after_w1);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1115
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1116 /* Level and directional override status are already recorded in
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1117 bidi_it, and do not need any change; see X6. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1118 if (override == R2L) /* X6 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1119 type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1120 else if (override == L2R)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1121 type = STRONG_L;
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1122 else
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1123 {
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1124 if (type == WEAK_NSM) /* W1 */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1125 {
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1126 /* 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
1127 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
1128 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
1129 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
1130 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
1131 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
1132 character. */
107884
8b1a353e3aab Fix a crash when an NSM character is inserted at BEGV.
Eli Zaretskii <eliz@gnu.org>
parents: 107806
diff changeset
1133 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
1134 /* 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
1135 && 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
1136 type = bidi_it->prev.type_after_w1;
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1137 else if (bidi_it->sor == R2L)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1138 type = STRONG_R;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1139 else if (bidi_it->sor == L2R)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1140 type = STRONG_L;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1141 else /* shouldn't happen! */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1142 abort ();
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1143 }
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1144 if (type == WEAK_EN /* W2 */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1145 && bidi_it->last_strong.type_after_w1 == STRONG_AL)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1146 type = WEAK_AN;
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1147 else if (type == STRONG_AL) /* W3 */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1148 type = STRONG_R;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1149 else if ((type == WEAK_ES /* W4 */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1150 && bidi_it->prev.type_after_w1 == WEAK_EN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1151 && bidi_it->prev.orig_type == WEAK_EN)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1152 || (type == WEAK_CS
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1153 && ((bidi_it->prev.type_after_w1 == WEAK_EN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1154 && bidi_it->prev.orig_type == WEAK_EN)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1155 || bidi_it->prev.type_after_w1 == WEAK_AN)))
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1156 {
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
1157 next_char =
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
1158 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
1159 ? 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
1160 type_of_next = bidi_get_type (next_char, override);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1161
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1162 if (type_of_next == WEAK_BN
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1163 || bidi_explicit_dir_char (next_char))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1164 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1165 bidi_copy_it (&saved_it, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1166 while (bidi_resolve_explicit (bidi_it) == new_level
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1167 && bidi_it->type == WEAK_BN)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1168 ;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1169 type_of_next = bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1170 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1171 }
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1172
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1173 /* 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
1174 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
1175 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
1176 should not be changed into EN. */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1177 if (type == WEAK_ES
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1178 && type_of_next == WEAK_EN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1179 && bidi_it->last_strong.type_after_w1 != STRONG_AL)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1180 type = WEAK_EN;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1181 else if (type == WEAK_CS)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1182 {
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1183 if (bidi_it->prev.type_after_w1 == WEAK_AN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1184 && (type_of_next == WEAK_AN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1185 /* If the next character is EN, but the last
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1186 strong-type character is AL, EN will be later
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1187 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
1188 So in that case, this ES should not be
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1189 changed into EN. */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1190 || (type_of_next == WEAK_EN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1191 && bidi_it->last_strong.type_after_w1 == STRONG_AL)))
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1192 type = WEAK_AN;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1193 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
1194 && type_of_next == WEAK_EN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1195 && bidi_it->last_strong.type_after_w1 != STRONG_AL)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1196 type = WEAK_EN;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1197 }
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1198 }
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1199 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
1200 || type == WEAK_BN) /* W5/Retaining */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1201 {
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1202 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
1203 || bidi_it->next_en_pos > bidi_it->charpos)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1204 type = WEAK_EN;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1205 else /* W5: ET/BN with EN after it. */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1206 {
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1207 EMACS_INT en_pos = bidi_it->charpos + 1;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1208
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1209 next_char =
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1210 bidi_it->bytepos + bidi_it->ch_len >= ZV_BYTE
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1211 ? 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
1212 type_of_next = bidi_get_type (next_char, override);
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1213
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1214 if (type_of_next == WEAK_ET
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1215 || type_of_next == WEAK_BN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1216 || bidi_explicit_dir_char (next_char))
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1217 {
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1218 bidi_copy_it (&saved_it, bidi_it);
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1219 while (bidi_resolve_explicit (bidi_it) == new_level
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1220 && (bidi_it->type == WEAK_BN
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1221 || bidi_it->type == WEAK_ET))
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1222 ;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1223 type_of_next = bidi_it->type;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1224 en_pos = bidi_it->charpos;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1225 bidi_copy_it (bidi_it, &saved_it);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1226 }
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1227 if (type_of_next == WEAK_EN)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1228 {
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1229 /* 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
1230 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
1231 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
1232 {
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1233 type = WEAK_EN;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1234 /* Remember this EN position, to speed up processing
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1235 of the next ETs. */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1236 bidi_it->next_en_pos = en_pos;
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1237 }
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1238 else if (type == WEAK_BN)
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1239 type = NEUTRAL_ON; /* W6/Retaining */
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107604
diff changeset
1240 }
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1241 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1242 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1243 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1244
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1245 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
1246 || (type == WEAK_BN
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1247 && (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
1248 || bidi_it->prev.type_after_w1 == WEAK_ES
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1249 || bidi_it->prev.type_after_w1 == WEAK_ET)))
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1250 type = NEUTRAL_ON;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1251
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1252 /* 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
1253 types in W7 and while resolving neutral types. But leave alone
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1254 the original types that were recorded above, because we will need
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1255 them for the L1 clause. */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1256 if (bidi_it->type_after_w1 == UNKNOWN_BT)
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1257 bidi_it->type_after_w1 = type;
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1258 bidi_check_type (bidi_it->type_after_w1);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1259
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1260 if (type == WEAK_EN) /* W7 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1261 {
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1262 if ((bidi_it->last_strong.type_after_w1 == STRONG_L)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1263 || (bidi_it->last_strong.type == UNKNOWN_BT && bidi_it->sor == L2R))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1264 type = STRONG_L;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1265 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1266
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1267 bidi_it->type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1268 bidi_check_type (bidi_it->type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1269 return type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1270 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1271
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
1272 static bidi_type_t
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1273 bidi_resolve_neutral (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1274 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1275 int prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1276 bidi_type_t type = bidi_resolve_weak (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1277 int current_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1278
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1279 if (!(type == STRONG_R
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1280 || type == STRONG_L
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1281 || type == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1282 || type == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1283 || type == WEAK_AN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1284 || type == NEUTRAL_B
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1285 || type == NEUTRAL_S
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1286 || type == NEUTRAL_WS
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1287 || type == NEUTRAL_ON))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1288 abort ();
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_get_category (type) == NEUTRAL
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1291 || (type == WEAK_BN && prev_level == current_level))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1292 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1293 if (bidi_it->next_for_neutral.type != UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1294 type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1295 bidi_it->next_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1296 current_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1297 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1298 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1299 /* Arrrgh!! The UAX#9 algorithm is too deeply entrenched in
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1300 the assumption of batch-style processing; see clauses W4,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1301 W5, and especially N1, which require to look far forward
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1302 (as well as back) in the buffer. May the fleas of a
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1303 thousand camels infest the armpits of those who design
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1304 supposedly general-purpose algorithms by looking at their
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1305 own implementations, and fail to consider other possible
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1306 implementations! */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1307 struct bidi_it saved_it;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1308 bidi_type_t next_type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1309
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1310 if (bidi_it->scan_dir == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1311 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1312
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1313 bidi_copy_it (&saved_it, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1314 /* Scan the text forward until we find the first non-neutral
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1315 character, and then use that to resolve the neutral we
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1316 are dealing with now. We also cache the scanned iterator
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1317 states, to salvage some of the effort later. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1318 bidi_cache_iterator_state (bidi_it, 0);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1319 do {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1320 /* Record the info about the previous character, so that
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1321 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
1322 if (bidi_it->type_after_w1 != WEAK_BN /* W1/Retaining */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1323 && bidi_it->type != WEAK_BN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1324 bidi_remember_char (&bidi_it->prev, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1325 type = bidi_resolve_weak (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1326 /* Paragraph separators have their levels fully resolved
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1327 at this point, so cache them as resolved. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1328 bidi_cache_iterator_state (bidi_it, type == NEUTRAL_B);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1329 /* FIXME: implement L1 here, by testing for a newline and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1330 resetting the level for any sequence of whitespace
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1331 characters adjacent to it. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1332 } while (!(type == NEUTRAL_B
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1333 || (type != WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1334 && bidi_get_category (type) != NEUTRAL)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1335 /* This is all per level run, so stop when we
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1336 reach the end of this level run. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1337 || bidi_it->level_stack[bidi_it->stack_idx].level !=
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1338 current_level));
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1339
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1340 bidi_remember_char (&saved_it.next_for_neutral, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1341
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1342 switch (type)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1343 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1344 case STRONG_L:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1345 case STRONG_R:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1346 case STRONG_AL:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1347 next_type = type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1348 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1349 case WEAK_EN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1350 case WEAK_AN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1351 /* N1: ``European and Arabic numbers are treated as
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1352 though they were R.'' */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1353 next_type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1354 saved_it.next_for_neutral.type = STRONG_R;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1355 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1356 case WEAK_BN:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1357 if (!bidi_explicit_dir_char (bidi_it->ch))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1358 abort (); /* can't happen: BNs are skipped */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1359 /* FALLTHROUGH */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1360 case NEUTRAL_B:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1361 /* Marched all the way to the end of this level run.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1362 We need to use the eor type, whose information is
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1363 stored by bidi_set_sor_type in the prev_for_neutral
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1364 member. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1365 if (saved_it.type != WEAK_BN
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1366 || bidi_get_category (bidi_it->prev.type_after_w1) == NEUTRAL)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1367 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1368 next_type = bidi_it->prev_for_neutral.type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1369 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
1370 bidi_check_type (next_type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1371 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1372 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1373 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1374 /* This is a BN which does not adjoin neutrals.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1375 Leave its type alone. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1376 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1377 return bidi_it->type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1378 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1379 break;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1380 default:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1381 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1382 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1383 type = bidi_resolve_neutral_1 (saved_it.prev_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1384 next_type, current_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1385 saved_it.type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1386 bidi_check_type (type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1387 bidi_copy_it (bidi_it, &saved_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1388 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1389 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1390 return type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1391 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1392
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1393 /* Given an iterator state in BIDI_IT, advance one character position
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1394 in the buffer to the next character (in the logical order), resolve
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1395 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
1396 static bidi_type_t
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1397 bidi_type_of_next_char (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1398 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1399 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1400
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1401 /* This should always be called during a forward scan. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1402 if (bidi_it->scan_dir != 1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1403 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1404
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1405 /* 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
1406 area where we found only empty levels. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1407 if ((bidi_it->ignore_bn_limit > 0
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1408 && bidi_it->ignore_bn_limit <= bidi_it->charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1409 || (bidi_it->ignore_bn_limit == -1
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1410 && !bidi_explicit_dir_char (bidi_it->ch)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1411 bidi_it->ignore_bn_limit = 0;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1412
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1413 type = bidi_resolve_neutral (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1414
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1415 return type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1416 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1417
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1418 /* Given an iterator state BIDI_IT, advance one character position in
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1419 the buffer to the next character (in the logical order), resolve
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1420 the embedding and implicit levels of that next character, and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1421 return the resulting level. */
107981
f52b0e29b841 Cosmetic changes in src/bidi.c.
Eli Zaretskii <eliz@gnu.org>
parents: 107980
diff changeset
1422 static int
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1423 bidi_level_of_next_char (struct bidi_it *bidi_it)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1424 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1425 bidi_type_t type;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1426 int level, prev_level = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1427 struct bidi_saved_info next_for_neutral;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1428
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1429 if (bidi_it->scan_dir == 1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1430 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1431 /* 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
1432 if (bidi_it->bytepos >= ZV_BYTE)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1433 return bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1434
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1435 /* Record the info about the previous character. */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1436 if (bidi_it->type_after_w1 != WEAK_BN /* W1/Retaining */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1437 && bidi_it->type != WEAK_BN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1438 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
1439 if (bidi_it->type_after_w1 == STRONG_R
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1440 || bidi_it->type_after_w1 == STRONG_L
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1441 || bidi_it->type_after_w1 == STRONG_AL)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1442 bidi_remember_char (&bidi_it->last_strong, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1443 /* FIXME: it sounds like we don't need both prev and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1444 prev_for_neutral members, but I'm leaving them both for now. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1445 if (bidi_it->type == STRONG_R || bidi_it->type == STRONG_L
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1446 || bidi_it->type == WEAK_EN || bidi_it->type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1447 bidi_remember_char (&bidi_it->prev_for_neutral, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1448
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1449 /* If we overstepped the characters used for resolving neutrals
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1450 and whitespace, invalidate their info in the iterator. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1451 if (bidi_it->charpos >= bidi_it->next_for_neutral.charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1452 bidi_it->next_for_neutral.type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1453 if (bidi_it->next_en_pos >= 0
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1454 && bidi_it->charpos >= bidi_it->next_en_pos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1455 bidi_it->next_en_pos = -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1456 if (bidi_it->next_for_ws.type != UNKNOWN_BT
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1457 && bidi_it->charpos >= bidi_it->next_for_ws.charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1458 bidi_it->next_for_ws.type = UNKNOWN_BT;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1459
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1460 /* This must be taken before we fill the iterator with the info
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1461 about the next char. If we scan backwards, the iterator
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1462 state must be already cached, so there's no need to know the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1463 embedding level of the previous character, since we will be
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1464 returning to our caller shortly. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1465 prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1466 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1467 next_for_neutral = bidi_it->next_for_neutral;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1468
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1469 /* Perhaps it is already cached. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1470 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
1471 if (type != UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1472 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1473 /* Don't lose the information for resolving neutrals! The
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1474 cached states could have been cached before their
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1475 next_for_neutral member was computed. If we are on our way
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1476 forward, we can simply take the info from the previous
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1477 state. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1478 if (bidi_it->scan_dir == 1
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1479 && bidi_it->next_for_neutral.type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1480 bidi_it->next_for_neutral = next_for_neutral;
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 resolved_level is -1, it means this state was cached
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1483 before it was completely resolved, so we cannot return
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1484 it. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1485 if (bidi_it->resolved_level != -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1486 return bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1487 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1488 if (bidi_it->scan_dir == -1)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1489 /* If we are going backwards, the iterator state is already cached
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1490 from previous scans, and should be fully resolved. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1491 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1492
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1493 if (type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1494 type = bidi_type_of_next_char (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1495
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1496 if (type == NEUTRAL_B)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1497 return bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1498
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1499 level = bidi_it->level_stack[bidi_it->stack_idx].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1500 if ((bidi_get_category (type) == NEUTRAL /* && type != NEUTRAL_B */)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1501 || (type == WEAK_BN && prev_level == level))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1502 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1503 if (bidi_it->next_for_neutral.type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1504 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1505
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1506 /* If the cached state shows a neutral character, it was not
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1507 resolved by bidi_resolve_neutral, so do it now. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1508 type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1509 bidi_it->next_for_neutral.type,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1510 level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1511 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1512
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1513 if (!(type == STRONG_R
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1514 || type == STRONG_L
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1515 || type == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1516 || type == WEAK_EN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1517 || type == WEAK_AN))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1518 abort ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1519 bidi_it->type = type;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1520 bidi_check_type (bidi_it->type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1521
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1522 /* For L1 below, we need to know, for each WS character, whether
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1523 it belongs to a sequence of WS characters preceeding a newline
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1524 or a TAB or a paragraph separator. */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1525 if (bidi_it->orig_type == NEUTRAL_WS
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1526 && bidi_it->next_for_ws.type == UNKNOWN_BT)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1527 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1528 int ch;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1529 int clen = bidi_it->ch_len;
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
1530 EMACS_INT bpos = bidi_it->bytepos;
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
1531 EMACS_INT cpos = bidi_it->charpos;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1532 bidi_type_t chtype;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1533
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1534 do {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1535 /*_fetch_multibyte_char_len = 1;*/
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
1536 ch = bpos + clen >= ZV_BYTE ? BIDI_EOB : FETCH_CHAR (bpos + clen);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1537 bpos += clen;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1538 cpos++;
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
1539 clen = (ch == BIDI_EOB ? 1 : CHAR_BYTES (ch));
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
1540 if (ch == '\n' || ch == BIDI_EOB /* || ch == LINESEP_CHAR */)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1541 chtype = NEUTRAL_B;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1542 else
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
1543 chtype = bidi_get_type (ch, NEUTRAL_DIR);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1544 } while (chtype == NEUTRAL_WS || chtype == WEAK_BN
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1545 || bidi_explicit_dir_char (ch)); /* L1/Retaining */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1546 bidi_it->next_for_ws.type = chtype;
107585
35abfc7649e1 Retrospective commit from 2009-08-22.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
1547 bidi_check_type (bidi_it->next_for_ws.type);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1548 bidi_it->next_for_ws.charpos = cpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1549 bidi_it->next_for_ws.bytepos = bpos;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1550 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1551
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1552 /* Resolve implicit levels, with a twist: PDFs get the embedding
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1553 level of the enbedding they terminate. See below for the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1554 reason. */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1555 if (bidi_it->orig_type == PDF
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1556 /* Don't do this if this formatting code didn't change the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1557 embedding level due to invalid or empty embeddings. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1558 && prev_level != level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1559 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1560 /* 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
1561 private quirk. The reason is that we want the formatting
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1562 codes to be delivered so that they bracket the text of their
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1563 embedding. For example, given the text
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1564
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1565 {RLO}teST{PDF}
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1566
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1567 we want it to be displayed as
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1568
109844
7d60b9e85349 bidi.c (bidi_level_of_next_char): Fix commentary regarding reordering of PDF.
Eli Zaretskii <eliz@gnu.org>
parents: 109779
diff changeset
1569 {PDF}STet{RLO}
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1570
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1571 not as
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1572
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1573 STet{RLO}{PDF}
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1574
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1575 which will result because we bump up the embedding level as
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1576 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
1577 so RLO itself has the same embedding level as "teST", and
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1578 thus would be normally delivered last, just before the PDF.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1579 The switch below fiddles with the level of PDF so that this
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1580 ugly side effect does not happen.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1581
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1582 (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
1583 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
1584 if the user wants to.) */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1585 level = prev_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1586 }
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1587 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
1588 || bidi_it->orig_type == NEUTRAL_S
107590
ebdfe4d01cff Retrospective commit from 2009-09-20.
Eli Zaretskii <eliz@gnu.org>
parents: 107589
diff changeset
1589 || 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
1590 /* || bidi_it->ch == LINESEP_CHAR */
107589
84267baa779b Retrospective commit from 2009-09-19.
Eli Zaretskii <eliz@gnu.org>
parents: 107586
diff changeset
1591 || (bidi_it->orig_type == NEUTRAL_WS
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1592 && (bidi_it->next_for_ws.type == NEUTRAL_B
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1593 || bidi_it->next_for_ws.type == NEUTRAL_S)))
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1594 level = bidi_it->level_stack[0].level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1595 else if ((level & 1) == 0) /* I1 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1596 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1597 if (type == STRONG_R)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1598 level++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1599 else if (type == WEAK_EN || type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1600 level += 2;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1601 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1602 else /* I2 */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1603 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1604 if (type == STRONG_L || type == WEAK_EN || type == WEAK_AN)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1605 level++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1606 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1607
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1608 bidi_it->resolved_level = level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1609 return level;
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 /* 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
1613 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
1614 resume the scan of the lower level.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1615
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1616 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
1617 the iterator structure with the iterator state on the other edge.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1618 Otherwise, we walk the buffer until we come back to the same level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1619 as LEVEL.
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1620
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1621 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
1622 sense of the term, but rather about a ``level'' which includes
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1623 all the levels higher than it. In other words, given the levels
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1624 like this:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1625
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1626 11111112222222333333334443343222222111111112223322111
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1627 A B C
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1628
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1629 and assuming we are at point A scanning left to right, this
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1630 function moves to point C, whereas the UAX#9 ``level 2 run'' ends
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1631 at point B. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1632 static void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1633 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
1634 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1635 int dir = end_flag ? -bidi_it->scan_dir : bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1636 int idx;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1637
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1638 /* Try the cache first. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1639 if ((idx = bidi_cache_find_level_change (level, dir, end_flag)) >= 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1640 bidi_cache_fetch_state (idx, bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1641 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1642 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1643 int new_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1644
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1645 if (end_flag)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1646 abort (); /* if we are at end of level, its edges must be cached */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1647
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1648 bidi_cache_iterator_state (bidi_it, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1649 do {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1650 new_level = bidi_level_of_next_char (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1651 bidi_cache_iterator_state (bidi_it, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1652 } while (new_level >= level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1653 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1654 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1655
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1656 void
108571
a476fd5a6f42 Rename bidi_get_next_char_visually to bidi_move_to_visually_next.
Eli Zaretskii <eliz@gnu.org>
parents: 108030
diff changeset
1657 bidi_move_to_visually_next (struct bidi_it *bidi_it)
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1658 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1659 int old_level, new_level, next_level;
107591
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1660 struct bidi_it sentinel;
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1661
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1662 if (bidi_it->scan_dir == 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1663 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1664 bidi_it->scan_dir = 1; /* default to logical order */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1665 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1666
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1667 /* 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
1668 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
1669 bidi_line_init (bidi_it);
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1670
108833
14bdecf19b8c Fix crash reported in bug #6306.
Eli Zaretskii <eliz@gnu.org>
parents: 108750
diff changeset
1671 /* Prepare the sentinel iterator state, and cache it. When we bump
14bdecf19b8c Fix crash reported in bug #6306.
Eli Zaretskii <eliz@gnu.org>
parents: 108750
diff changeset
1672 into it, scanning backwards, we'll know that the last non-base
14bdecf19b8c Fix crash reported in bug #6306.
Eli Zaretskii <eliz@gnu.org>
parents: 108750
diff changeset
1673 level is exhausted. */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1674 if (bidi_cache_idx == 0)
107591
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1675 {
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1676 bidi_copy_it (&sentinel, bidi_it);
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1677 if (bidi_it->first_elt)
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1678 {
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1679 sentinel.charpos--; /* cached charpos needs to be monotonic */
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1680 sentinel.bytepos--;
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1681 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
1682 sentinel.ch_len = 1;
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1683 }
108833
14bdecf19b8c Fix crash reported in bug #6306.
Eli Zaretskii <eliz@gnu.org>
parents: 108750
diff changeset
1684 bidi_cache_iterator_state (&sentinel, 1);
107591
86eec24bee2c Retrospective commit from 2009-09-26.
Eli Zaretskii <eliz@gnu.org>
parents: 107590
diff changeset
1685 }
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1686
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1687 old_level = bidi_it->resolved_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1688 new_level = bidi_level_of_next_char (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1689
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1690 /* Reordering of resolved levels (clause L2) is implemented by
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1691 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
1692 scanning the text whenever we find a level change. */
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1693 if (new_level != old_level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1694 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1695 int ascending = new_level > old_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1696 int level_to_search = ascending ? old_level + 1 : old_level;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1697 int incr = ascending ? 1 : -1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1698 int expected_next_level = old_level + incr;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1699
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1700 /* Jump (or walk) to the other edge of this level. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1701 bidi_find_other_level_edge (bidi_it, level_to_search, !ascending);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1702 /* Switch scan direction and peek at the next character in the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1703 new direction. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1704 bidi_it->scan_dir = -bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1705
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1706 /* The following loop handles the case where the resolved level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1707 jumps by more than one. This is typical for numbers inside a
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1708 run of text with left-to-right embedding direction, but can
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1709 also happen in other situations. In those cases the decision
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1710 where to continue after a level change, and in what direction,
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1711 is tricky. For example, given a text like below:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1712
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1713 abcdefgh
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1714 11336622
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1715
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1716 (where the numbers below the text show the resolved levels),
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1717 the result of reordering according to UAX#9 should be this:
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1718
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1719 efdcghba
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1720
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1721 This is implemented by the loop below which flips direction
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1722 and jumps to the other edge of the level each time it finds
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1723 the new level not to be the expected one. The expected level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1724 is always one more or one less than the previous one. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1725 next_level = bidi_peek_at_next_level (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1726 while (next_level != expected_next_level)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1727 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1728 expected_next_level += incr;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1729 level_to_search += incr;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1730 bidi_find_other_level_edge (bidi_it, level_to_search, !ascending);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1731 bidi_it->scan_dir = -bidi_it->scan_dir;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1732 next_level = bidi_peek_at_next_level (bidi_it);
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 /* Finally, deliver the next character in the new direction. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1736 next_level = bidi_level_of_next_char (bidi_it);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1737 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1738
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
1739 /* 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
1740 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
1741 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
1742 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
1743 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
1744 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
1745 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
1746 _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
1747 direction affects the reordering. */
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
1748 if (bidi_it->scan_dir == 1
107594
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1749 && bidi_it->orig_type == NEUTRAL_B
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1750 && bidi_it->bytepos < ZV_BYTE)
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1751 {
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1752 EMACS_INT sep_len =
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1753 bidi_at_paragraph_end (bidi_it->charpos + 1,
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1754 bidi_it->bytepos + bidi_it->ch_len);
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1755 if (sep_len >= 0)
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1756 {
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1757 bidi_it->new_paragraph = 1;
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
1758 /* 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
1759 paragraph separator. */
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107594
diff changeset
1760 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
1761 }
40b49fa464cf Retrospective commit from 2009-10-04.
Eli Zaretskii <eliz@gnu.org>
parents: 107593
diff changeset
1762 }
107593
a551e4109c04 Retrospective commit from 2009-10-03.
Eli Zaretskii <eliz@gnu.org>
parents: 107592
diff changeset
1763
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1764 if (bidi_it->scan_dir == 1 && bidi_cache_idx)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1765 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1766 /* If we are at paragraph's base embedding level and beyond the
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1767 last cached position, the cache's job is done and we can
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1768 discard it. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1769 if (bidi_it->resolved_level == bidi_it->level_stack[0].level
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1770 && bidi_it->charpos > bidi_cache[bidi_cache_idx - 1].charpos)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1771 bidi_cache_reset ();
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1772 /* But as long as we are caching during forward scan, we must
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1773 cache each state, or else the cache integrity will be
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1774 compromised: it assumes cached states correspond to buffer
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1775 positions 1:1. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1776 else
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1777 bidi_cache_iterator_state (bidi_it, 1);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1778 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1779 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1780
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1781 /* This is meant to be called from within the debugger, whenever you
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1782 wish to examine the cache contents. */
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1783 void
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1784 bidi_dump_cached_states (void)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1785 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1786 int i;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1787 int ndigits = 1;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1788
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1789 if (bidi_cache_idx == 0)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1790 {
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1791 fprintf (stderr, "The cache is empty.\n");
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1792 return;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1793 }
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1794 fprintf (stderr, "Total of %d state%s in cache:\n",
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1795 bidi_cache_idx, bidi_cache_idx == 1 ? "" : "s");
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1796
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1797 for (i = bidi_cache[bidi_cache_idx - 1].charpos; i > 0; i /= 10)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1798 ndigits++;
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1799 fputs ("ch ", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1800 for (i = 0; i < bidi_cache_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1801 fprintf (stderr, "%*c", ndigits, bidi_cache[i].ch);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1802 fputs ("\n", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1803 fputs ("lvl ", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1804 for (i = 0; i < bidi_cache_idx; i++)
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1805 fprintf (stderr, "%*d", ndigits, bidi_cache[i].resolved_level);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1806 fputs ("\n", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1807 fputs ("pos ", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1808 for (i = 0; i < bidi_cache_idx; i++)
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109170
diff changeset
1809 fprintf (stderr, "%*ld", ndigits, (long)bidi_cache[i].charpos);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1810 fputs ("\n", stderr);
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1811 }