stripped spaces around injected commas: metanorma/isodoc#617

lib/isodoc-yaml/i18n-en.yaml

@@ -1,4 +1,4 @@
 text: text
 at: at
-binary_and: "%1<conn> and </conn>%2"
-multiple_and: "%1<conn>, and </conn>%2"
+binary_and: "%1 <conn>and</conn> %2"
+multiple_and: "%1<conn>, and</conn> %2"

lib/isodoc/i18n.rb

@@ -64,7 +64,7 @@ def boolean_conj(list, conn)
 
     def enum_comma
       %w(Hans Hant).include?(@script) and return "<enum-comma>、</enum-comma>"
-      "<enum-comma>, </enum-comma>"
+      "<enum-comma>,</enum-comma> "
     end
 
     def cleanup_entities(text, is_xml: true)

spec/isodoc/base_spec.rb

@@ -139,17 +139,17 @@
     c = IsoDoc::I18n.new("en", "Latn")
     expect(c.boolean_conj([], "and")).to eq ""
     expect(c.boolean_conj(%w(a), "and")).to eq "a"
-    expect(c.boolean_conj(%w(a b), "and")).to eq "a<conn> and </conn>b"
-    expect(c.boolean_conj(%w(a b c), "and")).to eq "a<enum-comma>, </enum-comma>b<conn>, and </conn>c"
-    expect(c.boolean_conj(%w(a b c d), "and")).to eq "a<enum-comma>, </enum-comma>b<enum-comma>, </enum-comma>c<conn>, and </conn>d"
+    expect(c.boolean_conj(%w(a b), "and")).to eq "a <conn>and</conn> b"
+    expect(c.boolean_conj(%w(a b c), "and")).to eq "a<enum-comma>,</enum-comma> b<conn>, and</conn> c"
+    expect(c.boolean_conj(%w(a b c d), "and")).to eq "a<enum-comma>,</enum-comma> b<enum-comma>,</enum-comma> c<conn>, and</conn> d"
   end
 
   it "does boolean conjunctions in Traditional Chinese" do
     c = IsoDoc::I18n.new("zh", "Hant",
                          i18nhash: YAML.load_file("spec/assets/new.yaml"))
     expect(c.boolean_conj([], "and")).to eq ""
     expect(c.boolean_conj(%w(a), "and")).to eq "a"
-    expect(c.boolean_conj(%w(a b), "and")).to eq "a<conn> and </conn>b"
+    expect(c.boolean_conj(%w(a b), "and")).to eq "a <conn>and</conn> b"
     expect(c.boolean_conj(%w(a b c), "and")).to eq "a<enum-comma>、</enum-comma>b<conn>與</conn>c"
     expect(c.boolean_conj(%w(a b c d), "and")).to eq "a<enum-comma>、</enum-comma>b<enum-comma>、</enum-comma>c<conn>與</conn>d"
   end