rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch, 1.1, 1.2 workspace.i18n45.patch, 1.1, 1.2
Caolan McNamara
caolanm at fedoraproject.org
Fri Sep 5 08:45:29 UTC 2008
- Previous message: rpms/gcc/devel gcc43-pr37189.patch, NONE, 1.1 gcc43-x86_64-va_start.patch, NONE, 1.1 .cvsignore, 1.242, 1.243 gcc43.spec, 1.40, 1.41 sources, 1.245, 1.246 gcc43-fortran-debug1.patch, 1.1, NONE gcc43-fortran-debug10.patch, 1.2, NONE gcc43-fortran-debug11.patch, 1.1, NONE gcc43-fortran-debug2.patch, 1.2, NONE gcc43-fortran-debug3.patch, 1.1, NONE gcc43-fortran-debug4.patch, 1.1, NONE gcc43-fortran-debug5.patch, 1.1, NONE gcc43-fortran-debug6.patch, 1.1, NONE gcc43-fortran-debug7.patch, 1.1, NONE gcc43-fortran-debug8.patch, 1.1, NONE gcc43-fortran-debug9.patch, 1.1, NONE gcc43-pr37248.patch, 1.2, NONE
- Next message: rpms/dfu-programmer/F-9 .cvsignore, 1.3, 1.4 dfu-programmer.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9685
Modified Files:
openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch
workspace.i18n45.patch
Log Message:
tweak up patches to apply cleanly
openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch:
Index: openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch 4 Sep 2008 17:27:15 -0000 1.1
+++ openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch 5 Sep 2008 08:44:59 -0000 1.2
@@ -5,23 +5,32 @@
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 23 Jan 2008 17:17:10 -0000 1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 4 Sep 2008 17:21:25 -0000
-@@ -757,7 +768,8 @@
- nStyle &= ~SAL_FRAME_STYLE_FLOAT;
- }
+@@ -745,6 +745,9 @@
+ m_aForeignTopLevelWindow = None;
+ m_nStyle = nStyle;
-- m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
-+ GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
-+ m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL ) );
++ GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION))
++ ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
++
+ if( nStyle & SAL_FRAME_STYLE_SYSTEMCHILD )
+ {
+ m_pWindow = gtk_event_box_new();
+@@ -757,7 +760,7 @@
+ }
+ }
+ else
+- m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL );
++ m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL );
g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
- m_pParent = static_cast<GtkSalFrame*>(pParent);
-@@ -820,6 +832,9 @@
+ // force wm class hint
+@@ -817,6 +820,9 @@
InitCommon();
+ if (eWinType == GTK_WINDOW_TOPLEVEL)
-+ gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, GDK_CURRENT_TIME);
++ gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
+
if( bDecoHandling )
{
- gtk_window_set_resizable( m_pWindow, (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );
+ gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );
workspace.i18n45.patch:
Index: workspace.i18n45.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.i18n45.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.i18n45.patch 2 Sep 2008 08:37:18 -0000 1.1
+++ workspace.i18n45.patch 5 Sep 2008 08:44:59 -0000 1.2
@@ -1,837 +1,68 @@
-Index: l10n/i18npool/inc/breakiterator_cjk.hxx
-diff -u l10n/i18npool/inc/breakiterator_cjk.hxx:1.6 l10n/i18npool/inc/breakiterator_cjk.hxx:1.6.16.1
---- l10n/i18npool/inc/breakiterator_cjk.hxx:1.6 Thu Apr 10 01:37:18 2008
-+++ l10n/i18npool/inc/breakiterator_cjk.hxx Mon Aug 18 21:23:30 2008
-@@ -58,6 +58,7 @@
-
- protected:
- xdictionary *dict;
-+ rtl::OUString hangingCharacters;
- };
-
- #define BREAKITERATOR_CJK( lang ) \
-@@ -69,6 +70,7 @@
-
- #ifdef BREAKITERATOR_ALL
- BREAKITERATOR_CJK( zh )
-+BREAKITERATOR_CJK( zh_TW )
- BREAKITERATOR_CJK( ja )
- BREAKITERATOR_CJK( ko )
- #endif
-Index: l10n/i18npool/inc/breakiterator_hi.hxx
-diff -u l10n/i18npool/inc/breakiterator_hi.hxx:1.1 l10n/i18npool/inc/breakiterator_hi.hxx:removed
---- l10n/i18npool/inc/breakiterator_hi.hxx:1.1 Wed Apr 24 10:08:25 2002
-+++ l10n/i18npool/inc/breakiterator_hi.hxx Tue Sep 2 00:59:09 2008
-@@ -1,37 +0,0 @@
--/*************************************************************************
--#*
--#* Copyright (c) 2002 Sun Microsystems Inc.
--#*
--#* Bugs! - Contact Prabhat.Hegde at sun.com
--#*************************************************************************/
--
--#ifndef _I18N_BREAKITERATOR_HI_HXX_
--#define _I18N_BREAKITERATOR_HI_HXX_
--
--#include <breakiterator_ctl.hxx>
--
--namespace com {
--namespace sun {
--namespace star {
--namespace i18n {
--
--// ----------------------------------------------------
--// class BreakIterator_hi
--// ----------------------------------------------------
--class BreakIterator_hi : public BreakIterator_CTL
--{
--public:
-- BreakIterator_hi();
-- ~BreakIterator_hi();
--
--protected:
-- void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos)
-- throw(com::sun::star::uno::RuntimeException);
--};
--
--}
--}
--}
--}
--
--#endif
-Index: l10n/i18npool/inc/localedata.hxx
-diff -u l10n/i18npool/inc/localedata.hxx:1.20 l10n/i18npool/inc/localedata.hxx:1.20.16.1
---- l10n/i18npool/inc/localedata.hxx:1.20 Thu Apr 10 01:44:09 2008
-+++ l10n/i18npool/inc/localedata.hxx Mon Aug 18 21:23:30 2008
-@@ -112,6 +112,7 @@
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
-+ virtual rtl::OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-
- //XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-Index: l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx
-diff -u l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.28 l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.27.4.2
---- l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.28 Thu Aug 14 09:27:36 2008
-+++ l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx Mon Aug 25 11:31:48 2008
-@@ -234,6 +234,7 @@
- {
- if (nStartPos < 0 || nStartPos > Text.getLength())
- return -1;
-+ if (Text.getLength() == 0) return 0;
- return LBI->beginOfSentence(Text, nStartPos, rLocale);
- }
-
-@@ -242,6 +243,7 @@
- {
- if (nStartPos < 0 || nStartPos > Text.getLength())
- return -1;
-+ if (Text.getLength() == 0) return 0;
- return LBI->endOfSentence(Text, nStartPos, rLocale);
- }
-
-Index: l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx
-diff -u l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17 l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17.16.1
---- l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17 Thu Apr 10 01:52:22 2008
-+++ l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx Mon Aug 18 21:24:50 2008
-@@ -33,6 +33,7 @@
-
- #define BREAKITERATOR_ALL
- #include <breakiterator_cjk.hxx>
-+#include <localedata.hxx>
- #include <i18nutil/unicode.hxx>
-
- using namespace ::com::sun::star::uno;
-@@ -108,7 +109,7 @@
- LineBreakResults lbr;
-
- if (bOptions.allowPunctuationOutsideMargin &&
-- bOptions.forbiddenBeginCharacters.indexOf(Text[nStartPos]) != -1 &&
-+ hangingCharacters.indexOf(Text[nStartPos]) != -1 &&
- ++nStartPos == Text.getLength()) {
- ; // do nothing
- } else if (bOptions.applyForbiddenRules && 0 < nStartPos && nStartPos < Text.getLength()) {
-@@ -122,12 +123,15 @@
- lbr.breakType = BreakType::WORDBOUNDARY;
- return lbr;
- }
-+
-+#define LOCALE(language, country) lang::Locale(OUString::createFromAscii(language), OUString::createFromAscii(country), OUString())
- // ----------------------------------------------------
- // class BreakIterator_zh
- // ----------------------------------------------------;
- BreakIterator_zh::BreakIterator_zh()
- {
- dict = new xdictionary("zh");
-+ hangingCharacters = LocaleData().getHangingCharacters(LOCALE("zh", "CN"));
- cBreakIterator = "com.sun.star.i18n.BreakIterator_zh";
- }
-
-@@ -137,12 +141,28 @@
- }
-
- // ----------------------------------------------------
-+// class BreakIterator_zh_TW
-+// ----------------------------------------------------;
-+BreakIterator_zh_TW::BreakIterator_zh_TW()
-+{
-+ dict = new xdictionary("zh");
-+ hangingCharacters = LocaleData().getHangingCharacters(LOCALE("zh", "TW"));
-+ cBreakIterator = "com.sun.star.i18n.BreakIterator_zh_TW";
-+}
-+
-+BreakIterator_zh_TW::~BreakIterator_zh_TW()
-+{
-+ delete dict;
-+}
-+
-+// ----------------------------------------------------
- // class BreakIterator_ja
- // ----------------------------------------------------;
- BreakIterator_ja::BreakIterator_ja()
- {
- dict = new xdictionary("ja");
- dict->setJapaneseWordBreak();
-+ hangingCharacters = LocaleData().getHangingCharacters(LOCALE("ja", "JP"));
- cBreakIterator = "com.sun.star.i18n.BreakIterator_ja";
- }
-
-@@ -156,6 +176,7 @@
- // ----------------------------------------------------;
- BreakIterator_ko::BreakIterator_ko()
- {
-+ hangingCharacters = LocaleData().getHangingCharacters(LOCALE("ko", "KR"));
- cBreakIterator = "com.sun.star.i18n.BreakIterator_ko";
- }
-
-Index: l10n/i18npool/source/breakiterator/breakiterator_hi.cxx
-diff -u l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:1.3 l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:removed
---- l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:1.3 Sun Sep 17 02:13:49 2006
-+++ l10n/i18npool/source/breakiterator/breakiterator_hi.cxx Tue Sep 2 00:59:11 2008
-@@ -1,191 +0,0 @@
--/*************************************************************************
--#*
--#* Copyright (c) 2002 Sun Microsystems Inc.
--#*
--#* Bugs! - Contact Prabhat.Hegde at sun.com
--#************************************************************************/
--
--// MARKER(update_precomp.py): autogen include statement, do not remove
--#include "precompiled_i18npool.hxx"
--
--#include <breakiterator_hi.hxx>
--
--#include <string.h> // for memset
--
--using namespace ::com::sun::star::uno;
--using namespace ::com::sun::star::lang;
--using namespace ::rtl;
--
--namespace com { namespace sun { namespace star { namespace i18n {
--
--// ----------------------------------------------------
--// class Breakiterator_hi
--// ----------------------------------------------------;
--BreakIterator_hi::BreakIterator_hi()
--{
-- cBreakIterator = "com.sun.star.i18n.BreakIterator_hi";
--}
--
--BreakIterator_hi::~BreakIterator_hi()
--{
--}
--
--/*
-- * Devanagari character class Definitions
-- */
--#define _NP 1L
--#define _UP (1L<<1)
--#define _IV (1L<<2)
--#define _CN (1L<<3)
--#define _CK (1L<<4)
--#define _RC (1L<<5)
--#define _NM (1L<<6)
--#define _IM (1L<<7)
--#define _HL (1L<<8)
--#define _NK (1L<<9)
--#define _VD (1L<<10)
--#define _HD (1L<<11)
--#define _II_M (1L<<12)
--#define _EY_M (1L<<13)
--#define _AI_M (1L<<14)
--#define _OW1_M (1L<<15)
--#define _OW2_M (1L<<16)
--#define _MS (1L<<17)
--#define _AYE_M (1L<<18)
--#define _EE_M (1L<<19)
--#define _AWE_M (1L<<20)
--#define _O_M (1L<<21)
--#define _RM (_II_M|_EY_M|_AI_M|_OW1_M|_OW2_M|_AYE_M|_EE_M|_AWE_M|_O_M)
--
--/* Non-Defined Class type */
--#define __ND 0
--
--/*
-- * Devanagari character type definitions
-- */
--#define __UP 1 // ChandraBindu & Anuswar
--#define __NP 2 // Visarg
--#define __IV 3 // Independant Vowels
--#define __CN 4 // Consonants except _CK & _RC
--#define __CK 5 // Consonants that can be followed by Nukta
--#define __RC 6 // Ra
--#define __NM 7 // Matra
--#define __RM 8 // Ra + HAL
--#define __IM 9 // Choti I Matra
--#define __HL 10 // HAL
--#define __NK 11 // Nukta
--#define __VD 12 // Vedic
--#define __HD 13 // Hindu Numerals
--
--/*
-- * Devanagari character type table
-- */
--static const sal_uInt16 devaCT[128] = {
--/* 0, 1, 2, 3, 4, 5, 6, 7,
-- 8, 9, A, B, C, D, E, F, */
--/* 0900 */ __ND, __UP, __UP, __NP, __ND, __IV, __IV, __IV,
-- __IV, __IV, __IV, __IV, __IV, __IV, __IV, __IV,
--/* 0910 */ __IV, __IV, __IV, __IV, __IV, __CK, __CK, __CK,
-- __CN, __CN, __CN, __CN, __CK, __CN, __CN, __CN,
--/* 0920 */ __CN, __CK, __CK, __CN, __CN, __CN, __CN, __CN,
-- __CN, __CN, __CN, __CK, __CN, __CN, __CN, __CN,
--/* 0930 */ __RC, __CN, __CN, __CN, __CN, __CN, __CN, __CN,
-- __CN, __CN, __ND, __ND, __NK, __VD, __NM, __IM,
--/* 0940 */ __RM, __NM, __NM, __NM, __NM, __RM, __RM, __RM,
-- __RM, __RM, __RM, __RM, __RM, __HL, __ND, __ND,
--/* 0950 */ __ND, __VD, __VD, __VD, __VD, __ND, __ND, __ND,
-- __CN, __CN, __CN, __CN, __CN, __CN, __CN, __CN,
--/* 0960 */ __IV, __IV, __NM, __NM, __ND, __ND, __HD, __HD,
-- __HD, __HD, __HD, __HD, __HD, __HD, __HD, __HD,
--/* 0970 */ __ND, __ND, __ND, __ND, __ND, __ND, __ND, __ND,
-- __ND, __ND, __ND, __ND, __ND, __ND, __ND, __ND,
--};
--
--
--#define getCharType(x) \
-- ((x >= 0x0900 && x < 0x097f) ? devaCT[x - 0x0900] : __ND)
--
--/*
-- * Devanagari character composition table
-- */
--static const sal_uInt16 devaCompRel[14][14] = {
-- /* ND, UP, NP, IV, CN, CK, RC, NM, RM, IM, HL, NK, VD, HD, */
-- /* 0 */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* ND */
-- /* 1 */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* UP */
-- /* 2 */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* NP */
-- /* 3 */ { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* IV */
-- /* 4 */ { 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0 }, /* CN */
-- /* 5 */ { 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0 }, /* CK */
-- /* 6 */ { 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0 }, /* RC */
-- /* 7 */ { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* NM */
-- /* 8 */ { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* RM */
-- /* 9 */ { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* IM */
-- /* 10 */ { 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }, /* HL */
-- /* 11 */ { 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0 }, /* NK */
-- /* 12 */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* VD */
-- /* 13 */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* HD */
--};
--
--static sal_uInt16 SAL_CALL
--getCombState(const sal_Unicode *text, sal_Int32 pos)
--{
-- sal_uInt16 ch1 = getCharType(text[pos]);
-- sal_uInt16 ch2 = getCharType(text[pos+1]);
--
-- return devaCompRel[ch1][ch2];
--}
--
--static sal_uInt32 SAL_CALL
--getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len)
--{
-- sal_uInt32 curr = 1;
-- for (; pos + 1 < len && getCombState(text, pos) == 1; curr++, pos++) {}
-- return curr;
--}
--
--#define is_Hindi(x) ((x >= 0x0900 && x < 0x097f) || (x >= 0x0905 && x < 0x0940) || \
-- (x >= 0x093c && x < 0x094e) || (x >= 0x0950 && x < 0x0954) || \
-- (x >= 0x0958 && x < 0x0971))
--
--void SAL_CALL
--i18n::BreakIterator_hi::makeIndex(const OUString& Text, sal_Int32 nStartPos)
-- throw(uno::RuntimeException)
--{
-- if (Text != cachedText) {
-- cachedText = Text;
-- if (cellIndexSize < cachedText.getLength()) {
-- cellIndexSize = cachedText.getLength();
-- free(nextCellIndex);
-- free(previousCellIndex);
-- nextCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32));
-- previousCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32));
-- }
-- // reset nextCell for new Text
-- memset(nextCellIndex, 0, cellIndexSize * sizeof(sal_Int32));
-- }
-- else if (nextCellIndex[nStartPos] > 0 || ! is_Hindi(Text[nStartPos]))
-- return;
--
-- const sal_Unicode* str = cachedText.getStr();
-- sal_Int32 len = cachedText.getLength(), startPos, endPos;
--
-- startPos = nStartPos;
-- while (startPos > 0 && is_Hindi(str[startPos-1])) startPos--;
-- endPos = nStartPos+1;
-- while (endPos < len && is_Hindi(str[endPos])) endPos++;
--
-- sal_Int32 start, end, pos;
-- pos = start = end = startPos;
--
-- while (pos < endPos) {
-- end += getACell(str, start, endPos);
-- while (pos < end) {
-- nextCellIndex[pos] = end;
-- previousCellIndex[pos] = start;
-- pos++;
-- }
-- start = end;
-- }
--}
--
--} } } }
-Index: l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx
-diff -u l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36 l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36.2.1
---- l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36 Wed Jul 2 01:52:07 2008
-+++ l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx Mon Sep 1 17:26:14 2008
-@@ -363,11 +363,17 @@
- {
- LineBreakResults lbr;
-
-+ if (nStartPos >= Text.getLength()) {
-+ lbr.breakIndex = Text.getLength();
-+ lbr.breakType = BreakType::WORDBOUNDARY;
-+ return lbr;
-+ }
-+
- loadICUBreakIterator(rLocale, LOAD_LINE_BREAKITERATOR, 0, lineRule, Text);
-
- sal_Bool GlueSpace=sal_True;
- while (GlueSpace) {
-- if (line.aBreakIterator->isBoundary(nStartPos)) { //Line boundary break
-+ if (line.aBreakIterator->preceding(nStartPos + 1) == nStartPos) { //Line boundary break
- lbr.breakIndex = nStartPos;
- lbr.breakType = BreakType::WORDBOUNDARY;
- } else if (hOptions.rHyphenator.is()) { //Hyphenation break
-Index: l10n/i18npool/source/breakiterator/makefile.mk
-diff -u l10n/i18npool/source/breakiterator/makefile.mk:1.17 l10n/i18npool/source/breakiterator/makefile.mk:1.17.16.1
---- l10n/i18npool/source/breakiterator/makefile.mk:1.17 Thu Apr 10 01:53:36 2008
-+++ l10n/i18npool/source/breakiterator/makefile.mk Mon Sep 1 11:01:24 2008
-@@ -57,7 +57,6 @@
- $(SLO)$/breakiterator_cjk.obj \
- $(SLO)$/breakiterator_ctl.obj \
- $(SLO)$/breakiterator_th.obj \
-- $(SLO)$/breakiterator_hi.obj \
- $(SLO)$/breakiterator_unicode.obj \
- $(SLO)$/xdictionary.obj \
- $(subst,$(MISC)$/,$(SLO)$/ $(MY_MISC_CXXFILES:s/.c/.obj/))
-Index: l10n/i18npool/source/breakiterator/data/char_in.txt
-diff -u /dev/null l10n/i18npool/source/breakiterator/data/char_in.txt:1.1.2.1
---- /dev/null Tue Sep 2 00:59:11 2008
-+++ l10n/i18npool/source/breakiterator/data/char_in.txt Mon Sep 1 10:56:14 2008
-@@ -0,0 +1,48 @@
+--- /dev/null 2006-10-27 08:30:37.620506410 +0100
++++ OOD680_m4/i18npool/source/breakiterator/data/char.txt 2006-10-31 16:33:17.000000000 +0000
+@@ -0,0 +1,65 @@
+#
-+# Copyright (C) 2002-2003, International Business Machines Corporation and others.
++# Copyright (C) 2002-2006, International Business Machines Corporation and others.
+# All Rights Reserved.
+#
+# file: char.txt
+#
+# ICU Character Break Rules, also known as Grapheme Cluster Boundaries
+# See Unicode Standard Annex #29.
-+# These rules are based on TR29 Version 4.0.0
++# These rules are based on TR29 Version 5.0.0
++# Includes post-5.0 change to treat Japanese half width voicing marks
++# as Grapheme Extend.
+#
+
+#
+# Character Class Definitions.
-+# The names are those from TR29.
+#
-+$CR = \r;
-+$LF = \n;
-+$Control = [[:Zl:] [:Zp:] [:Cc:] [:Cf:]];
++$CR = [\p{Grapheme_Cluster_Break = CR}];
++$LF = [\p{Grapheme_Cluster_Break = LF}];
++$Control = [\p{Grapheme_Cluster_Break = Control}];
+
+# add Japanese Half Width voicing marks to $Extend
-+$VoiceMarks = [\uff9e\uff9f];
-+$cmcextend = [ \u0903 \u093e-\u0940 \u0949-\u094C \u09bf-\u09c0 \u09c7-\u09c8 \u09cb-\u09cc \u0bc1-\u0bc2 \u0bc6-\u0bc8 \u0bca-\u0bcc \u0c01-\u0c03 \u0c41-\u0c44];
-+$Extend = [[:Grapheme_Extend = TRUE:] $VoiceMarks $cmcextend];
++$VoiceMarks = [\uff9e\uff9f];
++$cmcextend = [\u0903 \u093e-\u0940 \u0949-\u094C \u09bf-\u09c0 \u09c7-\u09c8 \u09cb-\u09cc \u0c01-\u0c03 \u0c41-\u0c44];
++$Extend = [\p{Grapheme_Cluster_Break = Extend} $VoiceMarks $cmcextend];
+
+#
+# Korean Syllable Definitions
+#
-+$L = [:Hangul_Syllable_Type = L:];
-+$V = [:Hangul_Syllable_Type = V:];
-+$T = [:Hangul_Syllable_Type = T:];
++$L = [\p{Grapheme_Cluster_Break = L}];
++$V = [\p{Grapheme_Cluster_Break = V}];
++$T = [\p{Grapheme_Cluster_Break = T}];
+
-+$LV = [:Hangul_Syllable_Type = LV:];
-+$LVT = [:Hangul_Syllable_Type = LVT:];
++$LV = [\p{Grapheme_Cluster_Break = LV}];
++$LVT = [\p{Grapheme_Cluster_Break = LVT}];
+
+$HangulSyllable = $L+ | ($L* ($LV? $V+ | $LV | $LVT) $T*) | $T+;
+
-+#
-+# Forward Break Rules
-+#
++## -------------------------------------------------
++
++!!forward;
++
+$CR $LF;
-+([^$Control] | $HangulSyllable) $Extend*;
-+.;
++([^$Control $CR $LF] | $HangulSyllable) $Extend*;
+
++## -------------------------------------------------
+
-+#
-+# Reverse Rule, back up to the beginning of some preceding grapheme cluster.
-+#
-+! ($Extend | $V | $T )* ($LF $CR | ($LV | $LVT)?$L* | .);
-Index: l10n/i18npool/source/breakiterator/data/char_ta.txt
-diff -u l10n/i18npool/source/breakiterator/data/char_ta.txt:1.2 l10n/i18npool/source/breakiterator/data/char_ta.txt:removed
---- l10n/i18npool/source/breakiterator/data/char_ta.txt:1.2 Mon Oct 17 08:42:47 2005
-+++ l10n/i18npool/source/breakiterator/data/char_ta.txt Tue Sep 2 00:59:11 2008
-@@ -1,46 +0,0 @@
--#
--# Copyright (C) 2002-2003, International Business Machines Corporation and others.
--# All Rights Reserved.
--#
--# file: char.txt
--#
--# ICU Character Break Rules, also known as Grapheme Cluster Boundaries
--# See Unicode Standard Annex #29.
--# These rules are based on TR29 Version 4.0.0
--#
--
--#
--# Character Class Definitions.
--# The names are those from TR29.
--#
--$CR = \r;
--$LF = \n;
--$Control = [[:Zl:] [:Zp:] [:Cc:] [:Cf:]];
--
--$TAMIL = [ \u0bc1-\u0bc2 \u0bc6-\u0bc8 \u0bca-\u0bcc ];
--$Extend = [[:Grapheme_Extend = TRUE:] $TAMIL];
--
--#
--# Korean Syllable Definitions
--#
--$L = [:Hangul_Syllable_Type = L:];
--$V = [:Hangul_Syllable_Type = V:];
--$T = [:Hangul_Syllable_Type = T:];
--
--$LV = [:Hangul_Syllable_Type = LV:];
--$LVT = [:Hangul_Syllable_Type = LVT:];
--
--$HangulSyllable = $L+ | ($L* ($LV? $V+ | $LV | $LVT) $T*) | $T+;
--
--#
--# Forward Break Rules
--#
--$CR $LF;
--([^$Control] | $HangulSyllable) $Extend*;
--.;
--
--
--#
--# Reverse Rule, back up to the beginning of some preceding grapheme cluster.
--#
--! ($Extend | $V | $T )* ($LF $CR | ($LV | $LVT)?$L* | .);
-Index: l10n/i18npool/source/localedata/LocaleNode.cxx
-diff -u l10n/i18npool/source/localedata/LocaleNode.cxx:1.29 l10n/i18npool/source/localedata/LocaleNode.cxx:1.29.16.1
---- l10n/i18npool/source/localedata/LocaleNode.cxx:1.29 Thu Apr 10 02:04:34 2008
-+++ l10n/i18npool/source/localedata/LocaleNode.cxx Mon Aug 18 21:26:23 2008
-@@ -1449,15 +1449,18 @@
- if (forbidNode) {
- of.writeParameter( "forbiddenBegin", forbidNode -> getChildAt(0)->getValue());
- of.writeParameter( "forbiddenEnd", forbidNode -> getChildAt(1)->getValue());
-+ of.writeParameter( "hangingChars", forbidNode -> getChildAt(2)->getValue());
- } else {
- of.writeParameter( "forbiddenBegin", ::rtl::OUString());
- of.writeParameter( "forbiddenEnd", ::rtl::OUString());
-+ of.writeParameter( "hangingChars", ::rtl::OUString());
- }
- of.writeAsciiString("\nstatic const sal_Unicode* LCForbiddenCharactersArray[] = {\n");
- of.writeAsciiString("\tforbiddenBegin,\n");
-- of.writeAsciiString("\tforbiddenEnd\n");
-+ of.writeAsciiString("\tforbiddenEnd,\n");
-+ of.writeAsciiString("\thangingChars\n");
- of.writeAsciiString("};\n\n");
-- of.writeFunction("getForbiddenCharacters_", "2", "LCForbiddenCharactersArray");
-+ of.writeFunction("getForbiddenCharacters_", "3", "LCForbiddenCharactersArray");
-
- if (breakNode) {
- of.writeParameter( "EditMode", breakNode -> getChildAt(0)->getValue());
-Index: l10n/i18npool/source/localedata/localedata.cxx
-diff -u l10n/i18npool/source/localedata/localedata.cxx:1.59 l10n/i18npool/source/localedata/localedata.cxx:1.59.16.1
---- l10n/i18npool/source/localedata/localedata.cxx:1.59 Thu Apr 10 02:05:23 2008
-+++ l10n/i18npool/source/localedata/localedata.cxx Mon Aug 18 21:26:23 2008
-@@ -999,6 +999,21 @@
- }
- }
-
-+OUString SAL_CALL
-+LocaleData::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException)
-+{
-+ sal_Int16 LCForbiddenCharactersCount = 0;
-+ sal_Unicode **LCForbiddenCharactersArray = NULL;
-+
-+ MyFunc_Type func = (MyFunc_Type) getFunctionSymbol( rLocale, "getForbiddenCharacters" );
-+
-+ if ( func ) {
-+ LCForbiddenCharactersArray = func(LCForbiddenCharactersCount);
-+ return OUString(LCForbiddenCharactersArray[2]);
-+ }
-+
-+ return OUString();
-+}
-
- Sequence< OUString > SAL_CALL
- LocaleData::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeException)
-Index: l10n/i18npool/source/localedata/data/bn_BD.xml
-diff -u l10n/i18npool/source/localedata/data/bn_BD.xml:1.3 l10n/i18npool/source/localedata/data/bn_BD.xml:1.3.186.1
---- l10n/i18npool/source/localedata/data/bn_BD.xml:1.3 Thu Apr 20 06:31:30 2006
-+++ l10n/i18npool/source/localedata/data/bn_BD.xml Mon Sep 1 11:05:47 2008
-@@ -151,6 +151,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+ <BreakIteratorRules>
-+ <EditMode/>
-+ <DictionaryMode/>
-+ <WordCountMode/>
-+ <CharacterMode>char_in</CharacterMode>
-+ <LineMode/>
-+ </BreakIteratorRules>
- <ReservedWords>
- <trueWord>সতà§à¦¯</trueWord>
- <falseWord>মিথà§à¦¯à¦¾</falseWord>
-Index: l10n/i18npool/source/localedata/data/bn_IN.xml
-diff -u l10n/i18npool/source/localedata/data/bn_IN.xml:1.4 l10n/i18npool/source/localedata/data/bn_IN.xml:1.4.12.1
---- l10n/i18npool/source/localedata/data/bn_IN.xml:1.4 Tue May 13 07:06:42 2008
-+++ l10n/i18npool/source/localedata/data/bn_IN.xml Mon Sep 1 11:05:47 2008
-@@ -316,6 +316,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+ <BreakIteratorRules>
-+ <EditMode/>
-+ <DictionaryMode/>
-+ <WordCountMode/>
-+ <CharacterMode>char_in</CharacterMode>
-+ <LineMode/>
-+ </BreakIteratorRules>
- <ReservedWords>
- <trueWord>সতà§à¦¯</trueWord>
- <falseWord>মিথà§à¦¯à¦¾</falseWord>
-Index: l10n/i18npool/source/localedata/data/gu_IN.xml
-diff -u l10n/i18npool/source/localedata/data/gu_IN.xml:1.5 l10n/i18npool/source/localedata/data/gu_IN.xml:1.5.4.1
---- l10n/i18npool/source/localedata/data/gu_IN.xml:1.5 Wed Jul 2 03:07:00 2008
-+++ l10n/i18npool/source/localedata/data/gu_IN.xml Mon Sep 1 17:44:31 2008
-@@ -146,6 +146,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>સહà«</trueWord>
- <falseWord>àªàª²àª¤</falseWord>
-Index: l10n/i18npool/source/localedata/data/hi_IN.xml
-diff -u l10n/i18npool/source/localedata/data/hi_IN.xml:1.14 l10n/i18npool/source/localedata/data/hi_IN.xml:1.14.4.1
---- l10n/i18npool/source/localedata/data/hi_IN.xml:1.14 Wed Jul 2 03:07:31 2008
-+++ l10n/i18npool/source/localedata/data/hi_IN.xml Mon Sep 1 11:05:47 2008
-@@ -358,6 +358,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>सहà¥</trueWord>
- <falseWord>à¤à¤²à¤¤</falseWord>
-Index: l10n/i18npool/source/localedata/data/ja_JP.xml
-diff -u l10n/i18npool/source/localedata/data/ja_JP.xml:1.17 l10n/i18npool/source/localedata/data/ja_JP.xml:1.17.26.2
---- l10n/i18npool/source/localedata/data/ja_JP.xml:1.17 Mon Jan 28 07:35:35 2008
-+++ l10n/i18npool/source/localedata/data/ja_JP.xml Mon Sep 1 17:38:27 2008
-@@ -503,6 +503,7 @@
- <ForbiddenCharacters>
- <ForbiddenLineBeginCharacters>!%),.:;?]}¢°âââ°â²â³âããã
ããããããããã
ããã£ãã
ããããããã¡ã£ã¥ã§ã©ãã£ã¥ã§ã®ãµã¶ã»ã¼ã½ã¾ï¼ï¼
ï¼ï¼ï¼ï¼ï¼ï¼ï¼½ï½ï½¡ï½£ï½¤ï½¥ï½§ï½¨ï½©ï½ªï½«ï½¬ï½ï½®ï½¯ï½°ï¾ï¾Â¢</ForbiddenLineBeginCharacters>
- <ForbiddenLineEndCharacters>$([Â¥{£¥ââããããããï¼ï¼ï¼»ï½ï½¢Â£ï¿¥</ForbiddenLineEndCharacters>
-+ <LineBreakHangingCharacters>ããï¼ï¼</LineBreakHangingCharacters>
- </ForbiddenCharacters>
- <ReservedWords>
- <trueWord>true</trueWord>
-Index: l10n/i18npool/source/localedata/data/kn_IN.xml
-diff -u l10n/i18npool/source/localedata/data/kn_IN.xml:1.9 l10n/i18npool/source/localedata/data/kn_IN.xml:1.9.4.1
---- l10n/i18npool/source/localedata/data/kn_IN.xml:1.9 Wed Jul 2 03:09:49 2008
-+++ l10n/i18npool/source/localedata/data/kn_IN.xml Mon Sep 1 17:44:31 2008
-@@ -146,6 +146,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>ಸಹà³</trueWord>
- <falseWord>à²à²²à²¤à³</falseWord>
-Index: l10n/i18npool/source/localedata/data/ko_KR.xml
-diff -u l10n/i18npool/source/localedata/data/ko_KR.xml:1.22 l10n/i18npool/source/localedata/data/ko_KR.xml:1.22.186.1
---- l10n/i18npool/source/localedata/data/ko_KR.xml:1.22 Thu Apr 20 06:47:11 2006
-+++ l10n/i18npool/source/localedata/data/ko_KR.xml Mon Aug 18 21:26:23 2008
-@@ -580,6 +580,7 @@
- <ForbiddenCharacters>
- <ForbiddenLineBeginCharacters>!%),.:;?]}Â¢ï¿ ?'"â²â³â>ãï¼ãããããï¼ï¼
ï¼ï¼ï¼ï¼ï¼ï¼ï¼½ï½ï½¡ï½£ï½¤ï½¥ ï¾ï¾</ForbiddenLineBeginCharacters>
- <ForbiddenLineEndCharacters>$(¥£[\{ï¿¡ï¿¥'"<ï¼ãããããï¼ï¼ï¼»ï½ï¿¦ï½¢</ForbiddenLineEndCharacters>
-+ <LineBreakHangingCharacters>!,.:;?ããï¼ï¼ï¼ï¼ï¼ï¼</LineBreakHangingCharacters>
- </ForbiddenCharacters>
- <ReservedWords>
- <trueWord>ì°¸</trueWord>
-Index: l10n/i18npool/source/localedata/data/locale.dtd
-diff -u l10n/i18npool/source/localedata/data/locale.dtd:1.24 l10n/i18npool/source/localedata/data/locale.dtd:1.24.26.1
---- l10n/i18npool/source/localedata/data/locale.dtd:1.24 Mon Jan 28 07:36:04 2008
-+++ l10n/i18npool/source/localedata/data/locale.dtd Mon Aug 18 21:26:23 2008
-@@ -403,7 +403,7 @@
-
- <!ELEMENT LC_MISC (ForbiddenCharacters?, BreakIteratorRules?, ReservedWords?)>
- <!ATTLIST LC_MISC %RefLocale;>
--<!ELEMENT ForbiddenCharacters (ForbiddenLineBeginCharacters, ForbiddenLineEndCharacters)>
-+<!ELEMENT ForbiddenCharacters (ForbiddenLineBeginCharacters, ForbiddenLineEndCharacters, LineBreakHangingCharacters)>
- <!ELEMENT ForbiddenLineBeginCharacters (#PCDATA)>
- <!ELEMENT ForbiddenLineEndCharacters (#PCDATA)>
-
-Index: l10n/i18npool/source/localedata/data/ml_IN.xml
-diff -u l10n/i18npool/source/localedata/data/ml_IN.xml:1.2 l10n/i18npool/source/localedata/data/ml_IN.xml:1.2.182.1
---- l10n/i18npool/source/localedata/data/ml_IN.xml:1.2 Thu May 4 02:16:24 2006
-+++ l10n/i18npool/source/localedata/data/ml_IN.xml Mon Sep 1 17:44:31 2008
-@@ -314,6 +314,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+ <BreakIteratorRules>
-+ <EditMode/>
-+ <DictionaryMode/>
-+ <WordCountMode/>
-+ <CharacterMode>char_in</CharacterMode>
-+ <LineMode/>
-+ </BreakIteratorRules>
- <ReservedWords>
- <trueWord>à´
à´¤àµ</trueWord>
- <falseWord>à´
à´²àµà´²</falseWord>
-Index: l10n/i18npool/source/localedata/data/or_IN.xml
-diff -u l10n/i18npool/source/localedata/data/or_IN.xml:1.4 l10n/i18npool/source/localedata/data/or_IN.xml:1.4.4.1
---- l10n/i18npool/source/localedata/data/or_IN.xml:1.4 Wed Jul 2 03:11:42 2008
-+++ l10n/i18npool/source/localedata/data/or_IN.xml Mon Sep 1 17:44:31 2008
-@@ -327,6 +327,13 @@
- <Transliteration unoid="IGNORE_CASE"/>
- </LC_TRANSLITERATION>
- <LC_MISC>
-+ <BreakIteratorRules>
-+ <EditMode/>
-+ <DictionaryMode/>
-+ <WordCountMode/>
-+ <CharacterMode>char_in</CharacterMode>
-+ <LineMode/>
-+ </BreakIteratorRules>
- <ReservedWords>
- <trueWord>ସତ</trueWord>
- <falseWord>ମିà¬</falseWord>
-Index: l10n/i18npool/source/localedata/data/pa_IN.xml
-diff -u l10n/i18npool/source/localedata/data/pa_IN.xml:1.5 l10n/i18npool/source/localedata/data/pa_IN.xml:1.5.186.1
---- l10n/i18npool/source/localedata/data/pa_IN.xml:1.5 Thu Apr 20 06:50:32 2006
-+++ l10n/i18npool/source/localedata/data/pa_IN.xml Mon Sep 1 11:05:47 2008
-@@ -168,6 +168,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+ <BreakIteratorRules>
-+ <EditMode/>
-+ <DictionaryMode/>
-+ <WordCountMode/>
-+ <CharacterMode>char_in</CharacterMode>
-+ <LineMode/>
-+ </BreakIteratorRules>
- <ReservedWords>
- <trueWord>ਸਹà©</trueWord>
- <falseWord>à¨à¨²à¨¤</falseWord>
-Index: l10n/i18npool/source/localedata/data/ta_IN.xml
-diff -u l10n/i18npool/source/localedata/data/ta_IN.xml:1.8 l10n/i18npool/source/localedata/data/ta_IN.xml:1.8.4.1
---- l10n/i18npool/source/localedata/data/ta_IN.xml:1.8 Wed Jul 2 03:14:34 2008
-+++ l10n/i18npool/source/localedata/data/ta_IN.xml Mon Sep 1 11:05:48 2008
-@@ -146,6 +146,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>ஸரி</trueWord>
- <falseWord>தபà¯à®ª</falseWord>
-Index: l10n/i18npool/source/localedata/data/te_IN.xml
-diff -u l10n/i18npool/source/localedata/data/te_IN.xml:1.9 l10n/i18npool/source/localedata/data/te_IN.xml:1.9.4.1
---- l10n/i18npool/source/localedata/data/te_IN.xml:1.9 Wed Jul 2 03:14:53 2008
-+++ l10n/i18npool/source/localedata/data/te_IN.xml Mon Sep 1 11:05:48 2008
-@@ -145,6 +145,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>నిà°à°®à±</trueWord>
- <falseWord>à°
పాదమà±</falseWord>
-Index: l10n/i18npool/source/localedata/data/zh_CN.xml
-diff -u l10n/i18npool/source/localedata/data/zh_CN.xml:1.21 l10n/i18npool/source/localedata/data/zh_CN.xml:1.21.4.1
---- l10n/i18npool/source/localedata/data/zh_CN.xml:1.21 Wed Jul 2 03:15:57 2008
-+++ l10n/i18npool/source/localedata/data/zh_CN.xml Mon Aug 18 21:26:23 2008
-@@ -430,6 +430,7 @@
- <ForbiddenCharacters>
- <ForbiddenLineBeginCharacters>:!),.:;?]}¢'"ãããããããããã︰︱︳ï¹ï½¤ï¹ï¹ï¹ï¹ï¹ï¹ï¹ï¹ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï½ï½ï¸´ï¸¶ï¸¸ï¸ºï¸¼ï¸¾ï¹ï¹ï¹ï¹ï½¤ï½ï¿ ã
ââ¢Â·ËËâ--â²</ForbiddenLineBeginCharacters>
- <ForbiddenLineEndCharacters>([{£¥'"âµãããããããï¼ï¼»ï½ï¿¡ï¿¥ã︵︷︹︻︽︿ï¹ï¹ï¹ï¹ï¹ï¼ï½</ForbiddenLineEndCharacters>
-+<LineBreakHangingCharacters>!,.:;?ããï¼ï¼ï¼ï¼ï¼ï¼</LineBreakHangingCharacters>
- </ForbiddenCharacters>
- <ReservedWords>
- <trueWord>ç</trueWord>
-Index: l10n/i18npool/source/localedata/data/zh_TW.xml
-diff -u l10n/i18npool/source/localedata/data/zh_TW.xml:1.18 l10n/i18npool/source/localedata/data/zh_TW.xml:1.18.20.1
---- l10n/i18npool/source/localedata/data/zh_TW.xml:1.18 Wed Mar 5 10:45:25 2008
-+++ l10n/i18npool/source/localedata/data/zh_TW.xml Mon Aug 18 21:26:23 2008
-@@ -359,6 +359,7 @@
- <ForbiddenCharacters>
- <ForbiddenLineBeginCharacters>!),.:;?]}¢·--'"¨â¢â²ããããããããã︰︱︳︴︶︸︺︼︾ï¹ï¹ï¹ï¹ï¹ï½¤ï¹ï¹ï¹ï¹ï¹ï¹ï¹ï¹ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï½ï½ï½¤</ForbiddenLineBeginCharacters>
- <ForbiddenLineEndCharacters>([{£¥'"âµããããããã︵︷︹︻︽︿ï¹ï¹ï¹ï¹ï¹ï¼ï½</ForbiddenLineEndCharacters>
-+<LineBreakHangingCharacters>!,.:;?ããï¼ï¼ï¼ï¼ï¼ï¼</LineBreakHangingCharacters>
- </ForbiddenCharacters>
- <ReservedWords>
- <trueWord>ç</trueWord>
-Index: l10n/i18npool/source/registerservices/registerservices.cxx
-diff -u l10n/i18npool/source/registerservices/registerservices.cxx:1.44 l10n/i18npool/source/registerservices/registerservices.cxx:1.44.16.2
---- l10n/i18npool/source/registerservices/registerservices.cxx:1.44 Thu Apr 10 02:08:28 2008
-+++ l10n/i18npool/source/registerservices/registerservices.cxx Mon Sep 1 11:04:41 2008
-@@ -65,7 +65,6 @@
- #include <breakiteratorImpl.hxx>
- #include <breakiterator_cjk.hxx>
- #include <breakiterator_th.hxx>
--#include <breakiterator_hi.hxx>
- #include <breakiterator_unicode.hxx>
-
- #include <indexentrysupplier.hxx>
-@@ -152,9 +151,9 @@
- IMPL_CREATEINSTANCE( BreakIterator_Unicode )
- IMPL_CREATEINSTANCE( BreakIterator_ja )
- IMPL_CREATEINSTANCE( BreakIterator_zh )
-+IMPL_CREATEINSTANCE( BreakIterator_zh_TW )
- IMPL_CREATEINSTANCE( BreakIterator_ko )
- IMPL_CREATEINSTANCE( BreakIterator_th )
--IMPL_CREATEINSTANCE( BreakIterator_hi )
- IMPL_CREATEINSTANCE_MSF( ChapterCollator )
- IMPL_CREATEINSTANCE_MSF( CollatorImpl )
- IMPL_CREATEINSTANCE( Collator_Unicode )
-@@ -369,15 +368,15 @@
- { "com.sun.star.i18n.BreakIterator_zh",
- "com.sun.star.i18n.BreakIterator_zh",
- &BreakIterator_zh_CreateInstance },
-+ { "com.sun.star.i18n.BreakIterator_zh_TW",
-+ "com.sun.star.i18n.BreakIterator_zh_TW",
-+ &BreakIterator_zh_TW_CreateInstance },
- { "com.sun.star.i18n.BreakIterator_ko",
- "com.sun.star.i18n.BreakIterator_ko",
- &BreakIterator_ko_CreateInstance },
- { "com.sun.star.i18n.BreakIterator_th",
- "com.sun.star.i18n.BreakIterator_th",
- &BreakIterator_th_CreateInstance },
-- { "com.sun.star.i18n.BreakIterator_hi",
-- "com.sun.star.i18n.BreakIterator_hi",
-- &BreakIterator_hi_CreateInstance },
- { "com.sun.star.i18n.Collator",
- "com.sun.star.i18n.Collator",
- &CollatorImpl_CreateInstance },
++!!reverse;
++
++$BackHangulSyllable = $L+ | ($T* ($V+$LV? | $LV | $LVT) $L*) | $T+;
++$BackOneCluster = ($LF $CR) | ($Extend* ([^$Control $CR $LF] | $BackHangulSyllable));
++$BackOneCluster;
++
++## -------------------------------------------------
++
++!!safe_reverse;
++
++# rule 6, 7, 8
++$V+ $L;
++
++## -------------------------------------------------
++
++!!safe_forward;
++
++# rule 6, 7, 8
++$V+ $T;
- Previous message: rpms/gcc/devel gcc43-pr37189.patch, NONE, 1.1 gcc43-x86_64-va_start.patch, NONE, 1.1 .cvsignore, 1.242, 1.243 gcc43.spec, 1.40, 1.41 sources, 1.245, 1.246 gcc43-fortran-debug1.patch, 1.1, NONE gcc43-fortran-debug10.patch, 1.2, NONE gcc43-fortran-debug11.patch, 1.1, NONE gcc43-fortran-debug2.patch, 1.2, NONE gcc43-fortran-debug3.patch, 1.1, NONE gcc43-fortran-debug4.patch, 1.1, NONE gcc43-fortran-debug5.patch, 1.1, NONE gcc43-fortran-debug6.patch, 1.1, NONE gcc43-fortran-debug7.patch, 1.1, NONE gcc43-fortran-debug8.patch, 1.1, NONE gcc43-fortran-debug9.patch, 1.1, NONE gcc43-pr37248.patch, 1.2, NONE
- Next message: rpms/dfu-programmer/F-9 .cvsignore, 1.3, 1.4 dfu-programmer.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list