codeanticode
diff --git a/‎core/src/processing/core/PApplet.java‎
Lines changed: 14 additions & 1 deletion b/‎core/src/processing/core/PApplet.java‎
Lines changed: 14 additions & 1 deletion
diff --git a/‎core/src/processing/data/StringDict.java‎
Lines changed: 20 additions & 0 deletions b/‎core/src/processing/data/StringDict.java‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎core/src/processing/data/Table.java‎
Lines changed: 77 additions & 1 deletion b/‎core/src/processing/data/Table.java‎
Lines changed: 77 additions & 1 deletion
@@ -4525,7 +4525,20 @@ static public BufferedReader createReader(File file) {
   static public BufferedReader createReader(InputStream input) {
     InputStreamReader isr =
       new InputStreamReader(input, StandardCharsets.UTF_8);
-    return new BufferedReader(isr);
+
+    BufferedReader reader = new BufferedReader(isr);
+    // consume the Unicode BOM (byte order marker) if present
+    try {
+      reader.mark(1);
+      int c = reader.read();
+      // if not the BOM, back up to the beginning again
+      if (c != '\uFEFF') {
+        reader.reset();
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return reader;
   }
 
 
 
@@ -130,6 +130,26 @@ public StringDict(String[][] pairs) {
   }
 
 
+  /**
+   * Create a dictionary that maps between column titles and cell entries
+   * in a TableRow. If two columns have the same name, the later column's
+   * values will override the earlier values.
+   */
+  public StringDict(TableRow row) {
+    this(row.getColumnCount());
+
+    String[] titles = row.getColumnTitles();
+    if (titles == null) {
+      titles = new StringList(IntList.fromRange(row.getColumnCount())).array();
+    }
+    for (int col = 0; col < row.getColumnCount(); col++) {
+      set(titles[col], row.getString(col));
+    }
+    // remove unused and overwritten entries
+    crop();
+  }
+
+
   /**
    * @webref stringdict:method
    * @brief Returns the number of key/value pairs
 
@@ -379,6 +379,15 @@ protected void parse(InputStream input, String options) throws IOException {
     } else {
       InputStreamReader isr = new InputStreamReader(input, encoding);
       BufferedReader reader = new BufferedReader(isr);
+
+      // strip out the Unicode BOM, if present
+      reader.mark(1);
+      int c = reader.read();
+      // if not the BOM, back up to the beginning again
+      if (c != '\uFEFF') {
+        reader.reset();
+      }
+
       /*
        if (awfulCSV) {
         parseAwfulCSV(reader, header);
@@ -672,6 +681,12 @@ protected boolean ingest() {
               addPiece(start, i, hasEscapedQuotes);
               start = i+2;
               return true;
+
+            } else {
+              // This is a lone-wolf quote, occasionally seen in exports.
+              // It's a single quote in the middle of some other text,
+              // and not escaped properly. Pray for the best!
+              i++;
             }
 
           } else {  // not a quoted line
@@ -1791,7 +1806,7 @@ public void addColumn(String title) {
 
 
   /**
-   * @param type the type to be used for the new column: INT, LONG, FLOAT, DOUBLE, STRING, or CATEGORY
+   * @param type the type to be used for the new column: INT, LONG, FLOAT, DOUBLE, or STRING
    */
   public void addColumn(String title, int type) {
     insertColumn(columns.length, title, type);
@@ -4034,17 +4049,78 @@ public void removeTokens(String tokens, String columnName) {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
+
   /**
    * @webref table:method
    * @brief Trims whitespace from values
    * @see Table#removeTokens(String)
    */
   public void trim() {
+    columnTitles = PApplet.trim(columnTitles);
     for (int col = 0; col < getColumnCount(); col++) {
       trim(col);
     }
+    // remove empty columns
+    int lastColumn = getColumnCount() - 1;
+    //while (isEmptyColumn(lastColumn) && lastColumn >= 0) {
+    while (isEmptyArray(getStringColumn(lastColumn)) && lastColumn >= 0) {
+      lastColumn--;
+    }
+    setColumnCount(lastColumn + 1);
+
+    // trim() works from both sides
+    while (getColumnCount() > 0 && isEmptyArray(getStringColumn(0))) {
+      removeColumn(0);
+    }
+
+    // remove empty rows (starting from the end)
+    int lastRow = lastRowIndex();
+    //while (isEmptyRow(lastRow) && lastRow >= 0) {
+    while (isEmptyArray(getStringRow(lastRow)) && lastRow >= 0) {
+      lastRow--;
+    }
+    setRowCount(lastRow + 1);
+
+    while (getRowCount() > 0 && isEmptyArray(getStringRow(0))) {
+      removeRow(0);
+    }
   }
 
+
+  protected boolean isEmptyArray(String[] contents) {
+    for (String entry : contents) {
+      if (entry != null && entry.length() > 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+
+  /*
+  protected boolean isEmptyColumn(int column) {
+    String[] contents = getStringColumn(column);
+    for (String entry : contents) {
+      if (entry != null && entry.length() > 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+
+  protected boolean isEmptyRow(int row) {
+    String[] contents = getStringRow(row);
+    for (String entry : contents) {
+      if (entry != null && entry.length() > 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+  */
+
+
   /**
    * @param column ID number of the column to trim
    */