Code

reverting previous work on font-face attributes. These attributes are already treated...
[inkscape.git] / src / sp-font-face.h
index b095e6b041739629d2ba1d4de812b56a950369f2..754125831ab6e2a0722dfed792caf57979027e01 100644 (file)
 #define SP_IS_FONTFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_FONTFACE))
 #define SP_IS_FONTFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_FONTFACE))
 
-enum FontFaceStyleType{
-       SP_FONTFACE_STYLE_ALL,
-       SP_FONTFACE_STYLE_NORMAL,
-       SP_FONTFACE_STYLE_ITALIC,
-       SP_FONTFACE_STYLE_OBLIQUE
-};
-
-enum FontFaceVariantType{
-       SP_FONTFACE_VARIANT_NORMAL,
-       SP_FONTFACE_VARIANT_SMALL_CAPS
-};
-
-enum FontFaceWeightType{
-       SP_FONTFACE_WEIGHT_ALL,
-       SP_FONTFACE_WEIGHT_NORMAL,
-       SP_FONTFACE_WEIGHT_BOLD,
-       SP_FONTFACE_WEIGHT_100,
-       SP_FONTFACE_WEIGHT_200,
-       SP_FONTFACE_WEIGHT_300,
-       SP_FONTFACE_WEIGHT_400,
-       SP_FONTFACE_WEIGHT_500,
-       SP_FONTFACE_WEIGHT_600,
-       SP_FONTFACE_WEIGHT_700,
-       SP_FONTFACE_WEIGHT_800,
-       SP_FONTFACE_WEIGHT_900
-};
-
-enum FontFaceStretchType{
-       SP_FONTFACE_STRETCH_ALL,
-       SP_FONTFACE_STRETCH_NORMAL,
-       SP_FONTFACE_STRETCH_ULTRA_CONDENSED,
-       SP_FONTFACE_STRETCH_EXTRA_CONDENSED,
-       SP_FONTFACE_STRETCH_CONDENSED,
-       SP_FONTFACE_STRETCH_SEMI_CONDENSED,
-       SP_FONTFACE_STRETCH_SEMI_EXPANDED,
-       SP_FONTFACE_STRETCH_EXPANDED,
-       SP_FONTFACE_STRETCH_EXTRA_EXPANDED,
-       SP_FONTFACE_STRETCH_ULTRA_EXPANDED
-};
-
 enum FontFaceUnicodeRangeType{
        FONTFACE_UNICODERANGE_FIXME_HERE,
 };
 
 struct SPFontFace : public SPObject {
-    char* font_family;
-    std::vector<FontFaceStyleType> font_style;
-    std::vector<FontFaceVariantType> font_variant;
-    std::vector<FontFaceWeightType> font_weight;
-    std::vector<FontFaceStretchType> font_stretch;
-    char* font_size;
     std::vector<FontFaceUnicodeRangeType> unicode_range;
     double units_per_em;
     std::vector<int> panose_1;