From 613d977b905aa4b2264f0fa1e791f26b50ca48ce Mon Sep 17 00:00:00 2001
From: buliabyak <>
Date: Sat, 27 Mar 2010 19:40:38 -0300
Subject: inherit value as well as computed for linespacing and other spacing
 properties; fixes the linespacing display in text and font dialog

(bzr r9243)
---
 src/style.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/style.cpp')

diff --git a/src/style.cpp b/src/style.cpp
index 6d73e62ea..19ff711da 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -1446,16 +1446,19 @@ sp_style_merge_from_parent(SPStyle *const style, SPStyle const *const parent)
     }
 
     if (!style->line_height.set || style->line_height.inherit) {
+        style->line_height.value = parent->line_height.value;
         style->line_height.computed = parent->line_height.computed;
         style->line_height.normal = parent->line_height.normal;
     }
 
     if (!style->letter_spacing.set || style->letter_spacing.inherit) {
+        style->letter_spacing.value = parent->letter_spacing.value;
         style->letter_spacing.computed = parent->letter_spacing.computed;
         style->letter_spacing.normal = parent->letter_spacing.normal;
     }
 
     if (!style->word_spacing.set || style->word_spacing.inherit) {
+        style->word_spacing.value = parent->word_spacing.value;
         style->word_spacing.computed = parent->word_spacing.computed;
         style->word_spacing.normal = parent->word_spacing.normal;
     }
-- 
cgit v1.2.3


From 29edecc65ee3fcec2320d3ad718e7f4dc3cff42a Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 14 Apr 2010 17:36:23 +0200
Subject: Changed default font from Bitstream Vera Sans to Sans. Not everyone
 has Bitstream Vera Sans and having a non-existant default font can cause
 problems.

(bzr r9328)
---
 src/style.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/style.cpp')

diff --git a/src/style.cpp b/src/style.cpp
index 19ff711da..a05cef252 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -2783,9 +2783,9 @@ sp_text_style_new()
     ts->refcount = 1;
     sp_text_style_clear(ts);
 
-    ts->font_specification.value = g_strdup("Bitstream Vera Sans");
-    ts->font.value = g_strdup("Bitstream Vera Sans");
-    ts->font_family.value = g_strdup("Bitstream Vera Sans");
+    ts->font_specification.value = g_strdup("Sans");
+    ts->font.value = g_strdup("Sans");
+    ts->font_family.value = g_strdup("Sans");
 
     return ts;
 }
-- 
cgit v1.2.3