RedCloth 4.1.0 → 4.1.1

data/ext/redcloth_scan/redcloth_scan.c.rl

@@ -194,6 +194,9 @@ redcloth_latex_esc(VALUE self, VALUE str)
   return new_str;
 }
 
+/*
+ * Transforms a Textile document with +formatter+
+ */
 static VALUE
 redcloth_to(self, formatter)
   VALUE self, formatter;

data/ext/redcloth_scan/redcloth_scan.rl

@@ -37,6 +37,7 @@
   dl_start = (dt_start mtext (LF dt_start mtext)* " "* dd_start)  ;
   blank_line = LF;
   link_alias = ( "[" >{ ASET("type", "ignore"); } %A chars %T "]" %A uri %{ STORE_URL("href"); } ) ;
+  horizontal_rule = '*'{3,} | '-'{3,} | '_'{3,} ;
   
   # image lookahead
   IMG_A_LEFT = "<" %{ ASET("float", "left"); } ;
@@ -44,7 +45,7 @@
   aligned_image = ( "["? "!" (IMG_A_LEFT | IMG_A_RIGHT) ) >A @{ p = reg - 1; } ;
   
   # html blocks
-  BlockTagName = Name - ("pre" | "notextile" | "a" | "applet" | "basefont" | "bdo" | "br" | "font" | "iframe" | "img" | "map" | "object" | "param" | "q" | "script" | "span" | "sub" | "sup" | "abbr" | "acronym" | "cite" | "code" | "del" | "dfn" | "em" | "ins" | "kbd" | "samp" | "strong" | "var" | "b" | "big" | "i" | "s" | "small" | "strike" | "tt" | "u");
+  BlockTagName = Name - ("pre" | "notextile" | "a" | "applet" | "basefont" | "bdo" | "br" | "font" | "iframe" | "img" | "map" | "object" | "param" | "embed" | "q" | "script" | "span" | "sub" | "sup" | "abbr" | "acronym" | "cite" | "code" | "del" | "dfn" | "em" | "ins" | "kbd" | "samp" | "strong" | "var" | "b" | "big" | "i" | "s" | "small" | "strike" | "tt" | "u");
   block_start_tag = "<" BlockTagName space+ AttrSet* (AttrEnd)? ">" | "<" BlockTagName ">";
   block_empty_tag = "<" BlockTagName space+ AttrSet* (AttrEnd)? "/>" | "<" BlockTagName "/>" ;
   block_end_tag = "</" BlockTagName space* ">" ;
@@ -303,6 +304,7 @@
     bq_start        { INLINE(html, "bq_open"); ASET("type", "p"); fgoto bq; };
     block_start     { fgoto block; };
     footnote_start  { fgoto footnote; };
+    horizontal_rule { INLINE(html, "hr"); };
     list_start      { CLEAR_LIST(); LIST_ITEM(); fgoto list; };
     dl_start        { p = ts; INLINE(html, "dl_open"); ASET("type", "dt"); fgoto dl; };
     table           { INLINE(table, "table_close"); DONE(table); fgoto block; };

data/lib/redcloth/formatters/html.rb

@@ -33,6 +33,10 @@ module RedCloth::Formatters::HTML
     end
   end
   
+  def hr(opts)
+    "<hr />\n"
+  end
+  
   def acronym(opts)
     opts[:block] = true
     "<acronym#{pba(opts)}>#{caps(:text => opts[:text])}</acronym>"

data/lib/redcloth/version.rb

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

data/test/basic.yml

@@ -868,3 +868,51 @@ in: |-
 html: |-
   <p>citation [&#8220;(Berk.) Hilton&#8221;], see<br />
   [Papers &#8220;blah blah.&#8221;]</p>
+---
+name: horizontal rule using asterisks
+in: |-
+  Just some *** text
+  
+  ***
+  
+  Some more text.
+html: |-
+  <p>Just some <strong>*</strong> text</p>
+  <hr />
+  <p>Some more text.</p>
+---
+name: horizontal rule using more than three asterisks
+in: |-
+  Just some **** text
+
+  ****
+
+  Some more text.
+html: |-
+  <p>Just some **** text</p>
+  <hr />
+  <p>Some more text.</p>
+---
+name: horizontal rule using dashes
+in: |-
+  Just some --- text
+
+  ---
+
+  Some more text.
+html: |-
+  <p>Just some <del>-</del> text</p>
+  <hr />
+  <p>Some more text.</p>
+---
+name: horizontal rule using underscores
+in: |-
+  Just some ___ text
+
+  ___
+
+  Some more text.
+html: |-
+  <p>Just some <em>_</em> text</p>
+  <hr />
+  <p>Some more text.</p>

data/test/html.yml

@@ -300,6 +300,12 @@ html: '<p><a href="http://foo.com/bar?something=1~2~3">http://foo.com/bar?someth
 ---
 name: empty block
 in: |-
-  <embed src="test.swf"></embed>
+  <div class="test"></div>
 html: |-
-  <embed src="test.swf"></embed>
+  <div class="test"></div>
+---
+name: objects in paragraphs are not modified
+in: |-
+  <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
+html: |-
+  <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RedCloth
 version: !ruby/object:Gem::Version 
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors: 
 - Jason Garber
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-31 00:00:00 -04:00
+date: 2008-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: RedCloth-4.1.0 - Textile parser for Ruby. http://redcloth.org/
+description: RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/
 email: redcloth-upwards@rubyforge.org
 executables: 
 - redcloth
@@ -71,7 +71,6 @@ files:
 - Manifest
 - Rakefile
 - README
-- RedCloth.gemspec
 - setup.rb
 - test/basic.yml
 - test/code.yml
@@ -97,6 +96,7 @@ files:
 - test/textism.yml
 - test/threshold.yml
 - test/validate_fixtures.rb
+- RedCloth.gemspec
 - ext/redcloth_scan/redcloth_attributes.c
 - ext/redcloth_scan/redcloth_inline.c
 - ext/redcloth_scan/redcloth_scan.c
@@ -113,6 +113,7 @@ rdoc_options:
 require_paths: 
 - lib
 - ext
+- lib/case_sensitive_require
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -128,10 +129,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: redcloth
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: RedCloth-4.1.0 - Textile parser for Ruby. http://redcloth.org/
+summary: RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/
 test_files: 
 - test/test_custom_tags.rb
 - test/test_erb.rb