summaryrefslogtreecommitdiffstats
path: root/src/attributes.cpp
diff options
context:
space:
mode:
authorFelipe Corr??a da Silva Sanches <juca@members.fsf.org>2008-05-12 00:49:01 +0000
committerJucaBlues <JucaBlues@users.sourceforge.net>2008-05-12 00:49:01 +0000
commit700cff0bef815410b456ef0999b1fa944e9f4720 (patch)
treeca44bae8403ed96ad07edcc52bf90a4fc3dc209c /src/attributes.cpp
parentFix incorrect preview problems on Win32 with native dialogues - see LP #229045 (diff)
downloadinkscape-700cff0bef815410b456ef0999b1fa944e9f4720.tar.gz
inkscape-700cff0bef815410b456ef0999b1fa944e9f4720.zip
* implemented handling of font-style, font-variant, font-weight, and
font-stretch attributes on font-face tags * fixed typo on v-ideographic attribute on attributes.cpp * fixed typo on src/sp-font-face.h (bzr r5652)
Diffstat (limited to 'src/attributes.cpp')
-rw-r--r--src/attributes.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/attributes.cpp b/src/attributes.cpp
index de505236f..cfadab9c6 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -333,12 +333,12 @@ static SPStyleProp const props[] = {
{SP_ATTR_K, "k"},
/*<font-face>*/
- {SP_ATTR_FONT_FAMILY, "font-family"},
- {SP_ATTR_FONT_STYLE, "font-style"},
- {SP_ATTR_FONT_VARIANT, "font-variant"},
- {SP_ATTR_FONT_WEIGHT, "font-weight"},
- {SP_ATTR_FONT_STRETCH, "font-stretch"},
- {SP_ATTR_FONT_SIZE, "font-size"},
+ //{SP_ATTR_FONT_FAMILY, "font-family"}, these are already set for CSS2 (SP_PROP_FONT_FAMILY, SP_PROP_FONT_STYLE, SP_PROP_FONT_VARIANT etc...)
+ //{SP_ATTR_FONT_STYLE, "font-style"},
+ //{SP_ATTR_FONT_VARIANT, "font-variant"},
+ //{SP_ATTR_FONT_WEIGHT, "font-weight"},
+ //{SP_ATTR_FONT_STRETCH, "font-stretch"},
+ //{SP_ATTR_FONT_SIZE, "font-size"},
{SP_ATTR_UNICODE_RANGE, "unicode-range"},
{SP_ATTR_UNITS_PER_EM, "units-per-em"},
{SP_ATTR_PANOSE_1, "panose-1"},
@@ -356,7 +356,7 @@ static SPStyleProp const props[] = {
{SP_ATTR_ALPHABETIC, "alphabetic"},
{SP_ATTR_MATHEMATICAL, "mathematical"},
{SP_ATTR_HANGING, "hanging"},
- {SP_ATTR_V_IDEOGRAPHIC, "ideographic"},
+ {SP_ATTR_V_IDEOGRAPHIC, "v-ideographic"},
{SP_ATTR_V_ALPHABETIC, "v-alphabetic"},
{SP_ATTR_V_MATHEMATICAL, "v-mathematical"},
{SP_ATTR_V_HANGING, "v-hanging"},