restore HTML entities back (fix svg#80 + svg#81)

.svgo.yml

@@ -165,23 +165,29 @@ svg2js:
 
 js2svg:
 
-  doctypeStart: '<!DOCTYPE'
-  doctypeEnd: '>'
-  procInstStart: '<?'
-  procInstEnd: '?>'
-  tagOpenStart: '<'
-  tagOpenEnd: '>'
-  tagCloseStart: '</'
-  tagCloseEnd: '>'
-  tagShortStart: '<'
-  tagShortEnd: '/>'
-  attrStart: '="'
-  attrEnd: '"'
-  commentStart: '<!--'
-  commentEnd: '-->'
-  cdataStart: '<![CDATA['
-  cdataEnd: ']]>'
-  textStart: ''
-  textEnd: ''
-  indent: '    '
+  doctypeStart: "<!DOCTYPE"
+  doctypeEnd: ">"
+  procInstStart: "<?"
+  procInstEnd: "?>"
+  tagOpenStart: "<"
+  tagOpenEnd: ">"
+  tagCloseStart: "</"
+  tagCloseEnd: ">"
+  tagShortStart: "<"
+  tagShortEnd: "/>"
+  attrStart: "=\""
+  attrEnd: "\""
+  commentStart: "<!--"
+  commentEnd: "-->"
+  cdataStart: "<![CDATA["
+  cdataEnd: "]]>"
+  textStart: ""
+  textEnd: ""
+  indent: "    "
+  entities:
+    "&": "&amp;"
+    "'": "&apos;"
+    "\"": "&quot;"
+    ">": "&gt;"
+    "<": "&lt;"
   pretty: false

lib/svgo/js2svg.js

@@ -267,6 +267,11 @@ var Converter = INHERIT(/** @lends Nodes.prototype */{
      */
     createText: function(text) {
 
+        // convert entities back
+        for (var entity in this.config.entities) {
+            text = text.split(entity).join(this.config.entities[entity]);
+        }
+
         return  this.createIndent() +
                 this.config.textStart +
                 text +

plugins/removeUnusedIDs.js

@@ -5,8 +5,42 @@ var referencesProps = require('./_collections').referencesProps,
     regReferencesHref = /^#(.+?)$/,
     styleOrScript = ['style', 'script'];
 
+function replaceLast(str, char) {
+    str = str.split('');
+    str[str.length - 1] = char;
+    return str.join('');
+}
+
+function replaceFirst(str, char) {
+    str = str.split('');
+    str[0] = char;
+    return str.join('');
+}
+
+function generateID(prev) {
+    var next;
+
+    if (prev.charCodeAt(prev.length - 1) === 122) {
+        next = replaceAt(prev, 'A');
+    } else if (prev.charCodeAt(prev.length - 1) === 90) {
+        next = replaceAt(prev, 'A');
+    } else {
+        next = replaceAt(prev, String.fromCharCode(prev.charCodeAt(prev.length - 1) + 1));
+    }
+
+    // if (prev.length === 1) {
+    //     if (prev.charCodeAt(0) === 122) {
+    //         next = String.fromCharCode(65);
+    //     } else if (prev.charCodeAt(0) === 90) {
+    //         next = 'aa';
+    //     }
+    // } else if (prev.length === 2) {
+
+    // }
+}
+
 /**
- * Remove unused ID
+ * Remove unused IDs
  * (only if there are no any <style> or <script>).
  *
  * @param {Object} item current iteration item