RedCloth 4.0.0-x86-mswin32-60 → 4.0.1-x86-mswin32-60

data/ext/redcloth_scan/redcloth_scan.rl

@@ -40,9 +40,10 @@ int SYM_escape_preformatted;
   ul = "*" %{nest++; list_type = "ul";};
   ol = "#" %{nest++; list_type = "ol";};
   list_start  = ( ( ul | ol )+ N A C :> " "+ ) >{nest = 0;} ;
-  dl_start = "-" . " "+ ;
+  dt_start = "-" . " "+ ;
   dd_start = ":=" ;
   long_dd  = dd_start " "* LF %{ ADD_BLOCK(); ASET(type, dd); } any+ >A %{ TRANSFORM(text) } :>> "=:" ;
+  dl_start = (dt_start mtext (LF dt_start mtext)* " "* dd_start)  ;
   blank_line = LF;
   link_alias = ( "[" >{ ASET(type, ignore) } %A phrase %T "]" %A uri %{ STORE_URL(href); } ) ;
   
@@ -285,13 +286,13 @@ int SYM_escape_preformatted;
   *|;
 
   list := |*
-    LF list_start { ADD_BLOCK(); LIST_ITEM(); };
+    LF list_start   { ADD_BLOCK(); LIST_ITEM(); };
     block_end       { ADD_BLOCK(); nest = 0; LIST_CLOSE(); fgoto main; };
     default => cat;
   *|;
 
   dl := |*
-    LF dl_start   { ADD_BLOCK(); ASET(type, dt); };
+    LF dt_start     { ADD_BLOCK(); ASET(type, dt); };
     dd_start        { ADD_BLOCK(); ASET(type, dd); };
     long_dd         { INLINE(html, dd); };
     block_end       { ADD_BLOCK(); INLINE(html, dl_close);  fgoto main; };
@@ -312,7 +313,7 @@ int SYM_escape_preformatted;
     block_start     { fgoto block; };
     footnote_start  { fgoto footnote; };
     list_start      { list_layout = rb_ary_new(); LIST_ITEM(); fgoto list; };
-    dl_start        { INLINE(html, dl_open); ASET(type, dt); fgoto dl; };
+    dl_start        { p = ts; INLINE(html, dl_open); ASET(type, dt); fgoto dl; };
     table           { INLINE(table, table_close); DONE(table); fgoto block; };
     link_alias      { rb_hash_aset(refs_found, rb_hash_aref(regs, ID2SYM(rb_intern("text"))), rb_hash_aref(regs, ID2SYM(rb_intern("href")))); DONE(block); };
     aligned_image   { rb_hash_aset(regs, ID2SYM(rb_intern("type")), plain_block); fgoto block; };

data/lib/case_sensitive_require/RedCloth.rb

@@ -0,0 +1,6 @@
+# A workaround to make Rails 2.1 gem dependency easier on case-sensitive filesystems.
+# Since the gem name is RedCloth and the file is redcloth.rb, config.gem 'RedCloth' doesn't
+# work.  You'd have to use config.gem 'RedCloth', :lib => 'redcloth', and that's not 
+# immediately obvious.  This file remedies that.
+#
+require File.join(File.dirname(__FILE__), '..', 'redcloth')

data/lib/redcloth/version.rb

@@ -2,7 +2,7 @@ module RedCloth
   module VERSION
     MAJOR = 4
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
     RELEASE_CANDIDATE = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/test/basic.yml

@@ -123,6 +123,18 @@ in: Observe -- very nice!
 html: <p>Observe &#8212; very nice!</p>
 latex: "Observe --- very nice!\n\n"
 --- 
+name: parenthetical phrase set off with em dashes
+desc: Sentences with two em dashes should not turn them into strikethroughs
+in: An emdash indicates a parenthetical thought--like this one--which is set apart from the rest of a sentence.
+html: "<p>An emdash indicates a parenthetical thought&#8212;like this one&#8212;which is set apart from the rest of a sentence.</p>"
+latex: "An emdash indicates a parenthetical thought---like this one---which is set apart from the rest of a sentence.\n\n"
+---
+name: parenthetical phrase set off with em dashes surrounded by spaces
+desc: Sentences with two em dashes should not turn them into strikethroughs
+in: An emdash indicates a parenthetical thought -- like this one -- which is set apart from the rest of a sentence.
+html: "<p>An emdash indicates a parenthetical thought &#8212; like this one &#8212; which is set apart from the rest of a sentence.</p>"
+latex: "An emdash indicates a parenthetical thought --- like this one --- which is set apart from the rest of a sentence.\n\n"
+---
 name: single hyphens with spaces
 desc: Single hyphens are replaced with en-dashes if they are surrounded by spaces.
 in: Observe - tiny and brief.

data/test/definitions.yml

@@ -48,6 +48,17 @@ html: |-
   	<dd>woven threads</dd>
   </dl>
 ---
+name: not a definition list
+desc: a definition list with no definitions is not a definition list
+in: |-
+  - textile
+  - fabric
+  - cloth
+html: |-
+  <p>- textile<br />
+  - fabric<br />
+  - cloth</p>
+---
 name: long definition list
 in: |-
   here is a long definition

data/test/links.yml

@@ -197,6 +197,10 @@ name: link containing quotes
 in: '"He said it is "very unlikely" this works":http://slashdot.org/'
 html: '<p><a href="http://slashdot.org/">He said it is &#8220;very unlikely&#8221; this works</a></p>'
 ---
+name: link containing multiple quotes
+in: '"He said it is "very unlikely" the "economic stimulus" works":http://slashdot.org/'
+html: '<p><a href="http://slashdot.org/">He said it is &#8220;very unlikely&#8221; the &#8220;economic stimulus&#8221; works</a></p>'
+---
 name: linked quoted phrase
 in: '""Open the pod bay doors please, HAL."":http://www.youtube.com/watch?v=npN9l2Bd06s'
 html: '<p><a href="http://www.youtube.com/watch?v=npN9l2Bd06s">&#8220;Open the pod bay doors please, <span class="caps">HAL</span>.&#8221;</a></p>'
@@ -211,4 +215,9 @@ html: '<p>This is a link to a <a href="http://en.wikipedia.org/wiki/Textile_(mar
 ---
 name: links contained in parentheses
 in: 'This is a regular link (but in parentheses: "Google":http://www.google.com)'
-html: '<p>This is a regular link (but in parentheses: <a href="http://www.google.com">Google</a>)</p>'
+html: '<p>This is a regular link (but in parentheses: <a href="http://www.google.com">Google</a>)</p>'
+---
+name: quotes and follow link
+in: 'Some "text" followed by a "link":http://redcloth.org.'
+html: '<p>Some &#8220;text&#8221; followed by a <a href="http://redcloth.org">link</a>.</p>'
+lite_mode_html: 'Some &#8220;text&#8221; followed by a <a href="http://redcloth.org">link</a>.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RedCloth
 version: !ruby/object:Gem::Version 
-  version: 4.0.0
+  version: 4.0.1
 platform: x86-mswin32-60
 authors: 
 - Jason Garber
@@ -13,7 +13,7 @@ date: 2008-07-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: RedCloth-4.0.0 - Textile parser for Ruby. http://redcloth.org/
+description: RedCloth-4.0.1 - Textile parser for Ruby. http://redcloth.org/
 email: redcloth-upwards@rubyforge.org
 executables: []
 
@@ -52,6 +52,8 @@ files:
 - test/textism.yml
 - test/threshold.yml
 - test/validate_fixtures.rb
+- lib/case_sensitive_require
+- lib/case_sensitive_require/RedCloth.rb
 - lib/redcloth
 - lib/redcloth/formatters
 - lib/redcloth/formatters/base.rb
@@ -99,6 +101,6 @@ rubyforge_project: redcloth
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: RedCloth-4.0.0 - Textile parser for Ruby. http://redcloth.org/
+summary: RedCloth-4.0.1 - Textile parser for Ruby. http://redcloth.org/
 test_files: []