Ticket #26: glyphs_inline_ordering_bug.patch

File glyphs_inline_ordering_bug.patch, 1.6 kB (added by purp, 11 months ago)

Patch (with tests) fixing inline/glyphs ordering bug

  • test/textism.yml

     
    372372        <li>The time is not yesterday</li> 
    373373        <li>We must act</li> 
    374374  </ul> 
     375--- 
     376in: foo -- bar -- baz 
     377out: <p>foo&#8212;bar&#8212;baz</p> 
  • lib/redcloth/base.rb

     
    44    DEFAULT_RULES = [] # let each class add to this array 
    55    TEXTILE_RULES = [:refs_textile, :block_textile_table, :block_textile_lists, :block_textile_defs, 
    66                     :block_textile_prefix, :inline_textile_image, :inline_textile_link, 
    7                      :inline_textile_code, :inline_textile_span, :glyphs_textile, 
     7                     :inline_textile_code, :glyphs_textile, :inline_textile_span, 
    88                     :inline_textile_autolink_urls, :inline_textile_autolink_emails] 
    99    MARKDOWN_RULES = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule, 
    1010                      :block_markdown_bq, :block_markdown_lists,  
     
    586586    end 
    587587 
    588588    def inline( text )  
    589         [/^inline_/, /^glyphs_/].each do |meth_re| 
    590             @rules.each do |rule_name| 
    591                 method( rule_name ).call( text ) if rule_name.to_s.match( meth_re ) 
    592             end 
     589        @rules.each do |rule_name| 
     590            method( rule_name ).call( text ) if rule_name.to_s.match(/^(inline|glyphs)_/) 
    593591        end 
    594592    end 
    595593