Skip minimum distance between columns

ozh · Mar 18, 2022 · 2762be9 · 2762be9
1 parent 97b4a1a
commit 2762be9
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/assets/js/script.js b/assets/js/script.js
@@ -513,6 +513,9 @@ function parseTable(table) {
     for (var j = 0; j < longest.length; j++) {
         if (isColumnSeparator(lines.slice(), j)) {
             colIndexes.push(j);
+            // column separators are each padded by a space
+            // so skip over minimum distance between 2 columns
+            j += 2;
         }
     }
 
@@ -566,16 +569,15 @@ function isColumnSeparator(lines, column) {
             return false;
         }
 
-        var previousColumn = column-1;
+        var previousColumn = column - 1;
         var thisLineThisChar = thisLine[column];
         var thisLinePreviousChar = (previousColumn > 0) ? thisLine[previousColumn] : " ";
         var nextLineThisChar = nextLine[column];
         var nextLinePreviousChar = (previousColumn > 0) ? nextLine[previousColumn] : " ";
 
-        if (thisLineThisChar == nextLineThisChar 
-            && thisLineThisChar != " "
-            && thisLinePreviousChar == " "
-            && nextLinePreviousChar == " "
+        if (thisLineThisChar == nextLineThisChar
+            && !isSpace(thisLineThisChar)
+            && isSpace(thisLinePreviousChar, nextLinePreviousChar)
            ) {
             // Rows match, check next row down
             return isColumnSeparator(lines.splice(1), column);
@@ -590,6 +592,10 @@ function isSeparatorLine(line) {
     return line.trim().indexOf(" ") == -1; // must not have spaces
 }
 
+function isSpace(...chars) {
+    return chars.every(value => value == " ");
+}
+
 function _trim(str) {
     var rgx = /^\s*(.*?)\s*$/;
     var result = str.match(rgx);