Don't pretty print text elements because it affects text content. Fixes svg#241

GreLI · GreLI · commit eae723841594 · 2015-01-31T15:14:46.000+03:00
diff --git a/lib/svgo/js2svg.js b/lib/svgo/js2svg.js
@@ -1,6 +1,8 @@
 'use strict';
 
-var EXTEND = require('whet.extend');
+var EXTEND = require('whet.extend'),
+    textElem = require('../../plugins/_collections.js').elemsGroups.textContent.concat('title'),
+    textChildElem = require('../../plugins/_collections.js').elemsGroups.textContentChild;
 
 var defaults = {
     doctypeStart: '<!DOCTYPE',
@@ -62,7 +64,6 @@ function JS2SVG(config) {
         this.config.tagShortEnd += '\n';
         this.config.tagOpenEnd += '\n';
         this.config.tagCloseEnd += '\n';
-        this.config.textEnd += '\n';
     }
 
     this.indentLevel = 0;
@@ -227,17 +228,37 @@ JS2SVG.prototype.createElem = function(data) {
 
     // non-empty element
     } else {
+        var tagOpenStart = this.config.tagOpenStart,
+            tagOpenEnd = this.config.tagOpenEnd,
+            tagCloseStart = this.config.tagCloseStart,
+            tagCloseEnd = this.config.tagCloseEnd,
+            openIdent = '',
+            closeIdent = '';
+
+        if (data.isElem(textChildElem)) {
+            tagOpenStart = defaults.tagOpenStart;
+            tagCloseEnd = defaults.tagCloseEnd;
+        } else {
+            openIdent = this.createIndent();
+        }
 
-        return  this.createIndent() +
-                this.config.tagOpenStart +
+        if (data.isElem(textElem)) {
+            tagOpenEnd = defaults.tagOpenEnd;
+            tagCloseStart = defaults.tagCloseStart;
+        } else {
+            closeIdent = this.createIndent();
+        }
+
+        return  openIdent +
+                tagOpenStart +
                 data.elem +
                 this.createAttrs(data) +
-                this.config.tagOpenEnd +
+                tagOpenEnd +
                 this.convert(data).data +
-                this.createIndent() +
-                this.config.tagCloseStart +
+                closeIdent +
+                tagCloseStart +
                 data.elem +
-                this.config.tagCloseEnd;
+                tagCloseEnd;
 
     }
 
@@ -282,8 +303,7 @@ JS2SVG.prototype.createText = function(text) {
         text = text.split(entity).join(this.config.entities[entity]);
     }
 
-    return  this.createIndent() +
-            this.config.textStart +
+    return  this.config.textStart +
             text +
             this.config.textEnd;
 
diff --git a/plugins/_collections.js b/plugins/_collections.js
@@ -8,6 +8,7 @@ exports.elemsGroups = {
     structural: ['defs', 'g', 'svg', 'symbol', 'use'],
     gradient: ['linearGradient', 'radialGradient'],
     container: ['a', 'defs', 'g', 'marker', 'mask', 'missing-glyph', 'pattern', 'svg', 'switch', 'symbol'],
+    textContent: ['altGlyph', 'altGlyphDef', 'altGlyphItem', 'glyph', 'glyphRef', 'textPath', 'text', 'tref', 'tspan'],
     textContentChild: ['altGlyph', 'textPath', 'tref', 'tspan'],
     lightSource: ['feDiffuseLighting', 'feSpecularLighting', 'feDistantLight', 'fePointLight', 'feSpotLight'],
     filterPrimitive: ['feBlend', 'feColorMatrix', 'feComponentTransfer', 'feComposite', 'feConvolveMatrix', 'feDiffuseLighting', 'feDisplacementMap', 'feFlood', 'feGaussianBlur', 'feImage', 'feMerge', 'feMorphology', 'feOffset', 'feSpecularLighting', 'feTile', 'feTurbulence']
