*** misc/icu/source/common/brkiter.cpp Wed Aug 7 17:39:14 2002 --- misc/build/icu/source/common/brkiter.cpp Fri Feb 14 16:48:06 2003 *************** *** 39,51 **** // Creates a break iterator for word breaks. BreakIterator* ! BreakIterator::createWordInstance(const Locale& key, UErrorCode& status) { // WARNING: This routine is currently written specifically to handle only the // default rules files and the alternate rules files for Thai. This function // will have to be made fully general at some time in the future! BreakIterator* result = NULL; - const char* filename = "word"; if (U_FAILURE(status)) return NULL; --- 39,50 ---- // Creates a break iterator for word breaks. BreakIterator* ! BreakIterator::createWordInstance(const Locale& key, const char* filename, UErrorCode& status) { // WARNING: This routine is currently written specifically to handle only the // default rules files and the alternate rules files for Thai. This function // will have to be made fully general at some time in the future! BreakIterator* result = NULL; if (U_FAILURE(status)) return NULL; *************** *** 80,85 **** --- 79,90 ---- return result; } + BreakIterator* + BreakIterator::createWordInstance(const Locale& key, UErrorCode& status) + { + return createWordInstance(key, "word", status); + } + // ------------------------------------- // Creates a break iterator for line breaks. *** misc/icu/source/common/unicode/brkiter.h Wed Aug 7 17:39:14 2002 --- misc/build/icu/source/common/unicode/brkiter.h Fri Feb 14 16:48:06 2003 *************** *** 348,353 **** --- 348,355 ---- */ static BreakIterator* createWordInstance(const Locale& where, UErrorCode& status); + static BreakIterator* createWordInstance(const Locale& where, const char* filename, + UErrorCode& status); /** * Create BreakIterator for line-breaks using specified locale. *** misc/icu/source/config/mh-darwin Thu May 30 02:45:06 2002 --- misc/build/icu/source/config/mh-darwin Wed Apr 23 10:18:01 2003 *************** *** 36,43 **** STATIC_O = ao ## Versioned target for a shared library. ! FINAL_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) ! MIDDLE_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c --- 36,48 ---- STATIC_O = ao ## Versioned target for a shared library. ! # Modified to fit into OpenOffice versioning scheme ! # Original ! #FINAL_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) ! #MIDDLE_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) ! # Modified ! FINAL_SO_TARGET = $(basename $(SO_TARGET)).$(SO).$(SO_TARGET_VERSION) ! MIDDLE_SO_TARGET = $(basename $(SO_TARGET)).$(SO).$(SO_TARGET_VERSION_MAJOR) ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c *************** *** 67,76 **** [ -s $@ ] || rm -f $@' ## Versioned libraries rules ! ! %.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) $(RM) $@ && ln -s ${(rValue)) + #define SWAPL(rValue) loadBigEndianLong(reinterpret_cast(rValue)) + + inline le_uint16 loadBigEndianWord( const le_uint16& rValue ) + { + const le_uint8* p = reinterpret_cast(&rValue); + return ((p[0] << 8) + p[1]); + } + + inline le_uint32 loadBigEndianLong( const le_uint32& rValue ) + { + const le_uint8* p = reinterpret_cast(&rValue); + return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]); + } + + #endif + /** * This class is used to access data which stored in big endian order * regardless of the conventions of the platform. It has been designed *** misc/icu/source/layout/LookupProcessor.cpp Tue Jul 16 12:29:20 2002 --- misc/build/icu/source/layout/LookupProcessor.cpp Fri Feb 14 16:48:07 2003 *************** *** 109,115 **** Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset, LETag scriptTag, LETag languageTag, const LETag *featureOrder) : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), ! requiredFeatureTag(notSelected) { const ScriptListTable *scriptListTable = NULL; const LangSysTable *langSysTable = NULL; --- 109,115 ---- Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset, LETag scriptTag, LETag languageTag, const LETag *featureOrder) : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), ! requiredFeatureTag(notSelected), lookupOrderArray(NULL) { const ScriptListTable *scriptListTable = NULL; const LangSysTable *langSysTable = NULL; *** misc/icu/source/layout/Makefile.in Tue Apr 22 11:59:40 2003 --- misc/build/icu/source/layout/Makefile.in Tue Apr 22 12:07:20 2003 *************** *** 38,44 **** CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) DEFS += -DU_LAYOUT_IMPLEMENTATION ! LIBS = $(DEFAULT_LIBS) OBJECTS = loengine.o \ --- 38,44 ---- CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) DEFS += -DU_LAYOUT_IMPLEMENTATION ! LIBS = $(LIBICUUC) $(DEFAULT_LIBS) OBJECTS = loengine.o \ *** misc/icu/source/layout/OpenTypeLayoutEngine.h Tue Aug 13 17:17:50 2002 --- misc/build/icu/source/layout/OpenTypeLayoutEngine.h Fri Feb 14 16:48:07 2003 *************** *** 3,8 **** --- 3,9 ---- * %W% %E% * * (C) Copyright IBM Corp. 1998, 1999, 2000, 2001, 2002 - All Rights Reserved + * with some additions by Sun MicroSystems 2002 * */ *************** *** 316,321 **** --- 317,335 ---- glyphs = tempGlyphs; charIndices = tempCharIndices; + #if 1 // HDU: remove deleted glyphs (0xFFFF) and deleted marks (0xFFFE) + int nGlyphCount = 0; + for( int i = 0; i < tempGlyphCount; ++i ) + if( glyphs[i] < 0xFFFE ) + { + glyphs[ nGlyphCount ] = glyphs[ i ]; + charIndices[ nGlyphCount ] = charIndices[ i ]; + ++nGlyphCount; + } + + tempGlyphCount = nGlyphCount; + #endif + return tempGlyphCount; };