AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5856 Promote @draft API to @stable for ICU 3.8 release, and make sure that the existing API is labeled correctly.

Browse Source 
X-SVN-Rev: 22422
This commit is contained in:
George Rhoten 2007-08-19 08:59:28 +00:00
parent 10b81c7930
commit 9ce90e2c18
47 changed files with 637 additions and 752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4c/source/common/ubrk.cpp
View File

@ -1,6 +1,6 @@
/*
*****************************************************************************************
* Copyright (C) 1996-2006, International Business Machines
* Copyright (C) 1996-2007, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@ -176,7 +176,7 @@ ubrk_setText(UBreakIterator* bi,
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ubrk_setUText(UBreakIterator *bi,
UText *text,
UErrorCode *status)

24
icu4c/source/common/ucasemap.c
View File

@ -31,7 +31,7 @@
/* UCaseMap service object -------------------------------------------------- */
U_DRAFT UCaseMap * U_EXPORT2
U_CAPI UCaseMap * U_EXPORT2
ucasemap_open(const char *locale, uint32_t options, UErrorCode *pErrorCode) {
UCaseMap *csm;
@ -56,7 +56,7 @@ ucasemap_open(const char *locale, uint32_t options, UErrorCode *pErrorCode) {
return csm;
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ucasemap_close(UCaseMap *csm) {
if(csm!=NULL) {
#if !UCONFIG_NO_BREAK_ITERATION
@ -66,17 +66,17 @@ ucasemap_close(UCaseMap *csm) {
}
}
U_DRAFT const char * U_EXPORT2
U_CAPI const char * U_EXPORT2
ucasemap_getLocale(const UCaseMap *csm) {
return csm->locale;
}
U_DRAFT uint32_t U_EXPORT2
U_CAPI uint32_t U_EXPORT2
ucasemap_getOptions(const UCaseMap *csm) {
return csm->options;
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ucasemap_setLocale(UCaseMap *csm, const char *locale, UErrorCode *pErrorCode) {
int32_t length;
@ -101,19 +101,19 @@ ucasemap_setLocale(UCaseMap *csm, const char *locale, UErrorCode *pErrorCode) {
}
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ucasemap_setOptions(UCaseMap *csm, uint32_t options, UErrorCode *pErrorCode) {
csm->options=options;
}
#if !UCONFIG_NO_BREAK_ITERATION
U_DRAFT const UBreakIterator * U_EXPORT2
U_CAPI const UBreakIterator * U_EXPORT2
ucasemap_getBreakIterator(const UCaseMap *csm) {
return csm->iter;
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ucasemap_setBreakIterator(UCaseMap *csm, UBreakIterator *iterToAdopt, UErrorCode *pErrorCode) {
ubrk_close(csm->iter);
csm->iter=iterToAdopt;
@ -514,7 +514,7 @@ caseMap(const UCaseMap *csm,
/* public API functions */
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
ucasemap_utf8ToLower(const UCaseMap *csm,
char *dest, int32_t destCapacity,
const char *src, int32_t srcLength,
@ -525,7 +525,7 @@ ucasemap_utf8ToLower(const UCaseMap *csm,
TO_LOWER, pErrorCode);
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
ucasemap_utf8ToUpper(const UCaseMap *csm,
char *dest, int32_t destCapacity,
const char *src, int32_t srcLength,
@ -538,7 +538,7 @@ ucasemap_utf8ToUpper(const UCaseMap *csm,
#if !UCONFIG_NO_BREAK_ITERATION
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
ucasemap_utf8ToTitle(UCaseMap *csm,
char *dest, int32_t destCapacity,
const char *src, int32_t srcLength,
@ -551,7 +551,7 @@ ucasemap_utf8ToTitle(UCaseMap *csm,
#endif
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
ucasemap_utf8FoldCase(const UCaseMap *csm,
char *dest, int32_t destCapacity,
const char *src, int32_t srcLength,

12
icu4c/source/common/ucnv.c
View File

@ -461,7 +461,7 @@ ucnv_setSubstChars (UConverter * converter,
return;
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ucnv_setSubstString(UConverter *cnv,
const UChar *s,
int32_t length,
@ -2827,9 +2827,9 @@ ucnv_detectUnicodeSignature( const char* source,
return NULL;
}
U_DRAFT int32_t U_EXPORT2
ucnv_fromUCountPending(const UConverter* cnv, UErrorCode* status){
U_CAPI int32_t U_EXPORT2
ucnv_fromUCountPending(const UConverter* cnv, UErrorCode* status)
{
if(status == NULL || U_FAILURE(*status)){
return -1;
}
@ -2849,9 +2849,9 @@ ucnv_detectUnicodeSignature( const char* source,
}
return 0;
}
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
ucnv_toUCountPending(const UConverter* cnv, UErrorCode* status){
if(status == NULL || U_FAILURE(*status)){

4
icu4c/source/common/unicode/brkiter.h
View File

@ -161,7 +161,7 @@ public:
* @param status receives any error codes.
* @return The current UText for this break iterator. If an input
* UText was provided, it will always be returned.
* @draft ICU 3.4
* @stable ICU 3.4
*/
virtual UText *getUText(UText *fillIn, UErrorCode &status) const = 0;
@ -184,7 +184,7 @@ public:
*
* @param text The UText used to change the text.
* @param status receives any error codes.
* @draft ICU 3.4
* @stable ICU 3.4
*/
virtual void setText(UText *text, UErrorCode &status) = 0;

4
icu4c/source/common/unicode/rbbi.h
View File

@ -336,7 +336,7 @@ public:
* @param status receives any error codes.
* @return The current UText for this break iterator. If an input
* UText was provided, it will always be returned.
* @draft ICU 3.4
* @stable ICU 3.4
*/
virtual UText *getUText(UText *fillIn, UErrorCode &status) const;
@ -368,7 +368,7 @@ public:
*
* @param text The UText used to change the text.
* @param status Receives any error codes.
* @draft ICU 3.4
* @stable ICU 3.4
*/
virtual void setText(UText *text, UErrorCode &status);

6
icu4c/source/common/unicode/strenum.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2002-2006, International Business Machines
* Copyright (C) 2002-2007, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -189,7 +189,7 @@ public:
*
* @param that The other string enumeration to compare this object to
* @return TRUE if the enumerations are equal. FALSE if not.
* @draft ICU 3.6
* @stable ICU 3.6
*/
virtual UBool operator==(const StringEnumeration& that)const;
/**
@ -197,7 +197,7 @@ public:
*
* @param that The other string enumeration to compare this object to
* @return TRUE if the enumerations are equal. FALSE if not.
* @draft ICU 3.6
* @stable ICU 3.6
*/
virtual UBool operator!=(const StringEnumeration& that)const;

71
icu4c/source/common/unicode/ubidi.h
View File

@ -406,7 +406,7 @@ typedef uint8_t UBiDiLevel;
* @see ubidi_getVisualMap
* @see ubidi_getLogicalIndex
* @see ubidi_getLogicalMap
* @draft ICU 3.6
* @stable ICU 3.6
*/
#define UBIDI_MAP_NOWHERE (-1)
@ -631,20 +631,20 @@ ubidi_isOrderParagraphsLTR(UBiDi *pBiDi);
* algorithm to use.
*
* @see ubidi_setReorderingMode
* @draft ICU 3.6
* @stable ICU 3.6
*/
typedef enum UBiDiReorderingMode {
/** Regular Logical to Visual Bidi algorithm according to Unicode.
* This is a 0 value.
* @draft ICU 3.6 */
* @stable ICU 3.6 */
UBIDI_REORDER_DEFAULT = 0,
/** Logical to Visual algorithm which handles numbers in a way which
* mimicks the behavior of Windows XP.
* @draft ICU 3.6 */
* @stable ICU 3.6 */
UBIDI_REORDER_NUMBERS_SPECIAL,
/** Logical to Visual algorithm grouping numbers with adjacent R characters
* (reversible algorithm).
* @draft ICU 3.6 */
* @stable ICU 3.6 */
UBIDI_REORDER_GROUP_NUMBERS_WITH_R,
/** Reorder runs only to transform a Logical LTR string to the Logical RTL
* string with the same display, or vice-versa.<br>
@ -652,22 +652,23 @@ typedef enum UBiDiReorderingMode {
* <code>#UBIDI_OPTION_INSERT_MARKS</code>, some Bidi controls in the source
* text may be removed and other controls may be added to produce the
* minimum combination which has the required display.
* @draft ICU 3.6 */
* @stable ICU 3.6 */
UBIDI_REORDER_RUNS_ONLY,
/** Visual to Logical algorithm which handles numbers like L
* (same algorithm as selected by <code>ubidi_setInverse(TRUE)</code>.
* @see ubidi_setInverse
* @draft ICU 3.6 */
* @stable ICU 3.6 */
UBIDI_REORDER_INVERSE_NUMBERS_AS_L,
/** Visual to Logical algorithm equivalent to the regular Logical to Visual
* algorithm. @draft ICU 3.6 */
* algorithm.
* @stable ICU 3.6 */
UBIDI_REORDER_INVERSE_LIKE_DIRECT,
/** Inverse Bidi (Visual to Logical) algorithm for the
* <code>UBIDI_REORDER_NUMBERS_SPECIAL</code> Bidi algorithm.
* @draft ICU 3.6 */
* @stable ICU 3.6 */
UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL,
/** Number of values for reordering mode.
* @draft ICU 3.6 */
* @stable ICU 3.6 */
UBIDI_REORDER_COUNT
} UBiDiReorderingMode;
@ -822,9 +823,9 @@ typedef enum UBiDiReorderingMode {
* @see ubidi_setInverse
* @see ubidi_setPara
* @see ubidi_writeReordered
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ubidi_setReorderingMode(UBiDi *pBiDi, UBiDiReorderingMode reorderingMode);
/**
@ -833,9 +834,9 @@ ubidi_setReorderingMode(UBiDi *pBiDi, UBiDiReorderingMode reorderingMode);
* @param pBiDi is a <code>UBiDi</code> object.
* @return the current reordering mode of the Bidi object
* @see ubidi_setReorderingMode
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT UBiDiReorderingMode U_EXPORT2
U_STABLE UBiDiReorderingMode U_EXPORT2
ubidi_getReorderingMode(UBiDi *pBiDi);
/**
@ -843,14 +844,14 @@ ubidi_getReorderingMode(UBiDi *pBiDi);
* specified to affect the Bidi algorithm.
*
* @see ubidi_setReorderingOptions
* @draft ICU 3.6
* @stable ICU 3.6
*/
typedef enum UBiDiReorderingOption {
/**
* option value for <code>ubidi_setReorderingOptions</code>:
* disable all the options which can be set with this function
* @see ubidi_setReorderingOptions
* @draft ICU 3.6
* @stable ICU 3.6
*/
UBIDI_OPTION_DEFAULT = 0,
@ -896,7 +897,7 @@ typedef enum UBiDiReorderingOption {
*
* @see ubidi_setReorderingMode
* @see ubidi_setReorderingOptions
* @draft ICU 3.6
* @stable ICU 3.6
*/
UBIDI_OPTION_INSERT_MARKS = 1,
@ -914,7 +915,7 @@ typedef enum UBiDiReorderingOption {
*
* @see ubidi_setReorderingMode
* @see ubidi_setReorderingOptions
* @draft ICU 3.6
* @stable ICU 3.6
*/
UBIDI_OPTION_REMOVE_CONTROLS = 2,
@ -962,7 +963,7 @@ typedef enum UBiDiReorderingOption {
* @see ubidi_setReorderingOptions
* @see ubidi_getProcessedLength
* @see ubidi_orderParagraphsLTR
* @draft ICU 3.6
* @stable ICU 3.6
*/
UBIDI_OPTION_STREAMING = 4
} UBiDiReorderingOption;
@ -978,9 +979,9 @@ typedef enum UBiDiReorderingOption {
* <code>#UBIDI_OPTION_REMOVE_CONTROLS</code>, <code>#UBIDI_OPTION_STREAMING</code>.
*
* @see ubidi_getReorderingOptions
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ubidi_setReorderingOptions(UBiDi *pBiDi, uint32_t reorderingOptions);
/**
@ -989,9 +990,9 @@ ubidi_setReorderingOptions(UBiDi *pBiDi, uint32_t reorderingOptions);
* @param pBiDi is a <code>UBiDi</code> object.
* @return the current reordering options of the Bidi object
* @see ubidi_setReorderingOptions
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT uint32_t U_EXPORT2
U_STABLE uint32_t U_EXPORT2
ubidi_getReorderingOptions(UBiDi *pBiDi);
/**
@ -1735,9 +1736,9 @@ ubidi_invertMap(const int32_t *srcMap, int32_t *destMap, int32_t length);
* the last call to <code>ubidi_setPara</code>.
* @see ubidi_setPara
* @see UBIDI_OPTION_STREAMING
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ubidi_getProcessedLength(const UBiDi *pBiDi);
/**
@ -1765,9 +1766,9 @@ ubidi_getProcessedLength(const UBiDi *pBiDi);
* @see ubidi_setPara
* @see UBIDI_OPTION_INSERT_MARKS
* @see UBIDI_OPTION_REMOVE_CONTROLS
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ubidi_getResultLength(const UBiDi *pBiDi);
U_CDECL_BEGIN
@ -1775,7 +1776,7 @@ U_CDECL_BEGIN
* value returned by <code>UBiDiClassCallback</code> callbacks when
* there is no need to override the standard Bidi class for a given code point.
* @see UBiDiClassCallback
* @draft ICU 3.6
* @stable ICU 3.6
*/
#define U_BIDI_CLASS_DEFAULT U_CHAR_DIRECTION_COUNT
@ -1797,7 +1798,7 @@ U_CDECL_BEGIN
* for <code>c</code> is to be used.
* @see ubidi_setClassCallback
* @see ubidi_getClassCallback
* @draft ICU 3.6
* @stable ICU 3.6
*/
typedef UCharDirection U_CALLCONV
UBiDiClassCallback(const void *context, UChar32 c);
@ -1817,9 +1818,9 @@ U_CDECL_END
* @return The Bidi class for character <code>c</code> based
* on the given <code>pBiDi</code> instance.
* @see UBiDiClassCallback
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT UCharDirection U_EXPORT2
U_STABLE UCharDirection U_EXPORT2
ubidi_getCustomizedClass(UBiDi *pBiDi, UChar32 c);
/**
@ -1847,9 +1848,9 @@ ubidi_getCustomizedClass(UBiDi *pBiDi, UChar32 c);
* @param pErrorCode must be a valid pointer to an error code value.
*
* @see ubidi_getClassCallback
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ubidi_setClassCallback(UBiDi *pBiDi, UBiDiClassCallback *newFn,
const void *newContext, UBiDiClassCallback **oldFn,
const void **oldContext, UErrorCode *pErrorCode);
@ -1864,9 +1865,9 @@ ubidi_setClassCallback(UBiDi *pBiDi, UBiDiClassCallback *newFn,
* @param context fillin: Returns the callback's private context.
*
* @see ubidi_setClassCallback
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ubidi_getClassCallback(UBiDi *pBiDi, UBiDiClassCallback **fn, const void **context);
/**

4
icu4c/source/common/unicode/ubrk.h
View File

@ -303,9 +303,9 @@ ubrk_setText(UBreakIterator* bi,
* UText that was passed as a parameter, but that the underlying text itself
* must not be altered while being referenced by the break iterator.
* @param status The error code
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ubrk_setUText(UBreakIterator* bi,
UText* text,
UErrorCode* status);

36
icu4c/source/common/unicode/ucasemap.h
View File

@ -38,10 +38,10 @@
/**
* UCaseMap is an opaque service object for newer ICU case mapping functions.
* Older functions did not use a service object.
* @draft ICU 3.4
* @stable ICU 3.4
*/
struct UCaseMap;
typedef struct UCaseMap UCaseMap; /**< C typedef for struct UCaseMap. @draft ICU 3.4 */
typedef struct UCaseMap UCaseMap; /**< C typedef for struct UCaseMap. @stable ICU 3.4 */
/**
* Open a UCaseMap service object for a locale and a set of options.
@ -63,35 +63,35 @@ typedef struct UCaseMap UCaseMap; /**< C typedef for struct UCaseMap. @draft ICU
* @see U_FOLD_CASE_EXCLUDE_SPECIAL_I
* @see U_TITLECASE_NO_LOWERCASE
* @see U_TITLECASE_NO_BREAK_ADJUSTMENT
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UCaseMap * U_EXPORT2
U_STABLE UCaseMap * U_EXPORT2
ucasemap_open(const char *locale, uint32_t options, UErrorCode *pErrorCode);
/**
* Close a UCaseMap service object.
* @param csm Object to be closed.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ucasemap_close(UCaseMap *csm);
/**
* Get the locale ID that is used for language-dependent case mappings.
* @param csm UCaseMap service object.
* @return locale ID
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT const char * U_EXPORT2
U_STABLE const char * U_EXPORT2
ucasemap_getLocale(const UCaseMap *csm);
/**
* Get the options bit set that is used for case folding and string comparisons.
* @param csm UCaseMap service object.
* @return options bit set
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT uint32_t U_EXPORT2
U_STABLE uint32_t U_EXPORT2
ucasemap_getOptions(const UCaseMap *csm);
/**
@ -103,9 +103,9 @@ ucasemap_getOptions(const UCaseMap *csm);
* which must not indicate a failure before the function call.
*
* @see ucasemap_open
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ucasemap_setLocale(UCaseMap *csm, const char *locale, UErrorCode *pErrorCode);
/**
@ -117,9 +117,9 @@ ucasemap_setLocale(UCaseMap *csm, const char *locale, UErrorCode *pErrorCode);
* which must not indicate a failure before the function call.
*
* @see ucasemap_open
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ucasemap_setOptions(UCaseMap *csm, uint32_t options, UErrorCode *pErrorCode);
#ifndef U_HIDE_DRAFT_API
@ -272,9 +272,9 @@ ucasemap_toTitle(UCaseMap *csm,
* in which case it will be greater than destCapacity.
*
* @see u_strToLower
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucasemap_utf8ToLower(const UCaseMap *csm,
char *dest, int32_t destCapacity,
const char *src, int32_t srcLength,
@ -301,9 +301,9 @@ ucasemap_utf8ToLower(const UCaseMap *csm,
* in which case it will be greater than destCapacity.
*
* @see u_strToUpper
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucasemap_utf8ToUpper(const UCaseMap *csm,
char *dest, int32_t destCapacity,
const char *src, int32_t srcLength,

97
icu4c/source/common/unicode/uchar.h
View File

@ -379,43 +379,41 @@ typedef enum UProperty {
processing collation tailoring rules.
@stable ICU 3.0 */
UCHAR_SEGMENT_STARTER=41,
#ifndef U_HIDE_DRAFT_API
/** Binary property Pattern_Syntax (new in Unicode 4.1).
See UAX #31 Identifier and Pattern Syntax
(http://www.unicode.org/reports/tr31/)
@draft ICU 3.4 */
@stable ICU 3.4 */
UCHAR_PATTERN_SYNTAX=42,
/** Binary property Pattern_White_Space (new in Unicode 4.1).
See UAX #31 Identifier and Pattern Syntax
(http://www.unicode.org/reports/tr31/)
@draft ICU 3.4 */
@stable ICU 3.4 */
UCHAR_PATTERN_WHITE_SPACE=43,
/** Binary property alnum (a C/POSIX character class).
Implemented according to the UTS #18 Annex C Standard Recommendation.
See the uchar.h file documentation.
@draft ICU 3.4 */
@stable ICU 3.4 */
UCHAR_POSIX_ALNUM=44,
/** Binary property blank (a C/POSIX character class).
Implemented according to the UTS #18 Annex C Standard Recommendation.
See the uchar.h file documentation.
@draft ICU 3.4 */
@stable ICU 3.4 */
UCHAR_POSIX_BLANK=45,
/** Binary property graph (a C/POSIX character class).
Implemented according to the UTS #18 Annex C Standard Recommendation.
See the uchar.h file documentation.
@draft ICU 3.4 */
@stable ICU 3.4 */
UCHAR_POSIX_GRAPH=46,
/** Binary property print (a C/POSIX character class).
Implemented according to the UTS #18 Annex C Standard Recommendation.
See the uchar.h file documentation.
@draft ICU 3.4 */
@stable ICU 3.4 */
UCHAR_POSIX_PRINT=47,
/** Binary property xdigit (a C/POSIX character class).
Implemented according to the UTS #18 Annex C Standard Recommendation.
See the uchar.h file documentation.
@draft ICU 3.4 */
@stable ICU 3.4 */
UCHAR_POSIX_XDIGIT=48,
#endif /* U_HIDE_DRAFT_API */
/** One more than the last constant for binary Unicode properties. @stable ICU 2.1 */
UCHAR_BINARY_LIMIT=49,
@ -484,23 +482,21 @@ typedef enum UProperty {
see UNORM_FCD and http://www.unicode.org/notes/tn5/#FCD .
Returns 8-bit numeric values like UCHAR_CANONICAL_COMBINING_CLASS. @stable ICU 3.0 */
UCHAR_TRAIL_CANONICAL_COMBINING_CLASS=0x1011,
#ifndef U_HIDE_DRAFT_API
/** Enumerated property Grapheme_Cluster_Break (new in Unicode 4.1).
Used in UAX #29: Text Boundaries
(http://www.unicode.org/reports/tr29/)
Returns UGraphemeClusterBreak values. @draft ICU 3.4 */
Returns UGraphemeClusterBreak values. @stable ICU 3.4 */
UCHAR_GRAPHEME_CLUSTER_BREAK=0x1012,
/** Enumerated property Sentence_Break (new in Unicode 4.1).
Used in UAX #29: Text Boundaries
(http://www.unicode.org/reports/tr29/)
Returns USentenceBreak values. @draft ICU 3.4 */
Returns USentenceBreak values. @stable ICU 3.4 */
UCHAR_SENTENCE_BREAK=0x1013,
/** Enumerated property Word_Break (new in Unicode 4.1).
Used in UAX #29: Text Boundaries
(http://www.unicode.org/reports/tr29/)
Returns UWordBreakValues values. @draft ICU 3.4 */
Returns UWordBreakValues values. @stable ICU 3.4 */
UCHAR_WORD_BREAK=0x1014,
#endif /*U_HIDE_DRAFT_API*/
/** One more than the last constant for enumerated/integer Unicode properties. @stable ICU 2.2 */
UCHAR_INT_LIMIT=0x1015,
@ -1194,73 +1190,70 @@ enum UBlockCode {
/** @stable ICU 2.6 */
UBLOCK_VARIATION_SELECTORS_SUPPLEMENT = 125, /*[E0100]*/
#ifndef U_HIDE_DRAFT_API
/* New blocks in Unicode 4.1 */
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_ANCIENT_GREEK_MUSICAL_NOTATION = 126, /*[1D200]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_ANCIENT_GREEK_NUMBERS = 127, /*[10140]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_ARABIC_SUPPLEMENT = 128, /*[0750]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_BUGINESE = 129, /*[1A00]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_CJK_STROKES = 130, /*[31C0]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT = 131, /*[1DC0]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_COPTIC = 132, /*[2C80]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_ETHIOPIC_EXTENDED = 133, /*[2D80]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_ETHIOPIC_SUPPLEMENT = 134, /*[1380]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_GEORGIAN_SUPPLEMENT = 135, /*[2D00]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_GLAGOLITIC = 136, /*[2C00]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_KHAROSHTHI = 137, /*[10A00]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_MODIFIER_TONE_LETTERS = 138, /*[A700]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_NEW_TAI_LUE = 139, /*[1980]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_OLD_PERSIAN = 140, /*[103A0]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT = 141, /*[1D80]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_SUPPLEMENTAL_PUNCTUATION = 142, /*[2E00]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_SYLOTI_NAGRI = 143, /*[A800]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_TIFINAGH = 144, /*[2D30]*/
/** @draft ICU 3.4 */
/** @stable ICU 3.4 */
UBLOCK_VERTICAL_FORMS = 145, /*[FE10]*/
/* New blocks in Unicode 5.0 */
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_NKO = 146, /*[07C0]*/
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_BALINESE = 147, /*[1B00]*/
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_LATIN_EXTENDED_C = 148, /*[2C60]*/
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_LATIN_EXTENDED_D = 149, /*[A720]*/
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_PHAGS_PA = 150, /*[A840]*/
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_PHOENICIAN = 151, /*[10900]*/
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_CUNEIFORM = 152, /*[12000]*/
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_CUNEIFORM_NUMBERS_AND_PUNCTUATION = 153, /*[12400]*/
/** @draft ICU 3.6 */
/** @stable ICU 3.6 */
UBLOCK_COUNTING_ROD_NUMERALS = 154, /*[1D360]*/
#endif /*U_HIDE_DRAFT_API*/
/** @stable ICU 2.0 */
UBLOCK_COUNT = 155,
@ -1441,10 +1434,9 @@ typedef enum UJoiningGroup {
* Grapheme Cluster Break constants.
*
* @see UCHAR_GRAPHEME_CLUSTER_BREAK
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef enum UGraphemeClusterBreak {
#ifndef U_HIDE_DRAFT_API
U_GCB_OTHER = 0, /*[XX]*/ /*See note !!*/
U_GCB_CONTROL = 1, /*[CN]*/
U_GCB_CR = 2, /*[CR]*/
@ -1455,7 +1447,6 @@ typedef enum UGraphemeClusterBreak {
U_GCB_LVT = 7, /*[LVT]*/
U_GCB_T = 8, /*[T]*/
U_GCB_V = 9, /*[V]*/
#endif /*U_HIDE_DRAFT_API*/
U_GCB_COUNT = 10
} UGraphemeClusterBreak;
@ -1464,10 +1455,9 @@ typedef enum UGraphemeClusterBreak {
* (UWordBreak is a pre-existing enum type in ubrk.h for word break status tags.)
*
* @see UCHAR_WORD_BREAK
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef enum UWordBreakValues {
#ifndef U_HIDE_DRAFT_API
U_WB_OTHER = 0, /*[XX]*/ /*See note !!*/
U_WB_ALETTER = 1, /*[LE]*/
U_WB_FORMAT = 2, /*[FO]*/
@ -1476,7 +1466,6 @@ typedef enum UWordBreakValues {
U_WB_MIDNUM = 5, /*[MN]*/
U_WB_NUMERIC = 6, /*[NU]*/
U_WB_EXTENDNUMLET = 7, /*[EX]*/
#endif /*U_HIDE_DRAFT_API*/
U_WB_COUNT = 8
} UWordBreakValues;
@ -1484,10 +1473,9 @@ typedef enum UWordBreakValues {
* Sentence Break constants.
*
* @see UCHAR_SENTENCE_BREAK
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef enum USentenceBreak {
#ifndef U_HIDE_DRAFT_API
U_SB_OTHER = 0, /*[XX]*/ /*See note !!*/
U_SB_ATERM = 1, /*[AT]*/
U_SB_CLOSE = 2, /*[CL]*/
@ -1499,7 +1487,6 @@ typedef enum USentenceBreak {
U_SB_SP = 8, /*[SP]*/
U_SB_STERM = 9, /*[ST]*/
U_SB_UPPER = 10, /*[UP]*/
#endif /*U_HIDE_DRAFT_API*/
U_SB_COUNT = 11
} USentenceBreak;

12
icu4c/source/common/unicode/ucnv.h
View File

@ -593,9 +593,9 @@ ucnv_setSubstChars(UConverter *converter,
*
* @see ucnv_setSubstChars
* @see ucnv_getSubstChars
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ucnv_setSubstString(UConverter *cnv,
const UChar *s,
int32_t length,
@ -1915,9 +1915,9 @@ ucnv_detectUnicodeSignature(const char* source,
* @param status ICU error code in/out parameter.
* Must fulfill U_SUCCESS before the function call.
* @return The number of UChars in the state. -1 if an error is encountered.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucnv_fromUCountPending(const UConverter* cnv, UErrorCode* status);
/**
@ -1929,9 +1929,9 @@ ucnv_fromUCountPending(const UConverter* cnv, UErrorCode* status);
* @param status ICU error code in/out parameter.
* Must fulfill U_SUCCESS before the function call.
* @return The number of chars in the state. -1 if an error is encountered.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucnv_toUCountPending(const UConverter* cnv, UErrorCode* status);
#endif

4
icu4c/source/common/unicode/uconfig.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2002-2006, International Business Machines
* Copyright (C) 2002-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: uconfig.h
@ -81,7 +81,7 @@
* File access cannot be turned off for the icuio library or for the ICU
* test suites and ICU tools.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
#ifndef UCONFIG_NO_FILE_IO
# define UCONFIG_NO_FILE_IO 0

6
icu4c/source/common/unicode/udata.h
View File

@ -354,7 +354,7 @@ udata_setAppData(const char *packageName, const void *data, UErrorCode *err);
/**
* Possible settings for udata_setFileAccess()
* @see udata_setFileAccess
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef enum UDataFileAccess {
/** ICU does not access the file system for data loading. */
@ -379,9 +379,9 @@ typedef enum UDataFileAccess {
* @param access The type of file access to be used
* @param status Error code.
* @see UDataFileAccess
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
udata_setFileAccess(UDataFileAccess access, UErrorCode *status);
U_CDECL_END

6
icu4c/source/common/unicode/uobject.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2002-2006, International Business Machines
* Copyright (C) 2002-2007, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -50,16 +50,14 @@ U_NAMESPACE_BEGIN
#endif
#ifndef U_HIDE_DRAFT_API
/** U_HAVE_DEBUG_LOCATION_NEW - Define this to define the MFC debug
* version of the operator new.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
#ifndef U_HAVE_DEBUG_LOCATION_NEW
#define U_HAVE_DEBUG_LOCATION_NEW 0
#endif
#endif /*U_HIDE_DRAFT_API*/
/**
* UMemory is the common ICU base class.

12
icu4c/source/common/unicode/ures.h
View File

@ -400,9 +400,9 @@ ures_getString(const UResourceBundle* resourceBundle,
*
* @see ures_getString
* @see u_strToUTF8
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT const char * U_EXPORT2
U_STABLE const char * U_EXPORT2
ures_getUTF8String(const UResourceBundle *resB,
char *dest, int32_t *length,
UBool forceCopy,
@ -666,9 +666,9 @@ ures_getStringByIndex(const UResourceBundle *resourceBundle,
*
* @see ures_getStringByIndex
* @see u_strToUTF8
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT const char * U_EXPORT2
U_STABLE const char * U_EXPORT2
ures_getUTF8StringByIndex(const UResourceBundle *resB,
int32_t index,
char *dest, int32_t *pLength,
@ -759,9 +759,9 @@ ures_getStringByKey(const UResourceBundle *resB,
*
* @see ures_getStringByKey
* @see u_strToUTF8
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT const char * U_EXPORT2
U_STABLE const char * U_EXPORT2
ures_getUTF8StringByKey(const UResourceBundle *resB,
const char *key,
char *dest, int32_t *pLength,

6
icu4c/source/common/unicode/uscript.h
View File

@ -108,8 +108,7 @@ typedef enum UScriptCode {
/** New script code in Unicode 4.0.1 @stable ICU 3.0 */
USCRIPT_KATAKANA_OR_HIRAGANA = 54,/*Hrkt */
#ifndef U_HIDE_DRAFT_API
/* New scripts in Unicode 4.1 @draft ICU 3.4 */
/* New scripts in Unicode 4.1 @stable ICU 3.4 */
USCRIPT_BUGINESE = 55, /* Bugi */
USCRIPT_GLAGOLITIC = 56, /* Glag */
USCRIPT_KHAROSHTHI = 57, /* Khar */
@ -118,7 +117,7 @@ typedef enum UScriptCode {
USCRIPT_TIFINAGH = 60, /* Tfng */
USCRIPT_OLD_PERSIAN = 61, /* Xpeo */
/* New script codes from ISO 15924 @draft ICU 3.6 */
/* New script codes from ISO 15924 @stable ICU 3.6 */
USCRIPT_BALINESE = 62, /* Bali */
USCRIPT_BATAK = 63, /* Batk */
USCRIPT_BLISSYMBOLS = 64, /* Blis */
@ -177,7 +176,6 @@ typedef enum UScriptCode {
USCRIPT_MEITEI_MAYEK = 115,/* Mtei */
/* Private use codes from Qaaa - Qabx are not supported*/
#endif /* U_HIDE_DRAFT_API */
USCRIPT_CODE_LIMIT = 116
} UScriptCode;

8
icu4c/source/common/unicode/uset.h
View File

@ -544,9 +544,9 @@ uset_addString(USet* set, const UChar* str, int32_t strLen);
* @param set the object to which to add the character
* @param str the source string
* @param strLen the length of the string or -1 if null terminated.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
uset_addAllCodePoints(USet* set, const UChar *str, int32_t strLen);
/**
@ -811,9 +811,9 @@ uset_containsAll(const USet* set1, const USet* set2);
* @param str string containing codepoints to be checked for containment
* @param strLen the length of the string or -1 if null terminated.
* @return true if the test condition is met
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
uset_containsAllCodePoints(const USet* set, const UChar *str, int32_t strLen);
/**

14
icu4c/source/common/unicode/ushape.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2000-2006, International Business Machines
* Copyright (C) 2000-2007, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -236,28 +236,28 @@ u_shapeArabic(const UChar *source, int32_t sourceLength,
* Replaces any combination of U+0651 with one of
* U+064C, U+064D, U+064E, U+064F, U+0650 with
* U+FC5E, U+FC5F, U+FC60, U+FC61, U+FC62 consecutively.
* @draft ICU 3.6
* @stable ICU 3.6
*/
#define U_SHAPE_AGGREGATE_TASHKEEL 0x4000
/** Tashkeel aggregation option: do not aggregate tashkeels. @draft ICU 3.6 */
/** Tashkeel aggregation option: do not aggregate tashkeels. @stable ICU 3.6 */
#define U_SHAPE_AGGREGATE_TASHKEEL_NOOP 0
/** Bit mask for tashkeel aggregation. @draft ICU 3.6 */
/** Bit mask for tashkeel aggregation. @stable ICU 3.6 */
#define U_SHAPE_AGGREGATE_TASHKEEL_MASK 0x4000
/**
* Presentation form option:
* Don't replace Arabic Presentation Forms-A and Arabic Presentation Forms-B
* characters with 0+06xx characters, before shaping.
* @draft ICU 3.6
* @stable ICU 3.6
*/
#define U_SHAPE_PRESERVE_PRESENTATION 0x8000
/** Presentation form option:
* Replace Arabic Presentation Forms-A and Arabic Presentationo Forms-B with
* their unshaped correspondants in range 0+06xx, before shaping.
* @draft ICU 3.6
* @stable ICU 3.6
*/
#define U_SHAPE_PRESERVE_PRESENTATION_NOOP 0
/** Bit mask for preserve presentation form. @draft ICU 3.6 */
/** Bit mask for preserve presentation form. @stable ICU 3.6 */
#define U_SHAPE_PRESERVE_PRESENTATION_MASK 0x8000
#endif

12
icu4c/source/common/unicode/ustring.h
View File

@ -1311,9 +1311,9 @@ u_strFromUTF8(UChar *dest,
* @return The pointer to destination buffer.
* @see u_strToUTF8
* @see u_strFromUTF8WithSub
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT char* U_EXPORT2
U_STABLE char* U_EXPORT2
u_strToUTF8WithSub(char *dest,
int32_t destCapacity,
int32_t *pDestLength,
@ -1355,9 +1355,9 @@ u_strToUTF8WithSub(char *dest,
* @see u_strFromUTF8
* @see u_strFromUTF8Lenient
* @see u_strToUTF8WithSub
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT UChar* U_EXPORT2
U_STABLE UChar* U_EXPORT2
u_strFromUTF8WithSub(UChar *dest,
int32_t destCapacity,
int32_t *pDestLength,
@ -1411,9 +1411,9 @@ u_strFromUTF8WithSub(UChar *dest,
* @see u_strFromUTF8
* @see u_strFromUTF8WithSub
* @see u_strToUTF8WithSub
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_CAPI UChar * U_EXPORT2
U_STABLE UChar * U_EXPORT2
u_strFromUTF8Lenient(UChar *dest,
int32_t destCapacity,
int32_t *pDestLength,

223
icu4c/source/common/unicode/utext.h
View File

@ -146,7 +146,7 @@
U_CDECL_BEGIN
struct UText;
typedef struct UText UText; /**< C typedef for struct UText. @draft ICU 3.6 */
typedef struct UText UText; /**< C typedef for struct UText. @stable ICU 3.6 */
/***************************************************************************************
@ -174,9 +174,9 @@ typedef struct UText UText; /**< C typedef for struct UText. @draft ICU 3.6 */
* returned by this function, and may be safely used again in
* a subsequent utext_open.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_close(UText *ut);
@ -199,9 +199,9 @@ utext_close(UText *ut);
* @param status Errors are returned here.
* @return A pointer to the UText. If a pre-allocated UText was provided, it
* will always be used and returned.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_openUTF8(UText *ut, const char *s, int64_t length, UErrorCode *status);
@ -217,9 +217,9 @@ utext_openUTF8(UText *ut, const char *s, int64_t length, UErrorCode *status);
* @param status Errors are returned here.
* @return A pointer to the UText. If a pre-allocated UText was provided, it
* will always be used and returned.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status);
@ -234,9 +234,9 @@ utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status);
* @param status Errors are returned here.
* @return Pointer to the UText. If a UText was supplied as input, this
* will always be used and returned.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_openUnicodeString(UText *ut, U_NAMESPACE_QUALIFIER UnicodeString *s, UErrorCode *status);
@ -250,9 +250,9 @@ utext_openUnicodeString(UText *ut, U_NAMESPACE_QUALIFIER UnicodeString *s, UErro
* @param status Errors are returned here.
* @return Pointer to the UText. If a UText was supplied as input, this
* will always be used and returned.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_openConstUnicodeString(UText *ut, const U_NAMESPACE_QUALIFIER UnicodeString *s, UErrorCode *status);
@ -266,9 +266,9 @@ utext_openConstUnicodeString(UText *ut, const U_NAMESPACE_QUALIFIER UnicodeStrin
* @return Pointer to the UText. If a UText was supplied as input, this
* will always be used and returned.
* @see Replaceable
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_openReplaceable(UText *ut, U_NAMESPACE_QUALIFIER Replaceable *rep, UErrorCode *status);
/**
@ -281,9 +281,9 @@ utext_openReplaceable(UText *ut, U_NAMESPACE_QUALIFIER Replaceable *rep, UErrorC
* @return Pointer to the UText. If a UText was supplied as input, this
* will always be used and returned.
* @see Replaceable
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_openCharacterIterator(UText *ut, U_NAMESPACE_QUALIFIER CharacterIterator *ic, UErrorCode *status);
#endif
@ -344,9 +344,9 @@ utext_openCharacterIterator(UText *ut, U_NAMESPACE_QUALIFIER CharacterIterator *
* will be returned if the text provider is unable to clone the
* original text.
* @return The newly created clone, or NULL if the clone operation failed.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_clone(UText *dest, const UText *src, UBool deep, UBool readOnly, UErrorCode *status);
@ -359,9 +359,9 @@ utext_clone(UText *dest, const UText *src, UBool deep, UBool readOnly, UErrorCod
* @param a The first of the two UTexts to compare.
* @param b The other UText to be compared.
* @return TRUE if the two UTexts are equal.
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
utext_equals(const UText *a, const UText *b);
@ -380,9 +380,9 @@ utext_equals(const UText *a, const UText *b);
* @param ut the text to be accessed.
* @return the length of the text, expressed in native units.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int64_t U_EXPORT2
U_STABLE int64_t U_EXPORT2
utext_nativeLength(UText *ut);
/**
@ -396,9 +396,9 @@ utext_nativeLength(UText *ut);
*
* @param ut the text to be accessed.
* @return TRUE if determining the length of the text could be time consuming.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
utext_isLengthExpensive(const UText *ut);
/**
@ -424,9 +424,9 @@ utext_isLengthExpensive(const UText *ut);
* to other than the first unit of a multi-unit character, it will be adjusted
* to the start of the character.
* @return the code point at the specified index.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UChar32 U_EXPORT2
U_STABLE UChar32 U_EXPORT2
utext_char32At(UText *ut, int64_t nativeIndex);
@ -438,9 +438,9 @@ utext_char32At(UText *ut, int64_t nativeIndex);
*
* @param ut the text to be accessed.
* @return the Unicode code point at the current iterator position.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UChar32 U_EXPORT2
U_STABLE UChar32 U_EXPORT2
utext_current32(UText *ut);
@ -460,9 +460,9 @@ utext_current32(UText *ut);
* @param ut the text to be accessed.
* @return the Unicode code point at the iteration position.
* @see UTEXT_NEXT32
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UChar32 U_EXPORT2
U_STABLE UChar32 U_EXPORT2
utext_next32(UText *ut);
@ -481,9 +481,9 @@ utext_next32(UText *ut);
* @return the previous UChar32 code point, or U_SENTINEL (-1)
* if the iteration has reached the start of the text.
* @see UTEXT_PREVIOUS32
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UChar32 U_EXPORT2
U_STABLE UChar32 U_EXPORT2
utext_previous32(UText *ut);
@ -503,9 +503,9 @@ utext_previous32(UText *ut);
* @param nativeIndex Iteration index, in the native units of the text provider.
* @return Code point which starts at or before index,
* or U_SENTINEL (-1) if it is out of bounds.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UChar32 U_EXPORT2
U_STABLE UChar32 U_EXPORT2
utext_next32From(UText *ut, int64_t nativeIndex);
@ -523,9 +523,9 @@ utext_next32From(UText *ut, int64_t nativeIndex);
* @return Code point preceding the one at the initial index,
* or U_SENTINEL (-1) if it is out of bounds.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UChar32 U_EXPORT2
U_STABLE UChar32 U_EXPORT2
utext_previous32From(UText *ut, int64_t nativeIndex);
/**
@ -538,9 +538,9 @@ utext_previous32From(UText *ut, int64_t nativeIndex);
*
* @param ut the text to be accessed.
* @return the current index position, in the native units of the text provider.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int64_t U_EXPORT2
U_STABLE int64_t U_EXPORT2
utext_getNativeIndex(const UText *ut);
/**
@ -564,9 +564,9 @@ utext_getNativeIndex(const UText *ut);
*
* @param ut the text to be accessed.
* @param nativeIndex the native unit index of the new iteration position.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
utext_setNativeIndex(UText *ut, int64_t nativeIndex);
/**
@ -583,9 +583,9 @@ utext_setNativeIndex(UText *ut, int64_t nativeIndex);
* @param delta the signed number of code points to move the iteration position.
* @return TRUE if the position could be moved the requested number of positions while
* staying within the range [0 - text length].
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
utext_moveIndex32(UText *ut, int32_t delta);
/**
@ -608,9 +608,9 @@ utext_moveIndex32(UText *ut, int32_t delta);
* @param ut the text to be accessed
* @return the native index of the character preceeding the current index position,
* or zero if the current position is at the start of the text.
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT int64_t U_EXPORT2
U_STABLE int64_t U_EXPORT2
utext_getPreviousNativeIndex(UText *ut);
@ -646,16 +646,15 @@ utext_getPreviousNativeIndex(UText *ut);
* buffer was too small. Returns number of UChars for preflighting.
* @return Number of UChars in the data to be extracted. Does not include a trailing NUL.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
utext_extract(UText *ut,
int64_t nativeStart, int64_t nativeLimit,
UChar *dest, int32_t destCapacity,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/************************************************************************************
*
* #define inline versions of selected performance-critical text access functions
@ -680,7 +679,7 @@ utext_extract(UText *ut,
* Returns U_SENTINEL (-1) if the position is at the end of the
* text.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
#define UTEXT_NEXT32(ut) \
((ut)->chunkOffset < (ut)->chunkLength && ((ut)->chunkContents)[(ut)->chunkOffset]<0xd800 ? \
@ -694,7 +693,7 @@ utext_extract(UText *ut,
* This is a pre-decrement operation.
* Returns U_SENTINEL (-1) if the position is at the start of the text.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
#define UTEXT_PREVIOUS32(ut) \
((ut)->chunkOffset > 0 && \
@ -711,7 +710,7 @@ utext_extract(UText *ut,
* the corresponding UChar (UTF-16) index.
* The returned position will always be aligned to a code point boundary.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
#define UTEXT_GETNATIVEINDEX(ut) \
((ut)->chunkOffset <= (ut)->nativeIndexingLimit? \
@ -738,8 +737,6 @@ utext_extract(UText *ut,
#endif
/************************************************************************************
*
* Functions related to writing or modifying the text.
@ -764,10 +761,10 @@ utext_extract(UText *ut,
* @see utext_freeze()
* @see utext_replace()
* @see utext_copy()
* @draft ICU 3.4
* @stable ICU 3.4
*
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
utext_isWritable(const UText *ut);
@ -777,9 +774,9 @@ utext_isWritable(const UText *ut);
*
* @param ut The UText to be tested
* @return TRUE if the underlying text includes meta data.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
utext_hasMetaData(const UText *ut);
@ -808,9 +805,9 @@ utext_hasMetaData(const UText *ut);
* @return The signed number of (native) storage units by which
* the length of the text expanded or contracted.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
utext_replace(UText *ut,
int64_t nativeStart, int64_t nativeLimit,
const UChar *replacementText, int32_t replacementLength,
@ -848,9 +845,9 @@ utext_replace(UText *ut,
* @param move If TRUE, then the substring is moved, not copied/duplicated.
* @param status receives any error status. Possible errors include U_NO_WRITE_PERMISSION
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
utext_copy(UText *ut,
int64_t nativeStart, int64_t nativeLimit,
int64_t destIndex,
@ -877,43 +874,42 @@ utext_copy(UText *ut,
*
* @param ut The UText to be frozen.
* @see utext_isWritable()
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
utext_freeze(UText *ut);
#ifndef U_HIDE_DRAFT_API
/**
* UText provider properties (bit field indexes).
*
* @see UText
* @draft ICU 3.4
* @stable ICU 3.4
*/
enum {
/**
* It is potentially time consuming for the provider to determine the length of the text.
* @draft ICU 3.4
* @stable ICU 3.4
*/
UTEXT_PROVIDER_LENGTH_IS_EXPENSIVE = 1,
/**
* Text chunks remain valid and usable until the text object is modified or
* deleted, not just until the next time the access() function is called
* (which is the default).
* @draft ICU 3.4
* @stable ICU 3.4
*/
UTEXT_PROVIDER_STABLE_CHUNKS = 2,
/**
* The provider supports modifying the text via the replace() and copy()
* functions.
* @see Replaceable
* @draft ICU 3.4
* @stable ICU 3.4
*/
UTEXT_PROVIDER_WRITABLE = 3,
/**
* There is meta data associated with the text.
* @see Replaceable::hasMetaData()
* @draft ICU 3.4
* @stable ICU 3.4
*/
UTEXT_PROVIDER_HAS_META_DATA = 4,
/**
@ -921,7 +917,7 @@ enum {
* Generally occurs as the result of a deep clone of the UText.
* When closing the UText, the associated text must
* also be closed/deleted/freed/ whatever is appropriate.
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTEXT_PROVIDER_OWNS_TEXT = 5
};
@ -961,7 +957,7 @@ enum {
* original text.
* @return The newly created clone, or NULL if the clone operation failed.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef UText * U_CALLCONV
UTextClone(UText *dest, const UText *src, UBool deep, UErrorCode *status);
@ -973,7 +969,7 @@ UTextClone(UText *dest, const UText *src, UBool deep, UErrorCode *status);
* @param ut the UText to get the length of.
* @return the length, in the native units of the original text string.
* @see UText
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef int64_t U_CALLCONV
UTextNativeLength(UText *ut);
@ -1001,7 +997,7 @@ UTextNativeLength(UText *ut);
* (the requested index is out of bounds).
*
* @see UText
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef UBool U_CALLCONV
UTextAccess(UText *ut, int64_t nativeIndex, UBool forward);
@ -1031,7 +1027,7 @@ UTextAccess(UText *ut, int64_t nativeIndex, UBool forward);
* preflighting.
* @return Number of UChars in the data. Does not include a trailing NUL.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef int32_t U_CALLCONV
UTextExtract(UText *ut,
@ -1066,7 +1062,7 @@ UTextExtract(UText *ut,
* @return The signed number of (native) storage units by which
* the length of the text expanded or contracted.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef int32_t U_CALLCONV
UTextReplace(UText *ut,
@ -1100,7 +1096,7 @@ UTextReplace(UText *ut,
* @param move If TRUE, then the substring is moved, not copied/duplicated.
* @param status receives any error status. Possible errors include U_NO_WRITE_PERMISSION
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef void U_CALLCONV
UTextCopy(UText *ut,
@ -1120,7 +1116,7 @@ UTextCopy(UText *ut,
* @return Absolute (native) index corresponding to chunkOffset in the current chunk.
* The returned native index should always be to a code point boundary.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef int64_t U_CALLCONV
UTextMapOffsetToNative(const UText *ut);
@ -1138,7 +1134,7 @@ UTextMapOffsetToNative(const UText *ut);
* @return Chunk-relative UTF-16 offset corresponding to the specified native
* index.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef int32_t U_CALLCONV
UTextMapNativeIndexToUTF16(const UText *ut, int64_t nativeIndex);
@ -1159,7 +1155,7 @@ UTextMapNativeIndexToUTF16(const UText *ut, int64_t nativeIndex);
*
* @param ut A UText object to be closed.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef void U_CALLCONV
UTextClose(UText *ut);
@ -1172,7 +1168,7 @@ UTextClose(UText *ut);
* Each text provider implementation must provide an
* actual table that is initialized with the appropriate functions
* for the type of text being handled.
* @draft ICU 3.6
* @stable ICU 3.6
*/
struct UTextFuncs {
/**
@ -1187,7 +1183,7 @@ struct UTextFuncs {
* 4 pointers,
* 2 64-bit fields
* in sequence.
* @draft ICU 3.6
* @stable ICU 3.6
*/
int32_t tableSize;
@ -1203,7 +1199,7 @@ struct UTextFuncs {
* (public) Function pointer for UTextClone
*
* @see UTextClone
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextClone *clone;
@ -1212,7 +1208,7 @@ struct UTextFuncs {
* May be expensive to compute!
*
* @see UTextLength
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextNativeLength *nativeLength;
@ -1220,7 +1216,7 @@ struct UTextFuncs {
* (public) Function pointer for UTextAccess.
*
* @see UTextAccess
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextAccess *access;
@ -1228,7 +1224,7 @@ struct UTextFuncs {
* (public) Function pointer for UTextExtract.
*
* @see UTextExtract
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextExtract *extract;
@ -1236,7 +1232,7 @@ struct UTextFuncs {
* (public) Function pointer for UTextReplace.
*
* @see UTextReplace
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextReplace *replace;
@ -1244,7 +1240,7 @@ struct UTextFuncs {
* (public) Function pointer for UTextCopy.
*
* @see UTextCopy
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextCopy *copy;
@ -1252,7 +1248,7 @@ struct UTextFuncs {
* (public) Function pointer for UTextMapOffsetToNative.
*
* @see UTextMapOffsetToNative
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextMapOffsetToNative *mapOffsetToNative;
@ -1260,7 +1256,7 @@ struct UTextFuncs {
* (public) Function pointer for UTextMapNativeIndexToUTF16.
*
* @see UTextMapNativeIndexToUTF16
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextMapNativeIndexToUTF16 *mapNativeIndexToUTF16;
@ -1268,7 +1264,7 @@ struct UTextFuncs {
* (public) Function pointer for UTextClose.
*
* @see UTextClose
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextClose *close;
@ -1293,9 +1289,6 @@ struct UTextFuncs {
};
typedef struct UTextFuncs UTextFuncs;
#endif
#ifndef U_HIDE_DRAFT_API
/**
* UText struct. Provides the interface between the generic UText access code
* and the UText provider code that works on specific kinds of
@ -1305,7 +1298,7 @@ typedef struct UTextFuncs UTextFuncs;
* to pass text data to ICU services will have no need to view the
* internals of the UText structs that they open.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
struct UText {
/**
@ -1334,7 +1327,7 @@ struct UText {
/**
* Text provider properties. This set of flags is maintainted by the
* text provider implementation.
* @draft ICU 3.4
* @stable ICU 3.4
*/
int32_t providerProperties;
@ -1342,7 +1335,7 @@ struct UText {
* (public) sizeOfStruct=sizeof(UText)
* Allows possible backward compatible extension.
*
* @draft ICU 3.4
* @stable ICU 3.4
*/
int32_t sizeOfStruct;
@ -1352,13 +1345,13 @@ struct UText {
/**
* (protected) Native index of the first character position following
* the current chunk.
* @draft ICU 3.6
* @stable ICU 3.6
*/
int64_t chunkNativeLimit;
/**
* (protected) Size in bytes of the extra space (pExtra).
* @draft ICU 3.4
* @stable ICU 3.4
*/
int32_t extraSize;
@ -1367,7 +1360,7 @@ struct UText {
* chunk (UTF-16) indexing correspond. For UTF-16 sources, value
* will be equal to chunkLength.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
int32_t nativeIndexingLimit;
@ -1375,20 +1368,20 @@ struct UText {
/**
* (protected) Native index of the first character in the text chunk.
* @draft ICU 3.6
* @stable ICU 3.6
*/
int64_t chunkNativeStart;
/**
* (protected) Current iteration position within the text chunk (UTF-16 buffer).
* This is the index to the character that will be returned by utext_next32().
* @draft ICU 3.6
* @stable ICU 3.6
*/
int32_t chunkOffset;
/**
* (protected) Length the text chunk (UTF-16 buffer), in UChars.
* @draft ICU 3.6
* @stable ICU 3.6
*/
int32_t chunkLength;
@ -1399,20 +1392,20 @@ struct UText {
* (protected) pointer to a chunk of text in UTF-16 format.
* May refer either to original storage of the source of the text, or
* if conversion was required, to a buffer owned by the UText.
* @draft ICU 3.6
* @stable ICU 3.6
*/
const UChar *chunkContents;
/**
* (public) Pointer to Dispatch table for accessing functions for this UText.
* @draft ICU 3.6
* @stable ICU 3.6
*/
UTextFuncs *pFuncs;
/**
* (protected) Pointer to additional space requested by the
* text provider during the utext_open operation.
* @draft ICU 3.4
* @stable ICU 3.4
*/
void *pExtra;
@ -1420,7 +1413,7 @@ struct UText {
* (protected) Pointer to string or text-containin object or similar.
* This is the source of the text that this UText is wrapping, in a format
* that is known to the text provider functions.
* @draft ICU 3.4
* @stable ICU 3.4
*/
const void *context;
@ -1429,19 +1422,19 @@ struct UText {
/**
* (protected) Pointer fields available for use by the text provider.
* Not used by UText common code.
* @draft ICU 3.6
* @stable ICU 3.6
*/
const void *p;
/**
* (protected) Pointer fields available for use by the text provider.
* Not used by UText common code.
* @draft ICU 3.6
* @stable ICU 3.6
*/
const void *q;
/**
* (protected) Pointer fields available for use by the text provider.
* Not used by UText common code.
* @draft ICU 3.6
* @stable ICU 3.6
*/
const void *r;
@ -1459,21 +1452,21 @@ struct UText {
/**
* (protected) Integer field reserved for use by the text provider.
* Not used by the UText framework, or by the client (user) of the UText.
* @draft ICU 3.4
* @stable ICU 3.4
*/
int64_t a;
/**
* (protected) Integer field reserved for use by the text provider.
* Not used by the UText framework, or by the client (user) of the UText.
* @draft ICU 3.4
* @stable ICU 3.4
*/
int32_t b;
/**
* (protected) Integer field reserved for use by the text provider.
* Not used by the UText framework, or by the client (user) of the UText.
* @draft ICU 3.4
* @stable ICU 3.4
*/
int32_t c;
@ -1500,7 +1493,6 @@ struct UText {
int32_t privC;
};
#endif
/**
* Common function for use by Text Provider implementations to allocate and/or initialize
@ -1516,9 +1508,9 @@ struct UText {
* additional storage.
* @param status Errors are returned here.
* @return pointer to the UText, allocated if necessary, with extra space set up if requested.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UText * U_EXPORT2
U_STABLE UText * U_EXPORT2
utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status);
/**
@ -1529,14 +1521,13 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status);
enum {
UTEXT_MAGIC = 0x345ad82c
};
#ifndef U_HIDE_DRAFT_API
/**
* initializer to be used with local (stack) instances of a UText
* struct. UText structs must be initialized before passing
* them to one of the utext_open functions.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
#define UTEXT_INITIALIZER { \
UTEXT_MAGIC, /* magic */ \
@ -1560,8 +1551,6 @@ enum {
}
#endif /* U_HIDE_DRAFT_API */
U_CDECL_END

2
icu4c/source/common/unicode/utypes.h
View File

@ -374,7 +374,7 @@ typedef void* UClassID;
* \def U_TOOLUTIL_API
* Set to export library symbols from inside the toolutil library,
* and to import them from outside.
* @draft ICU 3.4
* @stable ICU 3.4
*/
#if defined(U_COMBINED_IMPLEMENTATION)

6
icu4c/source/common/uresbund.c
View File

@ -1068,7 +1068,7 @@ ures_toUTF8String(const UChar *s16, int32_t length16,
}
}
U_DRAFT const char * U_EXPORT2
U_CAPI const char * U_EXPORT2
ures_getUTF8String(const UResourceBundle *resB,
char *dest, int32_t *pLength,
UBool forceCopy,
@ -1395,7 +1395,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByIndex(const UResourceBundle *resB,
return NULL;
}
U_DRAFT const char * U_EXPORT2
U_CAPI const char * U_EXPORT2
ures_getUTF8StringByIndex(const UResourceBundle *resB,
int32_t index,
char *dest, int32_t *pLength,
@ -1724,7 +1724,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, c
return NULL;
}
U_DRAFT const char * U_EXPORT2
U_CAPI const char * U_EXPORT2
ures_getUTF8StringByKey(const UResourceBundle *resB,
const char *key,
char *dest, int32_t *pLength,

16
icu4c/source/common/uset.cpp
View File

@ -41,22 +41,22 @@ uset_close(USet* set) {
delete (UnicodeSet*) set;
}
U_DRAFT USet * U_EXPORT2
U_CAPI USet * U_EXPORT2
uset_clone(const USet *set) {
return (USet*) (((UnicodeSet*) set)->UnicodeSet::clone());
}
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
uset_isFrozen(const USet *set) {
return ((UnicodeSet*) set)->UnicodeSet::isFrozen();
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
uset_freeze(USet *set) {
((UnicodeSet*) set)->UnicodeSet::freeze();
}
U_DRAFT USet * U_EXPORT2
U_CAPI USet * U_EXPORT2
uset_cloneAsThawed(const USet *set) {
return (USet*) (((UnicodeSet*) set)->UnicodeSet::cloneAsThawed());
}
@ -190,22 +190,22 @@ uset_containsSome(const USet* set1, const USet* set2) {
return ((const UnicodeSet*) set1)->UnicodeSet::containsSome(* (const UnicodeSet*) set2);
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uset_span(const USet *set, const UChar *s, int32_t length, USetSpanCondition spanCondition) {
return ((UnicodeSet*) set)->UnicodeSet::span(s, length, spanCondition);
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uset_spanBack(const USet *set, const UChar *s, int32_t length, USetSpanCondition spanCondition) {
return ((UnicodeSet*) set)->UnicodeSet::spanBack(s, length, spanCondition);
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uset_spanUTF8(const USet *set, const char *s, int32_t length, USetSpanCondition spanCondition) {
return ((UnicodeSet*) set)->UnicodeSet::spanUTF8(s, length, spanCondition);
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uset_spanBackUTF8(const USet *set, const char *s, int32_t length, USetSpanCondition spanCondition) {
return ((UnicodeSet*) set)->UnicodeSet::spanBackUTF8(s, length, spanCondition);
}

2
icu4c/source/common/ustrcase.c
View File

@ -594,7 +594,7 @@ u_strToTitle(UChar *dest, int32_t destCapacity,
return length;
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
ucasemap_toTitle(UCaseMap *csm,
UChar *dest, int32_t destCapacity,
const UChar *src, int32_t srcLength,

60
icu4c/source/common/utext.cpp
View File

@ -36,7 +36,7 @@ utext_access(UText *ut, int64_t index, UBool forward) {
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
utext_moveIndex32(UText *ut, int32_t delta) {
UChar32 c;
if (delta > 0) {
@ -76,20 +76,20 @@ utext_moveIndex32(UText *ut, int32_t delta) {
}
U_DRAFT int64_t U_EXPORT2
U_CAPI int64_t U_EXPORT2
utext_nativeLength(UText *ut) {
return ut->pFuncs->nativeLength(ut);
}
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
utext_isLengthExpensive(const UText *ut) {
UBool r = (ut->providerProperties & I32_FLAG(UTEXT_PROVIDER_LENGTH_IS_EXPENSIVE)) != 0;
return r;
}
U_DRAFT int64_t U_EXPORT2
U_CAPI int64_t U_EXPORT2
utext_getNativeIndex(const UText *ut) {
if(ut->chunkOffset <= ut->nativeIndexingLimit) {
return ut->chunkNativeStart+ut->chunkOffset;
@ -99,7 +99,7 @@ utext_getNativeIndex(const UText *ut) {
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
utext_setNativeIndex(UText *ut, int64_t index) {
if(index<ut->chunkNativeStart || index>=ut->chunkNativeLimit) {
// The desired position is outside of the current chunk.
@ -133,7 +133,7 @@ utext_setNativeIndex(UText *ut, int64_t index) {
U_DRAFT int64_t U_EXPORT2
U_CAPI int64_t U_EXPORT2
utext_getPreviousNativeIndex(UText *ut) {
//
// Fast-path the common case.
@ -176,7 +176,7 @@ utext_getPreviousNativeIndex(UText *ut) {
// UText iteration position is always on a code point boundary,
// never on the trail half of a surrogate pair.
//
U_DRAFT UChar32 U_EXPORT2
U_CAPI UChar32 U_EXPORT2
utext_current32(UText *ut) {
UChar32 c;
if (ut->chunkOffset==ut->chunkLength) {
@ -230,7 +230,7 @@ utext_current32(UText *ut) {
}
U_DRAFT UChar32 U_EXPORT2
U_CAPI UChar32 U_EXPORT2
utext_char32At(UText *ut, int64_t nativeIndex) {
UChar32 c = U_SENTINEL;
@ -257,7 +257,7 @@ utext_char32At(UText *ut, int64_t nativeIndex) {
}
U_DRAFT UChar32 U_EXPORT2
U_CAPI UChar32 U_EXPORT2
utext_next32(UText *ut) {
UChar32 c;
@ -297,7 +297,7 @@ utext_next32(UText *ut) {
}
U_DRAFT UChar32 U_EXPORT2
U_CAPI UChar32 U_EXPORT2
utext_previous32(UText *ut) {
UChar32 c;
@ -337,7 +337,7 @@ utext_previous32(UText *ut) {
U_DRAFT UChar32 U_EXPORT2
U_CAPI UChar32 U_EXPORT2
utext_next32From(UText *ut, int64_t index) {
UChar32 c = U_SENTINEL;
@ -366,7 +366,7 @@ utext_next32From(UText *ut, int64_t index) {
}
U_DRAFT UChar32 U_EXPORT2
U_CAPI UChar32 U_EXPORT2
utext_previous32From(UText *ut, int64_t index) {
//
// Return the character preceding the specified index.
@ -414,7 +414,7 @@ utext_previous32From(UText *ut, int64_t index) {
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
utext_extract(UText *ut,
int64_t start, int64_t limit,
UChar *dest, int32_t destCapacity,
@ -424,7 +424,7 @@ utext_extract(UText *ut,
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
utext_equals(const UText *a, const UText *b) {
if (a==NULL || b==NULL ||
a->magic != UTEXT_MAGIC ||
@ -450,7 +450,7 @@ utext_equals(const UText *a, const UText *b) {
return TRUE;
}
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
utext_isWritable(const UText *ut)
{
UBool b = (ut->providerProperties & I32_FLAG(UTEXT_PROVIDER_WRITABLE)) != 0;
@ -458,14 +458,14 @@ utext_isWritable(const UText *ut)
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
utext_freeze(UText *ut) {
// Zero out the WRITABLE flag.
ut->providerProperties &= ~(I32_FLAG(UTEXT_PROVIDER_WRITABLE));
}
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
utext_hasMetaData(const UText *ut)
{
UBool b = (ut->providerProperties & I32_FLAG(UTEXT_PROVIDER_HAS_META_DATA)) != 0;
@ -474,7 +474,7 @@ utext_hasMetaData(const UText *ut)
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
utext_replace(UText *ut,
int64_t nativeStart, int64_t nativeLimit,
const UChar *replacementText, int32_t replacementLength,
@ -491,7 +491,7 @@ utext_replace(UText *ut,
return i;
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
utext_copy(UText *ut,
int64_t nativeStart, int64_t nativeLimit,
int64_t destIndex,
@ -510,7 +510,7 @@ utext_copy(UText *ut,
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_clone(UText *dest, const UText *src, UBool deep, UBool readOnly, UErrorCode *status) {
UText *result;
result = src->pFuncs->clone(dest, src, deep, status);
@ -557,7 +557,7 @@ struct ExtendedUText {
static const UText emptyText = UTEXT_INITIALIZER;
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) {
if (U_FAILURE(*status)) {
return ut;
@ -635,15 +635,15 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) {
ut->privB = 0;
ut->privC = 0;
ut->privP = NULL;
if (ut->pExtra!=NULL && ut->extraSize>0)
uprv_memset(ut->pExtra, 0, ut->extraSize);
if (ut->pExtra!=NULL && ut->extraSize>0)
uprv_memset(ut->pExtra, 0, ut->extraSize);
}
return ut;
}
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_close(UText *ut) {
if (ut==NULL ||
ut->magic != UTEXT_MAGIC ||
@ -1602,7 +1602,7 @@ static struct UTextFuncs utf8Funcs =
};
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_openUTF8(UText *ut, const char *s, int64_t length, UErrorCode *status) {
if(U_FAILURE(*status)) {
return NULL;
@ -2003,7 +2003,7 @@ static struct UTextFuncs repFuncs =
};
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_openReplaceable(UText *ut, Replaceable *rep, UErrorCode *status)
{
if(U_FAILURE(*status)) {
@ -2255,7 +2255,7 @@ static struct UTextFuncs unistrFuncs =
U_CDECL_END
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_openUnicodeString(UText *ut, UnicodeString *s, UErrorCode *status) {
// TODO: use openConstUnicodeString, then add in the differences.
//
@ -2277,7 +2277,7 @@ utext_openUnicodeString(UText *ut, UnicodeString *s, UErrorCode *status) {
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_openConstUnicodeString(UText *ut, const UnicodeString *s, UErrorCode *status) {
ut = utext_setup(ut, 0, status);
// note: use the standard (writable) function table for UnicodeString.
@ -2564,7 +2564,7 @@ static struct UTextFuncs ucstrFuncs =
U_CDECL_END
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status) {
if (U_FAILURE(*status)) {
return NULL;
@ -2777,7 +2777,7 @@ static struct UTextFuncs charIterFuncs =
U_CDECL_END
U_DRAFT UText * U_EXPORT2
U_CAPI UText * U_EXPORT2
utext_openCharacterIterator(UText *ut, CharacterIterator *ci, UErrorCode *status) {
if (U_FAILURE(*status)) {
return NULL;

310
icu4c/source/i18n/ucal.cpp
View File

@ -104,54 +104,6 @@ ucal_getDSTSavings(const UChar* zoneID, UErrorCode* ec) {
return result;
}
#ifdef U_USE_UCAL_OBSOLETE_2_8
U_CAPI const UChar* U_EXPORT2
ucal_getAvailableTZIDs( int32_t rawOffset,
int32_t index,
UErrorCode* status)
{
if(U_FAILURE(*status)) return 0;
int32_t count = 0;
const UChar *retVal = 0;
const UnicodeString** tzs = TimeZone::createAvailableIDs(rawOffset,
count);
if(tzs == 0) {
*status = U_MEMORY_ALLOCATION_ERROR;
return 0;
}
if(index < count)
retVal = tzs[index]->getBuffer();
else
*status = U_INDEX_OUTOFBOUNDS_ERROR;
uprv_free(tzs);
return retVal;
}
U_CAPI int32_t U_EXPORT2
ucal_countAvailableTZIDs(int32_t rawOffset)
{
int32_t count = 0;
const UnicodeString** tzs = TimeZone::createAvailableIDs(rawOffset,
count);
if(tzs == 0) {
// TBD: U_MEMORY_ALLOCATION_ERROR
return 0;
}
uprv_free(tzs);
return count;
}
#endif
U_CAPI UDate U_EXPORT2
ucal_getNow()
{
@ -214,289 +166,289 @@ ucal_getTimeZoneDisplayName(const UCalendar* cal,
UErrorCode* status)
{
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
const TimeZone& tz = ((Calendar*)cal)->getTimeZone();
UnicodeString id;
if(!(result==NULL && resultLength==0)) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
id.setTo(result, 0, resultLength);
}
const TimeZone& tz = ((Calendar*)cal)->getTimeZone();
UnicodeString id;
if(!(result==NULL && resultLength==0)) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
id.setTo(result, 0, resultLength);
}
switch(type) {
switch(type) {
case UCAL_STANDARD:
tz.getDisplayName(FALSE, TimeZone::LONG, Locale(locale), id);
break;
tz.getDisplayName(FALSE, TimeZone::LONG, Locale(locale), id);
break;
case UCAL_SHORT_STANDARD:
tz.getDisplayName(FALSE, TimeZone::SHORT, Locale(locale), id);
break;
tz.getDisplayName(FALSE, TimeZone::SHORT, Locale(locale), id);
break;
case UCAL_DST:
tz.getDisplayName(TRUE, TimeZone::LONG, Locale(locale), id);
break;
tz.getDisplayName(TRUE, TimeZone::LONG, Locale(locale), id);
break;
case UCAL_SHORT_DST:
tz.getDisplayName(TRUE, TimeZone::SHORT, Locale(locale), id);
break;
}
tz.getDisplayName(TRUE, TimeZone::SHORT, Locale(locale), id);
break;
}
return id.extract(result, resultLength, *status);
return id.extract(result, resultLength, *status);
}
U_CAPI UBool U_EXPORT2
ucal_inDaylightTime( const UCalendar* cal,
UErrorCode* status )
UErrorCode* status )
{
if(U_FAILURE(*status)) return (UBool) -1;
return ((Calendar*)cal)->inDaylightTime(*status);
if(U_FAILURE(*status)) return (UBool) -1;
return ((Calendar*)cal)->inDaylightTime(*status);
}
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ucal_setGregorianChange(UCalendar *cal, UDate date, UErrorCode *pErrorCode) {
if(U_FAILURE(*pErrorCode)) {
return;
}
Calendar *cpp_cal = (Calendar *)cal;
if(cpp_cal->getDynamicClassID() != GregorianCalendar::getStaticClassID()) {
*pErrorCode = U_UNSUPPORTED_ERROR;
return;
}
((GregorianCalendar *)cpp_cal)->setGregorianChange(date, *pErrorCode);
if(U_FAILURE(*pErrorCode)) {
return;
}
Calendar *cpp_cal = (Calendar *)cal;
if(cpp_cal->getDynamicClassID() != GregorianCalendar::getStaticClassID()) {
*pErrorCode = U_UNSUPPORTED_ERROR;
return;
}
((GregorianCalendar *)cpp_cal)->setGregorianChange(date, *pErrorCode);
}
U_DRAFT UDate U_EXPORT2
U_CAPI UDate U_EXPORT2
ucal_getGregorianChange(const UCalendar *cal, UErrorCode *pErrorCode) {
if(U_FAILURE(*pErrorCode)) {
return (UDate)0;
}
Calendar *cpp_cal = (Calendar *)cal;
if(cpp_cal->getDynamicClassID() != GregorianCalendar::getStaticClassID()) {
*pErrorCode = U_UNSUPPORTED_ERROR;
return (UDate)0;
}
return ((GregorianCalendar *)cpp_cal)->getGregorianChange();
if(U_FAILURE(*pErrorCode)) {
return (UDate)0;
}
Calendar *cpp_cal = (Calendar *)cal;
if(cpp_cal->getDynamicClassID() != GregorianCalendar::getStaticClassID()) {
*pErrorCode = U_UNSUPPORTED_ERROR;
return (UDate)0;
}
return ((GregorianCalendar *)cpp_cal)->getGregorianChange();
}
U_CAPI int32_t U_EXPORT2
ucal_getAttribute( const UCalendar* cal,
UCalendarAttribute attr)
UCalendarAttribute attr)
{
switch(attr) {
switch(attr) {
case UCAL_LENIENT:
return ((Calendar*)cal)->isLenient();
return ((Calendar*)cal)->isLenient();
case UCAL_FIRST_DAY_OF_WEEK:
return ((Calendar*)cal)->getFirstDayOfWeek();
return ((Calendar*)cal)->getFirstDayOfWeek();
case UCAL_MINIMAL_DAYS_IN_FIRST_WEEK:
return ((Calendar*)cal)->getMinimalDaysInFirstWeek();
return ((Calendar*)cal)->getMinimalDaysInFirstWeek();
default:
break;
}
return -1;
break;
}
return -1;
}
U_CAPI void U_EXPORT2
ucal_setAttribute( UCalendar* cal,
UCalendarAttribute attr,
int32_t newValue)
UCalendarAttribute attr,
int32_t newValue)
{
switch(attr) {
switch(attr) {
case UCAL_LENIENT:
((Calendar*)cal)->setLenient((UBool)newValue);
break;
((Calendar*)cal)->setLenient((UBool)newValue);
break;
case UCAL_FIRST_DAY_OF_WEEK:
((Calendar*)cal)->setFirstDayOfWeek((UCalendarDaysOfWeek)newValue);
break;
((Calendar*)cal)->setFirstDayOfWeek((UCalendarDaysOfWeek)newValue);
break;
case UCAL_MINIMAL_DAYS_IN_FIRST_WEEK:
((Calendar*)cal)->setMinimalDaysInFirstWeek((uint8_t)newValue);
break;
}
((Calendar*)cal)->setMinimalDaysInFirstWeek((uint8_t)newValue);
break;
}
}
U_CAPI const char* U_EXPORT2
ucal_getAvailable(int32_t index)
{
return uloc_getAvailable(index);
return uloc_getAvailable(index);
}
U_CAPI int32_t U_EXPORT2
ucal_countAvailable()
{
return uloc_countAvailable();
return uloc_countAvailable();
}
U_CAPI UDate U_EXPORT2
ucal_getMillis( const UCalendar* cal,
UErrorCode* status)
UErrorCode* status)
{
if(U_FAILURE(*status)) return (UDate) 0;
if(U_FAILURE(*status)) return (UDate) 0;
return ((Calendar*)cal)->getTime(*status);
return ((Calendar*)cal)->getTime(*status);
}
U_CAPI void U_EXPORT2
ucal_setMillis( UCalendar* cal,
UDate dateTime,
UErrorCode* status )
UDate dateTime,
UErrorCode* status )
{
if(U_FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->setTime(dateTime, *status);
((Calendar*)cal)->setTime(dateTime, *status);
}
// TBD: why does this take an UErrorCode?
U_CAPI void U_EXPORT2
ucal_setDate( UCalendar* cal,
int32_t year,
int32_t month,
int32_t date,
UErrorCode *status)
int32_t year,
int32_t month,
int32_t date,
UErrorCode *status)
{
if(U_FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->set(year, month, date);
((Calendar*)cal)->set(year, month, date);
}
// TBD: why does this take an UErrorCode?
U_CAPI void U_EXPORT2
ucal_setDateTime( UCalendar* cal,
int32_t year,
int32_t month,
int32_t date,
int32_t hour,
int32_t minute,
int32_t second,
UErrorCode *status)
int32_t year,
int32_t month,
int32_t date,
int32_t hour,
int32_t minute,
int32_t second,
UErrorCode *status)
{
if(U_FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->set(year, month, date, hour, minute, second);
((Calendar*)cal)->set(year, month, date, hour, minute, second);
}
U_CAPI UBool U_EXPORT2
ucal_equivalentTo( const UCalendar* cal1,
const UCalendar* cal2)
const UCalendar* cal2)
{
return ((Calendar*)cal1)->isEquivalentTo(*((Calendar*)cal2));
return ((Calendar*)cal1)->isEquivalentTo(*((Calendar*)cal2));
}
U_CAPI void U_EXPORT2
ucal_add( UCalendar* cal,
UCalendarDateFields field,
int32_t amount,
UErrorCode* status)
UCalendarDateFields field,
int32_t amount,
UErrorCode* status)
{
if(U_FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->add(field, amount, *status);
((Calendar*)cal)->add(field, amount, *status);
}
U_CAPI void U_EXPORT2
ucal_roll( UCalendar* cal,
UCalendarDateFields field,
int32_t amount,
UErrorCode* status)
UCalendarDateFields field,
int32_t amount,
UErrorCode* status)
{
if(U_FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->roll(field, amount, *status);
((Calendar*)cal)->roll(field, amount, *status);
}
U_CAPI int32_t U_EXPORT2
ucal_get( const UCalendar* cal,
UCalendarDateFields field,
UErrorCode* status )
UCalendarDateFields field,
UErrorCode* status )
{
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
return ((Calendar*)cal)->get(field, *status);
return ((Calendar*)cal)->get(field, *status);
}
U_CAPI void U_EXPORT2
ucal_set( UCalendar* cal,
UCalendarDateFields field,
int32_t value)
UCalendarDateFields field,
int32_t value)
{
((Calendar*)cal)->set(field, value);
((Calendar*)cal)->set(field, value);
}
U_CAPI UBool U_EXPORT2
ucal_isSet( const UCalendar* cal,
UCalendarDateFields field)
UCalendarDateFields field)
{
return ((Calendar*)cal)->isSet(field);
return ((Calendar*)cal)->isSet(field);
}
U_CAPI void U_EXPORT2
ucal_clearField( UCalendar* cal,
UCalendarDateFields field)
UCalendarDateFields field)
{
((Calendar*)cal)->clear(field);
((Calendar*)cal)->clear(field);
}
U_CAPI void U_EXPORT2
ucal_clear(UCalendar* calendar)
{
((Calendar*)calendar)->clear();
((Calendar*)calendar)->clear();
}
U_CAPI int32_t U_EXPORT2
ucal_getLimit( const UCalendar* cal,
UCalendarDateFields field,
UCalendarLimitType type,
UErrorCode *status)
UCalendarDateFields field,
UCalendarLimitType type,
UErrorCode *status)
{
if(status==0 || U_FAILURE(*status)) {
return -1;
}
switch(type) {
if(status==0 || U_FAILURE(*status)) {
return -1;
}
switch(type) {
case UCAL_MINIMUM:
return ((Calendar*)cal)->getMinimum(field);
return ((Calendar*)cal)->getMinimum(field);
case UCAL_MAXIMUM:
return ((Calendar*)cal)->getMaximum(field);
return ((Calendar*)cal)->getMaximum(field);
case UCAL_GREATEST_MINIMUM:
return ((Calendar*)cal)->getGreatestMinimum(field);
return ((Calendar*)cal)->getGreatestMinimum(field);
case UCAL_LEAST_MAXIMUM:
return ((Calendar*)cal)->getLeastMaximum(field);
return ((Calendar*)cal)->getLeastMaximum(field);
case UCAL_ACTUAL_MINIMUM:
return ((Calendar*)cal)->getActualMinimum(field,
*status);
return ((Calendar*)cal)->getActualMinimum(field,
*status);
case UCAL_ACTUAL_MAXIMUM:
return ((Calendar*)cal)->getActualMaximum(field,
*status);
return ((Calendar*)cal)->getActualMaximum(field,
*status);
default:
break;
}
return -1;
break;
}
return -1;
}
U_CAPI const char * U_EXPORT2

4
icu4c/source/i18n/unicode/dcfmtsym.h
View File

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2006, International Business Machines
* Copyright (C) 1997-2007, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -122,7 +122,7 @@ public:
* @stable ICU 3.0 */
kSignificantDigitSymbol,
/** The monetary grouping separator
* @draft ICU 3.6
* @stable ICU 3.6
*/
kMonetaryGroupingSeparatorSymbol,
/** count symbol constants */

20
icu4c/source/i18n/unicode/dtfmtsym.h
View File

@ -199,7 +199,7 @@ public:
*
* @param count Filled in with length of the array.
* @return the era name strings.
* @draft ICU 3.4
* @stable ICU 3.4
*/
const UnicodeString* getEraNames(int32_t& count) const;
@ -207,7 +207,7 @@ public:
* Sets era name strings. For example: "Anno Domini" and "Before Christ".
* @param eraNames Array of era name strings (DateFormatSymbols retains ownership.)
* @param count Filled in with length of the array.
* @draft ICU 3.6
* @stable ICU 3.6
*/
void setEraNames(const UnicodeString* eraNames, int32_t count);
@ -247,7 +247,7 @@ public:
/**
* Selector for date formatting context
* @draft ICU 3.6
* @stable ICU 3.6
*/
enum DtContextType {
FORMAT,
@ -257,7 +257,7 @@ public:
/**
* Selector for date formatting width
* @draft ICU 3.6
* @stable ICU 3.6
*/
enum DtWidthType {
ABBREVIATED,
@ -272,7 +272,7 @@ public:
* @param context The formatting context, either FORMAT or STANDALONE
* @param width The width of returned strings, either WIDE, ABBREVIATED, or NARROW.
* @return the month strings. (DateFormatSymbols retains ownership.)
* @draft ICU 3.4
* @stable ICU 3.4
*/
const UnicodeString* getMonths(int32_t& count, DtContextType context, DtWidthType width) const;
@ -283,7 +283,7 @@ public:
* @param count Filled in with length of the array.
* @param context The formatting context, either FORMAT or STANDALONE
* @param width The width of returned strings, either WIDE, ABBREVIATED, or NARROW.
* @draft ICU 3.6
* @stable ICU 3.6
*/
void setMonths(const UnicodeString* months, int32_t count, DtContextType context, DtWidthType width);
@ -326,7 +326,7 @@ public:
* @param context The formatting context, either FORMAT or STANDALONE
* @param width The width of returned strings, either WIDE, ABBREVIATED, or NARROW
* @return the month strings. (DateFormatSymbols retains ownership.)
* @draft ICU 3.4
* @stable ICU 3.4
*/
const UnicodeString* getWeekdays(int32_t& count, DtContextType context, DtWidthType width) const;
@ -336,7 +336,7 @@ public:
* @param count Filled in with length of the array.
* @param context The formatting context, either FORMAT or STANDALONE
* @param width The width of returned strings, either WIDE, ABBREVIATED, or NARROW
* @draft ICU 3.6
* @stable ICU 3.6
*/
void setWeekdays(const UnicodeString* weekdays, int32_t count, DtContextType context, DtWidthType width);
@ -347,7 +347,7 @@ public:
* @param width The width of returned strings, either WIDE or ABBREVIATED. There
* are no NARROW quarters.
* @return the quarter strings. (DateFormatSymbols retains ownership.)
* @draft ICU 3.6
* @stable ICU 3.6
*/
const UnicodeString* getQuarters(int32_t& count, DtContextType context, DtWidthType width) const;
@ -359,7 +359,7 @@ public:
* @param context The formatting context, either FORMAT or STANDALONE
* @param width The width of returned strings, either WIDE or ABBREVIATED. There
* are no NARROW quarters.
* @draft ICU 3.6
* @stable ICU 3.6
*/
void setQuarters(const UnicodeString* quarters, int32_t count, DtContextType context, DtWidthType width);

6
icu4c/source/i18n/unicode/tblcoll.h
View File

@ -192,7 +192,7 @@ public:
* @param status for catching errors
* @return newly created collator
* @see cloneBinary
* @draft ICU 3.4
* @stable ICU 3.4
*/
RuleBasedCollator(const uint8_t *bin, int32_t length,
const RuleBasedCollator *base,
@ -511,7 +511,7 @@ public:
* @param status for catching errors
* @return size of the image
* @see ucol_openBinary
* @draft ICU 3.4
* @stable ICU 3.4
*/
int32_t cloneBinary(uint8_t *buffer, int32_t capacity, UErrorCode &status);
@ -859,7 +859,7 @@ inline void RuleBasedCollator::setUCollator(UCollator *collator)
ucollator = collator;
dataIsOwned = FALSE;
isWriteThroughAlias = TRUE;
setRuleStringFromCollator();
setRuleStringFromCollator();
}
inline const UCollator * RuleBasedCollator::getUCollator()

2
icu4c/source/i18n/unicode/timezone.h
View File

@ -625,7 +625,7 @@ public:
* the known latest daylight saving value.
*
* @return the amount of saving time in milliseconds
* @draft ICU 3.6
* @stable ICU 3.6
*/
virtual int32_t getDSTSavings() const;

20
icu4c/source/i18n/unicode/translit.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2006, International Business Machines
* Copyright (C) 1999-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -349,7 +349,7 @@ protected:
friend class TransliteratorParser; // for parseID()
friend class TransliteratorIDParser; // for createBasicInstance()
friend class TransliteratorAlias; // for setID()
friend class TransliteratorAlias; // for setID()
public:
@ -607,7 +607,7 @@ protected:
* applying the filter. End user code should call <code>
* transliterate()</code> instead of this method. Subclass code
* and wrapping transliterators should call
* <code>filteredTransliterate()</code> instead of this method.<p>
* <code>filteredTransliterate()</code> instead of this method.<p>
*
* @param text the buffer holding transliterated and
* untransliterated text
@ -629,7 +629,7 @@ protected:
UBool incremental) const = 0;
public:
/**
/**
* Transliterate a substring of text, as specified by index, taking filters
* into account. This method is for subclasses that need to delegate to
* another transliterator, such as CompoundTransliterator.
@ -1010,10 +1010,10 @@ public:
* This can be a compound ID and can include filters and should
* refer to transliterators that have already been registered with
* the framework, although this isn't checked.
* @draft ICU 3.6
* @stable ICU 3.6
*/
static void U_EXPORT2 registerAlias(const UnicodeString& aliasID,
const UnicodeString& realID);
const UnicodeString& realID);
protected:
@ -1035,10 +1035,10 @@ protected:
*/
static void _registerInstance(Transliterator* adoptedObj);
/**
* @internal
*/
static void _registerAlias(const UnicodeString& aliasID, const UnicodeString& realID);
/**
* @internal
*/
static void _registerAlias(const UnicodeString& aliasID, const UnicodeString& realID);
/**
* Register two targets as being inverses of one another. For

37
icu4c/source/i18n/unicode/ucal.h
View File

@ -700,9 +700,9 @@ ucal_inDaylightTime(const UCalendar* cal,
*
* @see GregorianCalendar::setGregorianChange
* @see ucal_getGregorianChange
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ucal_setGregorianChange(UCalendar *cal, UDate date, UErrorCode *pErrorCode);
/**
@ -723,9 +723,9 @@ ucal_setGregorianChange(UCalendar *cal, UDate date, UErrorCode *pErrorCode);
*
* @see GregorianCalendar::getGregorianChange
* @see ucal_setGregorianChange
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT UDate U_EXPORT2
U_STABLE UDate U_EXPORT2
ucal_getGregorianChange(const UCalendar *cal, UErrorCode *pErrorCode);
/**
@ -1065,35 +1065,6 @@ ucal_getLimit(const UCalendar* cal,
UCalendarLimitType type,
UErrorCode* status);
#ifdef U_USE_UCAL_OBSOLETE_2_8
/**
* Get an available TimeZone ID.
* A Timezone ID is a string of the form "America/Los Angeles".
* @param rawOffset The desired GMT offset
* @param index The index of the desired TimeZone.
* @param status A pointer to an UErrorCode to receive any errors
* @return The requested TimeZone ID, or 0 if not found
* @see ucal_countAvailableTZIDs
* @obsolete ICU 2.8. Use ucal_openTimeZoneEnumeration instead since this API will be removed in that release.
*/
U_OBSOLETE const UChar* U_EXPORT2
ucal_getAvailableTZIDs(int32_t rawOffset,
int32_t index,
UErrorCode* status);
/**
* Determine how many TimeZones exist with a certain offset.
* This function is most useful as determining the loop ending condition for
* calls to \ref ucal_getAvailableTZIDs.
* @param rawOffset The desired GMT offset.
* @return The number of TimeZones with rawOffset.
* @see ucal_getAvailableTZIDs
* @obsolete ICU 2.8. Use ucal_openTimeZoneEnumeration instead since this API will be removed in that release.
*/
U_OBSOLETE int32_t U_EXPORT2
ucal_countAvailableTZIDs(int32_t rawOffset);
#endif
/** Get the locale for this calendar object. You can choose between valid and actual locale.
* @param cal The calendar object
* @param type type of the locale we're looking for (valid or actual)

59
icu4c/source/i18n/unicode/ucsdet.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2006, International Business Machines
* Copyright (C) 2005-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: ucsdet.h
@ -47,7 +47,7 @@
struct UCharsetDetector;
/**
* Structure representing a charset detector
* @draft ICU 3.6
* @stable ICU 3.6
*/
typedef struct UCharsetDetector UCharsetDetector;
@ -55,7 +55,7 @@ struct UCharsetMatch;
/**
* Opaque structure representing a match that was identified
* from a charset detection operation.
* @draft ICU 3.6
* @stable ICU 3.6
*/
typedef struct UCharsetMatch UCharsetMatch;
@ -65,9 +65,9 @@ typedef struct UCharsetMatch UCharsetMatch;
* @param status Any error conditions occurring during the open
* operation are reported back in this variable.
* @return the newly opened charset detector.
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT UCharsetDetector * U_EXPORT2
U_STABLE UCharsetDetector * U_EXPORT2
ucsdet_open(UErrorCode *status);
/**
@ -77,9 +77,9 @@ ucsdet_open(UErrorCode *status);
* memory leaks in the application.
*
* @param ucsd The charset detector to be closed.
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ucsdet_close(UCharsetDetector *ucsd);
/**
@ -95,9 +95,9 @@ ucsdet_close(UCharsetDetector *ucsd);
* is NUL terminated.
* @param status any error conditions are reported back in this variable.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ucsdet_setText(UCharsetDetector *ucsd, const char *textIn, int32_t len, UErrorCode *status);
@ -117,9 +117,9 @@ ucsdet_setText(UCharsetDetector *ucsd, const char *textIn, int32_t len, UErrorCo
* is NUL terminated.
* @param status any error conditions are reported back in this variable.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ucsdet_setDeclaredEncoding(UCharsetDetector *ucsd, const char *encoding, int32_t length, UErrorCode *status);
@ -146,9 +146,9 @@ ucsdet_setDeclaredEncoding(UCharsetDetector *ucsd, const char *encoding, int32_t
* @return a UCharsetMatch representing the best matching charset,
* or NULL if no charset matches the byte data.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT const UCharsetMatch * U_EXPORT2
U_STABLE const UCharsetMatch * U_EXPORT2
ucsdet_detect(UCharsetDetector *ucsd, UErrorCode *status);
@ -180,9 +180,9 @@ ucsdet_detect(UCharsetDetector *ucsd, UErrorCode *status);
* This array, and the UCharSetMatch instances to which it refers,
* are owned by the UCharsetDetector, and will remain valid until
* the detector is closed or modified.
* @draft ICU 3.4
* @stable ICU 3.6
*/
U_DRAFT const UCharsetMatch ** U_EXPORT2
U_STABLE const UCharsetMatch ** U_EXPORT2
ucsdet_detectAll(UCharsetDetector *ucsd, int32_t *matchesFound, UErrorCode *status);
@ -200,9 +200,9 @@ ucsdet_detectAll(UCharsetDetector *ucsd, int32_t *matchesFound, UErrorCode *stat
* @param status Any error conditions are reported back in this variable.
* @return The name of the matching charset.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT const char * U_EXPORT2
U_STABLE const char * U_EXPORT2
ucsdet_getName(const UCharsetMatch *ucsm, UErrorCode *status);
/**
@ -226,9 +226,9 @@ ucsdet_getName(const UCharsetMatch *ucsm, UErrorCode *status);
* @param status Any error conditions are reported back in this variable.
* @return A confidence number for the charset match.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucsdet_getConfidence(const UCharsetMatch *ucsm, UErrorCode *status);
/**
@ -258,9 +258,9 @@ ucsdet_getConfidence(const UCharsetMatch *ucsm, UErrorCode *status);
* @return The RFC 3066 code for the language of the input data, or
* an empty string if the language could not be determined.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT const char * U_EXPORT2
U_STABLE const char * U_EXPORT2
ucsdet_getLanguage(const UCharsetMatch *ucsm, UErrorCode *status);
@ -284,9 +284,9 @@ ucsdet_getLanguage(const UCharsetMatch *ucsm, UErrorCode *status);
* @param status Any error conditions are reported back in this variable.
* @return The number of UChars in the output string.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucsdet_getUChars(const UCharsetMatch *ucsm,
UChar *buf, int32_t cap, UErrorCode *status);
@ -309,10 +309,9 @@ ucsdet_getUChars(const UCharsetMatch *ucsm,
* @param ucsd a Charset detector.
* @param status Any error conditions are reported back in this variable.
* @return an iterator providing access to the detectable charset names.
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT UEnumeration * U_EXPORT2
U_STABLE UEnumeration * U_EXPORT2
ucsdet_getAllDetectableCharsets(const UCharsetDetector *ucsd, UErrorCode *status);
@ -324,9 +323,9 @@ ucsdet_getAllDetectableCharsets(const UCharsetDetector *ucsd, UErrorCode *statu
*
* @param ucsd The charset detector to check.
* @return TRUE if filtering is enabled.
* @draft ICU 3.4
* @stable ICU 3.6
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
ucsdet_isInputFilterEnabled(const UCharsetDetector *ucsd);
@ -339,9 +338,9 @@ ucsdet_isInputFilterEnabled(const UCharsetDetector *ucsd);
* @param filter <code>true</code> to enable input text filtering.
* @return The previous setting.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
ucsdet_enableInputFilter(UCharsetDetector *ucsd, UBool filter);
#endif

14
icu4c/source/i18n/unicode/udat.h
View File

@ -355,19 +355,17 @@ typedef enum UDateFormatField {
*/
UDAT_TIMEZONE_RFC_FIELD = 23,
#ifndef U_HIDE_DRAFT_API
/**
* FieldPosition and UFieldPosition selector for 'v' field alignment,
* corresponding to the UCAL_ZONE_OFFSET field.
* @draft ICU 3.4
* @stable ICU 3.4
*/
UDAT_TIMEZONE_GENERIC_FIELD = 24,
/**
* FieldPosition selector for 'c' field alignment,
* corresponding to the {@link #UCAL_DAY} field.
* This displays the stand alone day name, if available.
* @draft ICU 3.4
* @stable ICU 3.4
*/
UDAT_STANDALONE_DAY_FIELD = 25,
@ -375,7 +373,7 @@ typedef enum UDateFormatField {
* FieldPosition selector for 'L' field alignment,
* corresponding to the {@link #UCAL_MONTH} field.
* This displays the stand alone month name, if available.
* @draft ICU 3.4
* @stable ICU 3.4
*/
UDAT_STANDALONE_MONTH_FIELD = 26,
@ -384,7 +382,7 @@ typedef enum UDateFormatField {
* corresponding to quarters. This is implemented
* using the {@link #UCAL_MONTH} field. This
* displays the quarter.
* @draft ICU 3.6
* @stable ICU 3.6
*/
UDAT_QUARTER_FIELD = 27,
@ -393,12 +391,10 @@ typedef enum UDateFormatField {
* corresponding to stand-alone quarters. This is
* implemented using the {@link #UCAL_MONTH} field.
* This displays the stand-alone quarter.
* @draft ICU 3.6
* @stable ICU 3.6
*/
UDAT_STANDALONE_QUARTER_FIELD = 28,
#endif /*U_HIDE_DRAFT_API*/
/**
* Number of FieldPosition and UFieldPosition selectors for
* DateFormat and UDateFormat.

36
icu4c/source/i18n/unicode/ulocdata.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
* *
* Copyright (C) 2003-2006, International Business Machines *
* Copyright (C) 2003-2007, International Business Machines *
* Corporation and others. All Rights Reserved. *
* *
******************************************************************************
@ -26,27 +26,25 @@
* \brief C API: Provides access to locale data.
*/
/** Forward declaration of the ULocaleData structure. @draft ICU 3.6 */
/** Forward declaration of the ULocaleData structure. @stable ICU 3.6 */
struct ULocaleData;
/** A locale data object. @draft ICU 3.6 */
/** A locale data object. @stable ICU 3.6 */
typedef struct ULocaleData ULocaleData;
/** The possible types of exemplar character sets.
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef enum ULocaleDataExemplarSetType {
#ifndef U_HIDE_DRAFT_API
ULOCDATA_ES_STANDARD=0, /* Basic set */
ULOCDATA_ES_AUXILIARY=1, /* Auxiliary set */
#endif
ULOCDATA_ES_COUNT=3
} ULocaleDataExemplarSetType;
/** The possible types of delimiters.
* @draft ICU 3.4
* @stable ICU 3.4
*/
typedef enum ULocaleDataDelimiterType {
#ifndef U_HIDE_DRAFT_API
@ -64,18 +62,18 @@ typedef enum ULocaleDataDelimiterType {
* @param localeID Specifies the locale associated with this locale
* data object.
* @param status Pointer to error status code.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT ULocaleData* U_EXPORT2
U_STABLE ULocaleData* U_EXPORT2
ulocdata_open(const char *localeID, UErrorCode *status);
/**
* Closes a locale data object.
*
* @param uld The locale data object to close
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ulocdata_close(ULocaleData *uld);
/**
@ -87,9 +85,9 @@ ulocdata_close(ULocaleData *uld);
*
* @param uld The locale data object to set.
* @param setting Value of the "no substitute" attribute.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ulocdata_setNoSubstitute(ULocaleData *uld, UBool setting);
/**
@ -101,9 +99,9 @@ ulocdata_setNoSubstitute(ULocaleData *uld, UBool setting);
*
* @param uld Pointer to the The locale data object to set.
* @return UBool Value of the "no substitute" attribute.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
ulocdata_getNoSubstitute(ULocaleData *uld);
/**
@ -129,9 +127,9 @@ ulocdata_getNoSubstitute(ULocaleData *uld);
* must not be NULL.
* @return USet* Either fillIn, or if fillIn is NULL, a pointer to
* a newly-allocated USet that the user must close.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT USet* U_EXPORT2
U_STABLE USet* U_EXPORT2
ulocdata_getExemplarSet(ULocaleData *uld, USet *fillIn,
uint32_t options, ULocaleDataExemplarSetType extype, UErrorCode *status);
@ -146,9 +144,9 @@ ulocdata_getExemplarSet(ULocaleData *uld, USet *fillIn,
* @param status Pointer to an error code value
* @return int32_t The total buffer size needed; if greater than resultLength,
* the output was truncated.
* @draft ICU 3.4
* @stable ICU 3.4
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type, UChar *result, int32_t resultLength, UErrorCode *status);
/**

6
icu4c/source/i18n/unicode/unum.h
View File

@ -798,14 +798,10 @@ typedef enum UNumberFormatSymbol {
/** Significant digit symbol
* @stable ICU 3.0 */
UNUM_SIGNIFICANT_DIGIT_SYMBOL = 16,
#ifndef U_HIDE_DRAFT_API
/** The monetary grouping separator
* @draft ICU 3.6
* @stable ICU 3.6
*/
UNUM_MONETARY_GROUPING_SEPARATOR_SYMBOL = 17,
#endif /*U_HIDE_DRAFT_API*/
/** count symbol constants */
UNUM_FORMAT_SYMBOL_COUNT = 18
} UNumberFormatSymbol;

6
icu4c/source/i18n/unum.cpp
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2004, International Business Machines
* Copyright (C) 1996-2007, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* Modification History:
@ -250,7 +250,7 @@ unum_formatDouble( const UNumberFormat* fmt,
return res.extract(result, resultLength, *status);
}
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
unum_formatDoubleCurrency(const UNumberFormat* fmt,
double number,
UChar* currency,
@ -354,7 +354,7 @@ unum_parseDouble( const UNumberFormat* fmt,
return res.getDouble(*status);
}
U_DRAFT double U_EXPORT2
U_CAPI double U_EXPORT2
unum_parseDoubleCurrency(const UNumberFormat* fmt,
const UChar* text,
int32_t textLength,

4
icu4c/source/layout/LEFontInstance.h
View File

@ -214,7 +214,7 @@ public:
*
* @see LECharMapper
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
virtual void mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse, const LECharMapper *mapper, le_bool filterZeroWidth, LEGlyphStorage &glyphStorage) const;
@ -231,7 +231,7 @@ public:
*
* @see LECharMapper
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
virtual LEGlyphID mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const;

12
icu4c/source/layout/LEGlyphStorage.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1998-2006, International Business Machines
* Copyright (C) 1998-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -29,7 +29,7 @@ U_NAMESPACE_BEGIN
*
* @see LEInsertionList.h
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
class U_LAYOUT_API LEGlyphStorage : public UObject, protected LEInsertionCallback
{
@ -249,7 +249,7 @@ public:
*
* @return the size of the auxillary data array.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
le_int32 allocateAuxData(LEErrorCode &success);
@ -259,7 +259,7 @@ public:
* @param auxData the auxillary data array will be copied to this address
* @param success set to an error code if the data cannot be copied
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
void getAuxData(le_uint32 auxData[], LEErrorCode &success) const;
@ -296,7 +296,7 @@ public:
*
* @return the auxillary data
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
le_uint32 getAuxData(le_int32 glyphIndex, LEErrorCode &success) const;
@ -397,7 +397,7 @@ public:
* @param auxData the new auxillary data
* @param success will be set to an error code if the auxillary data cannot be set.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
void setAuxData(le_int32 glyphIndex, le_uint32 auxData, LEErrorCode &success);

4
icu4c/source/layout/LELanguages.h
View File

@ -1,6 +1,6 @@
/*
*
* (C) Copyright IBM Corp. 1998-2006. All Rights Reserved.
* (C) Copyright IBM Corp. 1998-2007. All Rights Reserved.
*
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
* YOU REALLY KNOW WHAT YOU'RE DOING.
@ -25,7 +25,7 @@ U_NAMESPACE_BEGIN
* this is just a list of languages which the LayoutEngine
* supports.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
enum LanguageCodes {

4
icu4c/source/layout/LEScripts.h
View File

@ -1,6 +1,6 @@
/*
*
* (C) Copyright IBM Corp. 1998-2006. All Rights Reserved.
* (C) Copyright IBM Corp. 1998-2007. All Rights Reserved.
*
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
* YOU REALLY KNOW WHAT YOU'RE DOING.
@ -24,7 +24,7 @@ U_NAMESPACE_BEGIN
* Constants for Unicode script values, generated using
* ICU4J's <code>UScript</code> class.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
enum ScriptCodes {

2
icu4c/source/layout/LayoutEngine.h
View File

@ -466,7 +466,7 @@ public:
/**
* Override of existing call that provides flags to control typography.
* @draft ICU 3.4
* @stable ICU 3.4
*/
static LayoutEngine *layoutEngineFactory(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, le_int32 typo_flags, LEErrorCode &success);

8
icu4c/source/layout/TibetanLayoutEngine.h
View File

@ -1,6 +1,6 @@
/*
*
* (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved
* (C) Copyright IBM Corp. 1998-2007 - All Rights Reserved
*
* Developed at DIT - Government of Bhutan
*
@ -73,7 +73,7 @@ public:
* @internal
*/
TibetanOpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode,
le_int32 typoFlags);
le_int32 typoFlags);
/**
* The destructor, virtual for correct polymorphic invocation.
@ -85,14 +85,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @draft ICU 3.6
* @internal ICU 3.6
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @draft ICU 3.6
* @internal ICU 3.6
*/
static UClassID getStaticClassID();

74
icu4c/source/layout/loengine.h
View File

@ -48,12 +48,12 @@ typedef void le_font;
*
* @internal
*/
U_DRAFT le_engine * U_EXPORT2
U_INTERNAL le_engine * U_EXPORT2
le_create(const le_font *font,
le_int32 scriptCode,
le_int32 languageCode,
le_int32 typo_flags,
LEErrorCode *success);
le_int32 scriptCode,
le_int32 languageCode,
le_int32 typo_flags,
LEErrorCode *success);
/**
* This function closes the given LayoutEngine. After
@ -63,7 +63,7 @@ le_create(const le_font *font,
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
le_close(le_engine *engine);
/**
@ -90,16 +90,16 @@ le_close(le_engine *engine);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
le_layoutChars(le_engine *engine,
const LEUnicode chars[],
le_int32 offset,
le_int32 count,
le_int32 max,
le_bool rightToLeft,
float x,
float y,
LEErrorCode *success);
const LEUnicode chars[],
le_int32 offset,
le_int32 count,
le_int32 max,
le_bool rightToLeft,
float x,
float y,
LEErrorCode *success);
/**
* This function returns the number of glyphs in the glyph array. Note
@ -113,9 +113,9 @@ le_layoutChars(le_engine *engine,
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
le_getGlyphCount(le_engine *engine,
LEErrorCode *success);
LEErrorCode *success);
/**
* This function copies the glyph array into a caller supplied array.
@ -128,10 +128,10 @@ le_getGlyphCount(le_engine *engine,
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
le_getGlyphs(le_engine *engine,
LEGlyphID glyphs[],
LEErrorCode *success);
LEGlyphID glyphs[],
LEErrorCode *success);
/**
* This function copies the character index array into a caller supplied array.
@ -144,10 +144,10 @@ le_getGlyphs(le_engine *engine,
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
le_getCharIndices(le_engine *engine,
le_int32 charIndices[],
LEErrorCode *success);
le_int32 charIndices[],
LEErrorCode *success);
/**
* This function copies the character index array into a caller supplied array.
@ -161,11 +161,11 @@ le_getCharIndices(le_engine *engine,
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
le_getCharIndicesWithBase(le_engine *engine,
le_int32 charIndices[],
le_int32 indexBase,
LEErrorCode *success);
le_int32 charIndices[],
le_int32 indexBase,
LEErrorCode *success);
/**
* This function copies the position array into a caller supplied array.
@ -179,10 +179,10 @@ le_getCharIndicesWithBase(le_engine *engine,
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
le_getGlyphPositions(le_engine *engine,
float positions[],
LEErrorCode *success);
float positions[],
LEErrorCode *success);
/**
* This function returns the X and Y position of the glyph at
@ -199,12 +199,12 @@ le_getGlyphPositions(le_engine *engine,
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
le_getGlyphPosition(le_engine *engine,
le_int32 glyphIndex,
float *x,
float *y,
LEErrorCode *success);
le_int32 glyphIndex,
float *x,
float *y,
LEErrorCode *success);
/**
* This function frees the glyph, character index and position arrays
@ -216,8 +216,8 @@ le_getGlyphPosition(le_engine *engine,
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
le_reset(le_engine *engine,
LEErrorCode *success);
LEErrorCode *success);
#endif

2
icu4c/source/layoutex/layout/RunArrays.h
View File

@ -96,7 +96,7 @@ public:
*
* Note: Subclass arrays will also be reset and not deleted.
*
* @draft ICU 3.6
* @stable ICU 3.6
*/
inline void reset();

54
icu4c/source/layoutex/layout/playout.h
View File

@ -93,7 +93,7 @@ typedef void pl_visualRun;
*
* @internal
*/
U_DRAFT pl_paragraph * U_EXPORT2
U_INTERNAL pl_paragraph * U_EXPORT2
pl_create(const LEUnicode chars[],
le_int32 count,
const pl_fontRuns *fontRuns,
@ -109,11 +109,11 @@ pl_create(const LEUnicode chars[],
*
* @param paragraph the <code>pl_paragraph</code> object to be
* closed. Once this routine returns the object
* can no longer be referenced
* can no longer be referenced
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_close(pl_paragraph *paragraph);
/**
@ -129,7 +129,7 @@ pl_close(pl_paragraph *paragraph);
* @internal
*/
U_DRAFT le_bool U_EXPORT2
U_INTERNAL le_bool U_EXPORT2
pl_isComplex(const LEUnicode chars[],
le_int32 count);
@ -144,7 +144,7 @@ pl_isComplex(const LEUnicode chars[],
*
* @internal
*/
U_DRAFT UBiDiLevel U_EXPORT2
U_INTERNAL UBiDiLevel U_EXPORT2
pl_getParagraphLevel(pl_paragraph *paragraph);
/**
@ -158,7 +158,7 @@ pl_getParagraphLevel(pl_paragraph *paragraph);
*
* @internal
*/
U_DRAFT UBiDiDirection U_EXPORT2
U_INTERNAL UBiDiDirection U_EXPORT2
pl_getTextDirection(pl_paragraph *paragraph);
/**
@ -176,7 +176,7 @@ pl_getTextDirection(pl_paragraph *paragraph);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getAscent(const pl_paragraph *paragraph);
/**
@ -189,7 +189,7 @@ pl_getAscent(const pl_paragraph *paragraph);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getDescent(const pl_paragraph *paragraph);
/**
@ -202,7 +202,7 @@ pl_getDescent(const pl_paragraph *paragraph);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getLeading(const pl_paragraph *paragraph);
/**
@ -212,7 +212,7 @@ pl_getLeading(const pl_paragraph *paragraph);
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_reflow(pl_paragraph *paragraph);
/**
@ -233,7 +233,7 @@ pl_reflow(pl_paragraph *paragraph);
*
* @internal
*/
U_DRAFT pl_line * U_EXPORT2
U_INTERNAL pl_line * U_EXPORT2
pl_nextLine(pl_paragraph *paragraph, float width);
/**
@ -245,7 +245,7 @@ pl_nextLine(pl_paragraph *paragraph, float width);
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_closeLine(pl_line *line);
/**
@ -257,7 +257,7 @@ pl_closeLine(pl_line *line);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_countLineRuns(const pl_line *line);
/**
@ -270,7 +270,7 @@ pl_countLineRuns(const pl_line *line);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getLineAscent(const pl_line *line);
/**
@ -283,7 +283,7 @@ pl_getLineAscent(const pl_line *line);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getLineDescent(const pl_line *line);
/**
@ -296,7 +296,7 @@ pl_getLineDescent(const pl_line *line);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getLineLeading(const pl_line *line);
/**
@ -310,7 +310,7 @@ pl_getLineLeading(const pl_line *line);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getLineWidth(const pl_line *line);
/**
@ -329,7 +329,7 @@ pl_getLineWidth(const pl_line *line);
*
* @internal
*/
U_DRAFT const pl_visualRun * U_EXPORT2
U_INTERNAL const pl_visualRun * U_EXPORT2
pl_getLineVisualRun(const pl_line *line, le_int32 runIndex);
/**
@ -346,7 +346,7 @@ pl_getLineVisualRun(const pl_line *line, le_int32 runIndex);
*
* @internal
*/
U_DRAFT const le_font * U_EXPORT2
U_INTERNAL const le_font * U_EXPORT2
pl_getVisualRunFont(const pl_visualRun *run);
/**
@ -359,7 +359,7 @@ pl_getVisualRunFont(const pl_visualRun *run);
*
* @internal
*/
U_DRAFT UBiDiDirection U_EXPORT2
U_INTERNAL UBiDiDirection U_EXPORT2
pl_getVisualRunDirection(const pl_visualRun *run);
/**
@ -371,7 +371,7 @@ pl_getVisualRunDirection(const pl_visualRun *run);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getVisualRunGlyphCount(const pl_visualRun *run);
/**
@ -386,7 +386,7 @@ pl_getVisualRunGlyphCount(const pl_visualRun *run);
*
* @internal
*/
U_DRAFT const LEGlyphID * U_EXPORT2
U_INTERNAL const LEGlyphID * U_EXPORT2
pl_getVisualRunGlyphs(const pl_visualRun *run);
/**
@ -404,7 +404,7 @@ pl_getVisualRunGlyphs(const pl_visualRun *run);
*
* @internal
*/
U_DRAFT const float * U_EXPORT2
U_INTERNAL const float * U_EXPORT2
pl_getVisualRunPositions(const pl_visualRun *run);
/**
@ -419,7 +419,7 @@ pl_getVisualRunPositions(const pl_visualRun *run);
*
* @internal
*/
U_DRAFT const le_int32 * U_EXPORT2
U_INTERNAL const le_int32 * U_EXPORT2
pl_getVisualRunGlyphToCharMap(const pl_visualRun *run);
/**
@ -432,7 +432,7 @@ pl_getVisualRunGlyphToCharMap(const pl_visualRun *run);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getVisualRunAscent(const pl_visualRun *run);
/**
@ -445,7 +445,7 @@ pl_getVisualRunAscent(const pl_visualRun *run);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getVisualRunDescent(const pl_visualRun *run);
/**
@ -458,7 +458,7 @@ pl_getVisualRunDescent(const pl_visualRun *run);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getVisualRunLeading(const pl_visualRun *run);
#endif

54
icu4c/source/layoutex/layout/plruns.h
View File

@ -42,7 +42,7 @@ typedef void pl_localeRuns;
*
* @internal
*/
U_DRAFT pl_fontRuns * U_EXPORT2
U_INTERNAL pl_fontRuns * U_EXPORT2
pl_openFontRuns(const le_font **fonts,
const le_int32 *limits,
le_int32 count);
@ -58,7 +58,7 @@ pl_openFontRuns(const le_font **fonts,
*
* @internal
*/
U_DRAFT pl_fontRuns * U_EXPORT2
U_INTERNAL pl_fontRuns * U_EXPORT2
pl_openEmptyFontRuns(le_int32 initialCapacity);
/**
@ -69,7 +69,7 @@ pl_openEmptyFontRuns(le_int32 initialCapacity);
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_closeFontRuns(pl_fontRuns *fontRuns);
/**
@ -81,7 +81,7 @@ pl_closeFontRuns(pl_fontRuns *fontRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getFontRunCount(const pl_fontRuns *fontRuns);
/**
@ -91,7 +91,7 @@ pl_getFontRunCount(const pl_fontRuns *fontRuns);
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_resetFontRuns(pl_fontRuns *fontRuns);
/**
@ -104,7 +104,7 @@ pl_resetFontRuns(pl_fontRuns *fontRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getFontRunLastLimit(const pl_fontRuns *fontRuns);
/**
@ -117,7 +117,7 @@ pl_getFontRunLastLimit(const pl_fontRuns *fontRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getFontRunLimit(const pl_fontRuns *fontRuns,
le_int32 run);
@ -133,7 +133,7 @@ pl_getFontRunLimit(const pl_fontRuns *fontRuns,
*
* @internal
*/
U_DRAFT const le_font * U_EXPORT2
U_INTERNAL const le_font * U_EXPORT2
pl_getFontRunFont(const pl_fontRuns *fontRuns,
le_int32 run);
@ -156,7 +156,7 @@ pl_getFontRunFont(const pl_fontRuns *fontRuns,
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_addFontRun(pl_fontRuns *fontRuns,
const le_font *font,
le_int32 limit);
@ -175,7 +175,7 @@ pl_addFontRun(pl_fontRuns *fontRuns,
*
* @internal
*/
U_DRAFT pl_valueRuns * U_EXPORT2
U_INTERNAL pl_valueRuns * U_EXPORT2
pl_openValueRuns(const le_int32 *values,
const le_int32 *limits,
le_int32 count);
@ -191,7 +191,7 @@ pl_openValueRuns(const le_int32 *values,
*
* @internal
*/
U_DRAFT pl_valueRuns * U_EXPORT2
U_INTERNAL pl_valueRuns * U_EXPORT2
pl_openEmptyValueRuns(le_int32 initialCapacity);
/**
@ -202,7 +202,7 @@ pl_openEmptyValueRuns(le_int32 initialCapacity);
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_closeValueRuns(pl_valueRuns *valueRuns);
/**
@ -214,7 +214,7 @@ pl_closeValueRuns(pl_valueRuns *valueRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getValueRunCount(const pl_valueRuns *valueRuns);
/**
@ -224,7 +224,7 @@ pl_getValueRunCount(const pl_valueRuns *valueRuns);
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_resetValueRuns(pl_valueRuns *valueRuns);
/**
@ -237,7 +237,7 @@ pl_resetValueRuns(pl_valueRuns *valueRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getValueRunLastLimit(const pl_valueRuns *valueRuns);
/**
@ -250,7 +250,7 @@ pl_getValueRunLastLimit(const pl_valueRuns *valueRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getValueRunLimit(const pl_valueRuns *valueRuns,
le_int32 run);
@ -266,7 +266,7 @@ pl_getValueRunLimit(const pl_valueRuns *valueRuns,
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getValueRunValue(const pl_valueRuns *valueRuns,
le_int32 run);
@ -288,7 +288,7 @@ pl_getValueRunValue(const pl_valueRuns *valueRuns,
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_addValueRun(pl_valueRuns *valueRuns,
le_int32 value,
le_int32 limit);
@ -307,7 +307,7 @@ pl_addValueRun(pl_valueRuns *valueRuns,
*
* @internal
*/
U_DRAFT pl_localeRuns * U_EXPORT2
U_INTERNAL pl_localeRuns * U_EXPORT2
pl_openLocaleRuns(const char **locales,
const le_int32 *limits,
le_int32 count);
@ -323,7 +323,7 @@ pl_openLocaleRuns(const char **locales,
*
* @internal
*/
U_DRAFT pl_localeRuns * U_EXPORT2
U_INTERNAL pl_localeRuns * U_EXPORT2
pl_openEmptyLocaleRuns(le_int32 initialCapacity);
/**
@ -334,7 +334,7 @@ pl_openEmptyLocaleRuns(le_int32 initialCapacity);
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_closeLocaleRuns(pl_localeRuns *localeRuns);
/**
@ -346,7 +346,7 @@ pl_closeLocaleRuns(pl_localeRuns *localeRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getLocaleRunCount(const pl_localeRuns *localeRuns);
/**
@ -356,7 +356,7 @@ pl_getLocaleRunCount(const pl_localeRuns *localeRuns);
*
* @internal
*/
U_DRAFT void U_EXPORT2
U_INTERNAL void U_EXPORT2
pl_resetLocaleRuns(pl_localeRuns *localeRuns);
/**
@ -369,7 +369,7 @@ pl_resetLocaleRuns(pl_localeRuns *localeRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getLocaleRunLastLimit(const pl_localeRuns *localeRuns);
/**
@ -382,7 +382,7 @@ pl_getLocaleRunLastLimit(const pl_localeRuns *localeRuns);
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_getLocaleRunLimit(const pl_localeRuns *localeRuns,
le_int32 run);
@ -398,7 +398,7 @@ pl_getLocaleRunLimit(const pl_localeRuns *localeRuns,
*
* @internal
*/
U_DRAFT const char * U_EXPORT2
U_INTERNAL const char * U_EXPORT2
pl_getLocaleRunLocale(const pl_localeRuns *localeRuns,
le_int32 run);
@ -421,7 +421,7 @@ pl_getLocaleRunLocale(const pl_localeRuns *localeRuns,
*
* @internal
*/
U_DRAFT le_int32 U_EXPORT2
U_INTERNAL le_int32 U_EXPORT2
pl_addLocaleRun(pl_localeRuns *localeRuns,
const char *locale,
le_int32 limit);