Move constants and splits/joins option to skin

bin/netlistsvg.js

@@ -24,13 +24,12 @@ function main(netlistpath, outputPath, skinPath) {
         fs.readFile(netlistpath, function(err, netlist_data) {
             if (err) throw err;
             var netlist = json5.parse(netlist_data);
-            var analog = /analog/.test(skinPath);
             lib.render(skin_data, netlist, function(err, svg_data) {
                 if (err) throw err;
                 fs.writeFile(outputPath, svg_data, 'utf-8', function(err) {
                     if (err) throw err;
                 });
-            }, analog);
+            });
         });
     });
 }

demo/demo.js

@@ -26,10 +26,9 @@ skins.forEach(function(skinPath, i) {
 
 function render() {
     var netlist = json5.parse(textarea.value);
-    var analog = /analog/.test(skinSelect.value);
     netlistSvg.render(skinSelect.value, netlist, function(e, svg) {
         svgArea.src = 'data:image/svg+xml,' + encodeURIComponent(svg);
-    }, analog);
+    });
 }
 
 function format() {

lib/index.js

@@ -9,8 +9,9 @@ var onml = require('onml'),
 var elk = new ELK();
 
 
-function render(skin_data, yosys_netlist, done, analog) {
+function render(skin_data, yosys_netlist, done) {
     var skin = onml.p(skin_data);
+    var layoutProps = getProperties(skin);
 
     // Find top module
     var module_name = null;
@@ -25,17 +26,18 @@ function render(skin_data, yosys_netlist, done, analog) {
     }
 
     var module = getReformattedModule(yosys_netlist.modules[module_name]);
-    if (!analog) {
+    if (layoutProps.constants !== false) {
         // this can be skipped if there are no 0's or 1's
         addConstants(module);
+    }
+    if (layoutProps.splitsAndJoins !== false) {
         // this can be skipped if there are no splits or joins
         addSplitsJoins(module);
     }
     createWires(module);
     var kgraph = buildKGraph(module, module_name, skin);
     //fs.writeJsonSync('kgraph_in.json', kgraph);
     //kgraph = fs.readJsonSync('kgraph_in.json');
-    var layoutProps = getProperties(skin);
 
     elk.layout(kgraph, {layoutOptions: layoutProps})
         .then(function(g) {
@@ -55,6 +57,12 @@ function getProperties(skin)
         if (!isNaN(val)) {
             return Number(val);
         }
+        if (val === 'true') {
+            return true;
+        }
+        if (val === 'false') {
+            return false;
+        }
         return val;
     });
 }