More command test fixes.

author: John MacFarlane <[email protected]> 2021-10-02 13:25:14 -0700
committer: John MacFarlane <[email protected]> 2021-10-02 13:25:14 -0700
commit: 8c8c11ee6b1702edabb848624a1fc781c36648d1 (patch)
tree: 4c57c4658562ca8a7a7e4753e70d06e3c18272e7
parent: 02f1ce769c3426a9476565555fe6069b7e14b4f8 (diff)
75 files changed, 550 insertions, 1711 deletions
diff --git a/test/command/1390.md b/test/command/1390.md
index 4fea32290..89987512a 100644
--- a/test/command/1390.md
+++ b/test/command/1390.md
@@ -4,11 +4,7 @@
 Testing: $\mu\foo\eta$.
 ^D
 [ Para
-    [ Str "Testing:"
-    , Space
-    , Math InlineMath "\\mu+\\eta"
-    , Str "."
-    ]
+    [ Str "Testing: " , Math InlineMath "\\mu+\\eta" , Str "." ]
 ]
 ```
 
diff --git a/test/command/1592.md b/test/command/1592.md
index c3dc933a8..e1962a5d3 100644
--- a/test/command/1592.md
+++ b/test/command/1592.md
@@ -79,19 +79,9 @@ to left.</bdo></p>
 [ Para
     [ Span
         ( "" , [] , [ ( "dir" , "rtl" ) ] )
-        [ Str "This"
-        , Space
-        , Str "text"
-        , Space
-        , Str "will"
-        , Space
-        , Str "go"
-        , Space
-        , Str "right"
+        [ Str "This text will go right"
         , SoftBreak
-        , Str "to"
-        , Space
-        , Str "left."
+        , Str "to left."
         ]
     ]
 ]
diff --git a/test/command/1608.md b/test/command/1608.md
index 59bd54ab4..1f6fcd51c 100644
--- a/test/command/1608.md
+++ b/test/command/1608.md
@@ -31,51 +31,16 @@ These are all pretty interesting facts.
 [ Div
     ( "def:tri" , [ "definition" ] , [] )
     [ Para
-        [ Strong [ Str "Definition" , Space , Str "1" ]
-        , Space
-        , Str "(right-angled"
-        , Space
-        , Str "triangles)."
-        , Space
-        , Space
-        , Str "A"
-        , Space
-        , Emph [ Str "right-angled" , Space , Str "triangle" ]
-        , Space
-        , Str "is"
-        , Space
-        , Str "a"
-        , Space
-        , Str "triangle"
-        , Space
-        , Str "whose"
-        , Space
-        , Str "sides"
-        , Space
-        , Str "of"
-        , Space
-        , Str "length\160"
+        [ Strong [ Str "Definition 1" ]
+        , Str " (right-angled triangles).  A "
+        , Emph [ Str "right-angled triangle" ]
+        , Str " is a triangle whose sides of length\160"
         , Math InlineMath "a"
-        , Str ","
-        , Space
+        , Str ", "
         , Math InlineMath "b"
-        , Space
-        , Str "and\160"
+        , Str " and\160"
         , Math InlineMath "c"
-        , Str ","
-        , Space
-        , Str "in"
-        , Space
-        , Str "some"
-        , Space
-        , Str "permutation"
-        , Space
-        , Str "of"
-        , Space
-        , Str "order,"
-        , Space
-        , Str "satisfies"
-        , Space
+        , Str ", in some permutation of order, satisfies "
         , Math InlineMath "a^2+b^2=c^2"
         , Str "."
         ]
@@ -83,33 +48,16 @@ These are all pretty interesting facts.
 , Div
     ( "" , [ "lemma" ] , [] )
     [ Para
-        [ Strong [ Str "Lemma" , Space , Str "2" ]
-        , Str "."
-        , Space
-        , Space
+        [ Strong [ Str "Lemma 2" ]
+        , Str ".  "
         , Emph
-            [ Str "The"
-            , Space
-            , Str "triangle"
-            , Space
-            , Str "with"
-            , Space
-            , Str "sides"
-            , Space
-            , Str "of"
-            , Space
-            , Str "length\160"
+            [ Str "The triangle with sides of length\160"
             , Math InlineMath "3"
-            , Str ","
-            , Space
+            , Str ", "
             , Math InlineMath "4"
-            , Space
-            , Str "and\160"
+            , Str " and\160"
             , Math InlineMath "5"
-            , Space
-            , Str "is"
-            , Space
-            , Str "right-angled."
+            , Str " is right-angled."
             ]
         ]
     ]
@@ -117,15 +65,7 @@ These are all pretty interesting facts.
     ( "" , [ "proof" ] , [] )
     [ Para
         [ Emph [ Str "Proof." ]
-        , Space
-        , Str "This"
-        , Space
-        , Str "lemma"
-        , Space
-        , Str "follows"
-        , Space
-        , Str "from"
-        , Space
+        , Str " This lemma follows from "
         , Link
             ( ""
             , []
@@ -135,70 +75,32 @@ These are all pretty interesting facts.
             )
             [ Str "Definition\160\&1" ]
             ( "#def:tri" , "" )
-        , Space
-        , Str "since"
-        , Space
+        , Str " since "
         , Math InlineMath "3^2+4^2=9+16=25=5^2"
-        , Str "."
-        , Str "\160\9723"
+        , Str ".\160\9723"
         ]
     ]
 , Div
     ( "thm:py" , [ "theorem" ] , [] )
     [ Para
-        [ Strong [ Str "Theorem" , Space , Str "3" ]
-        , Space
-        , Str "(Pythagorean"
-        , Space
-        , Str "triplets)."
-        , Space
-        , Space
+        [ Strong [ Str "Theorem 3" ]
+        , Str " (Pythagorean triplets).  "
         , Emph
-            [ Str "Triangles"
-            , Space
-            , Str "with"
-            , Space
-            , Str "sides"
-            , Space
-            , Str "of"
-            , Space
-            , Str "length"
-            , Space
+            [ Str "Triangles with sides of length "
             , Math InlineMath "a=p^2-q^2"
-            , Str ","
-            , Space
+            , Str ", "
             , Math InlineMath "b=2pq"
-            , Space
-            , Str "and"
-            , Space
+            , Str " and "
             , Math InlineMath "c=p^2+q^2"
-            , Space
-            , Str "are"
-            , Space
-            , Str "right-angled"
-            , Space
-            , Str "triangles."
+            , Str " are right-angled triangles."
             ]
         ]
     ]
 , Div
     ( "" , [ "remark" ] , [] )
     [ Para
-        [ Emph [ Str "Remark" , Space , Str "1" ]
-        , Str "."
-        , Space
-        , Space
-        , Str "These"
-        , Space
-        , Str "are"
-        , Space
-        , Str "all"
-        , Space
-        , Str "pretty"
-        , Space
-        , Str "interesting"
-        , Space
-        , Str "facts."
+        [ Emph [ Str "Remark 1" ]
+        , Str ".  These are all pretty interesting facts."
         ]
     ]
 ]
diff --git a/test/command/168.md b/test/command/168.md
index acd42b97d..1e0f20f9b 100644
--- a/test/command/168.md
+++ b/test/command/168.md
@@ -13,21 +13,13 @@ nested div
 ^D
 [ Div
     ( "" , [ "warning" ] , [] )
-    [ Para
-        [ Str "This"
-        , Space
-        , Str "is"
-        , Space
-        , Str "the"
-        , Space
-        , Str "warning!"
-        ]
+    [ Para [ Str "This is the warning!" ]
     , OrderedList
         ( 1 , Decimal , Period )
         [ [ Plain [ Str "list" ] ] , [ Plain [ Str "another" ] ] ]
     , Div
         ( "myid" , [ "class" ] , [ ( "key" , "val" ) ] )
-        [ Para [ Str "nested" , Space , Str "div" ] ]
+        [ Para [ Str "nested div" ] ]
     ]
 ]
 ```
@@ -58,16 +50,8 @@ And another.
 ^D
 [ Div
     ( "" , [ "Warning" ] , [] )
-    [ Para
-        [ Str "Here"
-        , Space
-        , Str "is"
-        , Space
-        , Str "a"
-        , Space
-        , Str "paragraph."
-        ]
-    , Para [ Str "And" , Space , Str "another." ]
+    [ Para [ Str "Here is a paragraph." ]
+    , Para [ Str "And another." ]
     ]
 ]
 ```
diff --git a/test/command/1718.md b/test/command/1718.md
index c93067869..9c4b76698 100644
--- a/test/command/1718.md
+++ b/test/command/1718.md
@@ -9,10 +9,7 @@ Note[^1].
 [WARNING] Note with key '2' defined at line 5 column 1 but not used.
 [ Para
     [ Str "Note"
-    , Note
-        [ Para
-            [ Str "the" , Space , Str "first" , Space , Str "note." ]
-        ]
+    , Note [ Para [ Str "the first note." ] ]
     , Str "."
     ]
 ]
diff --git a/test/command/1881.md b/test/command/1881.md
index 7a2468c1b..6af73069f 100644
--- a/test/command/1881.md
+++ b/test/command/1881.md
@@ -24,18 +24,7 @@
     ( "" , [] , [] )
     (Caption
        Nothing
-       [ Plain
-           [ Str "Demonstration"
-           , Space
-           , Str "of"
-           , Space
-           , Str "simple"
-           , Space
-           , Str "table"
-           , Space
-           , Str "syntax."
-           ]
-       ])
+       [ Plain [ Str "Demonstration of simple table syntax." ] ])
     [ ( AlignRight , ColWidthDefault )
     , ( AlignLeft , ColWidthDefault )
     , ( AlignCenter , ColWidthDefault )
diff --git a/test/command/2118.md b/test/command/2118.md
index 8be5c4886..4cb3e502e 100644
--- a/test/command/2118.md
+++ b/test/command/2118.md
@@ -10,7 +10,7 @@
 [ Para
     [ Image
         ( "fig:setminus" , [] , [ ( "width" , "80%" ) ] )
-        [ Str "Set" , Space , Str "subtraction" ]
+        [ Str "Set subtraction" ]
         ( "setminus.png" , "fig:" )
     ]
 ]
diff --git a/test/command/2549.md b/test/command/2549.md
index 12b21d0a1..56e7f2c2f 100644
--- a/test/command/2549.md
+++ b/test/command/2549.md
@@ -4,9 +4,7 @@
 \section{A section}\label{foo}
 }
 ^D
-[ Header
-    1 ( "foo" , [] , [] ) [ Str "A" , Space , Str "section" ]
-]
+[ Header 1 ( "foo" , [] , [] ) [ Str "A section" ] ]
 ```
 
 ```
@@ -17,9 +15,7 @@
 ^D
 [ Div
     ( "bar" , [] , [] )
-    [ Header
-        1 ( "foo" , [] , [] ) [ Str "A" , Space , Str "section" ]
-    ]
+    [ Header 1 ( "foo" , [] , [] ) [ Str "A section" ] ]
 ]
 ```
 
@@ -28,10 +24,7 @@
 Bar \hypertarget{foo}{Foo}
 ^D
 [ Para
-    [ Str "Bar"
-    , Space
-    , Span ( "foo" , [] , [] ) [ Str "Foo" ]
-    ]
+    [ Str "Bar " , Span ( "foo" , [] , [] ) [ Str "Foo" ] ]
 ]
 ```
 
diff --git a/test/command/256.md b/test/command/256.md
index 7e3f34dbd..e9ba92407 100644
--- a/test/command/256.md
+++ b/test/command/256.md
@@ -3,20 +3,7 @@
 Foo. bar baz h.k. and e.g. and Mr. Brown.
 ^D
 [ Para
-    [ Str "Foo.\160bar"
-    , Space
-    , Str "baz"
-    , Space
-    , Str "h.k.\160and"
-    , Space
-    , Str "e.g."
-    , Space
-    , Str "and"
-    , Space
-    , Str "Mr."
-    , Space
-    , Str "Brown."
-    ]
+    [ Str "Foo.\160bar baz h.k.\160and e.g. and Mr. Brown." ]
 ]
 ```
 ```
@@ -24,19 +11,6 @@ Foo. bar baz h.k. and e.g. and Mr. Brown.
 Foo. bar baz h.k. and e.g. and Mr. Brown.
 ^D
 [ Para
-    [ Str "Foo."
-    , Space
-    , Str "bar"
-    , Space
-    , Str "baz"
-    , Space
-    , Str "h.k."
-    , Space
-    , Str "and"
-    , Space
-    , Str "e.g.\160and"
-    , Space
-    , Str "Mr.\160Brown."
-    ]
+    [ Str "Foo. bar baz h.k. and e.g.\160and Mr.\160Brown." ]
 ]
 ```
diff --git a/test/command/3236.md b/test/command/3236.md
index b9a98f160..1ee4c2989 100644
--- a/test/command/3236.md
+++ b/test/command/3236.md
@@ -11,11 +11,7 @@ Magnificent \mycolor{} header.
         [ Str "image" ]
         ( "red/header" , "" )
     , SoftBreak
-    , Str "Magnificent"
-    , Space
-    , Str "red"
-    , Space
-    , Str "header."
+    , Str "Magnificent red header."
     ]
 ]
 ```
diff --git a/test/command/3257.md b/test/command/3257.md
index ef2419481..b04cf530a 100644
--- a/test/command/3257.md
+++ b/test/command/3257.md
@@ -9,5 +9,5 @@
 % pandoc -t native
 i<j-1, j>k
 ^D
-[ Para [ Str "i<j-1," , Space , Str "j>k" ] ]
+[ Para [ Str "i<j-1, j>k" ] ]
 ```
diff --git a/test/command/3348.md b/test/command/3348.md
index 964136086..a4efd4594 100644
--- a/test/command/3348.md
+++ b/test/command/3348.md
@@ -7,64 +7,56 @@
         line of text
   ----- ------------------------------------------------
 ^D
-[ Table
-    ( "" , [] , [] )
-    (Caption Nothing [])
-    [ ( AlignRight , ColWidth 8.333333333333333e-2 )
-    , ( AlignLeft , ColWidth 0.6805555555555556 )
-    ]
-    (TableHead ( "" , [] , [] ) [])
-    [ TableBody
-        ( "" , [] , [] )
-        (RowHeadColumns 0)
-        []
-        [ Row
-            ( "" , [] , [] )
-            [ Cell
-                ( "" , [] , [] )
-                AlignDefault
-                (RowSpan 1)
-                (ColSpan 1)
-                [ Plain [ Str "foo" ] ]
-            , Cell
-                ( "" , [] , [] )
-                AlignDefault
-                (RowSpan 1)
-                (ColSpan 1)
-                [ Plain [ Str "bar" ] ]
-            ]
-        , Row
-            ( "" , [] , [] )
-            [ Cell
-                ( "" , [] , [] )
-                AlignDefault
-                (RowSpan 1)
-                (ColSpan 1)
-                [ Plain [ Str "foo" ] ]
-            , Cell
-                ( "" , [] , [] )
-                AlignDefault
-                (RowSpan 1)
-                (ColSpan 1)
-                [ Plain
-                    [ Str "this"
-                    , Space
-                    , Str "is"
-                    , Space
-                    , Str "a"
-                    , Space
-                    , Str "long"
-                    , SoftBreak
-                    , Str "line"
-                    , Space
-                    , Str "of"
-                    , Space
-                    , Str "text"
-                    ]
-                ]
-            ]
-        ]
-    ]
-    (TableFoot ( "" , [] , [] ) [])
-]
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignRight , ColWidth 8.333333333333333e-2 )
+      , ( AlignLeft , ColWidth 0.6805555555555556 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "foo" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "bar" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "foo" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "this is a long"
+                      , SoftBreak
+                      , Str "line of text"
+                      ]
+                  ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  ]
 ```
diff --git a/test/command/3401.md b/test/command/3401.md
index 3b16e84a4..ec4e0e4da 100644
--- a/test/command/3401.md
+++ b/test/command/3401.md
@@ -5,7 +5,7 @@ See #3401 and <http://orgmode.org/manual/Macro-replacement.html>
 #+MACRO: HELLO /Hello, $1/
 {{{HELLO(World)}}}
 ^D
-[ Para [ Emph [ Str "Hello," , Space , Str "World" ] ] ]
+[ Para [ Emph [ Str "Hello, World" ] ] ]
 ```
 
 Inverted argument order
diff --git a/test/command/3510.md b/test/command/3510.md
index 48522f7e1..564a69ab0 100644
--- a/test/command/3510.md
+++ b/test/command/3510.md
@@ -12,11 +12,11 @@ More text
 ^D
 [ Para [ Str "Text" ]
 , Header 1 ( "subsection" , [] , [] ) [ Str "Subsection" ]
-, Para [ Str "Included" , Space , Str "text" ]
-, Plain [ Str "Lorem" , Space , Str "ipsum." ]
+, Para [ Str "Included text" ]
+, Plain [ Str "Lorem ipsum." ]
 , CodeBlock
     ( "" , [ "haskell" ] , [] ) "putStrLn outString\n"
 , RawBlock (Format "latex") "\\emph{Hello}"
-, Para [ Str "More" , Space , Str "text" ]
+, Para [ Str "More text" ]
 ]
 ```
diff --git a/test/command/3530.md b/test/command/3530.md
index 168cb7067..89223a1cb 100644
--- a/test/command/3530.md
+++ b/test/command/3530.md
@@ -3,54 +3,11 @@
 \subfile{command/sub-file-chapter-1}
 \subfile{command/sub-file-chapter-2}
 ^D
-[ Header
-    1
-    ( "chapter-1" , [] , [] )
-    [ Str "Chapter" , Space , Str "1" ]
+[ Header 1 ( "chapter-1" , [] , [] ) [ Str "Chapter 1" ]
+, Para [ Str "This is Chapter 1, provided in a sub file." ]
+, Header 1 ( "chapter-2" , [] , [] ) [ Str "Chapter 2" ]
 , Para
-    [ Str "This"
-    , Space
-    , Str "is"
-    , Space
-    , Str "Chapter"
-    , Space
-    , Str "1,"
-    , Space
-    , Str "provided"
-    , Space
-    , Str "in"
-    , Space
-    , Str "a"
-    , Space
-    , Str "sub"
-    , Space
-    , Str "file."
-    ]
-, Header
-    1
-    ( "chapter-2" , [] , [] )
-    [ Str "Chapter" , Space , Str "2" ]
-, Para
-    [ Str "This"
-    , Space
-    , Str "is"
-    , Space
-    , Str "Chapter"
-    , Space
-    , Str "2,"
-    , Space
-    , Str "provided"
-    , Space
-    , Str "in"
-    , Space
-    , Str "a"
-    , Space
-    , Str "second"
-    , Space
-    , Str "sub"
-    , Space
-    , Str "file."
-    ]
+    [ Str "This is Chapter 2, provided in a second sub file." ]
 ]
 ```
 
diff --git a/test/command/3533-rst-csv-tables.md b/test/command/3533-rst-csv-tables.md
index ed69ca860..d8e455c7c 100644
--- a/test/command/3533-rst-csv-tables.md
+++ b/test/command/3533-rst-csv-tables.md
@@ -59,14 +59,7 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain
-                    [ Str "On"
-                    , Space
-                    , Str "a"
-                    , Space
-                    , Str "stick!"
-                    ]
-                ]
+                [ Plain [ Str "On a stick!" ] ]
             ]
         , Row
             ( "" , [] , [] )
@@ -75,7 +68,7 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Crunchy" , Space , Str "Frog" ] ]
+                [ Plain [ Str "Crunchy Frog" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
@@ -88,31 +81,9 @@
                 (RowSpan 1)
                 (ColSpan 1)
                 [ Plain
-                    [ Str "If"
-                    , Space
-                    , Str "we"
-                    , Space
-                    , Str "took"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "bones"
-                    , Space
-                    , Str "out,"
-                    , Space
-                    , Str "it"
-                    , Space
-                    , Str "wouldn't"
-                    , Space
-                    , Str "be"
+                    [ Str "If we took the bones out, it wouldn't be"
                     , SoftBreak
-                    , Str "crunchy,"
-                    , Space
-                    , Str "now"
-                    , Space
-                    , Str "would"
-                    , Space
-                    , Str "it?"
+                    , Str "crunchy, now would it?"
                     ]
                 ]
             ]
diff --git a/test/command/3534.md b/test/command/3534.md
index 8692007d2..ad1649030 100644
--- a/test/command/3534.md
+++ b/test/command/3534.md
@@ -19,20 +19,7 @@ I want to explain the interface of \lstinline{public class MyClass}.
 I want to explain the interface of \lstinline[language=Java]{public class MyClass}.
 ^D
 [ Para
-    [ Str "I"
-    , Space
-    , Str "want"
-    , Space
-    , Str "to"
-    , Space
-    , Str "explain"
-    , Space
-    , Str "the"
-    , Space
-    , Str "interface"
-    , Space
-    , Str "of"
-    , Space
+    [ Str "I want to explain the interface of "
     , Code ( "" , [ "java" ] , [] ) "public class MyClass"
     , Str "."
     ]
@@ -60,20 +47,7 @@ I want to explain the interface of \mintinline{java}|public class MyClass|.
 I want to explain the interface of \mintinline[linenos]{java}{public class MyClass}.
 ^D
 [ Para
-    [ Str "I"
-    , Space
-    , Str "want"
-    , Space
-    , Str "to"
-    , Space
-    , Str "explain"
-    , Space
-    , Str "the"
-    , Space
-    , Str "interface"
-    , Space
-    , Str "of"
-    , Space
+    [ Str "I want to explain the interface of "
     , Code ( "" , [ "java" ] , [] ) "public class MyClass"
     , Str "."
     ]
diff --git a/test/command/3537.md b/test/command/3537.md
index 3f4445343..e35610321 100644
--- a/test/command/3537.md
+++ b/test/command/3537.md
@@ -14,13 +14,11 @@ foo bar
 % pandoc -t native
 Hi `there`{=ms}.
 ^D
-[ Para
-    [ Str "Hi"
-    , Space
-    , RawInline (Format "ms") "there"
-    , Str "."
-    ]
-]
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Para
+      [ Str "Hi " , RawInline (Format "ms") "there" , Str "." ]
+  ]
 ````
 
 ````
diff --git a/test/command/3539.md b/test/command/3539.md
index b2ce5455f..8faaabceb 100644
--- a/test/command/3539.md
+++ b/test/command/3539.md
@@ -5,14 +5,7 @@
 Many programming languages provide \glspl{API}. Each \gls{API} should provide a documentation.
 ^D
 [ Para
-    [ Str "Many"
-    , Space
-    , Str "programming"
-    , Space
-    , Str "languages"
-    , Space
-    , Str "provide"
-    , Space
+    [ Str "Many programming languages provide "
     , Span
         ( ""
         , []
@@ -21,10 +14,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "APIs" ]
-    , Str "."
-    , Space
-    , Str "Each"
-    , Space
+    , Str ". Each "
     , Span
         ( ""
         , []
@@ -33,14 +23,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "should"
-    , Space
-    , Str "provide"
-    , Space
-    , Str "a"
-    , Space
-    , Str "documentation."
+    , Str " should provide a documentation."
     ]
 ]
 ```
@@ -58,19 +41,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "XYZ"
-    , Space
-    , Str "ist"
-    , Space
-    , Str "not"
-    , Space
-    , Str "as"
-    , Space
-    , Str "performant"
-    , Space
-    , Str "as"
-    , Space
+    , Str " XYZ ist not as performant as "
     , Span
         ( ""
         , []
@@ -79,8 +50,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "ZXY."
+    , Str " ZXY."
     ]
 ]
 ```
@@ -98,19 +68,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "XYZ"
-    , Space
-    , Str "ist"
-    , Space
-    , Str "not"
-    , Space
-    , Str "as"
-    , Space
-    , Str "performant"
-    , Space
-    , Str "as"
-    , Space
+    , Str " XYZ ist not as performant as "
     , Span
         ( ""
         , []
@@ -119,8 +77,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "ZXY."
+    , Str " ZXY."
     ]
 ]
 ```
@@ -138,19 +95,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "XYZ"
-    , Space
-    , Str "ist"
-    , Space
-    , Str "not"
-    , Space
-    , Str "as"
-    , Space
-    , Str "performant"
-    , Space
-    , Str "as"
-    , Space
+    , Str " XYZ ist not as performant as "
     , Span
         ( ""
         , []
@@ -159,8 +104,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "ZXY."
+    , Str " ZXY."
     ]
 ]
 ```
@@ -178,19 +122,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "XYZ"
-    , Space
-    , Str "ist"
-    , Space
-    , Str "not"
-    , Space
-    , Str "as"
-    , Space
-    , Str "performant"
-    , Space
-    , Str "as"
-    , Space
+    , Str " XYZ ist not as performant as "
     , Span
         ( ""
         , []
@@ -199,8 +131,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "ZXY."
+    , Str " ZXY."
     ]
 ]
 ```
@@ -212,14 +143,7 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a
 Many programming languages provide \acp{API}. Each \ac{API} should provide a documentation.
 ^D
 [ Para
-    [ Str "Many"
-    , Space
-    , Str "programming"
-    , Space
-    , Str "languages"
-    , Space
-    , Str "provide"
-    , Space
+    [ Str "Many programming languages provide "
     , Span
         ( ""
         , []
@@ -228,10 +152,7 @@ Many programming languages provide \acp{API}. Each \ac{API} should provide a doc
           ]
         )
         [ Str "APIs" ]
-    , Str "."
-    , Space
-    , Str "Each"
-    , Space
+    , Str ". Each "
     , Span
         ( ""
         , []
@@ -240,14 +161,7 @@ Many programming languages provide \acp{API}. Each \ac{API} should provide a doc
           ]
         )
         [ Str "API" ]
-    , Space
-    , Str "should"
-    , Space
-    , Str "provide"
-    , Space
-    , Str "a"
-    , Space
-    , Str "documentation."
+    , Str " should provide a documentation."
     ]
 ]
 ```
diff --git a/test/command/3585.md b/test/command/3585.md
index 3f014db94..191a131fa 100644
--- a/test/command/3585.md
+++ b/test/command/3585.md
@@ -6,20 +6,7 @@ Same but bzip2 it and nice it <tt>zfs send tank/storage/data/svn@daily-2014-03-2
 ^D
 [ Para [ Quoted DoubleQuote [ Str "Hello" ] ]
 , Para
-    [ Str "Same"
-    , Space
-    , Str "but"
-    , Space
-    , Str "bzip2"
-    , Space
-    , Str "it"
-    , Space
-    , Str "and"
-    , Space
-    , Str "nice"
-    , Space
-    , Str "it"
-    , Space
+    [ Str "Same but bzip2 it and nice it "
     , Code
         ( "" , [] , [] )
         "zfs send tank/storage/data/svn@daily-2014-03-20_00.00.00--2w | nice -15 bzip2 | ssh [email protected] \"> /storage/c-3po/tank-storage-data-svn.dmp.bz2\""
diff --git a/test/command/3587.md b/test/command/3587.md
index 0a3c389b9..12bae0dd0 100644
--- a/test/command/3587.md
+++ b/test/command/3587.md
@@ -2,36 +2,14 @@
 % pandoc -f latex -t native
 \SI[round-precision=2]{1}{m} is equal to \SI{1000}{mm}
 ^D
-[ Para
-    [ Str "1\160m"
-    , Space
-    , Str "is"
-    , Space
-    , Str "equal"
-    , Space
-    , Str "to"
-    , Space
-    , Str "1000\160mm"
-    ]
-]
+[ Para [ Str "1\160m is equal to 1000\160mm" ] ]
 ```
 
 ```
 % pandoc -f latex -t native
 \SI[round-precision=2]{1}[\$]{} is equal to \SI{0.938094}{\euro}
 ^D
-[ Para
-    [ Str "$\160\&1"
-    , Space
-    , Str "is"
-    , Space
-    , Str "equal"
-    , Space
-    , Str "to"
-    , Space
-    , Str "0.938094\160\8364"
-    ]
-]
+[ Para [ Str "$\160\&1 is equal to 0.938094\160\8364" ] ]
 ```
 
 
diff --git a/test/command/3681.md b/test/command/3681.md
index 3e6c71a47..de7d421fe 100644
--- a/test/command/3681.md
+++ b/test/command/3681.md
@@ -5,31 +5,8 @@
 Software developers create \cicd pipelines to… Following issue can be resolved by \cicd:
 ^D
 [ Para
-    [ Str "Software"
-    , Space
-    , Str "developers"
-    , Space
-    , Str "create"
-    , Space
-    , Str "CI/CD"
-    , Space
-    , Str "pipelines"
-    , Space
-    , Str "to\8230"
-    , Space
-    , Str "Following"
-    , Space
-    , Str "issue"
-    , Space
-    , Str "can"
-    , Space
-    , Str "be"
-    , Space
-    , Str "resolved"
-    , Space
-    , Str "by"
-    , Space
-    , Str "CI/CD:"
+    [ Str
+        "Software developers create CI/CD pipelines to\8230 Following issue can be resolved by CI/CD:"
     ]
 ]
 ```
@@ -50,10 +27,7 @@ Software developers create \cicd pipelines to… Following issue can be resolved
                 ( "https://en.wikipedia.org/wiki/CI/CD" , "" )
             ]
         ]
-    , Space
-    , Str "is"
-    , Space
-    , Str "awesome."
+    , Str " is awesome."
     ]
 ]
 ```
@@ -65,5 +39,5 @@ Software developers create \cicd pipelines to… Following issue can be resolved
 
 \cicd\pipeline.
 ^D
-[ Para [ Str "CI/CD" , Space , Str "pipeline." ] ]
+[ Para [ Str "CI/CD pipeline." ] ]
 ```
diff --git a/test/command/3755.md b/test/command/3755.md
index e89eaec35..cb7d1d544 100644
--- a/test/command/3755.md
+++ b/test/command/3755.md
@@ -9,10 +9,7 @@ Pandoc
   Meta
     { unMeta =
         fromList
-          [ ( "date"
-            , MetaInlines
-                [ Str "22." , Space , Str "Juni" , Space , Str "2017" ]
-            )
+          [ ( "date" , MetaInlines [ Str "22. Juni 2017" ] )
           , ( "title" , MetaInlines [ Str "Titel" ] )
           ]
     }
@@ -35,7 +32,7 @@ Pandoc
             , MetaBlocks
                 [ OrderedList
                     ( 22 , Decimal , Period )
-                    [ [ Plain [ Str "Juni" , Space , Str "2017" ] ] ]
+                    [ [ Plain [ Str "Juni 2017" ] ] ]
                 ]
             )
           , ( "title"
diff --git a/test/command/3779.md b/test/command/3779.md
index 04111c2a6..25202540c 100644
--- a/test/command/3779.md
+++ b/test/command/3779.md
@@ -20,38 +20,8 @@
     Pandoc is 300\% awesome.
 }
 ^D
-[ BulletList
-    [ [ Para
-          [ Str "Pandoc"
-          , Space
-          , Str "is"
-          , Space
-          , Str "100%"
-          , Space
-          , Str "awesome."
-          ]
-      ]
-    ]
-, BulletList
-    [ [ Para
-          [ Str "Pandoc"
-          , Space
-          , Str "is"
-          , Space
-          , Str "200%"
-          , Space
-          , Str "awesome."
-          ]
-      ]
-    ]
-, Para
-    [ Str "Pandoc"
-    , Space
-    , Str "is"
-    , Space
-    , Str "300%"
-    , Space
-    , Str "awesome."
-    ]
+[ BulletList [ [ Para [ Str "Pandoc is 100% awesome." ] ] ]
+, BulletList [ [ Para [ Str "Pandoc is 200% awesome." ] ] ]
+, Para [ Str "Pandoc is 300% awesome." ]
 ]
 ```
diff --git a/test/command/3853.md b/test/command/3853.md
index caf21ed54..78e9ce404 100644
--- a/test/command/3853.md
+++ b/test/command/3853.md
@@ -21,8 +21,7 @@ more
 hello \iftoggle{ebook}{ebook}{noebook}
 ^D
 [ Para [ Str "ebook" , SoftBreak , Str "more" ]
-, Para
-    [ Str "not" , Space , Str "ebook" , SoftBreak , Str "more" ]
-, Para [ Str "hello" , Space , Str "noebook" ]
+, Para [ Str "not ebook" , SoftBreak , Str "more" ]
+, Para [ Str "hello noebook" ]
 ]
 ```
diff --git a/test/command/3916.md b/test/command/3916.md
index 8775ae7f6..adc3fff4f 100644
--- a/test/command/3916.md
+++ b/test/command/3916.md
@@ -6,7 +6,7 @@
 ^D
 [ OrderedList
     ( 1 , DefaultStyle , DefaultDelim )
-    [ [ Plain [ Str "text" , Space , Str "text" ]
+    [ [ Plain [ Str "text text" ]
       , CodeBlock ( "" , [] , [] ) "blabla"
       ]
     , [ Plain [ Str "more" ] ]
diff --git a/test/command/4068.md b/test/command/4068.md
index 83527a6fd..19d993b9c 100644
--- a/test/command/4068.md
+++ b/test/command/4068.md
@@ -7,12 +7,7 @@
 [ Para
     [ Link
         ( "" , [] , [] )
-        [ Str "open"
-        , Space
-        , Str "productname"
-        , Space
-        , Str "bugs"
-        ]
+        [ Str "open productname bugs" ]
         ( "https://domain.com/script.php?a=1&b=2&c=&d=4" , "" )
     ]
 , Para
@@ -21,13 +16,7 @@
         ( "" , [] , [] )
         [ Str "http://domain.com?a=" ]
         ( "http://domain.com?a=" , "" )
-    , Str "."
-    , Space
-    , Str "open"
-    , Space
-    , Str "productname"
-    , Space
-    , Str "bugs]"
+    , Str ". open productname bugs]"
     ]
 ]
 ```
diff --git a/test/command/4119.md b/test/command/4119.md
index fcbf79386..11ad4ee13 100644
--- a/test/command/4119.md
+++ b/test/command/4119.md
@@ -55,9 +55,6 @@ not a caption!
     ]
     (TableFoot ( "" , [] , [] ) [])
 , Div
-    ( "" , [ "notes" ] , [] )
-    [ Para
-        [ Str "not" , Space , Str "a" , Space , Str "caption!" ]
-    ]
+    ( "" , [ "notes" ] , [] ) [ Para [ Str "not a caption!" ] ]
 ]
 ```
diff --git a/test/command/4284.md b/test/command/4284.md
index 0308f521f..96bc50159 100644
--- a/test/command/4284.md
+++ b/test/command/4284.md
@@ -14,23 +14,9 @@
     , []
     , []
     )
-    [ Str "NOEXPORT"
-    , Space
-    , Str "should"
-    , Space
-    , Str "appear"
-    , Space
-    , Str "if"
-    , Space
-    , Str "not"
-    , Space
-    , Str "specified"
-    , Space
-    , Str "in"
-    , Space
-    , Str "EXCLUDE"
+    [ Str "NOEXPORT should appear if not specified in EXCLUDE"
     , Subscript [ Str "TAGS" ]
-    , Space
+    , Str " "
     , Span
         ( "" , [ "tag" ] , [ ( "tag-name" , "noexport" ) ] )
         [ SmallCaps [ Str "noexport" ] ]
@@ -47,12 +33,7 @@
 [ Header
     1
     ( "this-should-appear" , [] , [] )
-    [ Str "This"
-    , Space
-    , Str "should"
-    , Space
-    , Str "appear"
-    , Space
+    [ Str "This should appear "
     , Span
         ( "" , [ "tag" ] , [ ( "tag-name" , "fawn" ) ] )
         [ SmallCaps [ Str "fawn" ] ]
@@ -71,12 +52,7 @@
 [ Header
     1
     ( "this-should-appear" , [] , [] )
-    [ Str "This"
-    , Space
-    , Str "should"
-    , Space
-    , Str "appear"
-    , Space
+    [ Str "This should appear "
     , Span
         ( "" , [ "tag" ] , [ ( "tag-name" , "noexport" ) ] )
         [ SmallCaps [ Str "noexport" ] ]
@@ -95,23 +71,9 @@
     , []
     , []
     )
-    [ Str "NOEXPORT"
-    , Space
-    , Str "should"
-    , Space
-    , Str "appear"
-    , Space
-    , Str "if"
-    , Space
-    , Str "not"
-    , Space
-    , Str "specified"
-    , Space
-    , Str "in"
-    , Space
-    , Str "EXCLUDE"
+    [ Str "NOEXPORT should appear if not specified in EXCLUDE"
     , Subscript [ Str "TAGS" ]
-    , Space
+    , Str " "
     , Span
         ( "" , [ "tag" ] , [ ( "tag-name" , "noexport" ) ] )
         [ SmallCaps [ Str "noexport" ] ]
diff --git a/test/command/4306.md b/test/command/4306.md
index dcb90e312..887386832 100644
--- a/test/command/4306.md
+++ b/test/command/4306.md
@@ -7,14 +7,7 @@ The file id is \nolinkurl{ESP_123_5235}.
 \end{document}
 ^D
 [ Para
-    [ Str "The"
-    , Space
-    , Str "file"
-    , Space
-    , Str "id"
-    , Space
-    , Str "is"
-    , Space
+    [ Str "The file id is "
     , Code ( "" , [] , [] ) "ESP_123_5235"
     , Str "."
     ]
diff --git a/test/command/4513.md b/test/command/4513.md
index 1f36d1958..0b782a332 100644
--- a/test/command/4513.md
+++ b/test/command/4513.md
@@ -17,13 +17,13 @@
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain [ Str "heading" , Space , Str "1" ] ]
+               [ Plain [ Str "heading 1" ] ]
            , Cell
                ( "" , [] , [] )
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain [ Str "heading" , Space , Str "2" ] ]
+               [ Plain [ Str "heading 2" ] ]
            ]
        ])
     [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ]
diff --git a/test/command/4553.md b/test/command/4553.md
index 0104a08a8..1e6323c9b 100644
--- a/test/command/4553.md
+++ b/test/command/4553.md
@@ -2,20 +2,13 @@
 % pandoc -f latex -t native
 foo \include{command/bar}
 ^D
-[ Para [ Str "foo" ]
-, Para [ Emph [ Str "hi" , Space , Str "there" ] ]
-]
+[ Para [ Str "foo" ] , Para [ Emph [ Str "hi there" ] ] ]
 ```
 
 ```
 % pandoc -f latex -t native
 foo \input{command/bar}
 ^D
-[ Para
-    [ Str "foo"
-    , Space
-    , Emph [ Str "hi" , Space , Str "there" ]
-    ]
-]
+[ Para [ Str "foo " , Emph [ Str "hi there" ] ] ]
 ```
 
diff --git a/test/command/4635.md b/test/command/4635.md
index 7acb08539..3c7a61a7b 100644
--- a/test/command/4635.md
+++ b/test/command/4635.md
@@ -11,9 +11,7 @@ foo)
 a (cf.
 foo)
 ^D
-[ Para
-    [ Str "a" , Space , Str "(cf." , SoftBreak , Str "foo)" ]
-]
+[ Para [ Str "a (cf." , SoftBreak , Str "foo)" ] ]
 ```
 
 ```
@@ -29,7 +27,5 @@ foo
 a cf.
 foo
 ^D
-[ Para
-    [ Str "a" , Space , Str "cf." , SoftBreak , Str "foo" ]
-]
+[ Para [ Str "a cf." , SoftBreak , Str "foo" ] ]
 ```
diff --git a/test/command/4722.md b/test/command/4722.md
index 2b2ceb640..21e3d492f 100644
--- a/test/command/4722.md
+++ b/test/command/4722.md
@@ -7,15 +7,15 @@
 *Level 1
 ^D
 [ BulletList
-    [ [ Plain [ Str "Level" , Space , Str "1" ] ]
-    , [ Plain [ Str "Level" , Space , Str "1" ]
+    [ [ Plain [ Str "Level 1" ] ]
+    , [ Plain [ Str "Level 1" ]
       , BulletList
-          [ [ Plain [ Str "Level" , Space , Str "2" ]
-            , BulletList [ [ Plain [ Str "Level" , Space , Str "3" ] ] ]
+          [ [ Plain [ Str "Level 2" ]
+            , BulletList [ [ Plain [ Str "Level 3" ] ] ]
             ]
           ]
       ]
-    , [ Plain [ Str "Level" , Space , Str "1" ] ]
+    , [ Plain [ Str "Level 1" ] ]
     ]
 ]
 ```
@@ -29,18 +29,18 @@
 ^D
 [ OrderedList
     ( 1 , DefaultStyle , DefaultDelim )
-    [ [ Plain [ Str "Level" , Space , Str "1" ] ]
-    , [ Plain [ Str "Level" , Space , Str "1" ]
+    [ [ Plain [ Str "Level 1" ] ]
+    , [ Plain [ Str "Level 1" ]
       , OrderedList
           ( 1 , DefaultStyle , DefaultDelim )
-          [ [ Plain [ Str "Level" , Space , Str "2" ]
+          [ [ Plain [ Str "Level 2" ]
             , OrderedList
                 ( 1 , DefaultStyle , DefaultDelim )
-                [ [ Plain [ Str "Level" , Space , Str "3" ] ] ]
+                [ [ Plain [ Str "Level 3" ] ] ]
             ]
           ]
       ]
-    , [ Plain [ Str "Level" , Space , Str "1" ] ]
+    , [ Plain [ Str "Level 1" ] ]
     ]
 ]
 ```
diff --git a/test/command/4742.md b/test/command/4742.md
index a91dffb33..2a8f37485 100644
--- a/test/command/4742.md
+++ b/test/command/4742.md
@@ -8,14 +8,7 @@ extension properly.
 [ Header
     1
     ( "non-ascii--raksmorgas" , [] , [] )
-    [ Str "non"
-    , Space
-    , Str "ascii"
-    , Space
-    , Str "\9888\65039"
-    , Space
-    , Str "r\228ksm\246rg\229s"
-    ]
+    [ Str "non ascii \9888\65039 r\228ksm\246rg\229s" ]
 ]
 ```
 
@@ -30,14 +23,7 @@ so it survives...
 [ Header
     1
     ( "non-ascii-\65039-r\228ksm\246rg\229s" , [] , [] )
-    [ Str "non"
-    , Space
-    , Str "ascii"
-    , Space
-    , Str "\9888\65039"
-    , Space
-    , Str "r\228ksm\246rg\229s"
-    ]
+    [ Str "non ascii \9888\65039 r\228ksm\246rg\229s" ]
 ]
 ```
 
@@ -50,13 +36,6 @@ so it survives...
 [ Header
     1
     ( "non-ascii-\65039-r\228ksm\246rg\229s" , [] , [] )
-    [ Str "non"
-    , Space
-    , Str "ascii"
-    , Space
-    , Str "\9888\65039"
-    , Space
-    , Str "r\228ksm\246rg\229s"
-    ]
+    [ Str "non ascii \9888\65039 r\228ksm\246rg\229s" ]
 ]
 ```
diff --git a/test/command/4781.md b/test/command/4781.md
index e240facf3..d4e6fa29d 100644
--- a/test/command/4781.md
+++ b/test/command/4781.md
@@ -6,18 +6,9 @@ Markdown parsed *here*
 
 *But not here*
 ^D
-[ Para
-    [ Str "Markdown"
-    , Space
-    , Str "parsed"
-    , Space
-    , Emph [ Str "here" ]
-    ]
+[ Para [ Str "Markdown parsed " , Emph [ Str "here" ] ]
 , RawBlock (Format "tex") "\\include{command/bar}"
-, Para
-    [ Emph
-        [ Str "But" , Space , Str "not" , Space , Str "here" ]
-    ]
+, Para [ Emph [ Str "But not here" ] ]
 ]
 ```
 
@@ -29,12 +20,9 @@ Markdown parsed *here*
 ^D
 [ Para
     [ Emph [ Str "here" ]
-    , Space
+    , Str " "
     , RawInline (Format "tex") "\\input{command/bar}"
     ]
-, Para
-    [ Emph
-        [ Str "But" , Space , Str "not" , Space , Str "here" ]
-    ]
+, Para [ Emph [ Str "But not here" ] ]
 ]
 ```
diff --git a/test/command/4845.md b/test/command/4845.md
index 10d11127b..f7b74501f 100644
--- a/test/command/4845.md
+++ b/test/command/4845.md
@@ -3,19 +3,12 @@
 x<a href="/foo"> leading trailing space </a>x
 ^D
 [ Plain
-    [ Str "x"
-    , Space
+    [ Str "x "
     , Link
         ( "" , [] , [] )
-        [ Str "leading"
-        , Space
-        , Str "trailing"
-        , Space
-        , Str "space"
-        ]
+        [ Str "leading trailing space" ]
         ( "/foo" , "" )
-    , Space
-    , Str "x"
+    , Str " x"
     ]
 ]
 ```
diff --git a/test/command/4848.md b/test/command/4848.md
index c73699a3c..d54fbc1af 100644
--- a/test/command/4848.md
+++ b/test/command/4848.md
@@ -35,11 +35,8 @@ Lorem ipsum
 \blockquote{dolor sit amet}
 consectetuer.
 ^D
-[ Para [ Str "Lorem" , Space , Str "ipsum" ]
-, BlockQuote
-    [ Para
-        [ Str "dolor" , Space , Str "sit" , Space , Str "amet" ]
-    ]
+[ Para [ Str "Lorem ipsum" ]
+, BlockQuote [ Para [ Str "dolor sit amet" ] ]
 , Para [ Str "consectetuer." ]
 ]
 ```
@@ -50,10 +47,9 @@ Lorem ipsum
 \blockcquote[198]{Knu86}{dolor sit amet}
 consectetuer.
 ^D
-[ Para [ Str "Lorem" , Space , Str "ipsum" ]
+[ Para [ Str "Lorem ipsum" ]
 , BlockQuote
-    [ Para
-        [ Str "dolor" , Space , Str "sit" , Space , Str "amet" ]
+    [ Para [ Str "dolor sit amet" ]
     , Para
         [ Cite
             [ Citation
@@ -78,13 +74,11 @@ Lorem ipsum
 \foreignblockquote{italian}{dolor sit amet}
 consectetuer.
 ^D
-[ Para [ Str "Lorem" , Space , Str "ipsum" ]
+[ Para [ Str "Lorem ipsum" ]
 , BlockQuote
     [ Div
         ( "" , [] , [ ( "lang" , "it" ) ] )
-        [ Para
-            [ Str "dolor" , Space , Str "sit" , Space , Str "amet" ]
-        ]
+        [ Para [ Str "dolor sit amet" ] ]
     ]
 , Para [ Str "consectetuer." ]
 ]
diff --git a/test/command/4860.md b/test/command/4860.md
index 65b6bf65f..325669ee6 100644
--- a/test/command/4860.md
+++ b/test/command/4860.md
@@ -6,10 +6,7 @@ This is broken_.
 .. _broken: http://google.com
 ^D
 [ Para
-    [ Str "This"
-    , Space
-    , Str "is"
-    , Space
+    [ Str "This is "
     , Link
         ( "" , [] , [] )
         [ Str "broken" ]
diff --git a/test/command/4877.md b/test/command/4877.md
index ba8acd122..b33fe0a59 100644
--- a/test/command/4877.md
+++ b/test/command/4877.md
@@ -2,9 +2,7 @@
 % pandoc -f html -t native
 My <script type="math/tex">\mathcal{D}</script>
 ^D
-[ Plain
-    [ Str "My" , Space , Math InlineMath "\\mathcal{D}" ]
-]
+[ Plain [ Str "My " , Math InlineMath "\\mathcal{D}" ] ]
 ```
 
 ```
diff --git a/test/command/4928.md b/test/command/4928.md
index 86699aab5..63acbd4b8 100644
--- a/test/command/4928.md
+++ b/test/command/4928.md
@@ -6,7 +6,7 @@
     [ Cite
         [ Citation
             { citationId = "Knu86"
-            , citationPrefix = [ Str "Multiprenote" , Space , Str "23" ]
+            , citationPrefix = [ Str "Multiprenote 23" ]
             , citationSuffix = [ Str "42" ]
             , citationMode = NormalCitation
             , citationNoteNum = 0
@@ -15,8 +15,7 @@
         , Citation
             { citationId = "Nie72"
             , citationPrefix = []
-            , citationSuffix =
-                [ Str "65" , Str "," , Space , Str "multipostnote" ]
+            , citationSuffix = [ Str "65, multipostnote" ]
             , citationMode = NormalCitation
             , citationNoteNum = 0
             , citationHash = 0
@@ -38,7 +37,7 @@
     [ Cite
         [ Citation
             { citationId = "Knu86"
-            , citationPrefix = [ Str "Multiprenote" , Space , Str "23" ]
+            , citationPrefix = [ Str "Multiprenote 23" ]
             , citationSuffix = [ Str "42" ]
             , citationMode = NormalCitation
             , citationNoteNum = 0
@@ -78,8 +77,7 @@
         , Citation
             { citationId = "Nie72"
             , citationPrefix = []
-            , citationSuffix =
-                [ Str "65" , Str "," , Space , Str "multipostnote" ]
+            , citationSuffix = [ Str "65, multipostnote" ]
             , citationMode = NormalCitation
             , citationNoteNum = 0
             , citationHash = 0
@@ -140,8 +138,7 @@
         , Citation
             { citationId = "Nie72"
             , citationPrefix = []
-            , citationSuffix =
-                [ Str "65" , Str "," , Space , Str "multipostnote" ]
+            , citationSuffix = [ Str "65, multipostnote" ]
             , citationMode = NormalCitation
             , citationNoteNum = 0
             , citationHash = 0
@@ -164,7 +161,7 @@
         [ Citation
             { citationId = "Knu86"
             , citationPrefix = [ Str "Multiprenote" ]
-            , citationSuffix = [ Str "," , Space , Str "multipostnote" ]
+            , citationSuffix = [ Str ", multipostnote" ]
             , citationMode = NormalCitation
             , citationNoteNum = 0
             , citationHash = 0
@@ -188,8 +185,7 @@
             [ Cite
                 [ Citation
                     { citationId = "Knu86"
-                    , citationPrefix =
-                        [ Str "Multiprenote" , Space , Str "23" ]
+                    , citationPrefix = [ Str "Multiprenote 23" ]
                     , citationSuffix = [ Str "42" ]
                     , citationMode = NormalCitation
                     , citationNoteNum = 0
@@ -198,12 +194,7 @@
                 , Citation
                     { citationId = "Nie72"
                     , citationPrefix = []
-                    , citationSuffix =
-                        [ Str "65"
-                        , Str ","
-                        , Space
-                        , Str "multipostnote"
-                        ]
+                    , citationSuffix = [ Str "65, multipostnote" ]
                     , citationMode = NormalCitation
                     , citationNoteNum = 0
                     , citationHash = 0
diff --git a/test/command/5271.md b/test/command/5271.md
index 5df3958ef..1d8d45327 100644
--- a/test/command/5271.md
+++ b/test/command/5271.md
@@ -13,26 +13,8 @@ Pandoc
         fromList
           [ ( "abstract"
             , MetaBlocks
-                [ Para
-                    [ Str "This"
-                    , Space
-                    , Str "is"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "abstract."
-                    ]
-                , Para
-                    [ Str "It"
-                    , Space
-                    , Str "consists"
-                    , Space
-                    , Str "of"
-                    , Space
-                    , Str "two"
-                    , Space
-                    , Str "paragraphs."
-                    ]
+                [ Para [ Str "This is the abstract." ]
+                , Para [ Str "It consists of two paragraphs." ]
                 ]
             )
           ]
diff --git a/test/command/5619.md b/test/command/5619.md
index 0f612ea67..a5a801e28 100644
--- a/test/command/5619.md
+++ b/test/command/5619.md
@@ -9,27 +9,8 @@
 [ Para
     [ Image
         ( "test" , [] , [ ( "width" , "1in" ) ] )
-        [ Str "The"
-        , Space
-        , Str "caption."
-        , Space
-        , Str "Here's"
-        , Space
-        , Str "what"
-        , Space
-        , Str "piggybacking"
-        , Space
-        , Str "on"
-        , Space
-        , Str "caption"
-        , Space
-        , Str "would"
-        , Space
-        , Str "look"
-        , Space
-        , Str "like"
-        , Space
-        , Str "{#fig:1}"
+        [ Str
+            "The caption. Here's what piggybacking on caption would look like {#fig:1}"
         ]
         ( "img1.jpg" , "fig:" )
     ]
diff --git a/test/command/5686.md b/test/command/5686.md
index d669ae49b..7854c7b0e 100644
--- a/test/command/5686.md
+++ b/test/command/5686.md
@@ -7,25 +7,6 @@ This part does not make it to the html output.
 [ Para
     [ Str "FOO" , RawInline (Format "tex") "\\t0" , Str "BAR" ]
 , Para
-    [ Str "This"
-    , Space
-    , Str "part"
-    , Space
-    , Str "does"
-    , Space
-    , Str "not"
-    , Space
-    , Str "make"
-    , Space
-    , Str "it"
-    , Space
-    , Str "to"
-    , Space
-    , Str "the"
-    , Space
-    , Str "html"
-    , Space
-    , Str "output."
-    ]
+    [ Str "This part does not make it to the html output." ]
 ]
 ```
diff --git a/test/command/5700.md b/test/command/5700.md
index eae3663e5..612b25304 100644
--- a/test/command/5700.md
+++ b/test/command/5700.md
@@ -7,31 +7,10 @@ Pandoc
         fromList
           [ ( "desc"
             , MetaInlines
-                [ Str "Both"
-                , Space
-                , Str "of"
-                , Space
-                , Str "these"
-                , Space
-                , Str "files"
-                , Space
-                , Str "should"
-                , Space
-                , Str "be"
-                , Space
-                , Str "loaded."
-                ]
+                [ Str "Both of these files should be loaded." ]
             )
           , ( "title"
-            , MetaInlines
-                [ Str "Multiple"
-                , Space
-                , Str "metadata"
-                , Space
-                , Str "files"
-                , Space
-                , Str "test"
-                ]
+            , MetaInlines [ Str "Multiple metadata files test" ]
             )
           ]
     }
diff --git a/test/command/5714.md b/test/command/5714.md
index c874f1af7..56c936fb8 100644
--- a/test/command/5714.md
+++ b/test/command/5714.md
@@ -6,11 +6,9 @@ b_
 # hi _c
 c
 ^D
-[ Header
-    1 ( "hi-_a" , [] , [] ) [ Str "hi" , Space , Str "_a" ]
+[ Header 1 ( "hi-_a" , [] , [] ) [ Str "hi _a" ]
 , Para [ Str "b_" ]
-, Header
-    1 ( "hi-_c" , [] , [] ) [ Str "hi" , Space , Str "_c" ]
+, Header 1 ( "hi-_c" , [] , [] ) [ Str "hi _c" ]
 , Para [ Str "c" ]
 ]
 ```
diff --git a/test/command/5845.md b/test/command/5845.md
index aac73cf47..4dfb02bc3 100644
--- a/test/command/5845.md
+++ b/test/command/5845.md
@@ -20,6 +20,6 @@ Hello World
     , RawInline (Format "tex") "\\fboxsep"
     , Str "}{#1}}"
     ]
-, Para [ Str "Hello" , Space , Str "World" ]
+, Para [ Str "Hello World" ]
 ]
 ```
diff --git a/test/command/6137.md b/test/command/6137.md
index a58b4876f..d92406aeb 100644
--- a/test/command/6137.md
+++ b/test/command/6137.md
@@ -16,14 +16,7 @@ This reference to Figure \ref{fig:label} works fine.
 \end{figure}
 ^D
 [ Para
-    [ Str "This"
-    , Space
-    , Str "reference"
-    , Space
-    , Str "to"
-    , Space
-    , Str "Table"
-    , Space
+    [ Str "This reference to Table "
     , Link
         ( ""
         , []
@@ -33,29 +26,14 @@ This reference to Figure \ref{fig:label} works fine.
         )
         [ Str "1" ]
         ( "#tbl:label" , "" )
-    , Space
-    , Str "doesn\8217t"
-    , Space
-    , Str "work."
+    , Str " doesn\8217t work."
     ]
 , Div
     ( "tbl:label" , [] , [] )
     [ Table
         ( "" , [] , [] )
         (Caption
-           Nothing
-           [ Plain
-               [ Str "This"
-               , Space
-               , Str "caption"
-               , Space
-               , Str "has"
-               , Space
-               , Str "no"
-               , Space
-               , Str "number."
-               ]
-           ])
+           Nothing [ Plain [ Str "This caption has no number." ] ])
         [ ( AlignLeft , ColWidthDefault )
         , ( AlignCenter , ColWidthDefault )
         , ( AlignRight , ColWidthDefault )
@@ -112,14 +90,7 @@ This reference to Figure \ref{fig:label} works fine.
         (TableFoot ( "" , [] , [] ) [])
     ]
 , Para
-    [ Str "This"
-    , Space
-    , Str "reference"
-    , Space
-    , Str "to"
-    , Space
-    , Str "Figure"
-    , Space
+    [ Str "This reference to Figure "
     , Link
         ( ""
         , []
@@ -129,28 +100,12 @@ This reference to Figure \ref{fig:label} works fine.
         )
         [ Str "1" ]
         ( "#fig:label" , "" )
-    , Space
-    , Str "works"
-    , Space
-    , Str "fine."
+    , Str " works fine."
     ]
 , Para
     [ Image
         ( "fig:label" , [] , [ ( "width" , "\\textwidth" ) ] )
-        [ Str "A"
-        , Space
-        , Str "numbered"
-        , Space
-        , Str "caption,"
-        , Space
-        , Str "if"
-        , Space
-        , Str "I"
-        , Space
-        , Str "use"
-        , Space
-        , Str "pandoc-crossref."
-        ]
+        [ Str "A numbered caption, if I use pandoc-crossref." ]
         ( "example.png" , "fig:" )
     ]
 ]
diff --git a/test/command/6288.md b/test/command/6288.md
index 042e0a72e..3f2c5ec4d 100644
--- a/test/command/6288.md
+++ b/test/command/6288.md
@@ -4,7 +4,5 @@
 <label>I</label><title>Introduction</title>
 </sec>
 ^D
-[ Header
-    1 ( "" , [] , [] ) [ Str "I." , Space , Str "Introduction" ]
-]
+[ Header 1 ( "" , [] , [] ) [ Str "I. Introduction" ] ]
 ```
diff --git a/test/command/6324.md b/test/command/6324.md
index 51a22480c..523483470 100644
--- a/test/command/6324.md
+++ b/test/command/6324.md
@@ -17,9 +17,7 @@ Pandoc
     { unMeta =
         fromList
           [ ( "author" , MetaList [ MetaInlines [ Str "Me" ] ] )
-          , ( "title"
-            , MetaInlines [ Str "Document" , Space , Str "title" ]
-            )
+          , ( "title" , MetaInlines [ Str "Document title" ] )
           ]
     }
   []
diff --git a/test/command/6719.md b/test/command/6719.md
index 23701c066..11ddc9be5 100644
--- a/test/command/6719.md
+++ b/test/command/6719.md
@@ -4,7 +4,7 @@
 <emphasis>emphasized </emphasis>text
 </para>
 ^D
-[ Para [ Emph [ Str "emphasized" ] , Space , Str "text" ] ]
+[ Para [ Emph [ Str "emphasized" ] , Str " text" ] ]
 ```
 
 ```
@@ -13,6 +13,6 @@
 <italic> hi  </italic>there
 </p>
 ^D
-[ Para [ Emph [ Str "hi" ] , Space , Str "there" ] ]
+[ Para [ Emph [ Str "hi" ] , Str " there" ] ]
 ```
 
diff --git a/test/command/6836.md b/test/command/6836.md
index b8e668a62..e0f90ae27 100644
--- a/test/command/6836.md
+++ b/test/command/6836.md
@@ -22,7 +22,7 @@ See @foo.
         [ Str "[@buchanan]" ]
     ]
 , OrderedList ( 1 , Example , TwoParens ) [ [] ]
-, Para [ Str "See" , Space , Str "1." ]
+, Para [ Str "See 1." ]
 , Para
     [ Cite
         [ Citation
diff --git a/test/command/6873.md b/test/command/6873.md
index 20667d64c..49898f199 100644
--- a/test/command/6873.md
+++ b/test/command/6873.md
@@ -9,12 +9,9 @@
             { citationId = "key"
             , citationPrefix = []
             , citationSuffix =
-                [ Str "\8222Etwas"
-                , Space
-                , Str "[\8230"
+                [ Str "\8222Etwas [\8230"
                 , Span ( "" , [] , [] ) [ Str "]" ]
-                , Space
-                , Str "auslassen\8220"
+                , Str " auslassen\8220"
                 ]
             , citationMode = NormalCitation
             , citationNoteNum = 0
@@ -23,12 +20,9 @@
         ]
         [ Str "("
         , Strong [ Str "key?" ]
-        , Str "\8222Etwas"
-        , Space
-        , Str "[\8230"
+        , Str "\8222Etwas [\8230"
         , Span ( "" , [] , [] ) [ Str "]" ]
-        , Space
-        , Str "auslassen\8220)"
+        , Str " auslassen\8220)"
         ]
     ]
 ]
diff --git a/test/command/6890.md b/test/command/6890.md
index 579342980..48bec03c9 100644
--- a/test/command/6890.md
+++ b/test/command/6890.md
@@ -38,21 +38,10 @@ Some text.[^1]
             , citationHash = 0
             }
         ]
-        [ Str "Fr\252chtel,"
-        , Space
-        , Str "Budde,"
-        , Space
-        , Str "and"
-        , Space
-        , Str "Cyprian"
-        , Space
-        , Str "(2013)"
-        ]
+        [ Str "Fr\252chtel, Budde, and Cyprian (2013)" ]
     ]
 , Para
-    [ Str "Some"
-    , Space
-    , Str "text."
+    [ Str "Some text."
     , Note
         [ Para
             [ Cite
@@ -65,16 +54,7 @@ Some text.[^1]
                     , citationHash = 0
                     }
                 ]
-                [ Str "Fr\252chtel,"
-                , Space
-                , Str "Budde,"
-                , Space
-                , Str "and"
-                , Space
-                , Str "Cyprian"
-                , Space
-                , Str "(2013)"
-                ]
+                [ Str "Fr\252chtel, Budde, and Cyprian (2013)" ]
             ]
         ]
     ]
@@ -86,54 +66,13 @@ Some text.[^1]
     [ Div
         ( "ref-fruchtel-sozialer-2013a" , [ "csl-entry" ] , [] )
         [ Para
-            [ Str "Fr\252chtel,"
-            , Space
-            , Str "Frank,"
-            , Space
-            , Str "Wolfgang"
-            , Space
-            , Str "Budde,"
-            , Space
-            , Str "and"
-            , Space
-            , Str "Gudrun"
-            , Space
-            , Str "Cyprian."
-            , Space
-            , Str "2013."
-            , Space
+            [ Str
+                "Fr\252chtel, Frank, Wolfgang Budde, and Gudrun Cyprian. 2013. "
             , Emph
-                [ Str "Sozialer"
-                , Space
-                , Str "Raum"
-                , Space
-                , Str "und"
-                , Space
-                , Str "Soziale"
-                , Space
-                , Str "Arbeit"
-                , Space
-                , Str "Fieldbook:"
-                , Space
-                , Str "Methoden"
-                , Space
-                , Str "und"
-                , Space
-                , Str "Techniken"
+                [ Str
+                    "Sozialer Raum und Soziale Arbeit Fieldbook: Methoden und Techniken"
                 ]
-            , Str "."
-            , Space
-            , Str "3rd"
-            , Space
-            , Str "ed."
-            , Space
-            , Str "Wiesbaden,"
-            , Space
-            , Str "Germany:"
-            , Space
-            , Str "Springer"
-            , Space
-            , Str "VS."
+            , Str ". 3rd ed. Wiesbaden, Germany: Springer VS."
             ]
         ]
     ]
diff --git a/test/command/6993.md b/test/command/6993.md
index d2baa2748..6fdb592d5 100644
--- a/test/command/6993.md
+++ b/test/command/6993.md
@@ -2,32 +2,20 @@
 % pandoc -f mediawiki -t native
 '''Should be bold '''
 ^D
-[ Para
-    [ Strong
-        [ Str "Should" , Space , Str "be" , Space , Str "bold" ]
-    ]
-]
+[ Para [ Strong [ Str "Should be bold" ] ] ]
 ```
 
 ```
 % pandoc -f mediawiki -t native
 ''' Should be bold'''
 ^D
-[ Para
-    [ Strong
-        [ Str "Should" , Space , Str "be" , Space , Str "bold" ]
-    ]
-]
+[ Para [ Strong [ Str "Should be bold" ] ] ]
 ```
 
 ```
 % pandoc -f mediawiki -t native
 '' Should be emph ''
 ^D
-[ Para
-    [ Emph
-        [ Str "Should" , Space , Str "be" , Space , Str "emph" ]
-    ]
-]
+[ Para [ Emph [ Str "Should be emph" ] ] ]
 ```
 
diff --git a/test/command/7134.md b/test/command/7134.md
index 041d7ea24..661e273d6 100644
--- a/test/command/7134.md
+++ b/test/command/7134.md
@@ -8,44 +8,9 @@ This is a paragraph.
 
     This should be a second block quote.
 ^D
-[ Para
-    [ Str "This"
-    , Space
-    , Str "is"
-    , Space
-    , Str "a"
-    , Space
-    , Str "paragraph."
-    ]
+[ Para [ Str "This is a paragraph." ]
+, BlockQuote [ Para [ Str "This is a block quote." ] ]
 , BlockQuote
-    [ Para
-        [ Str "This"
-        , Space
-        , Str "is"
-        , Space
-        , Str "a"
-        , Space
-        , Str "block"
-        , Space
-        , Str "quote."
-        ]
-    ]
-, BlockQuote
-    [ Para
-        [ Str "This"
-        , Space
-        , Str "should"
-        , Space
-        , Str "be"
-        , Space
-        , Str "a"
-        , Space
-        , Str "second"
-        , Space
-        , Str "block"
-        , Space
-        , Str "quote."
-        ]
-    ]
+    [ Para [ Str "This should be a second block quote." ] ]
 ]
 ```
diff --git a/test/command/7145.md b/test/command/7145.md
index 623f40880..f960f39cb 100644
--- a/test/command/7145.md
+++ b/test/command/7145.md
@@ -9,33 +9,10 @@ empty
 linebreaks</ref>  Nulla ut massa eget ex venenatis lobortis id in eros.
 ^D
 [ Para
-    [ Str "Maecenas"
-    , Space
-    , Str "at"
-    , Space
-    , Str "sapien"
-    , Space
-    , Str "tempor,"
-    , Space
-    , Str "pretium"
-    , Space
-    , Str "turpis"
-    , Space
-    , Str "ut,"
-    , Space
-    , Str "imperdiet"
-    , Space
-    , Str "augue."
+    [ Str
+        "Maecenas at sapien tempor, pretium turpis ut, imperdiet augue."
     , Note
-        [ Para
-            [ Str "This"
-            , Space
-            , Str "is"
-            , Space
-            , Str "a"
-            , Space
-            , Str "multiline"
-            ]
+        [ Para [ Str "This is a multiline" ]
         , Para
             [ Str "reference"
             , SoftBreak
@@ -47,26 +24,8 @@ linebreaks</ref>  Nulla ut massa eget ex venenatis lobortis id in eros.
             ]
         , Para [ Str "linebreaks" ]
         ]
-    , Space
-    , Str "Nulla"
-    , Space
-    , Str "ut"
-    , Space
-    , Str "massa"
-    , Space
-    , Str "eget"
-    , Space
-    , Str "ex"
-    , Space
-    , Str "venenatis"
-    , Space
-    , Str "lobortis"
-    , Space
-    , Str "id"
-    , Space
-    , Str "in"
-    , Space
-    , Str "eros."
+    , Str
+        " Nulla ut massa eget ex venenatis lobortis id in eros."
     ]
 ]
 ```
diff --git a/test/command/7155.md b/test/command/7155.md
index 454c387d5..5c05e2617 100644
--- a/test/command/7155.md
+++ b/test/command/7155.md
@@ -5,12 +5,10 @@
 ^D
 [ Para
     [ Math InlineMath "x"
-    , Space
+    , Str " "
     , Math DisplayMath "x"
     , SoftBreak
-    , Str "\\(x\\)"
-    , Space
-    , Str "\\[x\\]"
+    , Str "\\(x\\) \\[x\\]"
     ]
 ]
 ```
@@ -21,12 +19,10 @@
 \\(x\\) \\[x\\]
 ^D
 [ Para
-    [ Str "(x)"
-    , Space
-    , Str "[x]"
+    [ Str "(x) [x]"
     , SoftBreak
     , Math InlineMath "x"
-    , Space
+    , Str " "
     , Math DisplayMath "x"
     ]
 ]
diff --git a/test/command/7436.md b/test/command/7436.md
index c2d434d60..415220566 100644
--- a/test/command/7436.md
+++ b/test/command/7436.md
@@ -15,17 +15,11 @@
     ( "" , [ "" ] , [ ( "literal" , "" ) ] )
     "1st line.\n2nd line.\n3rd line.\n"
 , Para
-    [ Str "1st"
-    , Space
-    , Str "line."
+    [ Str "1st line."
     , SoftBreak
-    , Str "2nd"
-    , Space
-    , Str "line."
+    , Str "2nd line."
     , SoftBreak
-    , Str "3rd"
-    , Space
-    , Str "line."
+    , Str "3rd line."
     ]
 ]
 ```
diff --git a/test/command/7557.md b/test/command/7557.md
index c837d0b3c..68fca25a2 100644
--- a/test/command/7557.md
+++ b/test/command/7557.md
@@ -2,19 +2,6 @@
 % pandoc -f org -t native
 - 11. and 12. 09. meeting
 ^D
-[ BulletList
-    [ [ Plain
-          [ Str "11."
-          , Space
-          , Str "and"
-          , Space
-          , Str "12."
-          , Space
-          , Str "09."
-          , Space
-          , Str "meeting"
-          ]
-      ]
-    ]
+[ BulletList [ [ Plain [ Str "11. and 12. 09. meeting" ] ] ]
 ]
 ```
diff --git a/test/command/934.md b/test/command/934.md
index 3c86a1f26..a5e81233c 100644
--- a/test/command/934.md
+++ b/test/command/934.md
@@ -10,35 +10,9 @@
 [ Para
     [ Emph
         [ Quoted
-            DoubleQuote
-            [ Str "This"
-            , Space
-            , Str "should"
-            , Space
-            , Str "be"
-            , Space
-            , Str "italic"
-            , Space
-            , Str "and"
-            , Space
-            , Str "in"
-            , Space
-            , Str "quotes"
-            ]
-        ]
-    ]
-, Para
-    [ Strong
-        [ Str "And"
-        , Space
-        , Str "this"
-        , Space
-        , Str "is"
-        , Space
-        , Str "the"
-        , Space
-        , Str "attribution"
+            DoubleQuote [ Str "This should be italic and in quotes" ]
         ]
     ]
+, Para [ Strong [ Str "And this is the attribution" ] ]
 ]
 ```
diff --git a/test/command/cite-in-inline-note.md b/test/command/cite-in-inline-note.md
index aa61b93e8..69ddca681 100644
--- a/test/command/cite-in-inline-note.md
+++ b/test/command/cite-in-inline-note.md
@@ -6,8 +6,7 @@ foo^[bar [@doe]]
     [ Str "foo"
     , Note
         [ Para
-            [ Str "bar"
-            , Space
+            [ Str "bar "
             , Cite
                 [ Citation
                     { citationId = "doe"
diff --git a/test/command/citeproc-author-in-text-suffix.md b/test/command/citeproc-author-in-text-suffix.md
index df3184aa8..f0ca8c280 100644
--- a/test/command/citeproc-author-in-text-suffix.md
+++ b/test/command/citeproc-author-in-text-suffix.md
@@ -21,14 +21,7 @@
             , citationHash = 0
             }
         ]
-        [ Str "@a"
-        , Space
-        , Str "[p."
-        , Space
-        , Str "33;"
-        , Space
-        , Str "@b]"
-        ]
+        [ Str "@a [p. 33; @b]" ]
     ]
 ]
 ```
diff --git a/test/command/csv.md b/test/command/csv.md
index 353512553..ef495ada8 100644
--- a/test/command/csv.md
+++ b/test/command/csv.md
@@ -53,7 +53,7 @@ Apple,25 cents,33
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "25" , Space , Str "cents" ] ]
+                [ Plain [ Str "25 cents" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
@@ -68,13 +68,13 @@ Apple,25 cents,33
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "\"Navel\"" , Space , Str "Orange" ] ]
+                [ Plain [ Str "\"Navel\" Orange" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "35" , Space , Str "cents" ] ]
+                [ Plain [ Str "35 cents" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
diff --git a/test/command/docbook-bibliography.md b/test/command/docbook-bibliography.md
index 6e42732ad..5c51d7e85 100644
--- a/test/command/docbook-bibliography.md
+++ b/test/command/docbook-bibliography.md
@@ -13,33 +13,18 @@
 </bibliomixed>
 </bibliodiv>
 ^D
-[ Header
-    1
-    ( "" , [] , [] )
-    [ Str "Document" , Space , Str "References" ]
+[ Header 1 ( "" , [] , [] ) [ Str "Document References" ]
 , Para
     [ Span ( "refTheFirst" , [] , [] ) []
-    , Str "[1]"
-    , Space
-    , Str "First"
-    , Space
-    , Str "reference"
+    , Str "[1] First reference"
     ]
 , Para
     [ Span ( "refTheSecond" , [] , [] ) []
-    , Str "[2]"
-    , Space
-    , Str "Second"
-    , Space
-    , Str "reference"
+    , Str "[2] Second reference"
     ]
 , Para
     [ Span ( "refTheThird" , [] , [] ) []
-    , Str "[3]"
-    , Space
-    , Str "Third"
-    , Space
-    , Str "reference"
+    , Str "[3] Third reference"
     ]
 ]
 ```
diff --git a/test/command/gfm.md b/test/command/gfm.md
index 78736b2d6..2520a8e05 100644
--- a/test/command/gfm.md
+++ b/test/command/gfm.md
@@ -75,8 +75,7 @@ gfm tests:
 % pandoc -f gfm -t native
 ~~stricken out~~
 ^D
-[ Para [ Strikeout [ Str "stricken" , Space , Str "out" ] ]
-]
+[ Para [ Strikeout [ Str "stricken out" ] ] ]
 ```
 
 ```
@@ -125,30 +124,68 @@ My:thumbsup:emoji:heart:
 
 ```
 % pandoc -t gfm -f native
-[Table ("",[],[]) (Caption Nothing
- [Plain [Str "The",Space,Str "caption."]])
- [(AlignDefault,ColWidthDefault)
- ,(AlignRight,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Fruit"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Price"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "apple"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "0.13"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1.12"]]]])]
- (TableFoot ("",[],[])
- [])]
+[ Table
+    ( "" , [] , [] )
+    (Caption Nothing [ Plain [ Str "The caption." ] ])
+    [ ( AlignDefault , ColWidthDefault )
+    , ( AlignRight , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Fruit" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Price" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "apple" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "0.13" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "orange" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1.12" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+]
 ^D
 | Fruit  | Price |
 |--------|------:|
@@ -193,8 +230,8 @@ hi
 - [x] bar
 ^D
 [ BulletList
-    [ [ Plain [ Str "\9744" , Space , Str "foo" ] ]
-    , [ Plain [ Str "\9746" , Space , Str "bar" ] ]
+    [ [ Plain [ Str "\9744 foo" ] ]
+    , [ Plain [ Str "\9746 bar" ] ]
     ]
 ]
 ```
@@ -205,9 +242,8 @@ hi
 - [x] bar
 ^D
 [ BulletList
-    [ [ Plain [ Str "[" , Space , Str "]" , Space , Str "foo" ]
-      ]
-    , [ Plain [ Str "[x]" , Space , Str "bar" ] ]
+    [ [ Plain [ Str "[ ] foo" ] ]
+    , [ Plain [ Str "[x] bar" ] ]
     ]
 ]
 ```
diff --git a/test/command/input-with-endinput.md b/test/command/input-with-endinput.md
index 55d298bc4..3d302aa91 100644
--- a/test/command/input-with-endinput.md
+++ b/test/command/input-with-endinput.md
@@ -9,7 +9,7 @@ Visible
 \end{document}
 ^D
 [ Para [ Str "Visible" ]
-, Para [ Emph [ Str "hi" , Space , Str "there" ] ]
+, Para [ Emph [ Str "hi there" ] ]
 , Para [ Str "Visible" ]
 ]
 ```
diff --git a/test/command/lettrine.md b/test/command/lettrine.md
index b4a2794d2..2b8e0ab01 100644
--- a/test/command/lettrine.md
+++ b/test/command/lettrine.md
@@ -7,14 +7,12 @@
 [ Para
     [ Span ( "" , [ "lettrine" ] , [] ) [ Str "A" ]
     , SmallCaps [ Str "category" ]
-    , Space
-    , Str "is"
+    , Str " is"
     ]
 , Para
     [ Span ( "" , [ "lettrine" ] , [] ) [ Str "A" ]
     , SmallCaps [ Str "category" ]
-    , Space
-    , Str "is"
+    , Str " is"
     ]
 ]
 ```
diff --git a/test/command/md-abbrevs.md b/test/command/md-abbrevs.md
index a3ee6af30..419fc30dd 100644
--- a/test/command/md-abbrevs.md
+++ b/test/command/md-abbrevs.md
@@ -15,7 +15,6 @@ If you don't want this to happen you can escape the period:
 % pandoc -t native
 Hi Mr\. Bob
 ^D
-[ Para [ Str "Hi" , Space , Str "Mr." , Space , Str "Bob" ]
-]
+[ Para [ Str "Hi Mr. Bob" ] ]
 ```
 
diff --git a/test/command/refs.md b/test/command/refs.md
index fb362febe..819f90482 100644
--- a/test/command/refs.md
+++ b/test/command/refs.md
@@ -78,24 +78,8 @@ Accuracy~\eqref{eq:Accuracy} is the proportion, measuring true results among all
         )
         [ Str "[eq:Accuracy]" ]
         ( "#eq:Accuracy" , "" )
-    , Space
-    , Str "is"
-    , Space
-    , Str "the"
-    , Space
-    , Str "proportion,"
-    , Space
-    , Str "measuring"
-    , Space
-    , Str "true"
-    , Space
-    , Str "results"
-    , Space
-    , Str "among"
-    , Space
-    , Str "all"
-    , Space
-    , Str "results."
+    , Str
+        " is the proportion, measuring true results among all results."
     ]
 , Para
     [ Math
@@ -122,8 +106,7 @@ Figure \ref{fig:Logo} illustrated the SVG logo
         ( "command/SVG_logo.svg" , "fig:" )
     ]
 , Para
-    [ Str "Figure"
-    , Space
+    [ Str "Figure "
     , Link
         ( ""
         , []
@@ -133,14 +116,7 @@ Figure \ref{fig:Logo} illustrated the SVG logo
         )
         [ Str "1" ]
         ( "#fig:Logo" , "" )
-    , Space
-    , Str "illustrated"
-    , Space
-    , Str "the"
-    , Space
-    , Str "SVG"
-    , Space
-    , Str "logo"
+    , Str " illustrated the SVG logo"
     ]
 ]
 ```
@@ -198,8 +174,7 @@ Figure \ref{fig:Logo3} illustrated the SVG logo
         ( "command/SVG_logo3.svg" , "fig:" )
     ]
 , Para
-    [ Str "Figure"
-    , Space
+    [ Str "Figure "
     , Link
         ( ""
         , []
@@ -209,18 +184,10 @@ Figure \ref{fig:Logo3} illustrated the SVG logo
         )
         [ Str "1.1" ]
         ( "#fig:Logo" , "" )
-    , Space
-    , Str "illustrated"
-    , Space
-    , Str "the"
-    , Space
-    , Str "SVG"
-    , Space
-    , Str "logo"
+    , Str " illustrated the SVG logo"
     ]
 , Para
-    [ Str "Figure"
-    , Space
+    [ Str "Figure "
     , Link
         ( ""
         , []
@@ -230,18 +197,10 @@ Figure \ref{fig:Logo3} illustrated the SVG logo
         )
         [ Str "1.2" ]
         ( "#fig:Logo2" , "" )
-    , Space
-    , Str "illustrated"
-    , Space
-    , Str "the"
-    , Space
-    , Str "SVG"
-    , Space
-    , Str "logo"
+    , Str " illustrated the SVG logo"
     ]
 , Para
-    [ Str "Figure"
-    , Space
+    [ Str "Figure "
     , Link
         ( ""
         , []
@@ -251,14 +210,7 @@ Figure \ref{fig:Logo3} illustrated the SVG logo
         )
         [ Str "2.1" ]
         ( "#fig:Logo3" , "" )
-    , Space
-    , Str "illustrated"
-    , Space
-    , Str "the"
-    , Space
-    , Str "SVG"
-    , Space
-    , Str "logo"
+    , Str " illustrated the SVG logo"
     ]
 ]
 ```
@@ -272,9 +224,7 @@ Figure \ref{fig:Logo3} illustrated the SVG logo
     [ Span
         ( "section" , [] , [ ( "label" , "section" ) ] )
         [ Str "[section]" ]
-    , Space
-    , Str "Section"
-    , Space
+    , Str " Section "
     , Link
         ( ""
         , []
diff --git a/test/command/shift-heading-level-by.md b/test/command/shift-heading-level-by.md
index 1ce966989..d83136f1c 100644
--- a/test/command/shift-heading-level-by.md
+++ b/test/command/shift-heading-level-by.md
@@ -13,14 +13,14 @@ Pandoc
     { unMeta =
         fromList
           [ ( "title"
-            , MetaInlines [ Str "My" , Space , Str "title" ]
+            , MetaInlines [ Str "My title" ]
             )
           ]
     }
   [ Header
       2
       ( "first-heading" , [] , [] )
-      [ Str "First" , Space , Str "heading" ]
+      [ Str "First heading" ]
   , Header 3 ( "second" , [] , [] ) [ Str "Second" ]
   ]
 ```
@@ -41,19 +41,10 @@ Pandoc
   Meta
     { unMeta =
         fromList
-          [ ( "title"
-            , MetaInlines [ Str "First" , Space , Str "heading" ]
-            )
-          ]
+          [ ( "title" , MetaInlines [ Str "First heading" ] ) ]
     }
   [ Header 1 ( "second" , [] , [] ) [ Str "Second" ]
-  , Para
-      [ Str "Another"
-      , Space
-      , Str "top-level"
-      , Space
-      , Str "heading"
-      ]
+  , Para [ Str "Another top-level heading" ]
   ]
 ```
 
diff --git a/test/command/sloppypar.md b/test/command/sloppypar.md
index 44ec93af3..79315d457 100644
--- a/test/command/sloppypar.md
+++ b/test/command/sloppypar.md
@@ -7,108 +7,12 @@ Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio c
 \end{sloppypar}
 ^D
 [ Para
-    [ Str "Sequi"
-    , Space
-    , Str "id"
-    , Space
-    , Str "qui"
-    , Space
-    , Str "facere"
-    , Space
-    , Str "et"
-    , Space
-    , Str "incidunt"
-    , Space
-    , Str "ut."
-    , Space
-    , Str "Et"
-    , Space
-    , Str "fuga"
-    , Space
-    , Str "ut"
-    , Space
-    , Str "voluptate"
-    , Space
-    , Str "enim"
-    , Space
-    , Str "qui."
-    , Space
-    , Str "Odit"
-    , Space
-    , Str "unde"
-    , Space
-    , Str "magni"
-    , Space
-    , Str "ipsam"
-    , Space
-    , Str "dicta"
-    , Space
-    , Str "modi."
-    , Space
-    , Str "Modi"
-    , Space
-    , Str "soluta"
-    , Space
-    , Str "velit"
-    , Space
-    , Str "est"
-    , Space
-    , Str "aut"
-    , Space
-    , Str "aut"
-    , Space
-    , Str "possimus."
+    [ Str
+        "Sequi id qui facere et incidunt ut. Et fuga ut voluptate enim qui. Odit unde magni ipsam dicta modi. Modi soluta velit est aut aut possimus."
     ]
 , Para
-    [ Str "Qui"
-    , Space
-    , Str "et"
-    , Space
-    , Str "temporibus"
-    , Space
-    , Str "explicabo."
-    , Space
-    , Str "Esse"
-    , Space
-    , Str "ab"
-    , Space
-    , Str "ut"
-    , Space
-    , Str "quidem."
-    , Space
-    , Str "Vel"
-    , Space
-    , Str "qui"
-    , Space
-    , Str "perspiciatis"
-    , Space
-    , Str "quae"
-    , Space
-    , Str "odio"
-    , Space
-    , Str "consectetur"
-    , Space
-    , Str "alias"
-    , Space
-    , Str "non"
-    , Space
-    , Str "sed."
-    , Space
-    , Str "Quo"
-    , Space
-    , Str "consectetur"
-    , Space
-    , Str "libero"
-    , Space
-    , Str "omnis"
-    , Space
-    , Str "quos"
-    , Space
-    , Str "eius"
-    , Space
-    , Str "ad"
-    , Space
-    , Str "vel."
+    [ Str
+        "Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio consectetur alias non sed. Quo consectetur libero omnis quos eius ad vel."
     ]
 ]
 ```
@@ -122,108 +26,12 @@ Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio c
 \end{sloppypar}
 ^D
 [ Para
-    [ Str "Sequi"
-    , Space
-    , Str "id"
-    , Space
-    , Str "qui"
-    , Space
-    , Str "facere"
-    , Space
-    , Str "et"
-    , Space
-    , Str "incidunt"
-    , Space
-    , Str "ut."
-    , Space
-    , Str "Et"
-    , Space
-    , Str "fuga"
-    , Space
-    , Str "ut"
-    , Space
-    , Str "voluptate"
-    , Space
-    , Str "enim"
-    , Space
-    , Str "qui."
-    , Space
-    , Str "Odit"
-    , Space
-    , Str "unde"
-    , Space
-    , Str "magni"
-    , Space
-    , Str "ipsam"
-    , Space
-    , Str "dicta"
-    , Space
-    , Str "modi."
-    , Space
-    , Str "Modi"
-    , Space
-    , Str "soluta"
-    , Space
-    , Str "velit"
-    , Space
-    , Str "est"
-    , Space
-    , Str "aut"
-    , Space
-    , Str "aut"
-    , Space
-    , Str "possimus."
+    [ Str
+        "Sequi id qui facere et incidunt ut. Et fuga ut voluptate enim qui. Odit unde magni ipsam dicta modi. Modi soluta velit est aut aut possimus."
     ]
 , Para
-    [ Str "Qui"
-    , Space
-    , Str "et"
-    , Space
-    , Str "temporibus"
-    , Space
-    , Str "explicabo."
-    , Space
-    , Str "Esse"
-    , Space
-    , Str "ab"
-    , Space
-    , Str "ut"
-    , Space
-    , Str "quidem."
-    , Space
-    , Str "Vel"
-    , Space
-    , Str "qui"
-    , Space
-    , Str "perspiciatis"
-    , Space
-    , Str "quae"
-    , Space
-    , Str "odio"
-    , Space
-    , Str "consectetur"
-    , Space
-    , Str "alias"
-    , Space
-    , Str "non"
-    , Space
-    , Str "sed."
-    , Space
-    , Str "Quo"
-    , Space
-    , Str "consectetur"
-    , Space
-    , Str "libero"
-    , Space
-    , Str "omnis"
-    , Space
-    , Str "quos"
-    , Space
-    , Str "eius"
-    , Space
-    , Str "ad"
-    , Space
-    , Str "vel."
+    [ Str
+        "Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio consectetur alias non sed. Quo consectetur libero omnis quos eius ad vel."
     ]
 ]
 ```
diff --git a/test/command/table-with-column-span.md b/test/command/table-with-column-span.md
index d4e8bebd4..db04033bf 100644
--- a/test/command/table-with-column-span.md
+++ b/test/command/table-with-column-span.md
@@ -81,31 +81,13 @@
                 AlignCenter
                 (RowSpan 1)
                 (ColSpan 8)
-                [ Para
-                    [ Strong
-                        [ Str "Octet"
-                        , Space
-                        , Str "no."
-                        , Space
-                        , Str "1"
-                        ]
-                    ]
-                ]
+                [ Para [ Strong [ Str "Octet no. 1" ] ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignCenter
                 (RowSpan 1)
                 (ColSpan 8)
-                [ Para
-                    [ Strong
-                        [ Str "Octet"
-                        , Space
-                        , Str "no."
-                        , Space
-                        , Str "2"
-                        ]
-                    ]
-                ]
+                [ Para [ Strong [ Str "Octet no. 2" ] ] ]
             ]
         , Row
             ( "" , [] , [] )
@@ -213,13 +195,13 @@
                 AlignCenter
                 (RowSpan 1)
                 (ColSpan 8)
-                [ Para [ Str "Code" , Space , Str "A" ] ]
+                [ Para [ Str "Code A" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignCenter
                 (RowSpan 1)
                 (ColSpan 8)
-                [ Para [ Str "Code" , Space , Str "B" ] ]
+                [ Para [ Str "Code B" ] ]
             ]
         ]
     ]
@@ -228,73 +210,164 @@
 ```
 ```
 % pandoc -f native -t opendocument --quiet
-[Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)
- ,(AlignDefault,ColWidth 6.25e-2)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
-    [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
-    [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "16"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "15"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "14"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "13"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "11"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "10"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "9"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "8"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "7"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "6"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "5"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "1"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
-    [Para [Str "Code",Space,Str "A"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
-    [Para [Str "Code",Space,Str "B"]]]])]
- (TableFoot ("",[],[])
- [])]
+[ Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    , ( AlignDefault , ColWidth 6.25e-2 )
+    ]
+    (TableHead ( "" , [] , [] ) [])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 8)
+                [ Para [ Strong [ Str "Octet no. 1" ] ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 8)
+                [ Para [ Strong [ Str "Octet no. 2" ] ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "16" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "15" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "14" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "13" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "11" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "10" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "9" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "8" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "7" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "6" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "5" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "4" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "3" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "2" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Para [ Str "1" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 8)
+                [ Para [ Str "Code A" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 8)
+                [ Para [ Str "Code B" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+]
 ^D
 <table:table table:name="Table1" table:style-name="Table1">
   <table:table-column table:style-name="Table1.A" />
diff --git a/test/command/tabularx.md b/test/command/tabularx.md
index 399741732..63df53593 100644
--- a/test/command/tabularx.md
+++ b/test/command/tabularx.md
@@ -36,40 +36,19 @@
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "1"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 1" ] ]
            , Cell
                ( "" , [] , [] )
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "2"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 2" ] ]
            , Cell
                ( "" , [] , [] )
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "3"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 3" ] ]
            ]
        ])
     [ TableBody
@@ -83,19 +62,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.1" ] ]
+                [ Plain [ Str "Cell 1.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.2" ] ]
+                [ Plain [ Str "Cell 1.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.3" ] ]
+                [ Plain [ Str "Cell 1.3" ] ]
             ]
         , Row
             ( "" , [] , [] )
@@ -104,19 +83,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.1" ] ]
+                [ Plain [ Str "Cell 2.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.2" ] ]
+                [ Plain [ Str "Cell 2.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.3" ] ]
+                [ Plain [ Str "Cell 2.3" ] ]
             ]
         , Row
             ( "" , [] , [] )
@@ -125,19 +104,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.1" ] ]
+                [ Plain [ Str "Cell 3.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.2" ] ]
+                [ Plain [ Str "Cell 3.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.3" ] ]
+                [ Plain [ Str "Cell 3.3" ] ]
             ]
         ]
     ]
@@ -183,40 +162,19 @@
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "1"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 1" ] ]
            , Cell
                ( "" , [] , [] )
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "2"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 2" ] ]
            , Cell
                ( "" , [] , [] )
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "3"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 3" ] ]
            ]
        ])
     [ TableBody
@@ -230,19 +188,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.1" ] ]
+                [ Plain [ Str "Cell 1.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.2" ] ]
+                [ Plain [ Str "Cell 1.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.3" ] ]
+                [ Plain [ Str "Cell 1.3" ] ]
             ]
         , Row
             ( "" , [] , [] )
@@ -251,19 +209,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.1" ] ]
+                [ Plain [ Str "Cell 2.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.2" ] ]
+                [ Plain [ Str "Cell 2.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.3" ] ]
+                [ Plain [ Str "Cell 2.3" ] ]
             ]
         , Row
             ( "" , [] , [] )
@@ -272,19 +230,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.1" ] ]
+                [ Plain [ Str "Cell 3.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.2" ] ]
+                [ Plain [ Str "Cell 3.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.3" ] ]
+                [ Plain [ Str "Cell 3.3" ] ]
             ]
         ]
     ]
@@ -330,40 +288,19 @@
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "1"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 1" ] ]
            , Cell
                ( "" , [] , [] )
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "2"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 2" ] ]
            , Cell
                ( "" , [] , [] )
                AlignDefault
                (RowSpan 1)
                (ColSpan 1)
-               [ Plain
-                   [ Str "Column"
-                   , Space
-                   , Str "Heading"
-                   , Space
-                   , Str "3"
-                   ]
-               ]
+               [ Plain [ Str "Column Heading 3" ] ]
            ]
        ])
     [ TableBody
@@ -377,19 +314,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.1" ] ]
+                [ Plain [ Str "Cell 1.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.2" ] ]
+                [ Plain [ Str "Cell 1.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "1.3" ] ]
+                [ Plain [ Str "Cell 1.3" ] ]
             ]
         , Row
             ( "" , [] , [] )
@@ -398,19 +335,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.1" ] ]
+                [ Plain [ Str "Cell 2.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.2" ] ]
+                [ Plain [ Str "Cell 2.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "2.3" ] ]
+                [ Plain [ Str "Cell 2.3" ] ]
             ]
         , Row
             ( "" , [] , [] )
@@ -419,19 +356,19 @@
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.1" ] ]
+                [ Plain [ Str "Cell 3.1" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.2" ] ]
+                [ Plain [ Str "Cell 3.2" ] ]
             , Cell
                 ( "" , [] , [] )
                 AlignDefault
                 (RowSpan 1)
                 (ColSpan 1)
-                [ Plain [ Str "Cell" , Space , Str "3.3" ] ]
+                [ Plain [ Str "Cell 3.3" ] ]
             ]
         ]
     ]
diff --git a/test/command/yaml-metadata-blocks.md b/test/command/yaml-metadata-blocks.md
index d483618d3..a4ee8bc1f 100644
--- a/test/command/yaml-metadata-blocks.md
+++ b/test/command/yaml-metadata-blocks.md
@@ -96,7 +96,7 @@ Pandoc
         fromList
           [ ( "other"
             , MetaInlines
-                [ Emph [ Str "markdown" ] , Space , Str "value" ]
+                [ Emph [ Str "markdown" ] , Str " value" ]
             )
           , ( "title" , MetaInlines [ Str "document" ] )
           ]
@@ -112,7 +112,7 @@ Pandoc
         fromList
           [ ( "other"
             , MetaInlines
-                [ Emph [ Str "markdown" ] , Space , Str "value" ]
+                [ Emph [ Str "markdown" ] , Str " value" ]
             )
           , ( "title" , MetaString "cmdline" )
           ]
author	John MacFarlane <[email protected]>	2021-10-02 13:25:14 -0700
committer	John MacFarlane <[email protected]>	2021-10-02 13:25:14 -0700
commit	8c8c11ee6b1702edabb848624a1fc781c36648d1 (patch)
tree	4c57c4658562ca8a7a7e4753e70d06e3c18272e7
parent	02f1ce769c3426a9476565555fe6069b7e14b4f8 (diff)