From dca182031f3a9c95ae6a1f06c139a89c298846a1 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 10 Jul 2016 16:51:02 +0200 Subject: Improve font editing dialog: 1. Allow for fonts with other than 1000 units per em. 2. Allow setting 'ascent', 'descent', etc. 3. Allow setting individual glyph horizontal advances. 4. Fix bug where 'units-per-em' was not read correctly. (bzr r15014.1.1) --- src/sp-font.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sp-font.cpp') diff --git a/src/sp-font.cpp b/src/sp-font.cpp index 341a6159f..6bdb24cf6 100644 --- a/src/sp-font.cpp +++ b/src/sp-font.cpp @@ -27,9 +27,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; -- cgit v1.2.3 From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 12:06:06 +0200 Subject: Removed unused includes, decrease compilation time (bzr r15025) --- src/sp-font.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/sp-font.cpp') diff --git a/src/sp-font.cpp b/src/sp-font.cpp index 341a6159f..2948dece4 100644 --- a/src/sp-font.cpp +++ b/src/sp-font.cpp @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -# include +#include #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" -- cgit v1.2.3 From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 13:26:17 +0200 Subject: Reverted changes to r15024 after many building problems (bzr r15027) --- src/sp-font.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/sp-font.cpp') diff --git a/src/sp-font.cpp b/src/sp-font.cpp index 2948dece4..341a6159f 100644 --- a/src/sp-font.cpp +++ b/src/sp-font.cpp @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include +# include #endif /* @@ -17,6 +17,8 @@ #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" -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/sp-font.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/sp-font.cpp') diff --git a/src/sp-font.cpp b/src/sp-font.cpp index 341a6159f..2948dece4 100644 --- a/src/sp-font.cpp +++ b/src/sp-font.cpp @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -# include +#include #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" -- cgit v1.2.3