Skip to content

Commit

Permalink
Resolve conflict between table signature and blocks beginning with t.…
Browse files Browse the repository at this point in the history
… Now Paul Goscicki can do absurd things like putting his tel. number on his website. ;) [#74 state:resolved]
  • Loading branch information
jgarber committed Jun 2, 2009
1 parent 19053ff commit 0782111
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
8 changes: 8 additions & 0 deletions CHANGELOG
@@ -1,15 +1,23 @@
=== Edge

* Resolve conflict between table signature and blocks beginning with t. [Jason Garber]

* Enable code signature to capture trailing space when in square brackets. [Jason Garber]

* Allow emphasized phrases to include underscores. [Jason Garber]

* Include an ending question mark in a citation. [Jason Garber]

* Fix <notextile> blocks being included in following paragraph. [Jason Garber]

* Preserve leading whitespace in pre and bc blocks. [Jason Garber]

* Don't add hard break after preexisting <br />. [Jason Garber]

* Switched tests from Test::Unit to Rspec. [Jason Garber]

* Accept multiline content in table cells. [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
Expand Down
2 changes: 1 addition & 1 deletion ext/redcloth_scan/redcloth_scan.rl
Expand Up @@ -62,7 +62,7 @@
trdef = ( A C :> dotspace ) %SET_ATTR ;
tr = ( trdef? "|" %{INLINE(table, "tr_open");} td+ ) >X %{INLINE(table, "tr_close");} ;
trows = ( tr (LF >X tr)* ) ;
tdef = ( "table" >X A C :> dotspace LF ) %SET_ATTR ;
tdef = ( "table" %X A C :> dotspace LF ) %SET_ATTR ;
table = ( tdef? trows >{CLEAR(table); INLINE(table, "table_open"); RESET_REG();} ) ;

# info
Expand Down
4 changes: 4 additions & 0 deletions spec/fixtures/basic.yml
Expand Up @@ -1000,3 +1000,7 @@ html: |-
name: code captures spaces when made explicit with square brackets
in: "Start a paragraph with [@p. @] (that's p, a period, and a space)."
html: "<p>Start a paragraph with <code>p. </code> (that&#8217;s p, a period, and a space).</p>"
---
name: unrecognized block starting with t not eaten
in: "tel. 0 700 123 123"
html: "<p>tel. 0 700 123 123</p>"

1 comment on commit 0782111

@pjg
Copy link

@pjg pjg commented on 0782111 Jun 2, 2009

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha ha! Good one :) Thanks!

Please sign in to comment.