Skip to content

Commit

Permalink
Removed vertical alignment in lists. It doesn't make sense and it con…
Browse files Browse the repository at this point in the history
…flicts with other things. [#73 state:resolved]
  • Loading branch information
jgarber committed Jun 2, 2009
1 parent 664fe40 commit 05cd533
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
@@ -1,5 +1,7 @@
=== Edge

* Removed vertical alignment in lists. It doesn't make sense and it conflicts with other things. [Jason Garber]

* Allow table cells to be empty. [Jason Garber]

* Resolve conflict between table signature and blocks beginning with t. [Jason Garber]
Expand Down
10 changes: 5 additions & 5 deletions ext/redcloth_scan/redcloth_scan.rl
Expand Up @@ -27,9 +27,9 @@
footnote_start = ( ftype A C :> dotspace ) %SET_ATTR ;
ul = "*" %{NEST(); SET_LIST_TYPE("ul");};
ol = "#" %{NEST(); SET_LIST_TYPE("ol");};
ul_start = ( ul | ol )* ul A_noactions C_noactions :> " "+ ;
ol_start = ( ul | ol )* ol N A_noactions C_noactions :> " "+ ;
list_start = " "* A C ( ul_start | ol_start ) >B >{RESET_NEST();} @{ fexec(bck); } ;
ul_start = ( ul | ol )* ul A_HLGN_noactions* C_noactions :> " "+ ;
ol_start = ( ul | ol )* ol N A_HLGN_noactions* C_noactions :> " "+ ;
list_start = " "* A_HLGN* C ( ul_start | ol_start ) >B >{RESET_NEST();} @{ fexec(bck); } ;

dt_start = "-" . " "+ ;
dd_start = ":=" ;
Expand Down Expand Up @@ -145,8 +145,8 @@
default => cat;
*|;

ul_item = ( ul | ol )* ul A C :> " "+ ;
ol_item = ( ul | ol )* ol N_noactions A C :> " "+ ;
ul_item = ( ul | ol )* ul A_HLGN* C :> " "+ ;
ol_item = ( ul | ol )* ol N_noactions A_HLGN* C :> " "+ ;
list_item := (" "* ( ul_item | ol_item )) @{ SET_ATTRIBUTES(); fgoto list_content; } ;

list_content := |*
Expand Down
8 changes: 8 additions & 0 deletions spec/fixtures/basic.yml
Expand Up @@ -1004,3 +1004,11 @@ html: "<p>Start a paragraph with <code>p. </code> (that&#8217;s p, a period, and
name: unrecognized block starting with t not eaten
in: "tel. 0 700 123 123"
html: "<p>tel. 0 700 123 123</p>"
---
name: bolded number at start of phrase
in: "*22 watermelons* is my limit"
html: "<p><strong>22 watermelons</strong> is my limit</p>"
---
name: FIXME
in: "*- I would expect it to be a bolded paragraph.*"
html: <p><strong>- I would expect it to be a bolded paragraph.</strong></p>

1 comment on commit 05cd533

@pjg
Copy link

@pjg pjg commented on 05cd533 Jun 2, 2009

Choose a reason for hiding this comment

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

Much appreciated!

Please sign in to comment.