Fixed more command tests with Space.

3 files changed, 52 insertions, 14 deletions

diff --git a/test/command/5684.md b/test/command/5684.md
index e723f755f..8212dc217 100644
--- a/test/command/5684.md
+++ b/test/command/5684.md
@@ -1,6 +1,10 @@
 ```
 % pandoc -f native -t latex
-[Str "\8222\8218Der",Space,Str "Erz\228hler.",Space,Str "Betrachtungen",Space,Str "zum",Space,Str "Werk",Space,Str "Nikolai",Space,Str "Lesskows\8216\8220."]
+[ Plain
+    [ Str
+        "\8222\8218Der Erz\228hler. Betrachtungen zum Werk Nikolai Lesskows\8216\8220."
+    ]
+]
 ^D
 „‚Der Erzähler. Betrachtungen zum Werk Nikolai Lesskows`\,``.
 ```
diff --git a/test/command/6755.md b/test/command/6755.md
index b6ff0fc0b..b95b1f5cb 100644
--- a/test/command/6755.md
+++ b/test/command/6755.md
@@ -1,8 +1,11 @@
 ```
 %pandoc -f native -t opendocument
-[Div ("divId",[],[])
- [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "div."]],
-Para [Span ("spanId",[],[]) [Str "And",Space,Str "here",Space,Str "is",Space,Str "a",Space,Str "span."]]]
+[ Div
+    ( "divId" , [] , [] ) [ Para [ Str "Here is a div." ] ]
+, Para
+    [ Span ( "spanId" , [] , [] ) [ Str "And here is a span." ]
+    ]
+]
 ^D
 <text:section text:name="divId"><text:p text:style-name="Text_20_body">Here
 is a div.</text:p></text:section>
diff --git a/test/command/6774.md b/test/command/6774.md
index 66549c0f2..5efab4274 100644
--- a/test/command/6774.md
+++ b/test/command/6774.md
@@ -1,7 +1,12 @@
 ```
 % pandoc -f native -t opendocument --quiet
-[Header 1 ("chapter1",[],[]) [Str "The",Space,Str "Chapter"]
-,Para [Str "Chapter",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "The",Space,Str "Chapter"] ("#chapter1","")]]
+[ Header 1 ( "chapter1" , [] , [] ) [ Str "The Chapter" ]
+, Para
+    [ Str "Chapter 1 references "
+    , Link
+        ( "" , [] , [] ) [ Str "The Chapter" ] ( "#chapter1" , "" )
+    ]
+]
 ^D
 <text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark-start text:name="chapter1" />The
 Chapter<text:bookmark-end text:name="chapter1" /></text:h>
@@ -11,10 +16,23 @@ Chapter</text:span></text:a></text:p>
 ```
 ```
 % pandoc -f native -t opendocument+xrefs_name --quiet
-[Header 1 ("chapter1",[],[]) [Str "The",Space,Str "Chapter"]
-,Para [Str "Chapter",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "The",Space,Str "Chapter"] ("#chapter1","")]
-,Para [Image ("lalune",[],[]) [Str "lalune"] ("lalune.jpg","fig:Voyage dans la Lune")]
-,Para [Str "Image",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "La",Space,Str "Lune"] ("#lalune","")]]
+[ Header 1 ( "chapter1" , [] , [] ) [ Str "The Chapter" ]
+, Para
+    [ Str "Chapter 1 references "
+    , Link
+        ( "" , [] , [] ) [ Str "The Chapter" ] ( "#chapter1" , "" )
+    ]
+, Para
+    [ Image
+        ( "lalune" , [] , [] )
+        [ Str "lalune" ]
+        ( "lalune.jpg" , "fig:Voyage dans la Lune" )
+    ]
+, Para
+    [ Str "Image 1 references "
+    , Link ( "" , [] , [] ) [ Str "La Lune" ] ( "#lalune" , "" )
+    ]
+]
 ^D
 <text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark-start text:name="chapter1" />The
 Chapter<text:bookmark-end text:name="chapter1" /></text:h>
@@ -45,10 +63,23 @@ Chapter<text:bookmark-end text:name="chapter1" /></text:h>
 ```
 ```
 % pandoc -f native -t opendocument+xrefs_number+xrefs_name --quiet
-[Header 1 ("chapter1",[],[]) [Str "The",Space,Str "Chapter"]
-,Para [Str "Chapter",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "The",Space,Str "Chapter"] ("#chapter1","")]
-,Para [Image ("lalune",[],[]) [Str "lalune"] ("lalune.jpg","fig:Voyage dans la Lune")]
-,Para [Str "Image",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "La",Space,Str "Lune"] ("#lalune","")]]
+[ Header 1 ( "chapter1" , [] , [] ) [ Str "The Chapter" ]
+, Para
+    [ Str "Chapter 1 references "
+    , Link
+        ( "" , [] , [] ) [ Str "The Chapter" ] ( "#chapter1" , "" )
+    ]
+, Para
+    [ Image
+        ( "lalune" , [] , [] )
+        [ Str "lalune" ]
+        ( "lalune.jpg" , "fig:Voyage dans la Lune" )
+    ]
+, Para
+    [ Str "Image 1 references "
+    , Link ( "" , [] , [] ) [ Str "La Lune" ] ( "#lalune" , "" )
+    ]
+]
 ^D
 <text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark-start text:name="chapter1" />The
 Chapter<text:bookmark-end text:name="chapter1" /></text:h>