Merge pull request #1321 from kmuto/fix-adhoc-1312

ul/ol/dl/bibpaperで改行を保持する
kmuto · Jun 9, 2019 · 3328886 · 3328886
2 parents 122ccdd + 8a511b1
commit 3328886
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
@@ -257,7 +257,7 @@ def ul_begin
     end
 
     def ul_item(lines)
-      str = lines.join
+      str = lines.join("\n")
       str.sub!(/\A(\[)/) { '\lbrack{}' }
       puts '\item ' + str
     end
@@ -276,7 +276,7 @@ def ol_begin
     end
 
     def ol_item(lines, _num)
-      str = lines.join
+      str = lines.join("\n")
       str.sub!(/\A(\[)/) { '\lbrack{}' }
       puts '\item ' + str
     end
@@ -298,7 +298,7 @@ def dt(str)
     end
 
     def dd(lines)
-      puts lines.join
+      puts lines.join("\n")
     end
 
     def dl_end
@@ -1215,7 +1215,7 @@ def bibpaper_header(id, caption)
     end
 
     def bibpaper_bibpaper(_id, _caption, lines)
-      print split_paragraph(lines).join
+      print split_paragraph(lines).join("\n")
       puts ''
     end
 

diff --git a/test/test_latexbuilder.rb b/test/test_latexbuilder.rb
@@ -280,12 +280,12 @@ def test_jis_x_0201_kana
 
   def test_dlist
     actual = compile_block(": foo\n  foo.\n  bar.\n")
-    assert_equal %Q(\n\\begin{description}\n\\item[foo] \\mbox{} \\\\\nfoo.bar.\n\\end{description}\n), actual
+    assert_equal %Q(\n\\begin{description}\n\\item[foo] \\mbox{} \\\\\nfoo.\nbar.\n\\end{description}\n), actual
   end
 
   def test_dlist_with_bracket
     actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
-    assert_equal %Q(\n\\begin{description}\n\\item[foo\\lbrack{}bar\\rbrack{}] \\mbox{} \\\\\nfoo.bar.\n\\end{description}\n), actual
+    assert_equal %Q(\n\\begin{description}\n\\item[foo\\lbrack{}bar\\rbrack{}] \\mbox{} \\\\\nfoo.\nbar.\n\\end{description}\n), actual
   end
 
   def test_dlist_beforeulol
@@ -783,8 +783,10 @@ def test_cont
     expected = <<-EOS
 
 \\begin{itemize}
-\\item AAA{-}AA
-\\item BBB{-}BB
+\\item AAA
+{-}AA
+\\item BBB
+{-}BB
 \\end{itemize}
 EOS
     actual = compile_block(src)

diff --git a/test/test_latexbuilder_v2.rb b/test/test_latexbuilder_v2.rb
@@ -249,12 +249,12 @@ def test_jis_x_0201_kana
 
   def test_dlist
     actual = compile_block(": foo\n  foo.\n  bar.\n")
-    assert_equal %Q(\n\\begin{description}\n\\item[foo] \\mbox{} \\\\\nfoo.bar.\n\\end{description}\n), actual
+    assert_equal %Q(\n\\begin{description}\n\\item[foo] \\mbox{} \\\\\nfoo.\nbar.\n\\end{description}\n), actual
   end
 
   def test_dlist_with_bracket
     actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
-    assert_equal %Q(\n\\begin{description}\n\\item[foo\\lbrack{}bar\\rbrack{}] \\mbox{} \\\\\nfoo.bar.\n\\end{description}\n), actual
+    assert_equal %Q(\n\\begin{description}\n\\item[foo\\lbrack{}bar\\rbrack{}] \\mbox{} \\\\\nfoo.\nbar.\n\\end{description}\n), actual
   end
 
   def test_dlist_beforeulol
@@ -739,8 +739,10 @@ def test_cont
     expected = <<-EOS
 
 \\begin{itemize}
-\\item AAA{-}AA
-\\item BBB{-}BB
+\\item AAA
+{-}AA
+\\item BBB
+{-}BB
 \\end{itemize}
 EOS
     actual = compile_block(src)