mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backing out to fix bustage :-(

This commit is contained in:
roc+%cs.cmu.edu 2007-05-24 05:16:53 +00:00
Родитель 23228d9dbb
Коммит 6a065b0930
7 изменённых файлов: 8 добавлений и 221 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
content/base/src/nsLineBreaker.cpp
Просмотреть файл

@ -57,12 +57,10 @@ IS_SPACE(PRUint8 u)
static inline int
IS_CJK_CHAR(PRUnichar u)
{
// CJK plus other scripts that require special line breaking treatment
return (0x0e01 <= u && u <= 0x0e5f) || // Thai
(0x1100 <= u && u <= 0x11ff) || // Hangul Jamo
(0x2e80 <= u && u <= 0xd7ff) || // several CJK blocks
(0xf900 <= u && u <= 0xfaff) || // CJK Compatibility Idographs
(0xff00 <= u && u <= 0xffef); // Halfwidth and Fullwidth Forms
return (0x1100 <= u && u <= 0x11ff) ||
(0x2e80 <= u && u <= 0xd7ff) ||
(0xf900 <= u && u <= 0xfaff) ||
(0xff00 <= u && u <= 0xffef);
}
nsLineBreaker::nsLineBreaker()

10
intl/build/Makefile.in
Просмотреть файл

@ -106,13 +106,3 @@ endif
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_PANGO
CXXFLAGS += \
$(MOZ_PANGO_CFLAGS) \
$(NULL)
EXTRA_DSO_LDOPTS += \
$(MOZ_PANGO_LIBS) \
$(NULL)
endif

5
intl/build/nsI18nModule.cpp
Просмотреть файл

@ -59,13 +59,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSemanticUnitScanner)
static nsModuleComponentInfo components[] =
{
// lwbrk
#ifdef MOZ_ENABLE_PANGO
{ "Line Breaker", NS_LBRK_CID,
NS_LBRK_CONTRACTID, nsPangoLineBreakerConstructor},
#else
{ "Line Breaker", NS_LBRK_CID,
NS_LBRK_CONTRACTID, nsJISx4051LineBreakerConstructor},
#endif
{ "Word Breaker", NS_WBRK_CID,
NS_WBRK_CONTRACTID, nsSampleWordBreakerConstructor},
{ "Semantic Unit Scanner", NS_SEMANTICUNITSCANNER_CID,

22
intl/lwbrk/src/Makefile.in
Просмотреть файл

@ -55,29 +55,9 @@ REQUIRES = xpcom \
CSRCS = rulebrk.c
CPPSRCS = \
nsJISx4501LineBreaker.cpp \
nsSampleWordBreaker.cpp \
nsSemanticUnitScanner.cpp \
$(NULL)
ifdef MOZ_ENABLE_PANGO
CPPSRCS += \
nsPangoLineBreaker.cpp \
$(NULL)
else
CPPSRCS += \
nsJISx4501LineBreaker.cpp \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_PANGO
CXXFLAGS += \
$(MOZ_PANGO_CFLAGS) \
$(NULL)
EXTRA_DSO_LDOPTS += \
$(MOZ_PANGO_LIBS) \
$(NULL)
endif

11
intl/lwbrk/src/nsLWBrkConstructors.h
Просмотреть файл

@ -41,20 +41,11 @@
#include "nsLWBrkCIID.h"
#include "nsILineBreaker.h"
#include "nsIWordBreaker.h"
#ifdef MOZ_ENABLE_PANGO
# include "nsPangoLineBreaker.h"
#else
# include "nsJISx4501LineBreaker.h"
#endif
#include "nsJISx4501LineBreaker.h"
#include "nsSampleWordBreaker.h"
#include "nsLWBRKDll.h"
#ifdef MOZ_ENABLE_PANGO
NS_GENERIC_FACTORY_CONSTRUCTOR(nsPangoLineBreaker)
#else
NS_GENERIC_FACTORY_CONSTRUCTOR(nsJISx4051LineBreaker)
#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSampleWordBreaker)
#endif

10
intl/lwbrk/src/nsLWIMP.h
Просмотреть файл

@ -37,16 +37,10 @@
#ifndef nsLWIMP_h__
#define nsLWIMP_h__
#ifdef MOZ_ENABLE_PANGO
# include "nsPangoLineBreaker.h"
# define LINEBREAKER nsPangoLineBreaker
#else
# include "nsJISx4501LineBreaker.h"
# define LINEBREAKER nsJISx4501LineBreaker
#endif
#include "nsJISx4501LineBreaker.h"
#include "nsSampleWordBreaker.h"
#define LINEBREAKER nsJISx4501LineBreaker
#define WORDBREAKER nsSampleWordBreaker
#endif /* nsLWIMP_h__ */

161
intl/lwbrk/src/nsPangoLineBreaker.cpp
Просмотреть файл

@ -1,161 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Theppitak Karoonboonyanan <thep@linux.thai.net>.
* Portions created by the Initial Developer are Copyright (C) 2007
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* - Theppitak Karoonboonyanan <thep@linux.thai.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsPangoLineBreaker.h"
#include <pango/pango.h>
#include "nsLWBRKDll.h"
#include "nsUnicharUtils.h"
#include "nsUTF8Utils.h"
#include "nsString.h"
#include "nsTArray.h"
NS_IMPL_ISUPPORTS1(nsPangoLineBreaker, nsILineBreaker)
PRBool
nsPangoLineBreaker::BreakInBetween(const PRUnichar* aText1 , PRUint32 aTextLen1,
const PRUnichar* aText2 , PRUint32 aTextLen2)
{
if (!aText1 || !aText2 || (0 == aTextLen1) || (0 == aTextLen2) ||
NS_IS_HIGH_SURROGATE(aText1[aTextLen1-1]) &&
NS_IS_LOW_SURROGATE(aText2[0]) ) //Do not separate a surrogate pair
{
return PR_FALSE;
}
nsAutoString concat(aText1, aTextLen1);
concat.Append(aText2, aTextLen2);
nsAutoTArray<PRPackedBool, 2000> breakState;
if (!breakState.AppendElements(concat.Length()))
return NS_ERROR_OUT_OF_MEMORY;
GetJISx4051Breaks(concat.Data(), concat.Length(), breakState.Elements());
return breakState[aTextLen1];
}
PRInt32
nsPangoLineBreaker::Next(const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos)
{
NS_ASSERTION(aText, "aText shouldn't be null");
NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
nsAutoTArray<PRPackedBool, 2000> breakState;
if (!breakState.AppendElements(aLen))
return NS_ERROR_OUT_OF_MEMORY;
GetJISx4051Breaks(aText, aLen, breakState.Elements());
while (++aPos < aLen)
if (breakState[aPos])
return aPos;
return NS_LINEBREAKER_NEED_MORE_TEXT;
}
PRInt32
nsPangoLineBreaker::Prev(const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos)
{
NS_ASSERTION(aText, "aText shouldn't be null");
NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
nsAutoTArray<PRPackedBool, 2000> breakState;
if (!breakState.AppendElements(aLen))
return NS_ERROR_OUT_OF_MEMORY;
GetJISx4051Breaks(aText, aLen, breakState.Elements());
while (aPos > 0)
if (breakState[--aPos])
return aPos;
return NS_LINEBREAKER_NEED_MORE_TEXT;
}
void
nsPangoLineBreaker::GetJISx4051Breaks(const PRUnichar* aText, PRUint32 aLen,
PRPackedBool* aBreakBefore)
{
NS_ASSERTION(aText, "aText shouldn't be null");
nsAutoTArray<PangoLogAttr, 2000> attrBuffer;
if (!attrBuffer.AppendElements(aLen + 1))
return;
NS_ConvertUTF16toUTF8 aUTF8(aText, aLen);
const gchar* p = aUTF8.Data();
const gchar* end = p + aUTF8.Length();
PRUint32 u16Offset = 0;
static PangoLanguage* language = pango_language_from_string("en");
while (p < end)
{
PangoLogAttr* attr = attrBuffer.Elements();
pango_get_log_attrs(p, end - p, -1, language, attr, attrBuffer.Length());
while (p < end)
{
aBreakBefore[u16Offset] = attr->is_line_break;
if (NS_IS_LOW_SURROGATE(aText[u16Offset]))
aBreakBefore[++u16Offset] = PR_FALSE; // Skip high surrogate
++u16Offset;
PRUint32 ch = UTF8CharEnumerator::NextChar(&p, end);
++attr;
if (ch == 0) {
// pango_break (pango 1.16.2) only analyses text before the
// first NUL (but sets one extra attr). Workaround loop to call
// pango_break again to analyse after the NUL is done somewhere else
// (gfx/thebes/src/gfxPangoFonts.cpp: SetupClusterBoundaries()).
// So, we do the same here for pango_get_log_attrs.
break;
}
}
}
}