Merge pull request #11 from adobe-webplatform/issue10

Fixes #10 NaNem

svgWriter.js

@@ -294,10 +294,9 @@
                 break;
             case "tspan": {
                 dealWithTSpan(ctx, sibling, omIn);
-                
+
                 if (omIn.children.length) {
                     mergeTSpans(ctx, sibling, omIn.children);
-//                    break;
                 }
 
 
@@ -554,7 +553,11 @@
             if (leading) {
                 fontSize = omIn.style["font-size"];
                 if (fontSize && leading.units === fontSize.units) {
-                    lineEM = util.round1k(leading.value / fontSize.value);
+                    if (fontSize.units) {
+                        lineEM = util.round1k(leading.value / fontSize.value);
+                    } else {
+                        lineEM = util.round1k(leading / fontSize);
+                    }
                 }
             }
 

svgWriterFx.js

@@ -45,7 +45,7 @@
 
         this.hasFx = function (ctx) {
             return (this.hasEffect(ctx, 'dropShadow') ||
-                    this.hasEffect(ctx, 'gradientFill', this.hasColorNoise) || 
+                    this.hasEffect(ctx, 'gradientFill', this.hasColorNoise) ||
                     this.hasEffect(ctx, 'solidFill') ||
                     this.hasSatin(ctx) ||
                     this.hasEffect(ctx, 'innerShadow'));
@@ -317,11 +317,11 @@
                 writeAttrIfNecessary(ctx, 'y', bounds.top);
                 writeAttrIfNecessary(ctx, 'width', bounds.right - bounds.left);
                 writeAttrIfNecessary(ctx, 'height', bounds.bottom - bounds.top);
-                writeAttrIfNecessary(ctx, 'preserveAspectRatio', 'none');               
+                writeAttrIfNecessary(ctx, 'preserveAspectRatio', 'none');
                 writeAttrIfNecessary(ctx, 'xlink:href', 'data:image/svg+xml;base64,' + base64);
                 writeln(ctx, '/>');
                 writeFeComposite(ctx, 'in', {in2: 'SourceGraphic'});
-                
+
                 return { l: bounds.left, r: bounds.right, t: bounds.top, b: bounds.bottom, mo: gradientFill.mode, base: base64 };
             }
 

tests/data/AdobeLogo-om.js

@@ -58,4 +58,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/filter-duplicate-om.js

@@ -313,4 +313,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/gradient-color-overlay-om.js

@@ -181,4 +181,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/group-om.js

@@ -207,4 +207,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/light-global-local-om.js

@@ -290,4 +290,4 @@ module.exports = {
 		"angle": 135,
 		"altitude": 30
 	}
-}
+}

tests/data/multi-layer-fx-1-om.js

@@ -980,4 +980,4 @@ module.exports = {
 		"angle": 45,
 		"altitude": 30
 	}
-}
+}

tests/data/multi-layer-fx-2-data.js

@@ -191,4 +191,4 @@ module.exports = {
             "generatorSettings": false
         }
     ]
-}
+}

tests/data/multi-layer-fx-2-om.js

@@ -105,4 +105,4 @@ module.exports = {
 		"angle": 90,
 		"altitude": 30
 	}
-}
+}

tests/data/multi-layer-fx-3-data.js

@@ -365,4 +365,4 @@ module.exports = {
             "generatorSettings": false
         }
     ]
-}
+}

tests/data/multi-layer-fx-3-om.js

@@ -229,4 +229,4 @@ module.exports = {
 		"angle": 90,
 		"altitude": 30
 	}
-}
+}

tests/data/multi-layer-fx-4-data.js

@@ -467,4 +467,4 @@ module.exports = {
             "generatorSettings": false
         }
     ]
-}
+}

tests/data/multi-layer-fx-4-om.js

@@ -304,4 +304,4 @@ module.exports = {
 		"angle": 45,
 		"altitude": 30
 	}
-}
+}

tests/data/stroke-style-om.js

@@ -690,4 +690,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/svgFill-om.js

@@ -189,4 +189,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/svgFill/svgFill-2-om.js

@@ -181,4 +181,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/svgFx-inner-glow-om.js

@@ -219,4 +219,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/svgFx-shadow-om.js

@@ -130,4 +130,4 @@ module.exports = {
 		"angle": -107,
 		"altitude": 90
 	}
-}
+}

tests/data/svgFx-shadow-overlay-om.js

@@ -143,4 +143,4 @@ module.exports = {
 		"angle": -107,
 		"altitude": 90
 	}
-}
+}

tests/data/svgGradientOverlay-om.js

@@ -1120,4 +1120,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/svgGradientOverlay-opacity-om.js

@@ -178,4 +178,4 @@ module.exports = {
 		"angle": 90,
 		"altitude": 30
 	}
-}
+}

tests/data/svgOverlay-om.js

@@ -97,4 +97,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/svgTextFx-om.js

@@ -248,4 +248,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}

tests/data/svgTextGradient-om.js

@@ -170,4 +170,4 @@ module.exports = {
 		"angle": 120,
 		"altitude": 30
 	}
-}
+}