| blob | d6ef805a90422e4747acaa32982400a004ac2121 |
1 diff -Nuar xulrunner-1.8.0.7/allmakefiles.sh xulrunner-1.8.0.7-mozlibthai/allmakefiles.sh
2 --- xulrunner-1.8.0.7/allmakefiles.sh 2006-10-07 14:18:07.000000000 +0700
3 +++ xulrunner-1.8.0.7-mozlibthai/allmakefiles.sh 2006-10-07 14:25:31.000000000 +0700
4 @@ -224,6 +224,8 @@
5 intl/locale/src/windows/Makefile
6 intl/locale/tests/Makefile
7 intl/lwbrk/Makefile
8 +intl/lwbrk/components/Makefile
9 +intl/lwbrk/components/libthai/Makefile
10 intl/lwbrk/src/Makefile
11 intl/lwbrk/public/Makefile
12 intl/lwbrk/tests/Makefile
13 diff -Nuar xulrunner-1.8.0.7/config/autoconf.mk.in xulrunner-1.8.0.7-mozlibthai/config/autoconf.mk.in
14 --- xulrunner-1.8.0.7/config/autoconf.mk.in 2006-10-07 14:19:38.000000000 +0700
15 +++ xulrunner-1.8.0.7-mozlibthai/config/autoconf.mk.in 2006-10-07 14:25:31.000000000 +0700
16 @@ -114,6 +114,9 @@
17 ENABLE_TESTS = @ENABLE_TESTS@
18 IBMBIDI = @IBMBIDI@
19 SUNCTL = @SUNCTL@
20 +MOZ_ENABLE_LIBTHAI_COMPONENT = @MOZ_ENABLE_LIBTHAI_COMPONENT@
21 +MOZ_LIBTHAI_CFLAGS = @MOZ_LIBTHAI_CFLAGS@
22 +MOZ_LIBTHAI_LIBS = @MOZ_LIBTHAI_LIBS@
23 ACCESSIBILITY = @ACCESSIBILITY@
24 MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@
25 MOZ_XPINSTALL = @MOZ_XPINSTALL@
26 diff -Nuar xulrunner-1.8.0.7/configure.in xulrunner-1.8.0.7-mozlibthai/configure.in
27 --- xulrunner-1.8.0.7/configure.in 2006-10-07 14:18:57.000000000 +0700
28 +++ xulrunner-1.8.0.7-mozlibthai/configure.in 2006-10-07 14:25:31.000000000 +0700
29 @@ -4634,6 +4634,23 @@
30 SUNCTL= )
32 dnl ========================================================
33 +dnl mozlibthai word break component,
34 +dnl built on libthai existence
35 +dnl ========================================================
36 +MOZ_ENABLE_LIBTHAI_COMPONENT=
37 +MOZ_ARG_DISABLE_BOOL(libthai,
38 +[ --disable-libthai Disable Thai word break support with libthai],
39 + MOZ_ENABLE_LIBTHAI_COMPONENT=,
40 + MOZ_ENABLE_LIBTHAI_COMPONENT=1)
41 +if test "$MOZ_ENABLE_LIBTHAI_COMPONENT"; then
42 + PKG_CHECK_MODULES(MOZ_LIBTHAI, libthai,[
43 + MOZ_ENABLE_LIBTHAI_COMPONENT=1
44 + ],[
45 + MOZ_ENABLE_LIBTHAI_COMPONENT=
46 + ])
47 +fi
48 +
49 +dnl ========================================================
50 dnl view source support on by default
51 dnl ========================================================
52 MOZ_ARG_DISABLE_BOOL(view-source,
53 @@ -6686,6 +6703,7 @@
54 AC_SUBST(ENABLE_TESTS)
55 AC_SUBST(IBMBIDI)
56 AC_SUBST(SUNCTL)
57 +AC_SUBST(MOZ_ENABLE_LIBTHAI_COMPONENT)
58 AC_SUBST(ACCESSIBILITY)
59 AC_SUBST(MOZ_XPINSTALL)
60 AC_SUBST(MOZ_VIEW_SOURCE)
61 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/components/libthai/Makefile.in xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/Makefile.in
62 --- xulrunner-1.8.0.7/intl/lwbrk/components/libthai/Makefile.in 1970-01-01 07:00:00.000000000 +0700
63 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/Makefile.in 2006-10-07 14:28:10.000000000 +0700
64 @@ -0,0 +1,76 @@
65 +# ***** BEGIN LICENSE BLOCK *****
66 +# Version: MPL 1.1/GPL 2.0/LGPL 2.1
67 +#
68 +# The contents of this file are subject to the Mozilla Public License Version
69 +# 1.1 (the "License"); you may not use this file except in compliance with
70 +# the License. You may obtain a copy of the License at
71 +# http://www.mozilla.org/MPL/
72 +#
73 +# Software distributed under the License is distributed on an "AS IS" basis,
74 +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
75 +# for the specific language governing rights and limitations under the
76 +# License.
77 +#
78 +# The Original Code is the Mozilla GNOME integration code.
79 +#
80 +# The Initial Developer of the Original Code is
81 +# IBM Corporation.
82 +# Portions created by the Initial Developer are Copyright (C) 2004
83 +# the Initial Developer. All Rights Reserved.
84 +#
85 +# Contributor(s):
86 +#
87 +# Alternatively, the contents of this file may be used under the terms of
88 +# either the GNU General Public License Version 2 or later (the "GPL"), or
89 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
90 +# in which case the provisions of the GPL or the LGPL are applicable instead
91 +# of those above. If you wish to allow use of your version of this file only
92 +# under the terms of either the GPL or the LGPL, and not to allow others to
93 +# use your version of this file under the terms of the MPL, indicate your
94 +# decision by deleting the provisions above and replace them with the notice
95 +# and other provisions required by the GPL or the LGPL. If you do not delete
96 +# the provisions above, a recipient may use your version of this file under
97 +# the terms of any one of the MPL, the GPL or the LGPL.
98 +#
99 +# ***** END LICENSE BLOCK *****
100 +
101 +DEPTH = ../../../..
102 +topsrcdir = @top_srcdir@
103 +srcdir = @srcdir@
104 +VPATH = @srcdir@
105 +
106 +include $(DEPTH)/config/autoconf.mk
107 +
108 +MODULE = mozlibthai
109 +
110 +XPIDLSRCS = \
111 + nsIThaiLineBreaker.idl \
112 + $(NULL)
113 +
114 +ifeq ($(MOZ_ENABLE_LIBTHAI_COMPONENT), 1)
115 +
116 +LIBRARY_NAME = mozlibthai
117 +FORCE_SHARED_LIB = 1
118 +IS_COMPONENT = 1
119 +
120 +REQUIRES = \
121 + xpcom \
122 + unicharutil \
123 + $(NULL)
124 +
125 +CPPSRCS = \
126 + nsLibThaiLineBreaker.cpp \
127 + nsLibThaiModule.cpp \
128 + $(NULL)
129 +
130 +CXXFLAGS += $(MOZ_LIBTHAI_CFLAGS)
131 +EXTRA_DSO_LDOPTS += \
132 + $(XPCOM_STANDARD_GLUE_LDOPTS) \
133 + $(NSPR_LIBS) \
134 + $(MOZ_LIBTHAI_LIBS) \
135 + $(NULL)
136 +
137 +endif
138 +
139 +include $(topsrcdir)/config/rules.mk
140 +
141 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/components/libthai/nsIThaiLineBreaker.idl xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/nsIThaiLineBreaker.idl
142 --- xulrunner-1.8.0.7/intl/lwbrk/components/libthai/nsIThaiLineBreaker.idl 1970-01-01 07:00:00.000000000 +0700
143 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/nsIThaiLineBreaker.idl 2006-10-07 14:28:10.000000000 +0700
144 @@ -0,0 +1,61 @@
145 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
146 +/* ***** BEGIN LICENSE BLOCK *****
147 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
148 + *
149 + * The contents of this file are subject to the Mozilla Public License Version
150 + * 1.1 (the "License"); you may not use this file except in compliance with
151 + * the License. You may obtain a copy of the License at
152 + * http://www.mozilla.org/MPL/
153 + *
154 + * Software distributed under the License is distributed on an "AS IS" basis,
155 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
156 + * for the specific language governing rights and limitations under the
157 + * License.
158 + *
159 + * The Original Code is mozilla.org code.
160 + *
161 + * The Initial Developer of the Original Code is
162 + * Netscape Communications Corporation.
163 + * Portions created by the Initial Developer are Copyright (C) 1998
164 + * the Initial Developer. All Rights Reserved.
165 + *
166 + * Contributor(s):
167 + * Theppitak Karoonboonyanan <thep@linux.thai.net>
168 + *
169 + * Alternatively, the contents of this file may be used under the terms of
170 + * either of the GNU General Public License Version 2 or later (the "GPL"),
171 + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
172 + * in which case the provisions of the GPL or the LGPL are applicable instead
173 + * of those above. If you wish to allow use of your version of this file only
174 + * under the terms of either the GPL or the LGPL, and not to allow others to
175 + * use your version of this file under the terms of the MPL, indicate your
176 + * decision by deleting the provisions above and replace them with the notice
177 + * and other provisions required by the GPL or the LGPL. If you do not delete
178 + * the provisions above, a recipient may use your version of this file under
179 + * the terms of any one of the MPL, the GPL or the LGPL.
180 + *
181 + * ***** END LICENSE BLOCK ***** */
182 +
183 +#include "nsISupports.idl"
184 +
185 +%{C++
186 +// {5E1CD5F3-C757-45A5-BDA2-60D530236473}
187 +#define NS_THAILINEBREAKER_CID { 0x5e1cd5f3, 0xc757, 0x45a5, { 0xbd, 0xa2, 0x60, 0xd5, 0x30, 0x23, 0x64, 0x73}}
188 +#define NS_THAILINEBREAKER_CONTRACTID "@mozilla.org/intl/thailinebreaker;1"
189 +%}
190 +
191 +/**
192 + * Provides Thai line breaker
193 + */
194 +[scriptable, uuid(5e1cd5f3-c757-45a5-bda2-60d530236473)]
195 +interface nsIThaiLineBreaker : nsISupports {
196 + boolean breakInBetween (in wstring aText1, in unsigned long aTextLen1,
197 + in wstring aText2, in unsigned long aTextLen2);
198 +
199 + void next (in wstring aText, in unsigned long aLen, in unsigned long aPos,
200 + out unsigned long pos, out boolean needMoreText);
201 +
202 + void prev (in wstring aText, in unsigned long aLen, in unsigned long aPos,
203 + out unsigned long pos, out boolean needMoreText);
204 +};
205 +
206 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp
207 --- xulrunner-1.8.0.7/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp 1970-01-01 07:00:00.000000000 +0700
208 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp 2006-10-07 14:28:10.000000000 +0700
209 @@ -0,0 +1,221 @@
210 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
211 +/* ***** BEGIN LICENSE BLOCK *****
212 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
213 + *
214 + * The contents of this file are subject to the Mozilla Public License Version
215 + * 1.1 (the "License"); you may not use this file except in compliance with
216 + * the License. You may obtain a copy of the License at
217 + * http://www.mozilla.org/MPL/
218 + *
219 + * Software distributed under the License is distributed on an "AS IS" basis,
220 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
221 + * for the specific language governing rights and limitations under the
222 + * License.
223 + *
224 + * The Original Code is mozilla.org code.
225 + *
226 + * The Initial Developer of the Original Code is
227 + * Netscape Communications Corporation.
228 + * Portions created by the Initial Developer are Copyright (C) 1998
229 + * the Initial Developer. All Rights Reserved.
230 + *
231 + * Contributor(s):
232 + * - Theppitak Karoonboonyanan <thep@linux.thai.net>
233 + *
234 + * Alternatively, the contents of this file may be used under the terms of
235 + * either of the GNU General Public License Version 2 or later (the "GPL"),
236 + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
237 + * in which case the provisions of the GPL or the LGPL are applicable instead
238 + * of those above. If you wish to allow use of your version of this file only
239 + * under the terms of either the GPL or the LGPL, and not to allow others to
240 + * use your version of this file under the terms of the MPL, indicate your
241 + * decision by deleting the provisions above and replace them with the notice
242 + * and other provisions required by the GPL or the LGPL. If you do not delete
243 + * the provisions above, a recipient may use your version of this file under
244 + * the terms of any one of the MPL, the GPL or the LGPL.
245 + *
246 + * ***** END LICENSE BLOCK ***** */
247 +
248 +#include <thai/thbrk.h>
249 +#include <thai/thwchar.h>
250 +
251 +#include "nsLibThaiLineBreaker.h"
252 +
253 +
254 +//// class BreakEntry implementation ////
255 +
256 +void BreakEntry::Set (const PRUnichar* pText, PRUint32 textLen,
257 + int* pvPos, int posLen)
258 +{
259 + Clear();
260 +
261 + mText = new PRUnichar [textLen+1];
262 + for (PRUnichar i = 0; i < textLen; i++)
263 + mText[i] = pText[i];
264 + mText[textLen] = 0;
265 + mTextLen = textLen;
266 +
267 + mPos = new int [posLen];
268 + for (int j = 0; j < posLen; j++)
269 + mPos[j] = pvPos[j];
270 + mPosLen = posLen;
271 +}
272 +
273 +//// class BreakCache implementation ////
274 +
275 +static PRUint16 StringHash (const PRUnichar* pText, PRUint32 textLen)
276 +{
277 + PRUint16 h = 0;
278 + for (PRUint32 i = 0; i < textLen; i++) {
279 + h = (h >> 12) ^ (h << 4) ^ pText[i];
280 + }
281 + return h;
282 +}
283 +
284 +BreakEntry& BreakCache::LookUp (const PRUnichar* pText, PRUint32 textLen)
285 +{
286 + return mvBucket [StringHash (pText, textLen) % N_BUCKETS];
287 +}
288 +
289 +
290 +//// class nsLibThaiLineBreaker implementation ////
291 +
292 +static thchar_t* GetTISText (const PRUnichar* pText, PRUint32 textLen)
293 +{
294 + thchar_t* pTISText = new thchar_t [textLen + 1];
295 + PRUint32 i;
296 + for (i = 0; i < textLen; i++)
297 + pTISText[i] = th_uni2tis (pText[i]);
298 + pTISText[i] = '\0';
299 +
300 + return pTISText;
301 +}
302 +
303 +static void FreeTISText (thchar_t* pTISText)
304 +{
305 + delete pTISText;
306 +}
307 +
308 +static PRBool IsStrEqual (const PRUnichar* pText1, PRUint32 len1,
309 + const PRUnichar* pText2, PRUint32 len2)
310 +{
311 + if (len1 != len2)
312 + return PR_FALSE;
313 +
314 + for (PRUint32 i = 0; i < len1; ++i)
315 + if (pText1[i] != pText2[i])
316 + return PR_FALSE;
317 +
318 + return PR_TRUE;
319 +}
320 +
321 +int nsLibThaiLineBreaker::GetBreaks (
322 + const PRUnichar* pText, PRUint32 textLen, int vPos[], int nPos)
323 +{
324 + // Call the expensive th_brk() only if uncached
325 + BreakEntry& breakEntry = mBreakCache.LookUp (pText, textLen);
326 + if (!IsStrEqual (breakEntry.Text(), breakEntry.TextLength(), pText, textLen))
327 + {
328 + thchar_t* pTISText = GetTISText (pText, textLen);
329 + int* pBreaks = new int [nPos];
330 + int nBreaks = th_brk (pTISText, pBreaks, nPos);
331 + FreeTISText (pTISText);
332 +
333 + breakEntry.Set (pText, textLen, pBreaks, nBreaks);
334 + delete pBreaks;
335 + }
336 +
337 + for (int i = 0; i < breakEntry.PosLength(); ++i)
338 + vPos [i] = breakEntry.Pos (i);
339 + return breakEntry.PosLength();
340 +}
341 +
342 +NS_IMPL_ISUPPORTS1 (nsLibThaiLineBreaker, nsIThaiLineBreaker)
343 +
344 +
345 +NS_IMETHODIMP nsLibThaiLineBreaker::BreakInBetween(
346 + const PRUnichar* aText1 , PRUint32 aTextLen1,
347 + const PRUnichar* aText2 , PRUint32 aTextLen2,
348 + PRBool* oCanBreak)
349 +{
350 + if (!aText1 || !aText2 || (0 == aTextLen1) || (0 == aTextLen2))
351 + {
352 + *oCanBreak = PR_FALSE;
353 + return NS_OK;
354 + }
355 +
356 + PRBool result = PR_FALSE;
357 +
358 + PRUnichar *pConcat = new PRUnichar [aTextLen1 + aTextLen2];
359 + for (PRUint32 i = 0; i < aTextLen1; i++)
360 + pConcat[i] = aText1[i];
361 + for (PRUint32 i = 0; i < aTextLen2; i++)
362 + pConcat[aTextLen1 + i] = aText2[i];
363 +
364 + int* pBreaks = new int [aTextLen1 + aTextLen2 + 1];
365 + int nBreaks = GetBreaks (pConcat, aTextLen1 + aTextLen2,
366 + pBreaks, int (aTextLen1 + aTextLen2 + 1));
367 + for (int i = 0; i < nBreaks; i++) {
368 + if (PRUint32 (pBreaks[i]) == aTextLen1) {
369 + result = PR_TRUE;
370 + break;
371 + }
372 + }
373 + delete pBreaks;
374 +
375 + delete pConcat;
376 +
377 + *oCanBreak = result;
378 + return NS_OK;
379 +}
380 +
381 +
382 +NS_IMETHODIMP nsLibThaiLineBreaker::Next(
383 + const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
384 + PRUint32* oNext, PRBool* oNeedMoreText)
385 +{
386 + NS_ASSERTION(aText, "aText shouldn't be null");
387 + NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
388 +
389 + *oNeedMoreText = PR_TRUE;
390 + *oNext = aLen;
391 +
392 + int* pBreaks = new int [aLen + 1];
393 + int nBreaks = GetBreaks (aText, aLen, pBreaks, int (aLen + 1));
394 + for (int i = 0; i < nBreaks; i++) {
395 + if (PRUint32 (pBreaks[i]) > aPos) {
396 + *oNext = pBreaks[i];
397 + *oNeedMoreText = PR_FALSE;
398 + break;
399 + }
400 + }
401 + delete pBreaks;
402 +
403 + return NS_OK;
404 +}
405 +
406 +
407 +NS_IMETHODIMP nsLibThaiLineBreaker::Prev(
408 + const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
409 + PRUint32* oPrev, PRBool* oNeedMoreText)
410 +{
411 + NS_ASSERTION(aText, "aText shouldn't be null");
412 + NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
413 +
414 + *oNeedMoreText = PR_TRUE;
415 + *oPrev = 0;
416 +
417 + int* pBreaks = new int [aLen + 1];
418 + int nBreaks = GetBreaks (aText, aLen, pBreaks, int (aLen + 1));
419 + for (int i = nBreaks - 1; i >= 0; i--) {
420 + if (PRUint32 (pBreaks[i]) < aPos) {
421 + *oPrev = pBreaks[i];
422 + *oNeedMoreText = PR_FALSE;
423 + break;
424 + }
425 + }
426 + delete pBreaks;
427 +
428 + return NS_OK;
429 +}
430 +
431 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h
432 --- xulrunner-1.8.0.7/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h 1970-01-01 07:00:00.000000000 +0700
433 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h 2006-10-07 14:28:10.000000000 +0700
434 @@ -0,0 +1,148 @@
435 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
436 +/* ***** BEGIN LICENSE BLOCK *****
437 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
438 + *
439 + * The contents of this file are subject to the Mozilla Public License Version
440 + * 1.1 (the "License"); you may not use this file except in compliance with
441 + * the License. You may obtain a copy of the License at
442 + * http://www.mozilla.org/MPL/
443 + *
444 + * Software distributed under the License is distributed on an "AS IS" basis,
445 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
446 + * for the specific language governing rights and limitations under the
447 + * License.
448 + *
449 + * The Original Code is mozilla.org code.
450 + *
451 + * The Initial Developer of the Original Code is
452 + * Netscape Communications Corporation.
453 + * Portions created by the Initial Developer are Copyright (C) 1998
454 + * the Initial Developer. All Rights Reserved.
455 + *
456 + * Contributor(s):
457 + * - Theppitak Karoonboonyanan <thep@linux.thai.net>
458 + *
459 + * Alternatively, the contents of this file may be used under the terms of
460 + * either of the GNU General Public License Version 2 or later (the "GPL"),
461 + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
462 + * in which case the provisions of the GPL or the LGPL are applicable instead
463 + * of those above. If you wish to allow use of your version of this file only
464 + * under the terms of either the GPL or the LGPL, and not to allow others to
465 + * use your version of this file under the terms of the MPL, indicate your
466 + * decision by deleting the provisions above and replace them with the notice
467 + * and other provisions required by the GPL or the LGPL. If you do not delete
468 + * the provisions above, a recipient may use your version of this file under
469 + * the terms of any one of the MPL, the GPL or the LGPL.
470 + *
471 + * ***** END LICENSE BLOCK ***** */
472 +
473 +#ifndef nsLibThaiLineBreaker_h__
474 +#define nsLibThaiLineBreaker_h__
475 +
476 +#include "nsIThaiLineBreaker.h"
477 +
478 +/*
479 + * Break Positions Info Entry
480 + */
481 +class BreakEntry {
482 +public:
483 + BreakEntry();
484 + ~BreakEntry();
485 +
486 + void Set (const PRUnichar* pText, PRUint32 textLen, int* pvPos, int posLen);
487 +
488 + const PRUnichar* Text() const;
489 + PRUint32 TextLength() const;
490 + int Pos(int index) const;
491 + int PosLength() const;
492 +
493 +private:
494 + void Clear();
495 +
496 +private:
497 + PRUnichar* mText;
498 + PRUint32 mTextLen;
499 + int* mPos;
500 + int mPosLen;
501 +};
502 +
503 +inline BreakEntry::BreakEntry()
504 + : mText (nsnull), mTextLen (0), mPos (nsnull), mPosLen (0)
505 +{
506 +}
507 +
508 +inline BreakEntry::~BreakEntry()
509 +{
510 + Clear();
511 +}
512 +
513 +inline void BreakEntry::Clear()
514 +{
515 + if (mText)
516 + delete mText;
517 + if (mPos)
518 + delete mPos;
519 +}
520 +
521 +inline const PRUnichar* BreakEntry::Text() const
522 +{
523 + return mText;
524 +}
525 +
526 +inline PRUint32 BreakEntry::TextLength() const
527 +{
528 + return mTextLen;
529 +}
530 +
531 +inline int BreakEntry::Pos (int index) const
532 +{
533 + return (mPos && index < mPosLen) ? mPos[index] : -1;
534 +}
535 +
536 +inline int BreakEntry::PosLength() const
537 +{
538 + return mPosLen;
539 +}
540 +
541 +
542 +/*
543 + * Break Positions Info Cache
544 + */
545 +class BreakCache
546 +{
547 +public:
548 + BreakEntry& LookUp (const PRUnichar* pText, PRUint32 textLen);
549 +
550 +private:
551 + enum { N_BUCKETS = 19 };
552 + BreakEntry mvBucket[N_BUCKETS];
553 +};
554 +
555 +
556 +/*
557 + * Thai Line Breaker using LibThai
558 + */
559 +class nsLibThaiLineBreaker : public nsIThaiLineBreaker
560 +{
561 + NS_DECL_ISUPPORTS
562 +
563 +public:
564 + NS_IMETHOD BreakInBetween (const PRUnichar* aText1 , PRUint32 aTextLen1,
565 + const PRUnichar* aText2 , PRUint32 aTextLen2,
566 + PRBool* oCanBreak);
567 +
568 + NS_IMETHOD Next (const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
569 + PRUint32* oNext, PRBool* oNeedMoreText);
570 +
571 + NS_IMETHOD Prev (const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
572 + PRUint32* oPrev, PRBool* oNeedMoreText);
573 +
574 +protected:
575 + int GetBreaks (const PRUnichar* pText, PRUint32 textLen,
576 + int vPos[], int nPos);
577 +
578 +private:
579 + BreakCache mBreakCache;
580 +};
581 +
582 +#endif /* nsLibThaiLineBreaker_h__ */
583 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/components/libthai/nsLibThaiModule.cpp xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/nsLibThaiModule.cpp
584 --- xulrunner-1.8.0.7/intl/lwbrk/components/libthai/nsLibThaiModule.cpp 1970-01-01 07:00:00.000000000 +0700
585 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/libthai/nsLibThaiModule.cpp 2006-10-07 14:28:10.000000000 +0700
586 @@ -0,0 +1,52 @@
587 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
588 +/* ***** BEGIN LICENSE BLOCK *****
589 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
590 + *
591 + * The contents of this file are subject to the Mozilla Public License Version
592 + * 1.1 (the "License"); you may not use this file except in compliance with
593 + * the License. You may obtain a copy of the License at
594 + * http://www.mozilla.org/MPL/
595 + *
596 + * Software distributed under the License is distributed on an "AS IS" basis,
597 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
598 + * for the specific language governing rights and limitations under the
599 + * License.
600 + *
601 + * The Original Code is the Mozilla GNOME integration code.
602 + *
603 + * The Initial Developer of the Original Code is
604 + * IBM Corporation.
605 + * Portions created by the Initial Developer are Copyright (C) 2004
606 + * the Initial Developer. All Rights Reserved.
607 + *
608 + * Contributor(s):
609 + * Theppitak Karoonboonyanan <thep@linux.thai.net>
610 + *
611 + * Alternatively, the contents of this file may be used under the terms of
612 + * either the GNU General Public License Version 2 or later (the "GPL"), or
613 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
614 + * in which case the provisions of the GPL or the LGPL are applicable instead
615 + * of those above. If you wish to allow use of your version of this file only
616 + * under the terms of either the GPL or the LGPL, and not to allow others to
617 + * use your version of this file under the terms of the MPL, indicate your
618 + * decision by deleting the provisions above and replace them with the notice
619 + * and other provisions required by the GPL or the LGPL. If you do not delete
620 + * the provisions above, a recipient may use your version of this file under
621 + * the terms of any one of the MPL, the GPL or the LGPL.
622 + *
623 + * ***** END LICENSE BLOCK ***** */
624 +
625 +#include "nsLibThaiLineBreaker.h"
626 +#include "nsIGenericFactory.h"
627 +
628 +NS_GENERIC_FACTORY_CONSTRUCTOR(nsLibThaiLineBreaker)
629 +
630 +static const nsModuleComponentInfo components[] = {
631 + { "LibThai Line Breaker",
632 + NS_THAILINEBREAKER_CID,
633 + NS_THAILINEBREAKER_CONTRACTID,
634 + nsLibThaiLineBreakerConstructor }
635 +};
636 +
637 +NS_IMPL_NSGETMODULE(mozlibthai, components)
638 +
639 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/components/Makefile.in xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/Makefile.in
640 --- xulrunner-1.8.0.7/intl/lwbrk/components/Makefile.in 1970-01-01 07:00:00.000000000 +0700
641 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/components/Makefile.in 2006-10-07 14:28:10.000000000 +0700
642 @@ -0,0 +1,48 @@
643 +#
644 +# ***** BEGIN LICENSE BLOCK *****
645 +# Version: MPL 1.1/GPL 2.0/LGPL 2.1
646 +#
647 +# The contents of this file are subject to the Mozilla Public License Version
648 +# 1.1 (the "License"); you may not use this file except in compliance with
649 +# the License. You may obtain a copy of the License at
650 +# http://www.mozilla.org/MPL/
651 +#
652 +# Software distributed under the License is distributed on an "AS IS" basis,
653 +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
654 +# for the specific language governing rights and limitations under the
655 +# License.
656 +#
657 +# The Original Code is mozilla.org code.
658 +#
659 +# The Initial Developer of the Original Code is
660 +# Netscape Communications Corporation.
661 +# Portions created by the Initial Developer are Copyright (C) 1998
662 +# the Initial Developer. All Rights Reserved.
663 +#
664 +# Contributor(s):
665 +#
666 +# Alternatively, the contents of this file may be used under the terms of
667 +# either of the GNU General Public License Version 2 or later (the "GPL"),
668 +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
669 +# in which case the provisions of the GPL or the LGPL are applicable instead
670 +# of those above. If you wish to allow use of your version of this file only
671 +# under the terms of either the GPL or the LGPL, and not to allow others to
672 +# use your version of this file under the terms of the MPL, indicate your
673 +# decision by deleting the provisions above and replace them with the notice
674 +# and other provisions required by the GPL or the LGPL. If you do not delete
675 +# the provisions above, a recipient may use your version of this file under
676 +# the terms of any one of the MPL, the GPL or the LGPL.
677 +#
678 +# ***** END LICENSE BLOCK *****
679 +
680 +DEPTH = ../../..
681 +topsrcdir = @top_srcdir@
682 +srcdir = @srcdir@
683 +VPATH = @srcdir@
684 +
685 +include $(DEPTH)/config/autoconf.mk
686 +
687 +DIRS = libthai
688 +
689 +include $(topsrcdir)/config/rules.mk
690 +
691 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/Makefile.in xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/Makefile.in
692 --- xulrunner-1.8.0.7/intl/lwbrk/Makefile.in 2006-10-07 14:20:53.000000000 +0700
693 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/Makefile.in 2006-10-07 14:25:31.000000000 +0700
694 @@ -43,7 +43,7 @@
695 include $(DEPTH)/config/autoconf.mk
697 MODULE = lwbrk
698 -DIRS = idl public src
699 +DIRS = idl public src components
701 ifdef ENABLE_TESTS
702 TOOL_DIRS += tests
703 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/src/Makefile.in xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/src/Makefile.in
704 --- xulrunner-1.8.0.7/intl/lwbrk/src/Makefile.in 2006-10-07 14:21:55.000000000 +0700
705 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/src/Makefile.in 2006-10-07 14:25:31.000000000 +0700
706 @@ -50,6 +50,7 @@
707 REQUIRES = xpcom \
708 string \
709 unicharutil \
710 + mozlibthai \
711 $(NULL)
713 CSRCS = rulebrk.c
714 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/src/nsJISx4501LineBreaker.cpp xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
715 --- xulrunner-1.8.0.7/intl/lwbrk/src/nsJISx4501LineBreaker.cpp 2006-10-07 14:22:43.000000000 +0700
716 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/src/nsJISx4501LineBreaker.cpp 2006-10-07 14:25:31.000000000 +0700
717 @@ -49,6 +49,7 @@
718 #include "rulebrk.h"
719 #include "nsUnicharUtils.h"
721 +#include "nsIServiceManager.h"
723 /*
725 @@ -238,6 +239,12 @@
726 }
728 static inline int
729 +IS_THAI(PRUnichar u)
730 +{
731 + return (0x0e01 <= (u) && (u) <= 0x0e5b);
732 +}
733 +
734 +static inline int
735 IS_SPACE(PRUnichar u)
736 {
737 return ((u) == 0x0020 || (u) == 0x0009 || (u) == 0x000a || (u) == 0x000d || (u)==0x200b);
738 @@ -254,7 +261,7 @@
739 {
740 c = GETCLASSFROMTABLE(gLBClass00, l);
741 }
742 - else if(th_isthai(u))
743 + else if(IS_THAI(u))
744 {
745 c = CLASS_THAI;
746 }
747 @@ -342,11 +349,17 @@
748 return (0 == ((gPair[c1] >> c2 ) & 0x0001));
749 }
751 +nsCOMPtr<nsIThaiLineBreaker> nsJISx4051LineBreaker::GetThaiLineBreaker()
752 +{
753 + if (!mThaiLineBreaker)
754 + mThaiLineBreaker = do_GetService (NS_THAILINEBREAKER_CONTRACTID);
755 + return mThaiLineBreaker;
756 +}
758 nsJISx4051LineBreaker::nsJISx4051LineBreaker(
759 const PRUnichar* aNoBegin, PRInt32 aNoBeginLen,
760 const PRUnichar* aNoEnd, PRInt32 aNoEndLen
761 -)
762 +) : mThaiLineBreaker(nsnull)
763 {
764 }
766 @@ -427,7 +440,7 @@
767 {
768 if (IS_SPACE(aText1[cur]))
769 break;
770 - if (IS_CJK_CHAR(aText1[cur]))
771 + if (IS_CJK_CHAR(aText1[cur]) || IS_THAI(aText1[cur]))
772 goto ROUTE_CJK_BETWEEN;
773 }
775 @@ -435,7 +448,7 @@
776 {
777 if (IS_SPACE(aText2[cur]))
778 break;
779 - if (IS_CJK_CHAR(aText2[cur]))
780 + if (IS_CJK_CHAR(aText2[cur]) || IS_THAI(aText2[cur]))
781 goto ROUTE_CJK_BETWEEN;
782 }
784 @@ -463,7 +476,12 @@
785 /* Handle cases for THAI */
786 if((CLASS_THAI == c1) && (CLASS_THAI == c2))
787 {
788 - *oCanBreak = (0 == TrbWordBreakPos(aText1, aTextLen1, aText2, aTextLen2));
789 + nsCOMPtr<nsIThaiLineBreaker> pThaiLineBreaker = GetThaiLineBreaker();
790 + if (pThaiLineBreaker)
791 + return pThaiLineBreaker->BreakInBetween(aText1, aTextLen1,
792 + aText2, aTextLen2, oCanBreak);
793 + else
794 + *oCanBreak = (0 == TrbWordBreakPos(aText1, aTextLen1, aText2, aTextLen2));
795 }
796 else
797 {
798 @@ -493,7 +511,7 @@
799 *oNeedMoreText = PR_FALSE;
800 return NS_OK;
801 }
802 - if (IS_CJK_CHAR(aText[cur]))
803 + if (IS_CJK_CHAR(aText[cur]) || IS_THAI(aText[cur]))
804 goto ROUTE_CJK_NEXT;
805 }
806 *oNext = aLen;
807 @@ -514,9 +532,14 @@
809 if(CLASS_THAI == c1)
810 {
811 - *oNext = PRUint32(TrbFollowing(aText, aLen, aPos));
812 - *oNeedMoreText = PR_FALSE;
813 - return NS_OK;
814 + nsCOMPtr<nsIThaiLineBreaker> pThaiLineBreaker = GetThaiLineBreaker();
815 + if (pThaiLineBreaker) {
816 + return pThaiLineBreaker->Next(aText, aLen, aPos, oNext, oNeedMoreText);
817 + } else {
818 + *oNext = PRUint32(TrbFollowing(aText, aLen, aPos));
819 + *oNeedMoreText = PR_FALSE;
820 + return NS_OK;
821 + }
822 }
824 for(cur++; cur <aLen; cur++)
825 @@ -563,7 +586,7 @@
826 *oNeedMoreText = PR_FALSE;
827 return NS_OK;
828 }
829 - if (IS_CJK_CHAR(aText[cur]))
830 + if (IS_CJK_CHAR(aText[cur]) || IS_THAI(aText[cur]))
831 goto ROUTE_CJK_PREV;
832 }
834 @@ -582,10 +605,26 @@
835 } else {
836 c2 = this->GetClass(aText[cur-1]);
837 }
838 - // To Do:
839 - //
840 - // Should handle CLASS_THAI here
841 - //
842 +
843 + if(CLASS_THAI == c2)
844 + {
845 + nsCOMPtr<nsIThaiLineBreaker> pThaiLineBreaker = GetThaiLineBreaker();
846 + if (pThaiLineBreaker) {
847 + return pThaiLineBreaker->Prev(aText, aLen, aPos, oPrev, oNeedMoreText);
848 + } else {
849 + // TODO: do some fallback analysis instead
850 + for (aPos--; aPos > 0; aPos--) {
851 + if (!IS_THAI(aText[aPos])) {
852 + *oPrev = aPos;
853 + *oNeedMoreText = PR_FALSE;
854 + return NS_OK;
855 + }
856 + }
857 + *oNeedMoreText = PR_TRUE;
858 + return NS_OK;
859 + }
860 + }
861 +
862 for(cur--; cur > 0; cur--)
863 {
864 if(NEED_CONTEXTUAL_ANALYSIS(aText[cur-1]))
865 diff -Nuar xulrunner-1.8.0.7/intl/lwbrk/src/nsJISx4501LineBreaker.h xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/src/nsJISx4501LineBreaker.h
866 --- xulrunner-1.8.0.7/intl/lwbrk/src/nsJISx4501LineBreaker.h 2006-10-07 14:23:18.000000000 +0700
867 +++ xulrunner-1.8.0.7-mozlibthai/intl/lwbrk/src/nsJISx4501LineBreaker.h 2006-10-07 14:25:31.000000000 +0700
868 @@ -40,6 +40,9 @@
870 #include "nsILineBreaker.h"
872 +#include "nsCOMPtr.h"
873 +#include "nsIThaiLineBreaker.h"
874 +
875 class nsJISx4051LineBreaker : public nsILineBreaker
876 {
877 NS_DECL_ISUPPORTS
878 @@ -66,6 +69,10 @@
879 PRInt8 ContextualAnalysis(PRUnichar prev, PRUnichar cur, PRUnichar next );
880 PRBool GetPair(PRInt8 c1, PRInt8 c2);
882 + nsCOMPtr<nsIThaiLineBreaker> GetThaiLineBreaker();
883 +
884 +protected:
885 + nsCOMPtr<nsIThaiLineBreaker> mThaiLineBreaker;
886 };
888 #endif /* nsJISx4501LineBreaker_h__ */