More scripting fixes

modules/markout/lib/markout.js

@@ -1309,6 +1309,8 @@ MarkOut.prototype.convertMDMachineLinks = function(sBlock)
             if (this.aCommandDefs[sCommand]) {
                 sValue = this.aCommandDefs[sCommand];
                 sCommand = "script";
+            } else if (sValue) {
+                sValue = sValue.replace(/"/g, """);
             }
             sReplacement = '<' + sControl + sControlType + ' onclick="commandMachine(';
             sReplacement += "'" + sMachineID + "',";

modules/shared/lib/component.js

@@ -676,6 +676,9 @@ class Component {
             }
             sToken += ch;
         }
+        if (sToken) {
+            aTokens.push(sToken);
+        }
         if (aTokens.length) {
             aaCommands.push(aTokens);
         }