RedCloth 3.0.2 → 3.0.3

data/bin/redcloth

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/local/bin/ruby18
 require 'redcloth'
 puts RedCloth.new( ARGF.read ).to_html

data/lib/redcloth.rb

@@ -166,7 +166,7 @@
 
 class RedCloth < String
 
-    VERSION = '3.0.2'
+    VERSION = '3.0.3'
     DEFAULT_RULES = [:textile, :markdown]
 
     #
@@ -193,6 +193,16 @@ class RedCloth < String
     #
     attr_accessor :hard_breaks
 
+    #
+    # Accessor for toggling span caps.
+    #
+    # Textile places `span' tags around capitalized
+    # words by default, but this wreaks havoc on Wikis.
+    # If +:no_span_caps+ is set, this will be
+    # suppressed.
+    #
+    attr_accessor :no_span_caps
+
     #
     # Establishes the markup predence.  Available rules include:
     #
@@ -344,7 +354,7 @@ class RedCloth < String
         [ /"/, '&#8220;' ], # double opening
         [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
         [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
-        [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]{2,})([^<a-z0-9]|$)/, '\1<span class="caps">\2</span>\3' ], # 3+ uppercase caps
+        [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]{2,})([^<a-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
         [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
         [ /\s->\s/, ' &rarr; ' ], # right arrow
         [ /\s-\s/, ' &#8211; ' ], # en dash
@@ -370,7 +380,7 @@ class RedCloth < String
     QTAGS = [
         ['**', 'b'],
         ['*', 'strong'],
-        ['??', 'cite'],
+        ['??', 'cite', :limit],
         ['-', 'del', :limit],
         ['__', 'i'],
         ['_', 'em', :limit],
@@ -414,7 +424,8 @@ class RedCloth < String
 
     # Search and replace for Textile glyphs (quotes, dashes, other symbols)
     def pgl( text )
-        GLYPHS.each do |re, resub|
+        GLYPHS.each do |re, resub, tog|
+            next if tog and method( tog ).call
             text.gsub! re, resub
         end
     end
@@ -546,14 +557,12 @@ class RedCloth < String
         end
     end
 
-    CODE_RE = /
-            (^|[\s>#{PUNCT}{(\[])            # 1 open bracket?
-            @                                # opening
-            (?:\|(\w+?)\|)?                  # 2 language
-            (\S(?:[^\n]|\n(?!\n))*?)         # 3 code
-            @                                # closing
-            (?=[\s\]}\)<#{PUNCT}]|$)         # 4 closing bracket?
-        /x 
+    CODE_RE = /(\W)
+        @
+        (?:\|(\w+?)\|)?
+        (.+?)
+        @
+        (?=\W)/x
 
     def inline_textile_code( text ) 
         text.gsub!( CODE_RE ) do |m|
@@ -934,11 +943,13 @@ class RedCloth < String
 
     def flush_left( text )
         indt = 0
-        while text !~ /^ {#{indt}}\S/
-            indt += 1
-        end unless text.empty?
-        if indt.nonzero?
-            text.gsub!( /^ {#{indt}}/, '' )
+        if text =~ /^ /
+            while text !~ /^ {#{indt}}\S/
+                indt += 1
+            end unless text.empty?
+            if indt.nonzero?
+                text.gsub!( /^ {#{indt}}/, '' )
+            end
         end
     end
 

data/tests/markdown.yml

@@ -19,14 +19,19 @@ out: |-
   </table>
   	<p>This is another regular paragraph.</p>
 ---
+in: '"Larry Bird":http://images.google.com/images?num=30&q=larry+bird'
+out: '<p>"Larry Bird":http://images.google.com/images?num=30&#38;q=larry+bird</p>'
+---
 in: '&copy;'
 out: <p>&copy;</p>
 ---
 in: AT&T
 out: <p>AT&#38;T</p>
----
-in: 4 < 5
-out: 4 &lt; 5
+
+# We don't do this.
+# ---
+# in: 4 < 5
+# out: 4 &lt; 5
 ---
 in: |
   This is an H1
@@ -74,7 +79,7 @@ in: |
   > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
   consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
   Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-
+  >
   > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
   id sem consectetuer libero luctus adipiscing.
 out: |-
@@ -126,9 +131,8 @@ out: |-
   	<p>1.   This is the first list item.
   	2.   This is the second list item.</p>
   
-  	<p>Here's some example code:
-  	<code>return shell_exec(\"echo $input | $markdown_script\");</code>
-  	</p>
+  	<p>Here's some example code:</p>
+  	<pre><code>return shell_exec("echo $input | $markdown_script");</code></pre>
   
   </blockquote>
 ---

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.4
 specification_version: 1
 name: RedCloth
 version: !ruby/object:Gem::Version 
-  version: 3.0.2
-date: 2005-02-03
+  version: 3.0.3
+date: 2005-02-06
 summary: RedCloth is a module for using Textile and Markdown in Ruby. Textile and Markdown are text formats.  A very simple text format. Another stab at making readable text that can be converted to HTML.
 require_paths: 
   - lib
-author: Why the Lucky Stiff
 email: why@ruby-lang.org
 homepage: http://www.whytheluckystiff.net/ruby/redcloth/
 rubyforge_project: redcloth
@@ -37,6 +36,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: 
+  - Why the Lucky Stiff
 files: 
   - bin/redcloth
   - tests/code.yml