pango 2.2.5-x86-mingw32 → 3.0.0-x86-mingw32

data/vendor/local/include/unicode/reldatefmt.h

@@ -1,6 +1,6 @@
 /*
 *****************************************************************************
-* Copyright (C) 2014, International Business Machines Corporation and
+* Copyright (C) 2014-2015, International Business Machines Corporation and
 * others.
 * All Rights Reserved.
 *****************************************************************************
@@ -57,65 +57,67 @@ typedef enum UDateRelativeDateTimeFormatterStyle {
   UDAT_STYLE_COUNT
 } UDateRelativeDateTimeFormatterStyle; 
 
+#endif /* U_HIDE_DRAFT_API */
+
 /**
  * Represents the unit for formatting a relative date. e.g "in 5 days"
  * or "in 3 months"
- * @draft ICU 53
+ * @stable ICU 53
  */
 typedef enum UDateRelativeUnit {
 
     /**
      * Seconds
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_RELATIVE_SECONDS,
 
     /**
      * Minutes
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_RELATIVE_MINUTES,
 
     /**
      * Hours
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_RELATIVE_HOURS,
 
     /**
      * Days
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_RELATIVE_DAYS,
 
     /**
      * Weeks
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_RELATIVE_WEEKS,
 
     /**
      * Months
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_RELATIVE_MONTHS,
 
     /**
      * Years
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_RELATIVE_YEARS,
 
     /**
      * Count of items in this enum.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_RELATIVE_UNIT_COUNT
 } UDateRelativeUnit;
 
 /**
  * Represents an absolute unit.
- * @draft ICU 53
+ * @stable ICU 53
  */
 typedef enum UDateAbsoluteUnit {
 
@@ -123,79 +125,79 @@ typedef enum UDateAbsoluteUnit {
     // Saturday.
     /**
      * Sunday
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_SUNDAY,
 
     /**
      * Monday
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_MONDAY,
 
     /**
      * Tuesday
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_TUESDAY,
 
     /**
      * Wednesday
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_WEDNESDAY,
 
     /**
      * Thursday
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_THURSDAY,
 
     /**
      * Friday
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_FRIDAY,
 
     /**
      * Saturday
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_SATURDAY,
 
     /**
      * Day
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_DAY,
 
     /**
      * Week
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_WEEK,
 
     /**
      * Month
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_MONTH,
 
     /**
      * Year
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_YEAR,
 
     /**
      * Now
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_NOW,
 
     /**
      * Count of items in this enum.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_ABSOLUTE_UNIT_COUNT
 } UDateAbsoluteUnit;
@@ -203,49 +205,49 @@ typedef enum UDateAbsoluteUnit {
 /**
  * Represents a direction for an absolute unit e.g "Next Tuesday"
  * or "Last Tuesday"
- * @draft ICU 53
+ * @stable ICU 53
  */
 typedef enum UDateDirection {
 
     /**
      * Two before. Not fully supported in every locale.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_DIRECTION_LAST_2,
 
     /**
      * Last
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_DIRECTION_LAST,
 
     /**
      * This
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_DIRECTION_THIS,
 
     /**
      * Next
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_DIRECTION_NEXT,
 
     /**
      * Two after. Not fully supported in every locale.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_DIRECTION_NEXT_2,
 
     /**
      * Plain, which means the absence of a qualifier.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_DIRECTION_PLAIN,
 
     /**
      * Count of items in this enum.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UDAT_DIRECTION_COUNT
 } UDateDirection;
@@ -326,20 +328,20 @@ class UnicodeString;
  *
  * The RelativeDateTimeFormatter class is not intended for public subclassing.
  *
- * @draft ICU 53
+ * @stable ICU 53
  */
 class U_I18N_API RelativeDateTimeFormatter : public UObject {
 public:
 
     /**
      * Create RelativeDateTimeFormatter with default locale.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     RelativeDateTimeFormatter(UErrorCode& status);
 
     /**
      * Create RelativeDateTimeFormatter with given locale.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     RelativeDateTimeFormatter(const Locale& locale, UErrorCode& status);
 
@@ -351,11 +353,12 @@ public:
      *   It is an error for caller to delete this pointer or change its
      *   contents after calling this constructor.
      * @status Any error is returned here.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     RelativeDateTimeFormatter(
         const Locale& locale, NumberFormat *nfToAdopt, UErrorCode& status);
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Create RelativeDateTimeFormatter with given locale, NumberFormat,
      * and capitalization context.
@@ -377,23 +380,24 @@ public:
             UDateRelativeDateTimeFormatterStyle style,
             UDisplayContext capitalizationContext,
             UErrorCode& status);
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Copy constructor.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     RelativeDateTimeFormatter(const RelativeDateTimeFormatter& other);
 
     /**
      * Assignment operator.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     RelativeDateTimeFormatter& operator=(
             const RelativeDateTimeFormatter& other);
 
     /**
      * Destructor.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     virtual ~RelativeDateTimeFormatter();
 
@@ -410,7 +414,7 @@ public:
      *  appended
      * @param status ICU error code returned here.
      * @return appendTo
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UnicodeString& format(
             double quantity,
@@ -429,7 +433,7 @@ public:
      *  no format string is available.
      * @param status ICU error code returned here.
      * @return appendTo
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UnicodeString& format(
             UDateDirection direction,
@@ -447,7 +451,7 @@ public:
      * @param appendTo concatenated date and time appended here
      * @param status ICU error code returned here.
      * @return appendTo
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UnicodeString& combineDateAndTime(
             const UnicodeString& relativeDateString,
@@ -458,10 +462,11 @@ public:
     /**
      * Returns the NumberFormat this object is using.
      *
-     * @draft ICU 53
+     * @stable ICU 53
      */
     const NumberFormat& getNumberFormat() const;
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Returns the capitalization context.
      *
@@ -475,6 +480,8 @@ public:
      * @draft ICU 54
      */
     UDateRelativeDateTimeFormatterStyle getFormatStyle() const;
+#endif  /* U_HIDE_DRAFT_API */
+
 private:
     const RelativeDateTimeCacheData* fCache;
     const SharedNumberFormat *fNumberFormat;
@@ -492,7 +499,5 @@ private:
 
 U_NAMESPACE_END
 
-#endif /* U_HIDE_DRAFT_API */
-
 #endif /* !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION*/
 #endif

data/vendor/local/include/unicode/scientificnumberformatter.h

@@ -0,0 +1,222 @@
+/*
+**********************************************************************
+* Copyright (c) 2014, International Business Machines
+* Corporation and others.  All Rights Reserved.
+**********************************************************************
+*/
+#ifndef SCINUMBERFORMATTER_H
+#define SCINUMBERFORMATTER_H
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#ifndef U_HIDE_DRAFT_API
+
+#include "unicode/unistr.h"
+
+/**
+ * \file 
+ * \brief C++ API: Formats in scientific notation.
+ */
+
+U_NAMESPACE_BEGIN
+
+class FieldPositionIterator;
+class DecimalFormatStaticSets;
+class DecimalFormatSymbols;
+class DecimalFormat;
+class Formattable;
+
+/**
+ * A formatter that formats numbers in user-friendly scientific notation.
+ *
+ * Sample code:
+ * <pre>
+ * UErrorCode status = U_ZERO_ERROR;
+ * LocalPointer<ScientificNumberFormatter> fmt(
+ *         ScientificNumberFormatter::createMarkupInstance(
+ *                 "en", "<sup>", "</sup>", status));
+ * if (U_FAILURE(status)) {
+ *     return;
+ * }
+ * UnicodeString appendTo;
+ * // appendTo = "1.23456x10<sup>-78</sup>"
+ * fmt->format(1.23456e-78, appendTo, status);
+ * </pre>
+ *
+ * @draft ICU 55
+ */
+class U_I18N_API ScientificNumberFormatter : public UObject {
+public:
+
+    /**
+     * Creates a ScientificNumberFormatter instance that uses
+     * superscript characters for exponents.
+     * @param fmtToAdopt The DecimalFormat which must be configured for
+     *   scientific notation.
+     * @param status error returned here.
+     * @return The new ScientificNumberFormatter instance.
+     *
+     * @draft ICU 55
+     */
+    static ScientificNumberFormatter *createSuperscriptInstance(
+            DecimalFormat *fmtToAdopt, UErrorCode &status);
+
+    /**
+     * Creates a ScientificNumberFormatter instance that uses
+     * superscript characters for exponents for this locale.
+     * @param locale The locale
+     * @param status error returned here.
+     * @return The ScientificNumberFormatter instance.
+     *
+     * @draft ICU 55
+     */
+    static ScientificNumberFormatter *createSuperscriptInstance(
+            const Locale &locale, UErrorCode &status);
+
+
+    /**
+     * Creates a ScientificNumberFormatter instance that uses
+     * markup for exponents.
+     * @param fmtToAdopt The DecimalFormat which must be configured for
+     *   scientific notation.
+     * @param beginMarkup the markup to start superscript.
+     * @param endMarkup the markup to end superscript.
+     * @param status error returned here.
+     * @return The new ScientificNumberFormatter instance.
+     *
+     * @draft ICU 55
+     */
+    static ScientificNumberFormatter *createMarkupInstance(
+            DecimalFormat *fmtToAdopt,
+            const UnicodeString &beginMarkup,
+            const UnicodeString &endMarkup,
+            UErrorCode &status);
+
+    /**
+     * Creates a ScientificNumberFormatter instance that uses
+     * markup for exponents for this locale.
+     * @param locale The locale
+     * @param beginMarkup the markup to start superscript.
+     * @param endMarkup the markup to end superscript.
+     * @param status error returned here.
+     * @return The ScientificNumberFormatter instance.
+     *
+     * @draft ICU 55
+     */
+    static ScientificNumberFormatter *createMarkupInstance(
+            const Locale &locale,
+            const UnicodeString &beginMarkup,
+            const UnicodeString &endMarkup,
+            UErrorCode &status);
+
+
+    /**
+     * Returns a copy of this object. Caller must free returned copy.
+     * @draft ICU 55
+     */
+    ScientificNumberFormatter *clone() const {
+        return new ScientificNumberFormatter(*this);
+    }
+
+    /**
+     * Destructor.
+     * @draft ICU 55
+     */
+    virtual ~ScientificNumberFormatter();
+
+    /**
+     * Formats a number into user friendly scientific notation.
+     *
+     * @param number the number to format.
+     * @param appendTo formatted string appended here.
+     * @param status any error returned here.
+     * @return appendTo
+     *
+     * @draft ICU 55
+     */
+    UnicodeString &format(
+            const Formattable &number,
+            UnicodeString &appendTo,
+            UErrorCode &status) const;
+ private:
+    class U_I18N_API Style : public UObject {
+    public:
+        virtual Style *clone() const = 0;
+    protected:
+        virtual UnicodeString &format(
+                const UnicodeString &original,
+                FieldPositionIterator &fpi,
+                const UnicodeString &preExponent,
+                const DecimalFormatStaticSets &decimalFormatSets,
+                UnicodeString &appendTo,
+                UErrorCode &status) const = 0;
+    private:
+        friend class ScientificNumberFormatter;
+    };
+
+    class U_I18N_API SuperscriptStyle : public Style {
+    public:
+        virtual Style *clone() const;
+    protected:
+        virtual UnicodeString &format(
+                const UnicodeString &original,
+                FieldPositionIterator &fpi,
+                const UnicodeString &preExponent,
+                const DecimalFormatStaticSets &decimalFormatSets,
+                UnicodeString &appendTo,
+                UErrorCode &status) const;
+    };
+
+    class U_I18N_API MarkupStyle : public Style {
+    public:
+        MarkupStyle(
+                const UnicodeString &beginMarkup,
+                const UnicodeString &endMarkup)
+                : Style(),
+                  fBeginMarkup(beginMarkup),
+                  fEndMarkup(endMarkup) { }
+        virtual Style *clone() const;
+    protected:
+        virtual UnicodeString &format(
+                const UnicodeString &original,
+                FieldPositionIterator &fpi,
+                const UnicodeString &preExponent,
+                const DecimalFormatStaticSets &decimalFormatSets,
+                UnicodeString &appendTo,
+                UErrorCode &status) const;
+    private:
+        UnicodeString fBeginMarkup;
+        UnicodeString fEndMarkup;
+    };
+
+    ScientificNumberFormatter(
+            DecimalFormat *fmtToAdopt,
+            Style *styleToAdopt,
+            UErrorCode &status);
+
+    ScientificNumberFormatter(const ScientificNumberFormatter &other);
+    ScientificNumberFormatter &operator=(const ScientificNumberFormatter &);
+
+    static void getPreExponent(
+            const DecimalFormatSymbols &dfs, UnicodeString &preExponent);
+
+    static ScientificNumberFormatter *createInstance(
+            DecimalFormat *fmtToAdopt,
+            Style *styleToAdopt,
+            UErrorCode &status);
+
+    UnicodeString fPreExponent;
+    DecimalFormat *fDecimalFormat;
+    Style *fStyle;
+    const DecimalFormatStaticSets *fStaticSets;
+
+};
+
+U_NAMESPACE_END
+
+#endif /* U_HIDE_DRAFT_API */
+
+#endif /* !UCONFIG_NO_FORMATTING */
+#endif 

data/vendor/local/include/unicode/smpdtfmt.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 1997-2014, International Business Machines Corporation and
+* Copyright (C) 1997-2015, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 *
@@ -45,6 +45,8 @@ class DateFormat;
 class MessageFormat;
 class FieldPositionHandler;
 class TimeZoneFormat;
+class SharedNumberFormat;
+class SimpleDateFormatMutableNFs;
 
 /**
  *
@@ -1117,7 +1119,6 @@ public:
      */
     virtual const TimeZoneFormat* getTimeZoneFormat(void) const;
 
-    /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
     /**
      * Set a particular UDisplayContext value in the formatter, such as
      * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. Note: For getContext, see
@@ -1126,7 +1127,7 @@ public:
      * @param status Input/output status. If at entry this indicates a failure
      *               status, the function will do nothing; otherwise this will be
      *               updated with any new status from the function. 
-     * @draft ICU 53
+     * @stable ICU 53
      */
     virtual void setContext(UDisplayContext value, UErrorCode& status);
     
@@ -1261,6 +1262,7 @@ private:
                    int32_t fieldNum,
                    FieldPositionHandler& handler,
                    Calendar& cal,
+                   SimpleDateFormatMutableNFs &mutableNFs,
                    UErrorCode& status) const; // in case of illegal argument
 
     /**
@@ -1307,14 +1309,6 @@ private:
      */
     Calendar *initializeCalendar(TimeZone* adoptZone, const Locale& locale, UErrorCode& status);
 
-    /**
-     * initializes fSymbols from parameters.
-     * @param locale Locale of the symbols
-     * @param calendar Alias to Calendar that will be used.
-     * @param status Error code
-     */
-    void initializeSymbols(const Locale& locale, Calendar* calendar, UErrorCode& status);
-
     /**
      * Called by several of the constructors to load pattern data and formatting symbols
      * out of a resource bundle and initialize the locale based on it.
@@ -1407,7 +1401,7 @@ private:
      */
     int32_t subParse(const UnicodeString& text, int32_t& start, UChar ch, int32_t count,
                      UBool obeyCount, UBool allowNegative, UBool ambiguousYear[], int32_t& saveHebrewMonth, Calendar& cal,
-                     int32_t patLoc, MessageFormat * numericLeapMonthFormatter, UTimeZoneFormatTimeType *tzTimeType) const;
+                     int32_t patLoc, MessageFormat * numericLeapMonthFormatter, UTimeZoneFormatTimeType *tzTimeType, SimpleDateFormatMutableNFs &mutableNFs) const;
 
     void parseInt(const UnicodeString& text,
                   Formattable& number,
@@ -1482,11 +1476,6 @@ private:
      */
     void initNumberFormatters(const Locale &locale,UErrorCode &status);
 
-    /**
-     * Get the numbering system to be used for a particular field.
-     */
-     NumberFormat * getNumberFormatByIndex(UDateFormatField index) const;
-
     /**
      * Parse the given override string and set up structures for number formats
      */
@@ -1507,6 +1496,8 @@ private:
      */
     TimeZoneFormat *tzFormat() const;
 
+    const NumberFormat* getNumberFormatByIndex(UDateFormatField index) const;
+
     /**
      * Used to map Calendar field to field level.
      * The larger the level, the smaller the field unit.
@@ -1514,7 +1505,16 @@ private:
      * UCAL_MONTH level is 20.
      */
     static const int32_t fgCalendarFieldToLevel[];
-    static const int32_t fgPatternCharToLevel[];
+
+    /**
+     * Map calendar field letter into calendar field level.
+     */
+    static int32_t getLevelFromChar(UChar ch);
+
+    /**
+     * Tell if a character can be used to define a field in a format string.
+     */
+    static UBool isSyntaxChar(UChar ch);
 
     /**
      * The formatting pattern for this formatter.
@@ -1563,15 +1563,21 @@ private:
      */
     /*transient*/ int32_t   fDefaultCenturyStartYear;
 
-    typedef struct NSOverride {
-        NumberFormat *nf;
+    struct NSOverride : public UMemory {
+        const SharedNumberFormat *snf;
         int32_t hash;
         NSOverride *next;
-    } NSOverride;
-
-    NumberFormat    **fNumberFormatters;
+        void free();
+        NSOverride() : snf(NULL), hash(0), next(NULL) {
+        }
+        ~NSOverride();
+    };
 
-    NSOverride      *fOverrideList;
+    /**
+     * The number format in use for each date field. NULL means fall back
+     * to fNumberFormat in DateFormat.
+     */
+    const SharedNumberFormat    **fSharedNumberFormatters;
 
     UBool fHaveDefaultCentury;