reverted redcloth to 3.0.3 (fixes formatting bugs)
upgraded integrated rails to 1.2.3
This commit is contained in:
Matthias Tarasiewicz
parent
8fb8517156
commit
ca9e155c17
1 changed files with 60 additions and 77 deletions
137
lib/redcloth.rb
137
lib/redcloth.rb
|
|
@ -166,7 +166,7 @@
|
|||
|
||||
class RedCloth < String
|
||||
|
||||
VERSION = '3.0.4'
|
||||
VERSION = '3.0.3'
|
||||
DEFAULT_RULES = [:textile, :markdown]
|
||||
|
||||
#
|
||||
|
|
@ -193,18 +193,6 @@ class RedCloth < String
|
|||
#
|
||||
attr_accessor :hard_breaks
|
||||
|
||||
# Accessor for toggling lite mode.
|
||||
#
|
||||
# In lite mode, block-level rules are ignored. This means
|
||||
# that tables, paragraphs, lists, and such aren't available.
|
||||
# Only the inline markup for bold, italics, entities and so on.
|
||||
#
|
||||
# r = RedCloth.new( "And then? She *fell*!", [:lite_mode] )
|
||||
# r.to_html
|
||||
# #=> "And then? She <strong>fell</strong>!"
|
||||
#
|
||||
attr_accessor :lite_mode
|
||||
|
||||
#
|
||||
# Accessor for toggling span caps.
|
||||
#
|
||||
|
|
@ -231,7 +219,7 @@ class RedCloth < String
|
|||
# inline_textile_image:: Textile inline images
|
||||
# inline_textile_link:: Textile inline links
|
||||
# inline_textile_span:: Textile inline spans
|
||||
# glyphs_textile:: Textile entities (such as em-dashes and smart quotes)
|
||||
# inline_textile_glyphs:: Textile entities (such as em-dashes and smart quotes)
|
||||
#
|
||||
# == Markdown
|
||||
#
|
||||
|
|
@ -272,7 +260,7 @@ class RedCloth < String
|
|||
@shelf = []
|
||||
textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
|
||||
:block_textile_prefix, :inline_textile_image, :inline_textile_link,
|
||||
:inline_textile_code, :inline_textile_span, :glyphs_textile]
|
||||
:inline_textile_code, :inline_textile_glyphs, :inline_textile_span]
|
||||
markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
|
||||
:block_markdown_bq, :block_markdown_lists,
|
||||
:inline_markdown_reflink, :inline_markdown_link]
|
||||
|
|
@ -290,16 +278,14 @@ class RedCloth < String
|
|||
# standard clean up
|
||||
incoming_entities text
|
||||
clean_white_space text
|
||||
no_textile text
|
||||
|
||||
# start processor
|
||||
@pre_list = []
|
||||
rip_offtags text
|
||||
no_textile text
|
||||
hard_break text
|
||||
unless @lite_mode
|
||||
refs text
|
||||
blocks text
|
||||
end
|
||||
hard_break text
|
||||
refs text
|
||||
blocks text
|
||||
inline text
|
||||
smooth_offtags text
|
||||
|
||||
|
|
@ -347,8 +333,6 @@ class RedCloth < String
|
|||
C = "(?:#{C_CLAS}?#{C_STYL}?#{C_LNGE}?|#{C_STYL}?#{C_LNGE}?#{C_CLAS}?|#{C_LNGE}?#{C_STYL}?#{C_CLAS}?)"
|
||||
# PUNCT = Regexp::quote( '!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~' )
|
||||
PUNCT = Regexp::quote( '!"#$%&\'*+,-./:;=?@\\^_`|~' )
|
||||
PUNCT_NOQ = Regexp::quote( '!"#$&\',./:;=?@\\`|' )
|
||||
PUNCT_Q = Regexp::quote( '*-_+^~%' )
|
||||
HYPERLINK = '(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)'
|
||||
|
||||
# Text markup tags, don't conflict with block tags
|
||||
|
|
@ -358,6 +342,41 @@ class RedCloth < String
|
|||
'br', 'map', 'q', 'sub', 'sup', 'span', 'bdo'
|
||||
]
|
||||
|
||||
# Elements to handle
|
||||
GLYPHS = [
|
||||
# [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1’\2' ], # single closing
|
||||
[ /([^\s\[{(>])\'/, '\1’' ], # single closing
|
||||
[ /\'(?=\s|s\b|[#{PUNCT}])/, '’' ], # single closing
|
||||
[ /\'/, '‘' ], # single opening
|
||||
# [ /([^\s\[{(])?"(\s|:|$)/, '\1”\2' ], # double closing
|
||||
[ /([^\s\[{(>])"/, '\1”' ], # double closing
|
||||
[ /"(?=\s|[#{PUNCT}])/, '”' ], # double closing
|
||||
[ /"/, '“' ], # double opening
|
||||
[ /\b( )?\.{3}/, '\1…' ], # 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', :no_span_caps ], # 3+ uppercase caps
|
||||
[ /(\.\s)?\s?--\s?/, '\1—' ], # em dash
|
||||
[ /\s->\s/, ' → ' ], # right arrow
|
||||
[ /\s-\s/, ' – ' ], # en dash
|
||||
[ /(\d+) ?x ?(\d+)/, '\1×\2' ], # dimension sign
|
||||
[ /\b ?[(\[]TM[\])]/i, '™' ], # trademark
|
||||
[ /\b ?[(\[]R[\])]/i, '®' ], # registered
|
||||
[ /\b ?[(\[]C[\])]/i, '©' ] # copyright
|
||||
]
|
||||
|
||||
H_ALGN_VALS = {
|
||||
'<' => 'left',
|
||||
'=' => 'center',
|
||||
'>' => 'right',
|
||||
'<>' => 'justify'
|
||||
}
|
||||
|
||||
V_ALGN_VALS = {
|
||||
'^' => 'top',
|
||||
'-' => 'middle',
|
||||
'~' => 'bottom'
|
||||
}
|
||||
|
||||
QTAGS = [
|
||||
['**', 'b'],
|
||||
['*', 'strong'],
|
||||
|
|
@ -379,56 +398,19 @@ class RedCloth < String
|
|||
(#{rcq})
|
||||
(#{C})
|
||||
(?::(\S+?))?
|
||||
(\S.*?\S|\S)
|
||||
(.+?)
|
||||
#{rcq}
|
||||
(?=\W)/x
|
||||
else
|
||||
/(#{rcq})
|
||||
(#{C})
|
||||
(?::(\S+))?
|
||||
(\S.*?\S|\S)
|
||||
(?::(\S+?))?
|
||||
(.+?)
|
||||
#{rcq}/xm
|
||||
end
|
||||
[rc, ht, re, rtype]
|
||||
end
|
||||
|
||||
# Elements to handle
|
||||
GLYPHS = [
|
||||
# [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1’\2' ], # single closing
|
||||
[ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1’' ], # single closing
|
||||
[ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '’' ], # single closing
|
||||
[ /\'/, '‘' ], # single opening
|
||||
[ /</, '<' ], # less-than
|
||||
[ />/, '>' ], # greater-than
|
||||
# [ /([^\s\[{(])?"(\s|:|$)/, '\1”\2' ], # double closing
|
||||
[ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1”' ], # double closing
|
||||
[ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '”' ], # double closing
|
||||
[ /"/, '“' ], # double opening
|
||||
[ /\b( )?\.{3}/, '\1…' ], # ellipsis
|
||||
[ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
|
||||
[ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^<A-Za-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
|
||||
[ /(\.\s)?\s?--\s?/, '\1—' ], # em dash
|
||||
[ /\s->\s/, ' → ' ], # right arrow
|
||||
[ /\s-\s/, ' – ' ], # en dash
|
||||
[ /(\d+) ?x ?(\d+)/, '\1×\2' ], # dimension sign
|
||||
[ /\b ?[(\[]TM[\])]/i, '™' ], # trademark
|
||||
[ /\b ?[(\[]R[\])]/i, '®' ], # registered
|
||||
[ /\b ?[(\[]C[\])]/i, '©' ] # copyright
|
||||
]
|
||||
|
||||
H_ALGN_VALS = {
|
||||
'<' => 'left',
|
||||
'=' => 'center',
|
||||
'>' => 'right',
|
||||
'<>' => 'justify'
|
||||
}
|
||||
|
||||
V_ALGN_VALS = {
|
||||
'^' => 'top',
|
||||
'-' => 'middle',
|
||||
'~' => 'bottom'
|
||||
}
|
||||
|
||||
#
|
||||
# Flexible HTML escaping
|
||||
#
|
||||
|
|
@ -548,7 +530,7 @@ class RedCloth < String
|
|||
depth.pop
|
||||
end
|
||||
end
|
||||
if depth.last and depth.last.length == tl.length
|
||||
if depth.last.length == tl.length
|
||||
lines[line_id - 1] << '</li>'
|
||||
end
|
||||
end
|
||||
|
|
@ -595,7 +577,7 @@ class RedCloth < String
|
|||
end
|
||||
|
||||
def hard_break( text )
|
||||
text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
|
||||
text.gsub!( /(.)\n(?! *[#*\s|]|$)/, "\\1<br />" ) if hard_breaks
|
||||
end
|
||||
|
||||
BLOCKS_GROUP_RE = /\n{2,}(?! )/m
|
||||
|
|
@ -723,9 +705,9 @@ class RedCloth < String
|
|||
end
|
||||
end
|
||||
|
||||
MARKDOWN_RULE_RE = /^(#{
|
||||
MARKDOWN_RULE_RE = /^#{
|
||||
['*', '-', '_'].collect { |ch| '( ?' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
|
||||
})$/
|
||||
}$/
|
||||
|
||||
def block_markdown_rule( text )
|
||||
text.gsub!( MARKDOWN_RULE_RE ) do |blk|
|
||||
|
|
@ -737,6 +719,9 @@ class RedCloth < String
|
|||
def block_markdown_lists( text )
|
||||
end
|
||||
|
||||
def inline_markdown_link( text )
|
||||
end
|
||||
|
||||
def inline_textile_span( text )
|
||||
QTAGS.each do |qtag_rc, ht, qtag_re, rtype|
|
||||
text.gsub!( qtag_re ) do |m|
|
||||
|
|
@ -918,12 +903,12 @@ class RedCloth < String
|
|||
|
||||
def shelve( val )
|
||||
@shelf << val
|
||||
" :redsh##{ @shelf.length }:"
|
||||
" <#{ @shelf.length }>"
|
||||
end
|
||||
|
||||
def retrieve( text )
|
||||
@shelf.each_with_index do |r, i|
|
||||
text.gsub!( " :redsh##{ i + 1 }:", r )
|
||||
text.gsub!( " <#{ i + 1 }>", r )
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -980,7 +965,7 @@ class RedCloth < String
|
|||
HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m
|
||||
ALLTAG_MATCH = /(<\/?\w[^\n]*?>)|.*?(?=<\/?\w[^\n]*?>|$)/m
|
||||
|
||||
def glyphs_textile( text, level = 0 )
|
||||
def inline_textile_glyphs( text, level = 0 )
|
||||
if text !~ HASTAG_MATCH
|
||||
pgl text
|
||||
footnote_ref text
|
||||
|
|
@ -996,11 +981,11 @@ class RedCloth < String
|
|||
codepre = 0 if codepre < 0
|
||||
end
|
||||
elsif codepre.zero?
|
||||
glyphs_textile( line, level + 1 )
|
||||
inline_textile_glyphs( line, level + 1 )
|
||||
else
|
||||
htmlesc( line, :NoQuotes )
|
||||
end
|
||||
# p [level, codepre, line]
|
||||
## p [level, codepre, orig_line, line]
|
||||
|
||||
line
|
||||
end
|
||||
|
|
@ -1048,10 +1033,8 @@ class RedCloth < String
|
|||
end
|
||||
|
||||
def inline( text )
|
||||
[/^inline_/, /^glyphs_/].each do |meth_re|
|
||||
@rules.each do |rule_name|
|
||||
method( rule_name ).call( text ) if rule_name.to_s.match( meth_re )
|
||||
end
|
||||
@rules.each do |rule_name|
|
||||
method( rule_name ).call( text ) if rule_name.to_s.match /^inline_/
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -1114,7 +1097,7 @@ class RedCloth < String
|
|||
q2 = ( q != '' ? q : '\s' )
|
||||
if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
|
||||
attrv = $1
|
||||
next if prop == 'src' and attrv =~ %r{^(?!http)\w+:}
|
||||
next if prop == 'src' and attrv !~ /^http/
|
||||
pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
|
||||
break
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue