@@ -1,5 +1,7 @@ === Edge +* Don't add hard break after preexisting <br />. [Jason Garber] + * Change to list attributes so you can give style/class to list items (taken from PyTextile). Breaks backwards compatibility. Before, the style applied to the first list item applied to the entire list. Now, class/id/style placed CHANGELOG @@ -17,6 +17,7 @@ empty_tag = empty_tag_noactions >X >A %T ; end_tag = end_tag_noactions >X >A %T ; html_comment = ("<!--" (default+) :>> "-->") >X >A %T; + html_break = ("<br" space* AttrSet* (AttrEnd)? "/"? ">" LF?) >X >A %T ; # links link_text_char = (default - [ "<>]) ; @@ -150,6 +151,7 @@ end_tag { INLINE(block, "inline_html"); }; empty_tag { INLINE(block, "inline_html"); }; html_comment { INLINE(block, "inline_html"); }; + html_break { INLINE(block, "inline_html"); }; redcloth_version { INLINE(block, "inline_redcloth_version"); }; ext/redcloth_scan/redcloth_inline.rl @@ -29,6 +29,21 @@ html: |- if you break.</li> </ul> --- +name: line breaks +desc: Explicit HTML line breaks are not double-broken +in: |- + I spoke.<br /> + And none replied. +html: |- + <p>I spoke.<br /> + And none replied.</p> +html_no_breaks: |- + <p>I spoke.<br /> + And none replied.</p> +lite_mode_html: |- + I spoke.<br /> + And none replied. +--- name: mixing of textile and XHTML in: |- <img src="test.jpg" alt="test" /> spec/fixtures/html.yml dd71f06315adaa022054dd25098deab2318c2954 Jason Garber jg@jasongarber.com http://github.com/jgarber/redcloth/commit/56bd02059fcf09c89d13fd971cf0183210286973 56bd02059fcf09c89d13fd971cf0183210286973 2009-05-26T13:59:44-07:00 2009-05-26T13:59:44-07:00 Don't add hard break after preexisting <br />. [#130 state:resolved] 26a88a9d8943f5b702357fe5afbe9161f0ed9463 Jason Garber jg@jasongarber.com