summaryrefslogtreecommitdiffstats
path: root/src/style-enums.h
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2015-05-16 12:50:10 +0000
committertavmjong-free <tavmjong@free.fr>2015-05-16 12:50:10 +0000
commitddf9853ed86846c5cc4e22a1ede31dafcda5c99d (patch)
tree1c3b8a10aa9caae16921dffc4b55eb11bad94e82 /src/style-enums.h
parentLatvian translation update (diff)
downloadinkscape-ddf9853ed86846c5cc4e22a1ede31dafcda5c99d.tar.gz
inkscape-ddf9853ed86846c5cc4e22a1ede31dafcda5c99d.zip
Enable setting of 'font-variant-position' and 'font-variant-caps'. Rendering awaits Pango update.
(bzr r14155)
Diffstat (limited to 'src/style-enums.h')
-rw-r--r--src/style-enums.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/style-enums.h b/src/style-enums.h
index 36eab216d..dca7e246d 100644
--- a/src/style-enums.h
+++ b/src/style-enums.h
@@ -79,6 +79,7 @@ enum SPCSSFontVariantLigatures {
SP_CSS_FONT_VARIANT_LIGATURES_DISCRETIONARY = 2,
SP_CSS_FONT_VARIANT_LIGATURES_HISTORICAL = 4,
SP_CSS_FONT_VARIANT_LIGATURES_CONTEXTUAL = 8,
+ SP_CSS_FONT_VARIANT_LIGATURES_NORMAL = 9, // Special case
SP_CSS_FONT_VARIANT_LIGATURES_NOCOMMON = 16,
SP_CSS_FONT_VARIANT_LIGATURES_NODISCRETIONARY = 32,
SP_CSS_FONT_VARIANT_LIGATURES_NOHISTORICAL = 64,
@@ -86,19 +87,19 @@ enum SPCSSFontVariantLigatures {
};
enum SPCSSFontVariantPosition {
- SP_CSS_FONT_VARIANT_POSITION_NORMAL,
- SP_CSS_FONT_VARIANT_POSITION_SUB,
- SP_CSS_FONT_VARIANT_POSITION_SUPER
+ SP_CSS_FONT_VARIANT_POSITION_NORMAL = 1,
+ SP_CSS_FONT_VARIANT_POSITION_SUB = 2,
+ SP_CSS_FONT_VARIANT_POSITION_SUPER = 4
};
enum SPCSSFontVariantCaps {
- SP_CSS_FONT_VARIANT_CAPS_NORMAL,
- SP_CSS_FONT_VARIANT_CAPS_SMALL,
- SP_CSS_FONT_VARIANT_CAPS_ALL_SMALL,
- SP_CSS_FONT_VARIANT_CAPS_PETITE,
- SP_CSS_FONT_VARIANT_CAPS_ALL_PETITE,
- SP_CSS_FONT_VARIANT_CAPS_UNICASE,
- SP_CSS_FONT_VARIANT_CAPS_TITLING,
+ SP_CSS_FONT_VARIANT_CAPS_NORMAL = 1,
+ SP_CSS_FONT_VARIANT_CAPS_SMALL = 2,
+ SP_CSS_FONT_VARIANT_CAPS_ALL_SMALL = 4,
+ SP_CSS_FONT_VARIANT_CAPS_PETITE = 8,
+ SP_CSS_FONT_VARIANT_CAPS_ALL_PETITE = 16,
+ SP_CSS_FONT_VARIANT_CAPS_UNICASE = 32,
+ SP_CSS_FONT_VARIANT_CAPS_TITLING = 64
};
// Can select more than one (see spec)
@@ -381,6 +382,7 @@ static SPStyleEnum const enum_font_variant_ligatures[] = {
{"discretionary-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_DISCRETIONARY},
{"historical-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_HISTORICAL},
{"contextual", SP_CSS_FONT_VARIANT_LIGATURES_CONTEXTUAL},
+ {"normal", SP_CSS_FONT_VARIANT_LIGATURES_NORMAL},
{"no-common-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_NOCOMMON},
{"no-discretionary-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_NODISCRETIONARY},
{"no-historical-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_NOHISTORICAL},
@@ -400,7 +402,7 @@ static SPStyleEnum const enum_font_variant_caps[] = {
{"small-caps", SP_CSS_FONT_VARIANT_CAPS_SMALL},
{"all-small-caps", SP_CSS_FONT_VARIANT_CAPS_ALL_SMALL},
{"petite-caps", SP_CSS_FONT_VARIANT_CAPS_PETITE},
- {"all_petite-caps", SP_CSS_FONT_VARIANT_CAPS_ALL_PETITE},
+ {"all-petite-caps", SP_CSS_FONT_VARIANT_CAPS_ALL_PETITE},
{"unicase", SP_CSS_FONT_VARIANT_CAPS_UNICASE},
{"titling", SP_CSS_FONT_VARIANT_CAPS_TITLING},
{NULL, -1}