RedCloth 4.0.3 → 4.0.4

data/ext/redcloth_scan/redcloth_scan.rl

@@ -39,7 +39,9 @@ int SYM_escape_preformatted, SYM_escape_attributes;
   footnote_start = ( ftype A C :> dotspace ) ;
   ul = "*" %{nest++; list_type = "ul";};
   ol = "#" %{nest++; list_type = "ol";};
-  list_start  = ( ( ul | ol )+ N A C :> " "+ ) >{nest = 0;} ;
+  ul_start  = ( ul | ol )* ul A C :> " "+   ;
+  ol_start  = ( ul | ol )* ol N A C :> " "+ ;
+  list_start  = ( ul_start | ol_start ) >{nest = 0;} ;
   dt_start = "-" . " "+ ;
   dd_start = ":=" ;
   long_dd  = dd_start " "* LF %{ ADD_BLOCK(); ASET(type, dd); } any+ >A %{ TRANSFORM(text) } :>> "=:" ;
@@ -294,7 +296,7 @@ int SYM_escape_preformatted, SYM_escape_attributes;
   dl := |*
     LF dt_start     { ADD_BLOCK(); ASET(type, dt); };
     dd_start        { ADD_BLOCK(); ASET(type, dd); };
-    long_dd         { INLINE(html, dd); };
+    long_dd         { INLINE(html, dd); CLEAR_REGS(); };
     block_end       { ADD_BLOCK(); INLINE(html, dl_close);  fgoto main; };
     default => cat;
   *|;
@@ -361,7 +363,7 @@ redcloth_transform(self, p, pe, refs)
 
   %% write exec;
 
-  if (RSTRING(block)->len > 0)
+  if (RSTRING_LEN(block) > 0)
   {
     ADD_BLOCK();
   }
@@ -381,7 +383,7 @@ redcloth_transform2(self, str)
   rb_str_cat2(str, "\n");
   StringValue(str);
   rb_funcall(self, rb_intern("before_transform"), 1, str);
-  return redcloth_transform(self, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1, Qnil);
+  return redcloth_transform(self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1, Qnil);
 }
 
 /*
@@ -395,12 +397,15 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
   rb_scan_args(argc, argv, "11", &str, &level);
   
   VALUE new_str = rb_str_new2("");
+  if (str == Qnil)
+    return new_str;
+    
   StringValue(str);
   
-  if (RSTRING(str)->len == 0)
+  if (RSTRING_LEN(str) == 0)
     return new_str;
   
-  char *ts = RSTRING(str)->ptr, *te = RSTRING(str)->ptr + RSTRING(str)->len;
+  char *ts = RSTRING_PTR(str), *te = RSTRING_PTR(str) + RSTRING_LEN(str);
   char *t = ts, *t2 = ts, *ch = NULL;
   if (te <= ts) return;
 
@@ -450,9 +455,16 @@ static VALUE
 redcloth_latex_esc(VALUE self, VALUE str)
 {  
   VALUE new_str = rb_str_new2("");
+  
+  if (str == Qnil)
+    return new_str;
+    
   StringValue(str);
   
-  char *ts = RSTRING(str)->ptr, *te = RSTRING(str)->ptr + RSTRING(str)->len;
+  if (RSTRING_LEN(str) == 0)
+    return new_str;
+  
+  char *ts = RSTRING_PTR(str), *te = RSTRING_PTR(str) + RSTRING_LEN(str);
   char *t = ts, *t2 = ts, *ch = NULL;
   if (te <= ts) return;
 

data/lib/redcloth/formatters/base.rb

@@ -34,8 +34,8 @@ module RedCloth::Formatters
       RedCloth::VERSION::STRING
     end
     
-    [:del_phrase, :sup_phrase, :sub_phrase].each do |phrase_method|
-      method = phrase_method.to_s[0..2]
+    [:del_phrase, :sup_phrase, :sub_phrase, :span_phrase].each do |phrase_method|
+      method = phrase_method.to_s.split('_')[0]
       define_method(phrase_method) do |opts|
         "#{opts[:beginning_space]}#{self.send(method, opts)}"
       end

data/lib/redcloth/formatters/html.rb

@@ -172,6 +172,10 @@ module RedCloth::Formatters::HTML
     "“#{opts[:text]}”"
   end
   
+  def multi_paragraph_quote(opts)
+    "“#{opts[:text]}"
+  end
+  
   def ellipsis(opts)
     "#{opts[:text]}…"
   end

data/lib/redcloth/formatters/latex.rb

@@ -4,6 +4,15 @@ module RedCloth::Formatters::LATEX
   include RedCloth::Formatters::Base
   
   ENTITIES = YAML::load(File.read(File.dirname(__FILE__)+'/latex_entities.yml')) 
+
+  module Settings
+    # Maps CSS style names to latex formatting options
+    def latex_image_styles
+      @latex_image_class_styles ||= {}
+    end
+  end
+
+  RedCloth::TextileDoc.send(:include, Settings)
   
   def escape(text)
     latex_esc(text)
@@ -136,8 +145,23 @@ module RedCloth::Formatters::LATEX
   end
   
   # FIXME: use includegraphics with security verification
+  #
+  # Remember to use '\RequirePackage{graphicx}' in your LaTeX header
+  # 
+  # FIXME: Look at dealing with width / height gracefully as this should be 
+  # specified in a unit like cm rather than px.
   def image(opts)
-    ""
+    # Don't know how to use remote links, plus can we trust them?
+    return "" if opts[:src] =~ /^\w+\:\/\//
+    # Resolve CSS styles if any have been set
+    styling = opts[:class].to_s.split(/\s+/).collect { |style| latex_image_styles[style] }.compact.join ','
+    # Build latex code
+    [ "\\begin{figure}[htp]",
+      "  \\includegraphics[#{styling}]{#{opts[:src]}}",
+     ("  \\caption{#{escape opts[:title]}}" if opts[:title]),
+     ("  \\label{#{escape opts[:alt]}}" if opts[:alt]),
+      "\\end{figure}",
+    ].compact.join "\n"
   end
   
   def footno(opts)
@@ -204,12 +228,14 @@ module RedCloth::Formatters::LATEX
   
   private
   
+  # Use this for block level commands that use \begin
   def begin_chunk(type)
     chunk_counter[type] += 1
     return "\\begin{#{type}}" if 1 == chunk_counter[type]
     ''
   end
   
+  # Use this for block level commands that use \end
   def end_chunk(type)
     chunk_counter[type] -= 1
     raise RuntimeError, "Bad latex #{type} nesting detected" if chunk_counter[type] < 0 # This should never need to happen

data/lib/redcloth/version.rb

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

data/test/basic.yml

@@ -110,6 +110,15 @@ name: curly quotes
 desc: Single- and double-quotes around words or phrases are converted to curly quotations, much easier on the eye.
 in: "\"Observe!\""
 html: <p>&#8220;Observe!&#8221;</p>
+---
+name: quotes contained in multi-paragraph quotes
+in: |-
+  "I first learned about this thing called "Redcloth" several years ago.
+
+  "It's wonderful."
+html: |-
+  <p>&#8220;I first learned about this thing called &#8220;Redcloth&#8221; several years ago.</p>
+  <p>&#8220;It&#8217;s wonderful.&#8221;</p>
 --- 
 name: double hyphens
 desc: Double hyphens are replaced with an em-dash.
@@ -225,6 +234,11 @@ desc: Strength can be give to text by surrounding with asterisks.  In HTML, this
 in: And then? She *fell*!
 html: <p>And then? She <strong>fell</strong>!</p>
 lite_mode_html: "And then? She <strong>fell</strong>!"
+---
+name: strong phrase beginning with a number
+desc: A strong phrase at the beginning of a line that begins with a number should not be recognized as a ul with a start value (no such thing)
+in: "*10 times as many*"
+html: "<p><strong>10 times as many</strong></p>"
 --- 
 name: force bold italics
 desc: Both italics and bold can be forced by doubling the underscores or asterisks.
@@ -264,12 +278,20 @@ name: superscript
 desc: To superscript a phrase, surround with carets.
 in: a ^2^ + b ^2^ = c ^2^
 html: <p>a <sup>2</sup> + b <sup>2</sup> = c <sup>2</sup></p>
+---
+name: parenthetical superscript phrase
+in: '^(image courtesy NASA)^'
+html: '<p><sup>(image courtesy <span class="caps">NASA</span>)</sup></p>'
 --- 
 name: subscript
 desc: To subscript, surround with tildes.
 in: log ~2~ x
 html: <p>log <sub>2</sub> x</p>
 ---
+name: parenthetical subscript phrase
+in: '~(image courtesy NASA)~'
+html: '<p><sub>(image courtesy <span class="caps">NASA</span>)</sub></p>'
+---
 name: tight superscript and subscript
 desc: if you want your superscript or subscript to not be surrounded by spaces, you must use square brackets
 in: f(x, n) = log[~4~]x[^n^]
@@ -291,6 +313,15 @@ html: |-
 lite_mode_html: |-
   I&#8217;m <span style="color:red;">unaware</span><br />
   of most soft drinks.
+---
+name: percent sign
+desc: though percent signs indicate a span, they shouldn't be overly greedy.
+in: |-
+  http://blah.com/one%20two%20three
+  (min)5%-95%(max)
+html: |-
+  <p>http://blah.com/one%20two%20three<br />
+  (min)5%-95%(max)</p>
 --- 
 name: css class
 desc: A block can be tagged with a CSS class by circling the class in parentheses and placing it just before the period which marks the block.
@@ -812,4 +843,29 @@ name: underscores in parentheses in quotes 2
 in: |-
    "one (two _three four_) five"
 html: |-
-  <p>&#8220;one (two <em>three four</em>) five&#8221;</p>
+  <p>&#8220;one (two <em>three four</em>) five&#8221;</p>
+---
+name: caps in parentheses
+desc: Uppercase words of three or more characters that are in parentheses should be recognized as well as those not in parentheses.
+in: IBM or (HAL)
+html: <p><span class="caps">IBM</span> or (<span class="caps">HAL</span>)</p>
+no_span_caps_html: <p>IBM or (HAL)</p>
+---
+name: phrase modifiers in parentheses
+desc: Inline modifiers are expected to work in parentheses as well.
+in: |-
+  __Amanita__s are mushrooms.
+  Lungworts (__Lobaria__) are lichens.
+  Blah blah (normal text **bold**) blah.
+html: |-
+  <p>__Amanita__s are mushrooms.<br />
+  Lungworts (<i>Lobaria</i>) are lichens.<br />
+  Blah blah (normal text <b>bold</b>) blah.</p>
+---
+name: square brackets are preserved
+in: |-
+  citation ["(Berk.) Hilton"], see
+  [Papers "blah blah."]
+html: |-
+  <p>citation [&#8220;(Berk.) Hilton&#8221;], see<br />
+  [Papers &#8220;blah blah.&#8221;]</p>

data/test/html.yml

@@ -296,4 +296,10 @@ html: |-
 ---
 name: tilde in innerHTML is not altered
 in: '<a href="http://foo.com/bar?something=1~2~3">http://foo.com/bar?something=1~2~3</a>'
-html: '<p><a href="http://foo.com/bar?something=1~2~3">http://foo.com/bar?something=1~2~3</a></p>'
+html: '<p><a href="http://foo.com/bar?something=1~2~3">http://foo.com/bar?something=1~2~3</a></p>'
+---
+name: empty block
+in: |-
+  <embed src="test.swf"></embed>
+html: |-
+  <embed src="test.swf"></embed>

data/test/images.yml

@@ -1,12 +1,27 @@
 ---
 in:  This is an !image.jpg!
 html: <p>This is an <img src="image.jpg" alt="" /></p>
+latex: |+
+  This is an \begin{figure}[htp]
+    \includegraphics[]{image.jpg}
+  \end{figure}
+
 ---
 in:  This is an !image.jpg(with alt text)!
 html: <p>This is an <img src="image.jpg" title="with alt text" alt="with alt text" /></p>
+latex: |+
+  This is an \begin{figure}[htp]
+    \includegraphics[]{image.jpg}
+    \caption{with alt text}
+  \end{figure}
+
 ---
 in:  This is an !http://example.com/i/image.jpg!
 html: <p>This is an <img src="http://example.com/i/image.jpg" alt="" /></p>
+# Note that we are removing remote links fro security reasons for now
+latex: |+
+  This is an 
+
 ---
 in:  This is an !http://example.com/i/image.jpg#a1!
 html: <p>This is an <img src="http://example.com/i/image.jpg#a1" alt="" /></p>
@@ -176,6 +191,11 @@ html: <p>(This is an <a href="http://example.com/index.html?foo=bar&amp;a=b#a10"
 name: image with relative src with dot
 in: "!../../image.jpg!"
 html: <p><img src="../../image.jpg" alt="" /></p>
+latex: |+
+  \begin{figure}[htp]
+    \includegraphics[]{../../image.jpg}
+  \end{figure}
+
 ---
 name: image with class
 in: "!(myclass)image.jpg!"
@@ -204,10 +224,22 @@ html: <p><img src="image.jpg" style="color:red;" alt="" /></p>
 name: image attributes has ampersand html entity in alt and title
 in: "!/pictures/cat_and_fox.jpg(Trady Blix & The cartoon fox)!"
 html: '<p><img src="/pictures/cat_and_fox.jpg" title="Trady Blix &amp; The cartoon fox" alt="Trady Blix &amp; The cartoon fox" /></p>'
+latex: |+
+  \begin{figure}[htp]
+    \includegraphics[]{/pictures/cat_and_fox.jpg}
+    \caption{Trady Blix \& The cartoon fox}
+  \end{figure}
+
 ---
 name: image attributes has double quote html entity in alt and title
 in: '!/pictures/bacon.jpg(The fox said: "Have some chunky bacon")!'
 html: '<p><img src="/pictures/bacon.jpg" title="The fox said: &quot;Have some chunky bacon&quot;" alt="The fox said: &quot;Have some chunky bacon&quot;" /></p>'
+latex: |+
+  \begin{figure}[htp]
+    \includegraphics[]{/pictures/bacon.jpg}
+    \caption{The fox said: "Have some chunky bacon"}
+  \end{figure}
+
 ---
 name: image attributes has single quote html entity in alt and title
 in: "!/pictures/bacon.jpg(The fox said: 'Have some chunky bacon')!"

data/test/links.yml

@@ -205,6 +205,10 @@ 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>'
 ---
+name: link following quoted phrase
+in: '"quote" text "quote" text "link":http://google.com'
+html: '<p>&#8220;quote&#8221; text &#8220;quote&#8221; text <a href="http://google.com">link</a></p>'
+---
 name: links containing underscores
 in: 'This is a link to a "Wikipedia article about Barack":http://en.wikipedia.org/wiki/Barack_Obama'
 html: '<p>This is a link to a <a href="http://en.wikipedia.org/wiki/Barack_Obama">Wikipedia article about Barack</a></p>'
@@ -228,4 +232,28 @@ in: |-
   
   [google-rocks]http://google.com
 html: |-
-  <p><a href="http://google.com">link</a></p>
+  <p><a href="http://google.com">link</a></p>
+---
+name: contained in multi-paragraph quotes
+in: |-
+  "I first learned about "Redcloth":http://redcloth.org/ several years ago.
+
+  "It's wonderful."
+html: |-
+  <p>&#8220;I first learned about <a href="http://redcloth.org/">Redcloth</a> several years ago.</p>
+  <p>&#8220;It&#8217;s wonderful.&#8221;</p>
+---
+name: as html in notextile contained in multi-paragraph quotes
+in: |-
+  "Here is a <notextile><a href="http://redcloth.org/">link</a></notextile>.
+
+  "I like links."
+html: |-
+  <p>&#8220;Here is a <a href="http://redcloth.org/">link</a>.</p>
+  <p>&#8220;I like links.&#8221;</p>
+---
+name: contained in para with multiple quotes
+in: |-
+  "My wife, Tipper, and I will donate 100% of the proceeds of the award to the "Alliance For Climate Protection":http://www.looktothestars.org/charity/638-alliance-for-climate-protection," said Gore in an email. "I am deeply honored to receive the Nobel Peace Prize."
+html: |-
+  <p>&#8220;My wife, Tipper, and I will donate 100% of the proceeds of the award to the <a href="http://www.looktothestars.org/charity/638-alliance-for-climate-protection">Alliance For Climate Protection</a>,&#8221; said Gore in an email. &#8220;I am deeply honored to receive the Nobel Peace Prize.&#8221;</p>

data/test/test_extensions.rb

@@ -11,7 +11,7 @@ class TestExtensions < Test::Unit::TestCase
     def refs_smiley(text)
       text.gsub!(/(\s)~(:P|:D|:O|:o|:S|:\||;\)|:'\(|:\)|:\()/) do |m|
         bef,ma = $~[1..2]
-        filename = "/images/emoticons/"+(ma.split(//).collect{|l| l[0] }.join('_'))+".png"
+        filename = "/images/emoticons/"+(ma.unpack("c*").join('_'))+".png"
         "#{bef}<img src='#{filename}' title='#{ma}' class='smiley' />"
       end
     end

data/test/test_formatters.rb

@@ -8,8 +8,17 @@ class TestFormatters < Test::Unit::TestCase
     RedCloth.new(doc['in']).to_html
   end
   
+  def test_html_orphan_parenthesis_in_link_can_be_followed_by_punctuation_and_words
+    assert_nothing_raised { RedCloth.new(%Q{Test "(read this":http://test.host), ok}).to_html }
+  end
+  
   generate_formatter_tests('latex') do |doc|
     RedCloth.new(doc['in']).to_latex
   end
 
+  def test_latex_orphan_parenthesis_in_link_can_be_followed_by_punctuation_and_words
+    assert_nothing_raised { RedCloth.new(%Q{Test "(read this":http://test.host), ok}).to_latex }
+  end
+  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RedCloth
 version: !ruby/object:Gem::Version 
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors: 
 - Jason Garber
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-18 00:00:00 -04:00
+date: 2008-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: RedCloth-4.0.3 - Textile parser for Ruby. http://redcloth.org/
+description: RedCloth-4.0.4 - Textile parser for Ruby. http://redcloth.org/
 email: redcloth-upwards@rubyforge.org
 executables: 
 - redcloth
@@ -98,9 +98,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: redcloth
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: RedCloth-4.0.3 - Textile parser for Ruby. http://redcloth.org/
+summary: RedCloth-4.0.4 - Textile parser for Ruby. http://redcloth.org/
 test_files: []