pango 3.2.7-x64-mingw32 → 3.2.8-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44dab78c5657fd3d44ea031a1953aaa4939ec1b8456c5601a018b387bf78ece7
-  data.tar.gz: 7309e2668443c0d93f01732d86c3c943ee0fb0f0553dcc9dca6bdd24271a2f83
+  metadata.gz: b5febc1eb5a07a556a26e6f93e922756f026bf020c79cb3e578dc3cc23fb9b50
+  data.tar.gz: 7cc69f903f5dc02c186fb33b51bf5907aaf9059f3179db0bdb333947938d50fa
 SHA512:
-  metadata.gz: 2f2654414d3f127dd5133b1f6ba76479e56eb042037053963635518e09c1d24fca2a1bc01e9f8f0b957779d26854623bebd7f722d9770a37efc8a4161f12a7da
-  data.tar.gz: b72f601e2bdbaa25e3bb41984409149fb00311176f8146d228197d946776e2ec0bc8afdf222eadbe208a568bdb079236605588adc8de0254779920274599d7ba
+  metadata.gz: e0f83b1d1b2896d8ecdfc1582e126585866c7ff6c0498da66bddb309bbfc3197e5bb242e5c8e2b8326dd10dd73c23c6b1baa5095e4aa18f3f9dbff20f1e6e76f
+  data.tar.gz: '0782a542ea063ccfb180b3544aaf5de061aa7789b704a819bc164d84ded7af868bcf42ab8fcc9babfcd1c5ce6062f4ce115dcc3ccb8e0a123727881100241eb6'

data/Rakefile

@@ -62,7 +62,7 @@ GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
       :name => "harfbuzz",
       :download_site => :freedesktop,
       :label => "HarfBuzz",
-      :version => "1.8.0",
+      :version => "1.8.5",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [
@@ -76,12 +76,15 @@ GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
       :name => "graphene",
       :download_site => :gnome,
       :label => "Graphene",
-      :version => "1.8.0",
+      :version => "1.8.2",
       :compression_method => "xz",
       :windows => {
-        :configure_args => [
-          "--enable-introspection",
-          "--disable-benchmarks",
+        :meson_args => [
+          "-Dtests=false",
+          "-Dbenchmarks=false",
+        ],
+        :patches => [
+          "graphene-disable-werror-float-conversion.diff",
         ],
         :built_file => "bin/libgraphene-1.0-0.dll",
       },
@@ -90,7 +93,7 @@ GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
       :name => "fribidi/fribidi",
       :download_site => :github,
       :label => "FriBidi",
-      :version => "v1.0.3",
+      :version => "v1.0.5",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [
@@ -103,7 +106,7 @@ GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
       :name => "pango",
       :download_site => :gnome,
       :label => "Pango",
-      :version => "1.42.1",
+      :version => "1.42.3",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/pango.gemspec

@@ -43,4 +43,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("cairo-gobject", "= #{s.version}")
   s.add_runtime_dependency("gobject-introspection", "= #{s.version}")
+
+  s.metadata["msys2_mingw_dependencies"] = "pango"
 end

data/vendor/local/bin/icu-config

@@ -64,8 +64,8 @@ datadir="${datarootdir}"
 sbindir="${exec_prefix}/sbin"
 
 # about the ICU version
-VERSION="61.1"
-UNICODE_VERSION="10.0"
+VERSION="62.1"
+UNICODE_VERSION="11.0"
 
 # The prefix for ICU libraries, normally 'icu'
 ICUPREFIX="icu"
@@ -212,7 +212,7 @@ CPPFLAGS="-I${prefix}/include"
 CXXFLAGS="-std=c++11"
 CXX="x86_64-w64-mingw32-g++"
 DEFAULT_MODE="dll"
-DEFS="-DPACKAGE_NAME=\"ICU\" -DPACKAGE_TARNAME=\"International\ Components\ for\ Unicode\" -DPACKAGE_VERSION=\"61.1\" -DPACKAGE_STRING=\"ICU\ 61.1\" -DPACKAGE_BUGREPORT=\"http://icu-project.org/bugs\" -DPACKAGE_URL=\"http://icu-project.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DHAVE_LIBM=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LIBPTHREAD=1 -DHAVE_INTTYPES_H=1 -DHAVE_DIRENT_H=1 -DHAVE_WCHAR_H=1 -DSIZEOF_WCHAR_T=2 "
+DEFS="-DPACKAGE_NAME=\"ICU\" -DPACKAGE_TARNAME=\"International\ Components\ for\ Unicode\" -DPACKAGE_VERSION=\"62.1\" -DPACKAGE_STRING=\"ICU\ 62.1\" -DPACKAGE_BUGREPORT=\"http://icu-project.org/bugs\" -DPACKAGE_URL=\"http://icu-project.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DHAVE_LIBM=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LIBPTHREAD=1 -DHAVE_INTTYPES_H=1 -DHAVE_DIRENT_H=1 -DHAVE_WCHAR_H=1 -DSIZEOF_WCHAR_T=2 "
 # use a consistent INSTALL 
 INSTALL="${SHELL} ${pkgdatadir}/install-sh -c"
 INSTALL_DATA="${INSTALL} -m 644"
@@ -221,8 +221,8 @@ INSTALL_SCRIPT="${INSTALL}"
 LDFLAGS="${RPATHLDFLAGS}"
 LIBS="-lpthread -lm  "
 LIB_M=""
-LIB_VERSION="61.1"
-LIB_VERSION_MAJOR="61"
+LIB_VERSION="62.1"
+LIB_VERSION_MAJOR="62"
 MKINSTALLDIRS="${SHELL} ${pkgdatadir}/mkinstalldirs"
 RANLIB="x86_64-w64-mingw32-ranlib"
 RMV="rm -rf"
@@ -250,7 +250,7 @@ INSTALL_L="${INSTALL_DATA}"
 
 # The basename of the ICU data file (i.e. icudt21b )
 ICUDATA_CHAR="l"
-ICUDATA_NAME="icudt61l"
+ICUDATA_NAME="icudt62l"
 
 # Defaults for pkgdata's mode and directories
 # The default data dir changes depending on what packaging mode 

data/vendor/local/include/fribidi/fribidi-config.h

@@ -7,10 +7,10 @@
 #define FRIBIDI_NAME "GNU FriBidi"
 #define FRIBIDI_BUGREPORT "https://github.com/fribidi/fribidi/issues/new"
 
-#define FRIBIDI_VERSION "1.0.3"
+#define FRIBIDI_VERSION "1.0.5"
 #define FRIBIDI_MAJOR_VERSION 1
 #define FRIBIDI_MINOR_VERSION 0
-#define FRIBIDI_MICRO_VERSION 3
+#define FRIBIDI_MICRO_VERSION 5
 #define FRIBIDI_INTERFACE_VERSION 4
 #define FRIBIDI_INTERFACE_VERSION_STRING "4"
 

data/vendor/local/include/graphene-1.0/graphene-macros.h

@@ -46,7 +46,7 @@
 # define GRAPHENE_ALIGN16
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+#if defined(_MSC_VER) && (_MSC_VER >= 1910)
 # ifdef _M_IX86
 /* Use __vectorcall to enable SSE intrinsics on 32-bit builds on MSVC 2013 and later */
 #  define GRAPHENE_VECTORCALL   __vectorcall

data/vendor/local/include/graphene-1.0/graphene-matrix.h

@@ -39,7 +39,7 @@ GRAPHENE_BEGIN_DECLS
 struct _graphene_matrix_t
 {
   /*< private >*/
-  GRAPHENE_PRIVATE_FIELD (graphene_simd4x4f_t, value);
+  GRAPHENE_ALIGN16 GRAPHENE_PRIVATE_FIELD (graphene_simd4x4f_t, value);
 };
 
 GRAPHENE_AVAILABLE_IN_1_0

data/vendor/local/include/graphene-1.0/graphene-vec2.h

@@ -43,7 +43,7 @@ GRAPHENE_BEGIN_DECLS
 struct _graphene_vec2_t
 {
   /*< private >*/
-  GRAPHENE_PRIVATE_FIELD (graphene_simd4f_t, value);
+  GRAPHENE_ALIGN16 GRAPHENE_PRIVATE_FIELD (graphene_simd4f_t, value);
 };
 
 GRAPHENE_AVAILABLE_IN_1_0

data/vendor/local/include/graphene-1.0/graphene-vec3.h

@@ -43,7 +43,7 @@ GRAPHENE_BEGIN_DECLS
 struct _graphene_vec3_t
 {
   /*< private >*/
-  GRAPHENE_PRIVATE_FIELD (graphene_simd4f_t, value);
+  GRAPHENE_ALIGN16 GRAPHENE_PRIVATE_FIELD (graphene_simd4f_t, value);
 };
 
 GRAPHENE_AVAILABLE_IN_1_0

data/vendor/local/include/graphene-1.0/graphene-vec4.h

@@ -43,7 +43,7 @@ GRAPHENE_BEGIN_DECLS
 struct _graphene_vec4_t
 {
   /*< private >*/
-  GRAPHENE_PRIVATE_FIELD (graphene_simd4f_t, value);
+  GRAPHENE_ALIGN16 GRAPHENE_PRIVATE_FIELD (graphene_simd4f_t, value);
 };
 
 GRAPHENE_AVAILABLE_IN_1_0

data/vendor/local/include/graphene-1.0/graphene-version.h

@@ -55,7 +55,7 @@
  *
  * Since: 1.0
  */
-#define GRAPHENE_MINOR_VERSION          (7)
+#define GRAPHENE_MINOR_VERSION          (8)
 
 /**
  * GRAPHENE_MICRO_VERSION:
@@ -65,6 +65,6 @@
  *
  * Since: 1.0
  */
-#define GRAPHENE_MICRO_VERSION          (1)
+#define GRAPHENE_MICRO_VERSION          (2)
 
 #endif /* __GRAPHENE_VERSION_H__ */

data/vendor/local/include/harfbuzz/hb-ot-layout.h

@@ -194,6 +194,13 @@ HB_EXTERN unsigned int
 hb_ot_layout_table_get_lookup_count (hb_face_t    *face,
 				     hb_tag_t      table_tag);
 
+HB_EXTERN void
+hb_ot_layout_collect_features (hb_face_t      *face,
+                               hb_tag_t        table_tag,
+                               const hb_tag_t *scripts,
+                               const hb_tag_t *languages,
+                               const hb_tag_t *features,
+                               hb_set_t       *feature_indexes /* OUT */);
 
 HB_EXTERN void
 hb_ot_layout_collect_lookups (hb_face_t      *face,
@@ -277,6 +284,12 @@ hb_ot_layout_lookup_substitute_closure (hb_face_t    *face,
 				        hb_set_t     *glyphs
 					/*TODO , hb_bool_t  inclusive */);
 
+HB_EXTERN void
+hb_ot_layout_lookups_substitute_closure (hb_face_t      *face,
+                                         const hb_set_t *lookups,
+                                         hb_set_t       *glyphs);
+
+
 #ifdef HB_NOT_IMPLEMENTED
 /* Note: You better have GDEF when using this API, or marks won't do much. */
 HB_EXTERN hb_bool_t

data/vendor/local/include/harfbuzz/hb-set.h

@@ -104,6 +104,10 @@ HB_EXTERN hb_bool_t
 hb_set_is_equal (const hb_set_t *set,
 		 const hb_set_t *other);
 
+HB_EXTERN hb_bool_t
+hb_set_is_subset (const hb_set_t *set,
+		  const hb_set_t *larger_set);
+
 HB_EXTERN void
 hb_set_set (hb_set_t       *set,
 	    const hb_set_t *other);

data/vendor/local/include/harfbuzz/hb-subset-plan.hh

@@ -32,7 +32,6 @@
 #include "hb-subset.h"
 #include "hb-subset-private.hh"
 
-#include "hb-object-private.hh"
 #include "hb-map-private.hh"
 
 struct hb_subset_plan_t
@@ -41,6 +40,7 @@ struct hb_subset_plan_t
   ASSERT_POD ();
 
   hb_bool_t drop_hints;
+  hb_bool_t drop_ot_layout;
 
   // For each cp that we'd like to retain maps to the corresponding gid.
   hb_set_t *unicodes;

data/vendor/local/include/harfbuzz/hb-subset-private.hh

@@ -44,6 +44,7 @@ struct hb_subset_input_t {
   hb_set_t *glyphs;
 
   hb_bool_t drop_hints;
+  hb_bool_t drop_ot_layout;
   /* TODO
    *
    * features

data/vendor/local/include/harfbuzz/hb-subset.h

@@ -71,6 +71,9 @@ hb_subset_input_glyph_set (hb_subset_input_t *subset_input);
 HB_EXTERN hb_bool_t *
 hb_subset_input_drop_hints (hb_subset_input_t *subset_input);
 
+HB_EXTERN hb_bool_t *
+hb_subset_input_drop_ot_layout (hb_subset_input_t *subset_input);
+
 /* hb_subset() */
 HB_EXTERN hb_face_t *
 hb_subset (hb_face_t *source,

data/vendor/local/include/harfbuzz/hb-version.h

@@ -38,9 +38,9 @@ HB_BEGIN_DECLS
 
 #define HB_VERSION_MAJOR 1
 #define HB_VERSION_MINOR 8
-#define HB_VERSION_MICRO 0
+#define HB_VERSION_MICRO 5
 
-#define HB_VERSION_STRING "1.8.0"
+#define HB_VERSION_STRING "1.8.5"
 
 #define HB_VERSION_ATLEAST(major,minor,micro) \
 	((major)*10000+(minor)*100+(micro) <= \

data/vendor/local/include/pango-1.0/pango/pango-features.h

@@ -4,9 +4,9 @@
 
 #define PANGO_VERSION_MAJOR 1
 #define PANGO_VERSION_MINOR 42
-#define PANGO_VERSION_MICRO 1
+#define PANGO_VERSION_MICRO 3
 
-#define PANGO_VERSION_STRING "1.42.1"
+#define PANGO_VERSION_STRING "1.42.3"
 
 
 #endif

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

@@ -638,7 +638,7 @@ protected:
 
 private:
 
-    /** @internal */
+    /** @internal (private) */
     char actualLocale[ULOC_FULLNAME_CAPACITY];
     char validLocale[ULOC_FULLNAME_CAPACITY];
 };

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

@@ -143,7 +143,7 @@ private:
     virtual int32_t getMaxLinearMatchLength() const { return BytesTrie::kMaxLinearMatchLength; }
 
     /**
-     * @internal
+     * @internal (private)
      */
     class BTLinearMatchNode : public LinearMatchNode {
     public:

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

@@ -153,13 +153,13 @@ private:
 
     /**
      * Copy constructor. Private for now.
-     * @internal
+     * @internal (private)
      */
     CanonicalIterator(const CanonicalIterator& other);
 
     /**
      * Assignment operator. Private for now.
-     * @internal
+     * @internal (private)
      */
     CanonicalIterator& operator=(const CanonicalIterator& other);
 

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

@@ -84,7 +84,7 @@ public:
      * Destructor.
      * @stable ICU 51
      */
-    virtual ~CompactDecimalFormat();
+    ~CompactDecimalFormat() U_OVERRIDE;
 
     /**
      * Assignment operator.
@@ -101,245 +101,21 @@ public:
      * @return    a polymorphic copy of this CompactDecimalFormat.
      * @stable ICU 51
      */
-    virtual Format* clone() const;
-
-    /**
-     * Return TRUE if the given Format objects are semantically equal.
-     * Objects of different subclasses are considered unequal.
-     *
-     * @param other    the object to be compared with.
-     * @return         TRUE if the given Format objects are semantically equal.
-     * @stable ICU 51
-     */
-    virtual UBool operator==(const Format& other) const;
-
+    Format* clone() const U_OVERRIDE;
 
     using DecimalFormat::format;
 
     /**
-     * Format a double or long number using base-10 representation.
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param pos       On input: an alignment field, if desired.
-     *                  On output: the offsets of the alignment field.
-     * @return          Reference to 'appendTo' parameter.
-     * @stable ICU 51
-     */
-    virtual UnicodeString& format(double number,
-                                  UnicodeString& appendTo,
-                                  FieldPosition& pos) const;
-
-    /**
-     * Format a double or long number using base-10 representation.
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param pos       On input: an alignment field, if desired.
-     *                  On output: the offsets of the alignment field.
-     * @param status
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(double number,
-                                  UnicodeString& appendTo,
-                                  FieldPosition& pos,
-                                  UErrorCode &status) const;
-
-    /**
-     * Format a double or long number using base-10 representation.
-     * Currently sets status to U_UNSUPPORTED_ERROR.
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param posIter   On return, can be used to iterate over positions
-     *                  of fields generated by this format call.
-     *                  Can be NULL.
-     * @param status    Output param filled with success/failure status.
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(double number,
-                                  UnicodeString& appendTo,
-                                  FieldPositionIterator* posIter,
-                                  UErrorCode& status) const;
-
-    /**
-     * Format a long number using base-10 representation.
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param pos       On input: an alignment field, if desired.
-     *                  On output: the offsets of the alignment field.
-     * @return          Reference to 'appendTo' parameter.
-     * @stable ICU 56
-     */
-    virtual UnicodeString& format(int32_t number,
-                                  UnicodeString& appendTo,
-                                  FieldPosition& pos) const;
-
-    /**
-     * Format a long number using base-10 representation.
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param pos       On input: an alignment field, if desired.
-     *                  On output: the offsets of the alignment field.
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(int32_t number,
-                                  UnicodeString& appendTo,
-                                  FieldPosition& pos,
-                                  UErrorCode &status) const;
-
-    /**
-     * Format a long number using base-10 representation.
-     * Currently sets status to U_UNSUPPORTED_ERROR
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param posIter   On return, can be used to iterate over positions
-     *                  of fields generated by this format call.
-     *                  Can be NULL.
-     * @param status    Output param filled with success/failure status.
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(int32_t number,
-                                  UnicodeString& appendTo,
-                                  FieldPositionIterator* posIter,
-                                  UErrorCode& status) const;
-
-    /**
-     * Format an int64 number using base-10 representation.
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param pos       On input: an alignment field, if desired.
-     *                  On output: the offsets of the alignment field.
-     * @return          Reference to 'appendTo' parameter.
+     * CompactDecimalFormat does not support parsing. This implementation
+     * does nothing.
+     * @param text           Unused.
+     * @param result         Does not change.
+     * @param parsePosition  Does not change.
+     * @see Formattable
      * @stable ICU 51
      */
-    virtual UnicodeString& format(int64_t number,
-                                  UnicodeString& appendTo,
-                                  FieldPosition& pos) const;
-
-    /**
-     * Format an int64 number using base-10 representation.
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param pos       On input: an alignment field, if desired.
-     *                  On output: the offsets of the alignment field.
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(int64_t number,
-                                  UnicodeString& appendTo,
-                                  FieldPosition& pos,
-                                  UErrorCode &status) const;
-
-    /**
-     * Format an int64 number using base-10 representation.
-     * Currently sets status to U_UNSUPPORTED_ERROR
-     *
-     * @param number    The value to be formatted.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param posIter   On return, can be used to iterate over positions
-     *                  of fields generated by this format call.
-     *                  Can be NULL.
-     * @param status    Output param filled with success/failure status.
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(int64_t number,
-                                  UnicodeString& appendTo,
-                                  FieldPositionIterator* posIter,
-                                  UErrorCode& status) const;
-
-    /**
-     * Format a decimal number. Currently sets status to U_UNSUPPORTED_ERROR
-     * The syntax of the unformatted number is a "numeric string"
-     * as defined in the Decimal Arithmetic Specification, available at
-     * http://speleotrove.com/decimal
-     *
-     * @param number    The unformatted number, as a string.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param posIter   On return, can be used to iterate over positions
-     *                  of fields generated by this format call.
-     *                  Can be NULL.
-     * @param status    Output param filled with success/failure status.
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(StringPiece number,
-                                  UnicodeString& appendTo,
-                                  FieldPositionIterator* posIter,
-                                  UErrorCode& status) const;
-
-    /**
-     * Format a decimal number. Currently sets status to U_UNSUPPORTED_ERROR
-     * The number is a DigitList wrapper onto a floating point decimal number.
-     * The default implementation in NumberFormat converts the decimal number
-     * to a double and formats that.
-     *
-     * @param number    The number, a DigitList format Decimal Floating Point.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param posIter   On return, can be used to iterate over positions
-     *                  of fields generated by this format call.
-     * @param status    Output param filled with success/failure status.
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(const DigitList &number,
-                                  UnicodeString& appendTo,
-                                  FieldPositionIterator* posIter,
-                                  UErrorCode& status) const;
-
-    /**
-     * Format a decimal number. Currently sets status to U_UNSUPPORTED_ERROR.
-     * The number is a DigitList wrapper onto a floating point decimal number.
-     * The default implementation in NumberFormat converts the decimal number
-     * to a double and formats that.
-     *
-     * @param number    The number, a DigitList format Decimal Floating Point.
-     * @param appendTo  Output parameter to receive result.
-     *                  Result is appended to existing contents.
-     * @param pos       On input: an alignment field, if desired.
-     *                  On output: the offsets of the alignment field.
-     * @param status    Output param filled with success/failure status.
-     * @return          Reference to 'appendTo' parameter.
-     * @internal
-     */
-    virtual UnicodeString& format(const DigitList &number,
-                                  UnicodeString& appendTo,
-                                  FieldPosition& pos,
-                                  UErrorCode& status) const;
-
-   /**
-    * CompactDecimalFormat does not support parsing. This implementation
-    * does nothing.
-    * @param text           Unused.
-    * @param result         Does not change.
-    * @param parsePosition  Does not change.
-    * @see Formattable
-    * @stable ICU 51
-    */
-    virtual void parse(const UnicodeString& text,
-                       Formattable& result,
-                       ParsePosition& parsePosition) const;
+    void parse(const UnicodeString& text, Formattable& result,
+               ParsePosition& parsePosition) const U_OVERRIDE;
 
     /**
      * CompactDecimalFormat does not support parsing. This implementation
@@ -350,10 +126,9 @@ public:
      * @param status    Always set to U_UNSUPPORTED_ERROR.
      * @stable ICU 51
      */
-    virtual void parse(const UnicodeString& text,
-                       Formattable& result,
-                       UErrorCode& status) const;
+    void parse(const UnicodeString& text, Formattable& result, UErrorCode& status) const U_OVERRIDE;
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Parses text from the given string as a currency amount.  Unlike
      * the parse() method, this method will attempt to parse a generic
@@ -374,8 +149,8 @@ public:
      *             the parsed currency; if parse fails, this is NULL.
      * @internal
      */
-    virtual CurrencyAmount* parseCurrency(const UnicodeString& text,
-                                          ParsePosition& pos) const;
+    CurrencyAmount* parseCurrency(const UnicodeString& text, ParsePosition& pos) const U_OVERRIDE;
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Return the class ID for this class.  This is useful only for
@@ -401,18 +176,10 @@ public:
      *                  other classes have different class IDs.
      * @stable ICU 51
      */
-    virtual UClassID getDynamicClassID() const;
-
-private:
-
-    const UHashtable* _unitsByVariant;
-    const double* _divisors;
-    PluralRules* _pluralRules;
-
-    // Default constructor not implemented.
-    CompactDecimalFormat(const DecimalFormat &, const UHashtable* unitsByVariant, const double* divisors, PluralRules* pluralRules);
+    UClassID getDynamicClassID() const U_OVERRIDE;
 
-    UBool eqHelper(const CompactDecimalFormat& that) const;
+  private:
+    CompactDecimalFormat(const Locale& inLocale, UNumberCompactStyle style, UErrorCode& status);
 };
 
 U_NAMESPACE_END