ICU-64260.0.1.tar.gz

[apple/icu.git] / icuSources / common / unicode / brkiter.h

diff --git a/icuSources/common/unicode/brkiter.h b/icuSources/common/unicode/brkiter.h
index 98560e55ec761ba01d801a067c8a30bd224d3ad1..42a0fbfa1da3ee002409bee2bfb37d34b2a45896 100644 (file)
--- a/icuSources/common/unicode/brkiter.h
+++ b/icuSources/common/unicode/brkiter.h
@@ -253,7 +253,7 @@ public:
     virtual int32_t next(void) = 0;
 
     /**
     virtual int32_t next(void) = 0;
 
     /**

-     * Return character index of the current interator position within the text.
+     * Return character index of the current iterator position within the text.

      * @return The boundary most recently returned.
      * @stable ICU 2.0
      */
      * @return The boundary most recently returned.
      * @stable ICU 2.0
      */


@@ -280,7 +280,7 @@ public:
     virtual int32_t preceding(int32_t offset) = 0;
 
     /**
     virtual int32_t preceding(int32_t offset) = 0;
 
     /**

-     * Return true if the specfied position is a boundary position.
+     * Return true if the specified position is a boundary position.

      * As a side effect, the current position of the iterator is set
      * to the first boundary position at or following the specified offset.
      * @param offset the offset to check.
      * As a side effect, the current position of the iterator is set
      * to the first boundary position at or following the specified offset.
      * @param offset the offset to check.


@@ -295,21 +295,20 @@ public:
      * does nothing.  Negative values move to previous boundaries
      * and positive values move to later boundaries.
      * @return The new iterator position, or
      * does nothing.  Negative values move to previous boundaries
      * and positive values move to later boundaries.
      * @return The new iterator position, or

-     * DONE if there are fewer than |n| boundaries in the specfied direction.
+     * DONE if there are fewer than |n| boundaries in the specified direction.

      * @stable ICU 2.0
      */
     virtual int32_t next(int32_t n) = 0;
 
    /**
      * @stable ICU 2.0
      */
     virtual int32_t next(int32_t n) = 0;
 
    /**

-     * For RuleBasedBreakIterators, return the status tag from the
-     * break rule that determined the most recently
-     * returned break position.
+     * For RuleBasedBreakIterators, return the status tag from the break rule
+     * that determined the boundary at the current iteration position.

      * <p>
      * For break iterator types that do not support a rule status,
      * a default value of 0 is returned.
      * <p>
      * <p>
      * For break iterator types that do not support a rule status,
      * a default value of 0 is returned.
      * <p>

-     * @return the status from the break rule that determined the most recently
-     *         returned break position.
+     * @return the status from the break rule that determined the boundary at
+     *         the current iteration position.

      * @see RuleBaseBreakIterator::getRuleStatus()
      * @see UWordBreak
      * @stable ICU 52
      * @see RuleBaseBreakIterator::getRuleStatus()
      * @see UWordBreak
      * @stable ICU 52


@@ -318,7 +317,7 @@ public:
 
    /**
     * For RuleBasedBreakIterators, get the status (tag) values from the break rule(s)
 
    /**
     * For RuleBasedBreakIterators, get the status (tag) values from the break rule(s)

-    * that determined the most recently returned break position.
+    * that determined the boundary at the current iteration position.

     * <p>
     * For break iterator types that do not support rule status,
     * no values are returned.
     * <p>
     * For break iterator types that do not support rule status,
     * no values are returned.


@@ -334,10 +333,10 @@ public:
     * @param fillInVec an array to be filled in with the status values.
     * @param capacity  the length of the supplied vector.  A length of zero causes
     *                  the function to return the number of status values, in the
     * @param fillInVec an array to be filled in with the status values.
     * @param capacity  the length of the supplied vector.  A length of zero causes
     *                  the function to return the number of status values, in the

-    *                  normal way, without attemtping to store any values.
+    *                  normal way, without attempting to store any values.

     * @param status    receives error codes.
     * @return          The number of rule status values from rules that determined
     * @param status    receives error codes.
     * @return          The number of rule status values from rules that determined

-    *                  the most recent boundary returned by the break iterator.
+    *                  the boundary at the current iteration position.

     *                  In the event of a U_BUFFER_OVERFLOW_ERROR, the return value
     *                  is the total number of status values that were available,
     *                  not the reduced number that were actually returned.
     *                  In the event of a U_BUFFER_OVERFLOW_ERROR, the return value
     *                  is the total number of status values that were available,
     *                  not the reduced number that were actually returned.


@@ -435,12 +434,13 @@ public:
     static BreakIterator* U_EXPORT2
     createSentenceInstance(const Locale& where, UErrorCode& status);
 
     static BreakIterator* U_EXPORT2
     createSentenceInstance(const Locale& where, UErrorCode& status);
 

+#ifndef U_HIDE_DEPRECATED_API

     /**
      * Create BreakIterator for title-casing breaks using the specified locale
      * Returns an instance of a BreakIterator implementing title breaks.
      * The iterator returned locates title boundaries as described for
      * Unicode 3.2 only. For Unicode 4.0 and above title boundary iteration,
     /**
      * Create BreakIterator for title-casing breaks using the specified locale
      * Returns an instance of a BreakIterator implementing title breaks.
      * The iterator returned locates title boundaries as described for
      * Unicode 3.2 only. For Unicode 4.0 and above title boundary iteration,

-     * please use Word Boundary iterator.{@link #createWordInstance }
+     * please use a word boundary iterator. See {@link #createWordInstance }.

      *
      * @param where the locale.
      * @param status The error code.
      *
      * @param where the locale.
      * @param status The error code.


@@ -455,10 +455,11 @@ public:
      * used; neither the requested locale nor any of its fall back locales
      * could be found.
      * The caller owns the returned object and is responsible for deleting it.
      * used; neither the requested locale nor any of its fall back locales
      * could be found.
      * The caller owns the returned object and is responsible for deleting it.

-     * @stable ICU 2.1
+     * @deprecated ICU 64 Use createWordInstance instead.

      */
     static BreakIterator* U_EXPORT2
     createTitleInstance(const Locale& where, UErrorCode& status);
      */
     static BreakIterator* U_EXPORT2
     createTitleInstance(const Locale& where, UErrorCode& status);

+#endif /* U_HIDE_DEPRECATED_API */

 
     /**
      * Get the set of Locales for which TextBoundaries are installed.
 
     /**
      * Get the set of Locales for which TextBoundaries are installed.


@@ -472,7 +473,7 @@ public:
     static const Locale* U_EXPORT2 getAvailableLocales(int32_t& count);
 
     /**
     static const Locale* U_EXPORT2 getAvailableLocales(int32_t& count);
 
     /**

-     * Get name of the object for the desired Locale, in the desired langauge.
+     * Get name of the object for the desired Locale, in the desired language.

      * @param objectLocale must be from getAvailableLocales.
      * @param displayLocale specifies the desired locale for output.
      * @param name the fill-in parameter of the return value
      * @param objectLocale must be from getAvailableLocales.
      * @param displayLocale specifies the desired locale for output.
      * @param name the fill-in parameter of the return value


@@ -485,7 +486,7 @@ public:
                                          UnicodeString& name);
 
     /**
                                          UnicodeString& name);
 
     /**

-     * Get name of the object for the desired Locale, in the langauge of the
+     * Get name of the object for the desired Locale, in the language of the

      * default locale.
      * @param objectLocale must be from getMatchingLocales
      * @param name the fill-in parameter of the return value
      * default locale.
      * @param objectLocale must be from getMatchingLocales
      * @param name the fill-in parameter of the return value


@@ -618,8 +619,17 @@ public:
      */
     virtual BreakIterator &refreshInputText(UText *input, UErrorCode &status) = 0;
 
      */
     virtual BreakIterator &refreshInputText(UText *input, UErrorCode &status) = 0;
 

+#ifndef U_HIDE_INTERNAL_API
+    /**
+     * Set the ULineWordOptions for this break iterator.
+     * @param lineWordOpts The ULineWordOptions to set.
+     * @internal Apple only
+     */
+    void setLineWordOpts(ULineWordOptions lineWordOpts);
+#endif  /* U_HIDE_INTERNAL_API */
+

  private:
  private:

-    static BreakIterator* buildInstance(const Locale& loc, const char *type, int32_t kind, UErrorCode& status);
+    static BreakIterator* buildInstance(const Locale& loc, const char *type, UErrorCode& status);

     static BreakIterator* createInstance(const Locale& loc, int32_t kind, UErrorCode& status);
     static BreakIterator* makeInstance(const Locale& loc, int32_t kind, UErrorCode& status);
 
     static BreakIterator* createInstance(const Locale& loc, int32_t kind, UErrorCode& status);
     static BreakIterator* makeInstance(const Locale& loc, int32_t kind, UErrorCode& status);
 


@@ -632,30 +642,25 @@ protected:
     /** @internal */
     BreakIterator();
     /** @internal */
     /** @internal */
     BreakIterator();
     /** @internal */

-    BreakIterator (const BreakIterator &other) : UObject(other) {}
+    BreakIterator (const BreakIterator &other);

 #ifndef U_HIDE_INTERNAL_API
     /** @internal */
 #ifndef U_HIDE_INTERNAL_API
     /** @internal */

-    BreakIterator (const Locale& valid, const Locale& actual);
+    BreakIterator (const Locale& valid, const Locale &actual);
+    /** @internal. Assignment Operator, used by RuleBasedBreakIterator. */
+    BreakIterator &operator = (const BreakIterator &other);

 #endif  /* U_HIDE_INTERNAL_API */
 #endif  /* U_HIDE_INTERNAL_API */

-    UBool fKeepAll;
+    ULineWordOptions fLineWordOpts;

 
 private:
 
 
 private:
 

-    /** @internal */
+    /** @internal (private) */

     char actualLocale[ULOC_FULLNAME_CAPACITY];
     char validLocale[ULOC_FULLNAME_CAPACITY];
     char actualLocale[ULOC_FULLNAME_CAPACITY];
     char validLocale[ULOC_FULLNAME_CAPACITY];

-
-    /**
-     * The assignment operator has no real implementation.
-     * It's provided to make the compiler happy. Do not call.
-     */
-    BreakIterator& operator=(const BreakIterator&);
-    void setKeepAll(UBool keepAll);

 };
 
 };
 

-inline void BreakIterator::setKeepAll(UBool keepAll)
+inline void BreakIterator::setLineWordOpts(ULineWordOptions lineWordOpts)

 {
 {

-    fKeepAll = keepAll;
+    fLineWordOpts = lineWordOpts;

 }
 
 #ifndef U_HIDE_DEPRECATED_API
 }
 
 #ifndef U_HIDE_DEPRECATED_API


@@ -672,5 +677,5 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 
 
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 

-#endif // _BRKITER
+#endif // BRKITER_H

 //eof
 //eof