*** test/test_hikidoc.rb.old	Sat Aug  8 10:05:15 2009
--- test/test_hikidoc.rb	Mon Aug 10 02:20:41 2009
***************
*** 143,154 ****
--- 143,166 ----
                     " foo\n bar")
      assert_convert("<pre>foo\nbar</pre>\n",
                     " foo\n bar\n")
+     assert_convert("<pre>foo</pre>\n<pre>bar</pre>\n",
+                    " foo\n\n bar")
      assert_convert("<pre>&lt;foo&gt;</pre>\n",
                     " <foo>")
      assert_convert("<pre>{{_:a/a}}</pre>\n",
                     " {{_:a/a}}")
      assert_convert("<pre>[[_:a/a]]</pre>\n",
                     " [[_:a/a]]")
+     assert_convert("<pre>{{\na\n}}</pre>\n",
+                    " {{\n a\n }}")
+     assert_convert("<pre>{{</pre>\n<p>a\n}}</p>\n",
+                    " {{\na\n}}")
+   end
+ 
+   def test_pre_with_plugin
+     assert_convert("<pre>{{</pre>\n" +
+                    "<div class=\"plugin\">{{foo}}</div>\n",
+                    " {{\n{{foo}}")
    end
  
    def test_multi_pre
***************
*** 158,171 ****
--- 170,203 ----
                     "<<<\nfoo\n bar\n>>>")
      assert_convert("<pre>foo</pre>\n<pre>bar</pre>\n",
                     "<<<\nfoo\n>>>\n<<<\nbar\n>>>")
+     assert_convert("<pre>foo\n\nbar</pre>\n",
+                    "<<<\nfoo\n\nbar\n>>>")
      assert_convert("<pre>&lt;foo&gt;</pre>\n",
                     "<<<\n<foo>\n>>>")
+     assert_convert("<pre>{{foo}}</pre>\n",
+                    "<<<\n{{foo}}\n>>>")
+     assert_convert("<pre>{{</pre>\n<p>foo}}</p>\n",
+                    "<<<\n{{\n>>>\nfoo}}")
+     assert_convert(<<-END_OF_EXPECTED, <<-END_OF_INPUT)
+ <pre>{{&lt;&lt;TEST
+  test
+ TEST}}</pre>
+                    END_OF_EXPECTED
+ <<<
+ {{<<TEST
+  test
+ TEST}}
+ >>>
+                    END_OF_INPUT
    end
  
    def test_multi_pre_with_plugin
      assert_convert("<pre>{{{}}}</pre>\n" +
                     "<div class=\"plugin\">{{'test'}}</div>\n",
                     "<<<\n{{{}}}\n>>>\n{{'test'}}")
+     assert_convert("<pre>{{</pre>\n" +
+                    "<div class=\"plugin\">{{'test'}}</div>\n",
+                    "<<<\n{{\n>>>\n{{'test'}}")
    end
  
    def test_comment