Merge lp:~ado-papas/inkscape/bug_732797 into lp:~inkscape.dev/inkscape/trunk

[Adonis Papaderos]

According to my understating of http://www.w3.org/TR/SVG/text.html#BaselineShiftProperty, the baseline-shift should not be inherited by default.

This patch sets the value of baseline-shift to 0 if it is unset.

[jazzynico (jazzynico)]

Maybe it's unrelated, but using this patch lead to another issue: when you follow the steps in the description of Bug #732797, the "1" is no longer shifted as expected, but if you then select the whole text, unset subscript and set it again, "1" is shifted again.

[Martin Owens (doctormo)]

I can confirm the patch does what it says, but JazzyNico's testing shows that there is further work here to fix this error. The application of the shift for a second time may be the culprit as seen in the comments in the code.

review: Needs Fixing (functional review)

Unmerged revisions

10090. By Adonis Papaderos on 2011-03-11

make baseline-shift not inherited

=== modified file 'src/style.cpp'
--- src/style.cpp	2011-02-21 07:59:34 +0000
+++ src/style.cpp	2011-03-11 11:48:43 +0000
@@ -1365,7 +1365,9 @@
                                           SPIFontSize const &pfont_size)
 {
     /* 'baseline-shift' */
-    if (!child.set || child.inherit) {
+    if (!child.set) {
+        child.computed = 0; //no inheritance
+    } else if (child.inherit) {
         /* Inherit the computed value.  Reference: http://www.w3.org/TR/SVG11/styling.html#Inheritance */
         child.computed = parent.computed;  // Does this make sense (applying a shift a second time)?
     } else if (child.type == SP_BASELINE_SHIFT_LITERAL) {