ICU-1126 move break iterator code to common library so that titlecasing can use it

X-SVN-Rev: 7728
This commit is contained in:
Markus Scherer 2002-02-21 04:42:32 +00:00
parent 6b6183346e
commit aae7ac8a66
18 changed files with 159 additions and 154 deletions

View file

@ -72,10 +72,11 @@ udata.o ucmndata.o udatamem.o umapfile.o filestrm.o \
uresbund.o uresdata.o resbund.o cwchar.o uloc.o locid.o uhash.o uhash_us.o \
ucnv.o ucnv_bld.o ucnv_cb.o ucnv_cnv.o ucnv_err.o ucnv_io.o ucnvlat1.o \
ucnv_utf.o ucnvmbcs.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvscsu.o ucnvisci.o \
unistr.o utf_impl.o ustring.o cstring.o ustrfmt.o ustrtrns.o \
unistr.o utf_impl.o ustring.o ustrcase.o cstring.o ustrfmt.o ustrtrns.o \
normlzr.o unorm.o chariter.o schriter.o uchriter.o uiter.o \
uchar.o bidi.o ubidi.o ubidiwrt.o ubidiln.o ushape.o unames.o ucln_cmn.o \
uscript.o umemstrm.o ucmp8.o ucmpe32.o uvector.o digitlst.o \
brkiter.o brkdict.o ubrk.o dbbi.o dbbi_tbl.o rbbi.o rbbi_tbl.o \
unicode.o scsu.o convert.o utrie.o
STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))

View file

@ -98,6 +98,14 @@ SOURCE=.\bidi.cpp
# End Source File
# Begin Source File
SOURCE=.\brkdict.cpp
# End Source File
# Begin Source File
SOURCE=.\brkiter.cpp
# End Source File
# Begin Source File
SOURCE=.\chariter.cpp
# End Source File
# Begin Source File
@ -114,6 +122,14 @@ SOURCE=.\cwchar.c
# End Source File
# Begin Source File
SOURCE=.\dbbi.cpp
# End Source File
# Begin Source File
SOURCE=.\dbbi_tbl.cpp
# End Source File
# Begin Source File
SOURCE=.\digitlst.cpp
# End Source File
# Begin Source File
@ -143,6 +159,14 @@ SOURCE=.\putil.c
# End Source File
# Begin Source File
SOURCE=.\rbbi.cpp
# End Source File
# Begin Source File
SOURCE=.\rbbi_tbl.cpp
# End Source File
# Begin Source File
SOURCE=.\resbund.cpp
# End Source File
# Begin Source File
@ -167,6 +191,10 @@ SOURCE=.\ubidiwrt.c
# End Source File
# Begin Source File
SOURCE=.\ubrk.cpp
# End Source File
# Begin Source File
SOURCE=.\uchar.c
# End Source File
# Begin Source File
@ -318,6 +346,10 @@ SOURCE=.\ushape.c
# End Source File
# Begin Source File
SOURCE=.\ustrcase.c
# End Source File
# Begin Source File
SOURCE=.\ustrfmt.c
# End Source File
# Begin Source File
@ -373,6 +405,37 @@ InputPath=.\unicode\bidi.h
# End Source File
# Begin Source File
SOURCE=.\brkdict.h
# End Source File
# Begin Source File
SOURCE=.\unicode\brkiter.h
!IF "$(CFG)" == "common - Win32 Release"
# Begin Custom Build
InputPath=.\unicode\brkiter.h
"..\..\include\unicode\brkiter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\brkiter.h ..\..\include\unicode
# End Custom Build
!ELSEIF "$(CFG)" == "common - Win32 Debug"
# Begin Custom Build
InputPath=.\unicode\brkiter.h
"..\..\include\unicode\brkiter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\brkiter.h ..\..\include\unicode
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\unicode\chariter.h
!IF "$(CFG)" == "common - Win32 Release"
@ -443,6 +506,37 @@ SOURCE=.\cwchar.h
# End Source File
# Begin Source File
SOURCE=.\unicode\dbbi.h
!IF "$(CFG)" == "common - Win32 Release"
# Begin Custom Build
InputPath=.\unicode\dbbi.h
"..\..\include\unicode\dbbi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\dbbi.h ..\..\include\unicode
# End Custom Build
!ELSEIF "$(CFG)" == "common - Win32 Debug"
# Begin Custom Build
InputPath=.\unicode\dbbi.h
"..\..\include\unicode\dbbi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\dbbi.h ..\..\include\unicode
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\dbbi_tbl.h
# End Source File
# Begin Source File
SOURCE=.\digitlst.h
# End Source File
# Begin Source File
@ -571,6 +665,37 @@ InputPath=.\unicode\pwin32.h
# End Source File
# Begin Source File
SOURCE=.\unicode\rbbi.h
!IF "$(CFG)" == "common - Win32 Release"
# Begin Custom Build
InputPath=.\unicode\rbbi.h
"..\..\include\unicode\rbbi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\rbbi.h ..\..\include\unicode
# End Custom Build
!ELSEIF "$(CFG)" == "common - Win32 Debug"
# Begin Custom Build
InputPath=.\unicode\rbbi.h
"..\..\include\unicode\rbbi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\rbbi.h ..\..\include\unicode
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\rbbi_tbl.h
# End Source File
# Begin Source File
SOURCE=.\unicode\rep.h
!IF "$(CFG)" == "common - Win32 Release"
@ -710,6 +835,33 @@ SOURCE=.\ubidiimp.h
# End Source File
# Begin Source File
SOURCE=.\unicode\ubrk.h
!IF "$(CFG)" == "common - Win32 Release"
# Begin Custom Build
InputPath=.\unicode\ubrk.h
"..\..\include\unicode\ubrk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\ubrk.h ..\..\include\unicode
# End Custom Build
!ELSEIF "$(CFG)" == "common - Win32 Debug"
# Begin Custom Build
InputPath=.\unicode\ubrk.h
"..\..\include\unicode\ubrk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\ubrk.h ..\..\include\unicode
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\unicode\uchar.h
!IF "$(CFG)" == "common - Win32 Release"

View file

@ -177,7 +177,7 @@ U_NAMESPACE_BEGIN
* \endcode
* </pre>
*/
class U_I18N_API BreakIterator {
class U_COMMON_API BreakIterator {
public:
virtual ~BreakIterator();

View file

@ -46,7 +46,7 @@ class DictionaryBasedBreakIteratorTables;
* <b> NOTE </b> The DictionaryBasedIterator class is still under development. The
* APIs are not in stable condition yet.
*/
class U_I18N_API DictionaryBasedBreakIterator : public RuleBasedBreakIterator {
class U_COMMON_API DictionaryBasedBreakIterator : public RuleBasedBreakIterator {
private:
/**

View file

@ -183,7 +183,7 @@ class BreakIterator;
*
* @author Richard Gillam
*/
class U_I18N_API RuleBasedBreakIterator : public BreakIterator {
class U_COMMON_API RuleBasedBreakIterator : public BreakIterator {
public:
/**

View file

@ -59,7 +59,7 @@ endif
LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
LIBS = $(LIBICUUC) @LIBS@
OBJECTS = ucln_in.o brkiter.o brkdict.o ubrk.o \
OBJECTS = ucln_in.o \
fmtable.o format.o msgfmt.o umsg.o numfmt.o unum.o decimfmt.o dcfmtsym.o \
choicfmt.o datefmt.o smpdtfmt.o dtfmtsym.o udat.o \
ucal.o calendar.o gregocal.o timezone.o simpletz.o \
@ -68,7 +68,7 @@ ucol.o ucol_bld.o ucol_cnt.o ucol_elm.o ucol_tok.o ucol_wgt.o tblcoll.o \
strmatch.o usearch.o search.o stsearch.o \
uniset.o unifltlg.o translit.o utrans.o \
cpdtrans.o hextouni.o rbt.o rbt_data.o rbt_pars.o rbt_rule.o rbt_set.o \
dbbi.o dbbi_tbl.o rbbi.o rbbi_tbl.o nultrans.o \
nultrans.o \
remtrans.o titletrn.o tolowtrn.o toupptrn.o xformtrn.o \
name2uni.o uni2name.o unitohex.o nortrans.o unifilt.o quant.o transreg.o \
llong.o nfrs.o nfrule.o nfsubs.o rbnf.o upropset.o util.o esctrn.o unesctrn.o \

View file

@ -98,14 +98,6 @@ SOURCE=.\bocsu.c
# End Source File
# Begin Source File
SOURCE=.\brkdict.cpp
# End Source File
# Begin Source File
SOURCE=.\brkiter.cpp
# End Source File
# Begin Source File
SOURCE=.\calendar.cpp
# End Source File
# Begin Source File
@ -134,14 +126,6 @@ SOURCE=.\datefmt.cpp
# End Source File
# Begin Source File
SOURCE=.\dbbi.cpp
# End Source File
# Begin Source File
SOURCE=.\dbbi_tbl.cpp
# End Source File
# Begin Source File
SOURCE=.\dcfmtsym.cpp
# End Source File
# Begin Source File
@ -218,14 +202,6 @@ SOURCE=.\quant.cpp
# End Source File
# Begin Source File
SOURCE=.\rbbi.cpp
# End Source File
# Begin Source File
SOURCE=.\rbbi_tbl.cpp
# End Source File
# Begin Source File
SOURCE=.\rbnf.cpp
# End Source File
# Begin Source File
@ -314,10 +290,6 @@ SOURCE=.\tridpars.cpp
# End Source File
# Begin Source File
SOURCE=.\ubrk.cpp
# End Source File
# Begin Source File
SOURCE=.\ucal.cpp
# End Source File
# Begin Source File
@ -422,37 +394,6 @@ SOURCE=.\bocsu.h
# End Source File
# Begin Source File
SOURCE=.\brkdict.h
# End Source File
# Begin Source File
SOURCE=.\unicode\brkiter.h
!IF "$(CFG)" == "i18n - Win32 Release"
# Begin Custom Build
InputPath=.\unicode\brkiter.h
"..\..\include\unicode\brkiter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\brkiter.h ..\..\include\unicode
# End Custom Build
!ELSEIF "$(CFG)" == "i18n - Win32 Debug"
# Begin Custom Build
InputPath=.\unicode\brkiter.h
"..\..\include\unicode\brkiter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\brkiter.h ..\..\include\unicode
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\unicode\calendar.h
!IF "$(CFG)" == "i18n - Win32 Release"
@ -646,37 +587,6 @@ InputPath=.\unicode\datefmt.h
# End Source File
# Begin Source File
SOURCE=.\unicode\dbbi.h
!IF "$(CFG)" == "i18n - Win32 Release"
# Begin Custom Build
InputPath=.\unicode\dbbi.h
"..\..\include\unicode\dbbi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\dbbi.h ..\..\include\unicode
# End Custom Build
!ELSEIF "$(CFG)" == "i18n - Win32 Debug"
# Begin Custom Build
InputPath=.\unicode\dbbi.h
"..\..\include\unicode\dbbi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\dbbi.h ..\..\include\unicode
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\dbbi_tbl.h
# End Source File
# Begin Source File
SOURCE=.\unicode\dcfmtsym.h
!IF "$(CFG)" == "i18n - Win32 Release"
@ -1060,37 +970,6 @@ SOURCE=.\quant.h
# End Source File
# Begin Source File
SOURCE=.\unicode\rbbi.h
!IF "$(CFG)" == "i18n - Win32 Release"
# Begin Custom Build
InputPath=.\unicode\rbbi.h
"..\..\include\unicode\rbbi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\rbbi.h ..\..\include\unicode
# End Custom Build
!ELSEIF "$(CFG)" == "i18n - Win32 Debug"
# Begin Custom Build
InputPath=.\unicode\rbbi.h
"..\..\include\unicode\rbbi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\rbbi.h ..\..\include\unicode
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\rbbi_tbl.h
# End Source File
# Begin Source File
SOURCE=.\unicode\rbnf.h
!IF "$(CFG)" == "i18n - Win32 Release"
@ -1405,33 +1284,6 @@ SOURCE=.\tzdat.h
# End Source File
# Begin Source File
SOURCE=.\unicode\ubrk.h
!IF "$(CFG)" == "i18n - Win32 Release"
# Begin Custom Build
InputPath=.\unicode\ubrk.h
"..\..\include\unicode\ubrk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\ubrk.h ..\..\include\unicode
# End Custom Build
!ELSEIF "$(CFG)" == "i18n - Win32 Debug"
# Begin Custom Build
InputPath=.\unicode\ubrk.h
"..\..\include\unicode\ubrk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode\ubrk.h ..\..\include\unicode
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\unicode\ucal.h
!IF "$(CFG)" == "i18n - Win32 Release"