slightfoot
diff --git a/‎lib/html_parser.dart
Lines changed: 44 additions & 18 deletions b/‎lib/html_parser.dart
Lines changed: 44 additions & 18 deletions
@@ -296,30 +296,33 @@ class HtmlRichTextParser extends StatelessWidget {
     // a text only node is a child of a tag with no inner html
     if (node is dom.Text) {
       // WHITESPACE CONSIDERATIONS ---
-      // truly empty nodes, should just be ignored
+      // truly empty nodes should just be ignored
       if (node.text.trim() == "" && node.text.indexOf(" ") == -1) {
         return;
       }
 
-      // if (node.text.trim() == "" &&
-      //     node.text.indexOf(" ") != -1 &&
-      //     parseContext.condenseWhitespace) {
-      //   node.text = " ";
-      // }
-
       // we might want to preserve internal whitespace
       // empty strings of whitespace might be significant or not, condense it by default
       String finalText = parseContext.condenseWhitespace
           ? condenseHtmlWhitespace(node.text)
           : node.text;
 
-      // if this is part of a string of spans, we will preserve leading and trailing whitespace
-      if (!(parseContext.parentElement is TextSpan ||
-          parseContext.parentElement is LinkTextSpan))
-        finalText = finalText.trim();
+      // if this is part of a string of spans, we will preserve leading
+      // and trailing whitespace unless the previous character is whitespace
+      if (parseContext.parentElement == null)
+        finalText = finalText.trimLeft();
+      else if (parseContext.parentElement is TextSpan ||
+          parseContext.parentElement is LinkTextSpan) {
+        String lastString = parseContext.parentElement.text ?? '';
+        if (!parseContext.parentElement.children.isEmpty) {
+          lastString = parseContext.parentElement.children.last.text;
+        }
+        if (lastString.endsWith(' ') || lastString.endsWith('\n'))
+          finalText = finalText.trimLeft();
+      }
 
       // if the finalText is actually empty, just return
-      if (finalText.isEmpty) return;
+      if (finalText.trim().isEmpty) return;
 
       // NOW WE HAVE OUR TRULY FINAL TEXT
       // debugPrint("Plain Text Node: '$finalText'");
@@ -372,7 +375,7 @@ class HtmlRichTextParser extends StatelessWidget {
               .add(BlockText(child: RichText(text: span)));
         }
 
-        // this allows future items to be added as children
+        // this allows future items to be added as children of this item
         parseContext.parentElement = span;
 
         // if the parent is a LinkTextSpan, keep the main attributes of that span going.
@@ -387,8 +390,10 @@ class HtmlRichTextParser extends StatelessWidget {
         ));
 
         // if the parent is a normal span, just add this to that list
-      } else {
+      } else if (!(parseContext.parentElement.children is List<Widget>)) {
         parseContext.parentElement.children.add(span);
+      } else {
+        print('doing nothing');
       }
       return;
     }
@@ -521,33 +526,54 @@ class HtmlRichTextParser extends StatelessWidget {
             break;
 
           case "table":
-          case "tbody":
-          case "thead":
             // new block, so clear out the parent element
             parseContext.parentElement = null;
             nextContext.parentElement = Column(
               crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[],
             );
             nextContext.rootWidgetList.add(nextContext.parentElement);
             break;
 
+          // we don't handle tbody or thead elements separately for now
+          case "tbody":
+          case "thead":
+            break;
+
+          // caption elements throw us off
+          case "caption":
+            RichText text =
+                RichText(text: TextSpan(text: '', children: <TextSpan>[]));
+            Row row = Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: <Widget>[
+                text,
+              ],
+            );
+            nextContext.parentElement.children.add(row);
+            nextContext.parentElement = text.text;
+            break;
+
           case "td":
           case "th":
             int colspan = 1;
             if (node.attributes['colspan'] != null) {
               colspan = int.tryParse(node.attributes['colspan']);
             }
+            RichText text =
+                RichText(text: TextSpan(text: '', children: <TextSpan>[]));
             Expanded cell = Expanded(
               flex: colspan,
-              child: Wrap(),
+              child: text,
             );
             nextContext.parentElement.children.add(cell);
-            nextContext.parentElement = cell.child;
+            nextContext.parentElement = text.text;
             break;
 
           case "tr":
             Row row = Row(
               crossAxisAlignment: CrossAxisAlignment.center,
+              children: <Widget>[],
             );
             nextContext.parentElement.children.add(row);
             nextContext.parentElement = row;