summaryrefslogtreecommitdiffstats
path: root/src/sp-font.cpp
diff options
context:
space:
mode:
authorMichael Soegtrop <MSoegtrop@yahoo.de>2017-06-05 13:01:17 +0000
committerMichael Soegtrop <MSoegtrop@yahoo.de>2017-06-05 13:01:17 +0000
commite7248b2fa042f42a5c4dd14cd86ab6a5b4524059 (patch)
tree9097520c54e355ded9bd0b4d6618af4e8dacdd91 /src/sp-font.cpp
parentupdated to latest trunk (diff)
parent[Bug #1695016] Xaml export misses some radialGradients. (diff)
downloadinkscape-e7248b2fa042f42a5c4dd14cd86ab6a5b4524059.tar.gz
inkscape-e7248b2fa042f42a5c4dd14cd86ab6a5b4524059.zip
updated to latest trunk
(bzr r14876.2.4)
Diffstat (limited to 'src/sp-font.cpp')
-rw-r--r--src/sp-font.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/sp-font.cpp b/src/sp-font.cpp
index 341a6159f..0d97463df 100644
--- a/src/sp-font.cpp
+++ b/src/sp-font.cpp
@@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
#endif
/*
@@ -17,8 +17,6 @@
#include "xml/repr.h"
#include "attributes.h"
#include "sp-font.h"
-#include "sp-glyph.h"
-#include "sp-missing-glyph.h"
#include "document.h"
#include "display/nr-svgfonts.h"
@@ -27,9 +25,9 @@
//I think we should have extra stuff here and in the set method in order to set default value as specified at http://www.w3.org/TR/SVG/fonts.html
// TODO determine better values and/or make these dynamic:
-double FNT_DEFAULT_ADV = 90; // TODO determine proper default
-double FNT_DEFAULT_ASCENT = 90; // TODO determine proper default
-double FNT_UNITS_PER_EM = 90; // TODO determine proper default
+double FNT_DEFAULT_ADV = 1024; // TODO determine proper default
+double FNT_DEFAULT_ASCENT = 768; // TODO determine proper default
+double FNT_UNITS_PER_EM = 1024; // TODO determine proper default
SPFont::SPFont() : SPObject() {
this->horiz_origin_x = 0;