From 31a0a4c22478268538480254efe035918627ca04 Mon Sep 17 00:00:00 2001 From: ishikawa999 Date: Mon, 27 Sep 2021 08:41:47 +0000 Subject: [PATCH 5/8] Fix modules where folder structure does not meet Zeitwerk rules --- lib/redmine.rb | 1 + lib/redmine/wiki_formatting/textile/formatter.rb | 2 +- lib/redmine/wiki_formatting/textile/redcloth3.rb | 1908 +++++++++++----------- 3 files changed, 959 insertions(+), 952 deletions(-) diff --git a/lib/redmine.rb b/lib/redmine.rb index 2880df64d7..0980a21617 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -17,6 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +require 'diff' require 'core_ext' begin diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb index d425306514..d4961b1678 100644 --- a/lib/redmine/wiki_formatting/textile/formatter.rb +++ b/lib/redmine/wiki_formatting/textile/formatter.rb @@ -23,7 +23,7 @@ require 'digest/md5' module Redmine module WikiFormatting module Textile - class Formatter < RedCloth3 + class Formatter < Redmine::WikiFormatting::Textile::RedCloth3 include ActionView::Helpers::TagHelper include Redmine::WikiFormatting::LinksHelper diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb index 2816e1c90d..28eec6fa86 100644 --- a/lib/redmine/wiki_formatting/textile/redcloth3.rb +++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb @@ -166,1055 +166,1061 @@ # # class RedCloth::Textile.new( str ) -class RedCloth3 < String - include Redmine::Helpers::URL - - VERSION = '3.0.4' - DEFAULT_RULES = [:textile, :markdown] - - # - # Two accessor for setting security restrictions. - # - # This is a nice thing if you're using RedCloth for - # formatting in public places (e.g. Wikis) where you - # don't want users to abuse HTML for bad things. - # - # If +:filter_html+ is set, HTML which wasn't - # created by the Textile processor will be escaped. - # - # If +:filter_styles+ is set, it will also disable - # the style markup specifier. ('{color: red}') - # - attr_accessor :filter_html, :filter_styles - - # - # Accessor for toggling hard breaks. - # - # If +:hard_breaks+ is set, single newlines will - # be converted to HTML break tags. This is the - # default behavior for traditional RedCloth. - # - 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 fell!" - # - attr_accessor :lite_mode - - # - # 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: - # - # == Textile Rules - # - # The following textile rules can be set individually. Or add the complete - # set of rules with the single :textile rule, which supplies the rule set in - # the following precedence: - # - # refs_textile:: Textile references (i.e. [hobix]http://hobix.com/) - # block_textile_table:: Textile table block structures - # block_textile_lists:: Textile list structures - # block_textile_prefix:: Textile blocks with prefixes (i.e. bq., h2., etc.) - # 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) - # - # == Markdown - # - # refs_markdown:: Markdown references (for example: [hobix]: http://hobix.com/) - # block_markdown_setext:: Markdown setext headers - # block_markdown_atx:: Markdown atx headers - # block_markdown_rule:: Markdown horizontal rules - # block_markdown_bq:: Markdown blockquotes - # block_markdown_lists:: Markdown lists - # inline_markdown_link:: Markdown links - attr_accessor :rules - - # Returns a new RedCloth object, based on _string_ and - # enforcing all the included _restrictions_. - # - # r = RedCloth.new( "h1. A bold man", [:filter_html] ) - # r.to_html - # #=>"

A <b>bold</b> man

" - # - def initialize( string, restrictions = [] ) - restrictions.each { |r| method( "#{r}=" ).call( true ) } - super( string ) - end +module Redmine + module WikiFormatting + module Textile + class RedCloth3 < String + include Redmine::Helpers::URL + + VERSION = '3.0.4' + DEFAULT_RULES = [:textile, :markdown] + + # + # Two accessor for setting security restrictions. + # + # This is a nice thing if you're using RedCloth for + # formatting in public places (e.g. Wikis) where you + # don't want users to abuse HTML for bad things. + # + # If +:filter_html+ is set, HTML which wasn't + # created by the Textile processor will be escaped. + # + # If +:filter_styles+ is set, it will also disable + # the style markup specifier. ('{color: red}') + # + attr_accessor :filter_html, :filter_styles + + # + # Accessor for toggling hard breaks. + # + # If +:hard_breaks+ is set, single newlines will + # be converted to HTML break tags. This is the + # default behavior for traditional RedCloth. + # + 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 fell!" + # + attr_accessor :lite_mode + + # + # 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: + # + # == Textile Rules + # + # The following textile rules can be set individually. Or add the complete + # set of rules with the single :textile rule, which supplies the rule set in + # the following precedence: + # + # refs_textile:: Textile references (i.e. [hobix]http://hobix.com/) + # block_textile_table:: Textile table block structures + # block_textile_lists:: Textile list structures + # block_textile_prefix:: Textile blocks with prefixes (i.e. bq., h2., etc.) + # 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) + # + # == Markdown + # + # refs_markdown:: Markdown references (for example: [hobix]: http://hobix.com/) + # block_markdown_setext:: Markdown setext headers + # block_markdown_atx:: Markdown atx headers + # block_markdown_rule:: Markdown horizontal rules + # block_markdown_bq:: Markdown blockquotes + # block_markdown_lists:: Markdown lists + # inline_markdown_link:: Markdown links + attr_accessor :rules + + # Returns a new RedCloth object, based on _string_ and + # enforcing all the included _restrictions_. + # + # r = RedCloth.new( "h1. A bold man", [:filter_html] ) + # r.to_html + # #=>"

A <b>bold</b> man

" + # + def initialize( string, restrictions = [] ) + restrictions.each { |r| method( "#{r}=" ).call( true ) } + super( string ) + end - # - # Generates HTML from the Textile contents. - # - # r = RedCloth.new( "And then? She *fell*!" ) - # r.to_html( true ) - # #=>"And then? She fell!" - # - def to_html( *rules ) - rules = DEFAULT_RULES if rules.empty? - # make our working copy - text = self.dup - - @urlrefs = {} - @shelf = [] - textile_rules = [:block_textile_table, :block_textile_lists, - :block_textile_prefix, :inline_textile_image, :inline_textile_code, - :inline_textile_span, :inline_textile_link, :glyphs_textile] - 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] - @rules = rules.collect do |rule| - case rule - when :markdown - markdown_rules - when :textile - textile_rules - else - rule - end - end.flatten - - # standard clean up - incoming_entities text - clean_white_space text - - # start processor - @pre_list = [] - rip_offtags text - no_textile text - escape_html_tags text - # need to do this before #hard_break and #blocks - block_textile_quotes text unless @lite_mode - hard_break text - unless @lite_mode - refs text - blocks text - end - inline text - smooth_offtags text + # + # Generates HTML from the Textile contents. + # + # r = RedCloth.new( "And then? She *fell*!" ) + # r.to_html( true ) + # #=>"And then? She fell!" + # + def to_html( *rules ) + rules = DEFAULT_RULES if rules.empty? + # make our working copy + text = self.dup + + @urlrefs = {} + @shelf = [] + textile_rules = [:block_textile_table, :block_textile_lists, + :block_textile_prefix, :inline_textile_image, :inline_textile_code, + :inline_textile_span, :inline_textile_link, :glyphs_textile] + 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] + @rules = rules.collect do |rule| + case rule + when :markdown + markdown_rules + when :textile + textile_rules + else + rule + end + end.flatten + + # standard clean up + incoming_entities text + clean_white_space text + + # start processor + @pre_list = [] + rip_offtags text + no_textile text + escape_html_tags text + # need to do this before #hard_break and #blocks + block_textile_quotes text unless @lite_mode + hard_break text + unless @lite_mode + refs text + blocks text + end + inline text + smooth_offtags text - retrieve text + retrieve text - text.gsub!( /<\/?notextile>/, '' ) - text.gsub!( /x%x%/, '&' ) - clean_html text if filter_html - text.strip! - text - end + text.gsub!( /<\/?notextile>/, '' ) + text.gsub!( /x%x%/, '&' ) + clean_html text if filter_html + text.strip! + text + end - private - - # - # Mapping of 8-bit ASCII codes to HTML numerical entity equivalents. - # (from PyTextile) - # - TEXTILE_TAGS = - [[128, 8364], [129, 0], [130, 8218], [131, 402], [132, 8222], [133, 8230], - [134, 8224], [135, 8225], [136, 710], [137, 8240], [138, 352], [139, 8249], - [140, 338], [141, 0], [142, 0], [143, 0], [144, 0], [145, 8216], [146, 8217], - [147, 8220], [148, 8221], [149, 8226], [150, 8211], [151, 8212], [152, 732], - [153, 8482], [154, 353], [155, 8250], [156, 339], [157, 0], [158, 0], [159, 376]]. - collect! do |a, b| - [a.chr, ( b.zero? and "" or "&#{b};" )] - end - # - # Regular expressions to convert to HTML. - # - A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/ - A_VLGN = /[\-^~]/ - C_CLAS = '(?:\([^")]+\))' - C_LNGE = '(?:\[[a-z\-_]+\])' - C_STYL = '(?:\{[^{][^"}]+\})' - S_CSPN = '(?:\\\\\d+)' - S_RSPN = '(?:/\d+)' - A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)" - S = "(?:#{S_CSPN}?#{S_RSPN}|#{S_RSPN}?#{S_CSPN}?)" - 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 - SIMPLE_HTML_TAGS = [ - 'tt', 'b', 'i', 'big', 'small', 'em', 'strong', 'dfn', 'code', - 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'br', - 'br', 'map', 'q', 'sub', 'sup', 'span', 'bdo' - ] - - QTAGS = [ - ['**', 'b', :limit], - ['*', 'strong', :limit], - ['??', 'cite', :limit], - ['-', 'del', :limit], - ['__', 'i', :limit], - ['_', 'em', :limit], - ['%', 'span', :limit], - ['+', 'ins', :limit], - ['^', 'sup', :limit], - ['~', 'sub', :limit] - ] - QTAGS_JOIN = QTAGS.map {|rc, ht, rtype| Regexp::quote rc}.join('|') - - QTAGS.collect! do |rc, ht, rtype| - rcq = Regexp::quote rc - re = - case rtype - when :limit - /(^|[>\s\(]) # sta - (?!\-\-) - (#{QTAGS_JOIN}|) # oqs - (#{rcq}) # qtag - ([[:word:]]|[^\s].*?[^\s]) # content - (?!\-\-) - #{rcq} - (#{QTAGS_JOIN}|) # oqa - (?=[[:punct:]]|<|\s|\)|$)/x - else - /(#{rcq}) - (#{C}) - (?::(\S+))? - ([[:word:]]|[^\s\-].*?[^\s\-]) - #{rcq}/xm - end - [rc, ht, re, rtype] - end + private + + # + # Mapping of 8-bit ASCII codes to HTML numerical entity equivalents. + # (from PyTextile) + # + TEXTILE_TAGS = + [[128, 8364], [129, 0], [130, 8218], [131, 402], [132, 8222], [133, 8230], + [134, 8224], [135, 8225], [136, 710], [137, 8240], [138, 352], [139, 8249], + [140, 338], [141, 0], [142, 0], [143, 0], [144, 0], [145, 8216], [146, 8217], + [147, 8220], [148, 8221], [149, 8226], [150, 8211], [151, 8212], [152, 732], + [153, 8482], [154, 353], [155, 8250], [156, 339], [157, 0], [158, 0], [159, 376]]. + collect! do |a, b| + [a.chr, ( b.zero? and "" or "&#{b};" )] + end + # + # Regular expressions to convert to HTML. + # + A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/ + A_VLGN = /[\-^~]/ + C_CLAS = '(?:\([^")]+\))' + C_LNGE = '(?:\[[a-z\-_]+\])' + C_STYL = '(?:\{[^{][^"}]+\})' + S_CSPN = '(?:\\\\\d+)' + S_RSPN = '(?:/\d+)' + A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)" + S = "(?:#{S_CSPN}?#{S_RSPN}|#{S_RSPN}?#{S_CSPN}?)" + 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 + SIMPLE_HTML_TAGS = [ + 'tt', 'b', 'i', 'big', 'small', 'em', 'strong', 'dfn', 'code', + 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'br', + 'br', 'map', 'q', 'sub', 'sup', 'span', 'bdo' + ] + + QTAGS = [ + ['**', 'b', :limit], + ['*', 'strong', :limit], + ['??', 'cite', :limit], + ['-', 'del', :limit], + ['__', 'i', :limit], + ['_', 'em', :limit], + ['%', 'span', :limit], + ['+', 'ins', :limit], + ['^', 'sup', :limit], + ['~', 'sub', :limit] + ] + QTAGS_JOIN = QTAGS.map {|rc, ht, rtype| Regexp::quote rc}.join('|') + + QTAGS.collect! do |rc, ht, rtype| + rcq = Regexp::quote rc + re = + case rtype + when :limit + /(^|[>\s\(]) # sta + (?!\-\-) + (#{QTAGS_JOIN}|) # oqs + (#{rcq}) # qtag + ([[:word:]]|[^\s].*?[^\s]) # content + (?!\-\-) + #{rcq} + (#{QTAGS_JOIN}|) # oqa + (?=[[:punct:]]|<|\s|\)|$)/x + else + /(#{rcq}) + (#{C}) + (?::(\S+))? + ([[:word:]]|[^\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 - # [ //, '>' ], # 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(?:[(]([^)]*)[)])/, '\1' ], # 3+ uppercase acronym - # [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^\2\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 - # - def htmlesc( str, mode=:Quotes ) - if str - str.gsub!( '&', '&' ) - str.gsub!( '"', '"' ) if mode != :NoQuotes - str.gsub!( "'", ''' ) if mode == :Quotes - str.gsub!( '<', '<') - str.gsub!( '>', '>') - end - str - 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 + # [ //, '>' ], # 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(?:[(]([^)]*)[)])/, '\1' ], # 3+ uppercase acronym + # [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^\2\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 + # + def htmlesc( str, mode=:Quotes ) + if str + str.gsub!( '&', '&' ) + str.gsub!( '"', '"' ) if mode != :NoQuotes + str.gsub!( "'", ''' ) if mode == :Quotes + str.gsub!( '<', '<') + str.gsub!( '>', '>') + end + str + end - # Search and replace for Textile glyphs (quotes, dashes, other symbols) - def pgl( text ) - # GLYPHS.each do |re, resub, tog| - # next if tog and method( tog ).call - # text.gsub! re, resub - # end - text.gsub!(/\b([A-Z][A-Z0-9]{1,})\b(?:[(]([^)]*)[)])/) do |m| - "#{$1}" - end - end + # Search and replace for Textile glyphs (quotes, dashes, other symbols) + def pgl( text ) + # GLYPHS.each do |re, resub, tog| + # next if tog and method( tog ).call + # text.gsub! re, resub + # end + text.gsub!(/\b([A-Z][A-Z0-9]{1,})\b(?:[(]([^)]*)[)])/) do |m| + "#{$1}" + end + end - # Parses Textile attribute lists and builds an HTML attribute string - def pba( text_in, element = "" ) - return +'' unless text_in + # Parses Textile attribute lists and builds an HTML attribute string + def pba( text_in, element = "" ) + return +'' unless text_in - style = [] - text = text_in.dup - if element == 'td' - colspan = $1 if text =~ /\\(\d+)/ - rowspan = $1 if text =~ /\/(\d+)/ - style << "vertical-align:#{v_align($&)};" if text =~ A_VLGN - end + style = [] + text = text_in.dup + if element == 'td' + colspan = $1 if text =~ /\\(\d+)/ + rowspan = $1 if text =~ /\/(\d+)/ + style << "vertical-align:#{v_align($&)};" if text =~ A_VLGN + end - if text.sub!( /\{([^"}]*)\}/, '' ) && !filter_styles - sanitized = sanitize_styles($1) - style << "#{sanitized};" unless sanitized.blank? - end + if text.sub!( /\{([^"}]*)\}/, '' ) && !filter_styles + sanitized = sanitize_styles($1) + style << "#{sanitized};" unless sanitized.blank? + end - lang = $1 if - text.sub!( /\[([a-z\-_]+?)\]/, '' ) + lang = $1 if + text.sub!( /\[([a-z\-_]+?)\]/, '' ) - cls = $1 if - text.sub!( /\(([^()]+?)\)/, '' ) + cls = $1 if + text.sub!( /\(([^()]+?)\)/, '' ) - style << "padding-left:#{$1.length}em;" if - text.sub!( /([(]+)/, '' ) + style << "padding-left:#{$1.length}em;" if + text.sub!( /([(]+)/, '' ) - style << "padding-right:#{$1.length}em;" if text.sub!( /([)]+)/, '' ) + style << "padding-right:#{$1.length}em;" if text.sub!( /([)]+)/, '' ) - style << "text-align:#{h_align($&)};" if text =~ A_HLGN + style << "text-align:#{h_align($&)};" if text =~ A_HLGN - cls, id = $1, $2 if cls =~ /^(.*?)#(.*)$/ + cls, id = $1, $2 if cls =~ /^(.*?)#(.*)$/ - # add wiki-class- and wiki-id- to classes and ids to prevent setting of - # arbitrary classes and ids - cls = cls.split(/\s+/).map do |c| - c.starts_with?('wiki-class-') ? c : "wiki-class-#{c}" - end.join(' ') if cls + # add wiki-class- and wiki-id- to classes and ids to prevent setting of + # arbitrary classes and ids + cls = cls.split(/\s+/).map do |c| + c.starts_with?('wiki-class-') ? c : "wiki-class-#{c}" + end.join(' ') if cls - id = id.starts_with?('wiki-id-') ? id : "wiki-id-#{id}" if id + id = id.starts_with?('wiki-id-') ? id : "wiki-id-#{id}" if id - atts = +'' - atts << " style=\"#{style.join}\"" unless style.empty? - atts << " class=\"#{cls}\"" unless cls.to_s.empty? - atts << " lang=\"#{lang}\"" if lang - atts << " id=\"#{id}\"" if id - atts << " colspan=\"#{colspan}\"" if colspan - atts << " rowspan=\"#{rowspan}\"" if rowspan + atts = +'' + atts << " style=\"#{style.join}\"" unless style.empty? + atts << " class=\"#{cls}\"" unless cls.to_s.empty? + atts << " lang=\"#{lang}\"" if lang + atts << " id=\"#{id}\"" if id + atts << " colspan=\"#{colspan}\"" if colspan + atts << " rowspan=\"#{rowspan}\"" if rowspan - atts - end - - STYLES_RE = /^(color|(min-|max-)?+(width|height)|border|background|padding|margin|font|text|float)(-[a-z]+)*:\s*((\d+%?|\d+px|\d+(\.\d+)?em|#[0-9a-f]+|[a-z]+)\s*)+$/i + atts + end - def sanitize_styles(str) - styles = str.split(";").map(&:strip) - styles.reject! do |style| - !style.match(STYLES_RE) - end - styles.join(";") - end + STYLES_RE = /^(color|(min-|max-)?+(width|height)|border|background|padding|margin|font|text|float)(-[a-z]+)*:\s*((\d+%?|\d+px|\d+(\.\d+)?em|#[0-9a-f]+|[a-z]+)\s*)+$/i - TABLE_RE = /^(?:table(_?#{S}#{A}#{C})\. ?\n)?^(#{A}#{C}\.? ?\|.*?\|)(\n\n|\Z)/m - - # Parses a Textile table block, building HTML from the result. - def block_textile_table( text ) - text.gsub!( TABLE_RE ) do |matches| - tatts, fullrow = $~[1..2] - tatts = pba( tatts, 'table' ) - tatts = shelve( tatts ) if tatts - rows = [] - fullrow.gsub!(/([^|\s])\s*\n/, "\\1
") - fullrow.each_line do |row| - ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m - cells = [] - # the regexp prevents wiki links with a | from being cut as cells - row.scan(/\|(_?#{S}#{A}#{C}\. ?)?((\[\[[^|\]]*\|[^|\]]*\]\]|[^|])*?)(?=\|)/) do |modifiers, cell| - ctyp = 'd' - ctyp = 'h' if modifiers && modifiers =~ /^_/ - - catts = nil - catts = pba( modifiers, 'td' ) if modifiers - - catts = shelve( catts ) if catts - cells << "\t\t\t#{cell}" + def sanitize_styles(str) + styles = str.split(";").map(&:strip) + styles.reject! do |style| + !style.match(STYLES_RE) + end + styles.join(";") end - ratts = shelve( ratts ) if ratts - rows << "\t\t\n#{cells.join("\n")}\n\t\t" - end - "\t\n#{rows.join("\n")}\n\t\n\n" - end - end - LISTS_RE = /^([#*]+?#{C} .*?)$(?![^#*])/m - LISTS_CONTENT_RE = /^([#*]+)(#{A}#{C}) (.*)$/m - - # Parses Textile lists and generates HTML - def block_textile_lists( text ) - text.gsub!( LISTS_RE ) do |match| - lines = match.split( /\n/ ) - last_line = -1 - depth = [] - lines.each_with_index do |line, line_id| - if line =~ LISTS_CONTENT_RE - tl,atts,content = $~[1..3] - if depth.last - if depth.last.length > tl.length - (depth.length - 1).downto(0) do |i| - break if depth[i].length == tl.length - lines[line_id - 1] << "\n\t\n\t" - depth.pop + TABLE_RE = /^(?:table(_?#{S}#{A}#{C})\. ?\n)?^(#{A}#{C}\.? ?\|.*?\|)(\n\n|\Z)/m + + # Parses a Textile table block, building HTML from the result. + def block_textile_table( text ) + text.gsub!( TABLE_RE ) do |matches| + tatts, fullrow = $~[1..2] + tatts = pba( tatts, 'table' ) + tatts = shelve( tatts ) if tatts + rows = [] + fullrow.gsub!(/([^|\s])\s*\n/, "\\1
") + fullrow.each_line do |row| + ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m + cells = [] + # the regexp prevents wiki links with a | from being cut as cells + row.scan(/\|(_?#{S}#{A}#{C}\. ?)?((\[\[[^|\]]*\|[^|\]]*\]\]|[^|])*?)(?=\|)/) do |modifiers, cell| + ctyp = 'd' + ctyp = 'h' if modifiers && modifiers =~ /^_/ + + catts = nil + catts = pba( modifiers, 'td' ) if modifiers + + catts = shelve( catts ) if catts + cells << "\t\t\t#{cell}" end + ratts = shelve( ratts ) if ratts + rows << "\t\t\n#{cells.join("\n")}\n\t\t" end - if depth.last and depth.last.length == tl.length - lines[line_id - 1] << '' + "\t\n#{rows.join("\n")}\n\t\n\n" + end + end + + LISTS_RE = /^([#*]+?#{C} .*?)$(?![^#*])/m + LISTS_CONTENT_RE = /^([#*]+)(#{A}#{C}) (.*)$/m + + # Parses Textile lists and generates HTML + def block_textile_lists( text ) + text.gsub!( LISTS_RE ) do |match| + lines = match.split( /\n/ ) + last_line = -1 + depth = [] + lines.each_with_index do |line, line_id| + if line =~ LISTS_CONTENT_RE + tl,atts,content = $~[1..3] + if depth.last + if depth.last.length > tl.length + (depth.length - 1).downto(0) do |i| + break if depth[i].length == tl.length + lines[line_id - 1] << "\n\t\n\t" + depth.pop + end + end + if depth.last and depth.last.length == tl.length + lines[line_id - 1] << '' + end + end + if depth.last != tl + depth << tl + atts = pba( atts ) + atts = shelve( atts ) if atts + lines[line_id] = +"\t<#{lT(tl)}l#{atts}>\n\t
  • #{content}" + else + lines[line_id] = +"\t\t
  • #{content}" + end + last_line = line_id + else + last_line = line_id + end + if line_id - last_line > 1 or line_id == lines.length - 1 + while v = depth.pop + lines[last_line] << "
    • \n\t" + end + end end + lines.join( "\n" ) end - if depth.last != tl - depth << tl - atts = pba( atts ) - atts = shelve( atts ) if atts - lines[line_id] = +"\t<#{lT(tl)}l#{atts}>\n\t
  • #{content}" - else - lines[line_id] = +"\t\t
  • #{content}" + end + + QUOTES_RE = /(^>+([^\n]*?)(\n|$))+/m + QUOTES_CONTENT_RE = /^([> ]+)(.*)$/m + + def block_textile_quotes( text ) + text.gsub!( QUOTES_RE ) do |match| + lines = match.split( /\n/ ) + quotes = +'' + indent = 0 + lines.each do |line| + line =~ QUOTES_CONTENT_RE + bq,content = $1, $2 + l = bq.count('>') + if l != indent + quotes << ("\n\n" + (l>indent ? '
    ' * (l-indent) : '
    ' * (indent-l)) + "\n\n") + indent = l end - last_line = line_id - else - last_line = line_id + quotes << (content + "\n") + end + quotes << ("\n" + '' * indent + "\n\n") + quotes + end end - if line_id - last_line > 1 or line_id == lines.length - 1 - while v = depth.pop - lines[last_line] << "
    • \n\t" + + CODE_RE = /(\W) + @ + (?:\|(\w+?)\|)? + (.+?) + @ + (?=\W)/x + + def inline_textile_code( text ) + text.gsub!( CODE_RE ) do |m| + before,lang,code,after = $~[1..4] + lang = " lang=\"#{lang}\"" if lang + rip_offtags( +"#{before}#{code}#{after}", false ) end end - end - lines.join( "\n" ) - end - end - QUOTES_RE = /(^>+([^\n]*?)(\n|$))+/m - QUOTES_CONTENT_RE = /^([> ]+)(.*)$/m - - def block_textile_quotes( text ) - text.gsub!( QUOTES_RE ) do |match| - lines = match.split( /\n/ ) - quotes = +'' - indent = 0 - lines.each do |line| - line =~ QUOTES_CONTENT_RE - bq,content = $1, $2 - l = bq.count('>') - if l != indent - quotes << ("\n\n" + (l>indent ? '
    ' * (l-indent) : '
    ' * (indent-l)) + "\n\n") - indent = l - end - quotes << (content + "\n") - end - quotes << ("\n" + '' * indent + "\n\n") - quotes - end - end + def lT( text ) + /\#$/.match?(text) ? 'o' : 'u' + end - CODE_RE = /(\W) - @ - (?:\|(\w+?)\|)? - (.+?) - @ - (?=\W)/x - - def inline_textile_code( text ) - text.gsub!( CODE_RE ) do |m| - before,lang,code,after = $~[1..4] - lang = " lang=\"#{lang}\"" if lang - rip_offtags( +"#{before}#{code}#{after}", false ) - end - end + def hard_break( text ) + text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1
    " ) if hard_breaks + end - def lT( text ) - /\#$/.match?(text) ? 'o' : 'u' - end + BLOCKS_GROUP_RE = /\n{2,}(?! )/m - def hard_break( text ) - text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1
    " ) if hard_breaks - end + def blocks( text, deep_code = false ) + text.replace( text.split( BLOCKS_GROUP_RE ).collect do |blk| + plain = blk !~ /\A[#*> ]/ - BLOCKS_GROUP_RE = /\n{2,}(?! )/m - - def blocks( text, deep_code = false ) - text.replace( text.split( BLOCKS_GROUP_RE ).collect do |blk| - plain = blk !~ /\A[#*> ]/ - - # skip blocks that are complex HTML - if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1 - blk - else - # search for indentation levels - blk.strip! - if blk.empty? - blk - else - code_blk = nil - blk.gsub!( /((?:\n(?:\n^ +[^\n]*)+)+)/m ) do |iblk| - flush_left iblk - blocks iblk, plain - iblk.gsub( /^(\S)/, "\t\\1" ) - if plain - code_blk = iblk; "" + # skip blocks that are complex HTML + if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1 + blk else - iblk + # search for indentation levels + blk.strip! + if blk.empty? + blk + else + code_blk = nil + blk.gsub!( /((?:\n(?:\n^ +[^\n]*)+)+)/m ) do |iblk| + flush_left iblk + blocks iblk, plain + iblk.gsub( /^(\S)/, "\t\\1" ) + if plain + code_blk = iblk; "" + else + iblk + end + end + + block_applied = 0 + @rules.each do |rule_name| + block_applied += 1 if rule_name.to_s.match /^block_/ and method(rule_name).call(blk) + end + if block_applied.zero? + if deep_code + blk = "\t
    #{blk}
    " + else + blk = "\t

    #{blk}

    " + end + end + # hard_break blk + blk + "\n#{code_blk}" + end end - end + end.join( "\n\n" ) ) + end - block_applied = 0 - @rules.each do |rule_name| - block_applied += 1 if rule_name.to_s.match /^block_/ and method(rule_name).call(blk) - end - if block_applied.zero? - if deep_code - blk = "\t
    #{blk}
    " - else - blk = "\t

    #{blk}

    " - end - end - # hard_break blk - blk + "\n#{code_blk}" + def textile_bq( tag, atts, cite, content ) + cite, cite_title = check_refs( cite ) + cite = " cite=\"#{cite}\"" if cite + atts = shelve( atts ) if atts + "\t\n\t\t#{content}

    \n\t" end - end - end.join( "\n\n" ) ) - end - def textile_bq( tag, atts, cite, content ) - cite, cite_title = check_refs( cite ) - cite = " cite=\"#{cite}\"" if cite - atts = shelve( atts ) if atts - "\t\n\t\t#{content}

    \n\t" - end + def textile_p( tag, atts, cite, content ) + atts = shelve( atts ) if atts + "\t<#{tag}#{atts}>#{content}" + end - def textile_p( tag, atts, cite, content ) - atts = shelve( atts ) if atts - "\t<#{tag}#{atts}>#{content}" - end + alias textile_h1 textile_p + alias textile_h2 textile_p + alias textile_h3 textile_p + alias textile_h4 textile_p + alias textile_h5 textile_p + alias textile_h6 textile_p + + def textile_fn_( tag, num, atts, cite, content ) + atts << " id=\"fn#{num}\" class=\"footnote\"" + content = "#{num} #{content}" + atts = shelve( atts ) if atts + "\t#{content}

    " + end - alias textile_h1 textile_p - alias textile_h2 textile_p - alias textile_h3 textile_p - alias textile_h4 textile_p - alias textile_h5 textile_p - alias textile_h6 textile_p - - def textile_fn_( tag, num, atts, cite, content ) - atts << " id=\"fn#{num}\" class=\"footnote\"" - content = "#{num} #{content}" - atts = shelve( atts ) if atts - "\t#{content}

    " - end + BLOCK_RE = /^(([a-z]+)(\d*))(#{A}#{C})\.(?::(\S+))? (.*)$/m - BLOCK_RE = /^(([a-z]+)(\d*))(#{A}#{C})\.(?::(\S+))? (.*)$/m + def block_textile_prefix( text ) + if text =~ BLOCK_RE + tag,tagpre,num,atts,cite,content = $~[1..6] + atts = pba( atts ) - def block_textile_prefix( text ) - if text =~ BLOCK_RE - tag,tagpre,num,atts,cite,content = $~[1..6] - atts = pba( atts ) + # pass to prefix handler + replacement = nil + if respond_to? "textile_#{tag}", true + replacement = method( "textile_#{tag}" ).call( tag, atts, cite, content ) + elsif respond_to? "textile_#{tagpre}_", true + replacement = method( "textile_#{tagpre}_" ).call( tagpre, num, atts, cite, content ) + end + text.gsub!( $& ) { replacement } if replacement + end + end - # pass to prefix handler - replacement = nil - if respond_to? "textile_#{tag}", true - replacement = method( "textile_#{tag}" ).call( tag, atts, cite, content ) - elsif respond_to? "textile_#{tagpre}_", true - replacement = method( "textile_#{tagpre}_" ).call( tagpre, num, atts, cite, content ) - end - text.gsub!( $& ) { replacement } if replacement - end - end + SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m + def block_markdown_setext( text ) + if text =~ SETEXT_RE + tag = ($2 == "=" ? "h1" : "h2") + blk, cont = "<#{tag}>#{$1}", $' + blocks cont + text.replace( blk + cont ) + end + end - SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m - def block_markdown_setext( text ) - if text =~ SETEXT_RE - tag = ($2 == "=" ? "h1" : "h2") - blk, cont = "<#{tag}>#{$1}", $' - blocks cont - text.replace( blk + cont ) - end - end + ATX_RE = /\A(\#{1,6}) # $1 = string of #'s + [ ]* + (.+?) # $2 = Header text + [ ]* + \#* # optional closing #'s (not counted) + $/x + def block_markdown_atx( text ) + if text =~ ATX_RE + tag = "h#{$1.length}" + blk, cont = "<#{tag}>#{$2}\n\n", $' + blocks cont + text.replace( blk + cont ) + end + end - ATX_RE = /\A(\#{1,6}) # $1 = string of #'s - [ ]* - (.+?) # $2 = Header text - [ ]* - \#* # optional closing #'s (not counted) - $/x - def block_markdown_atx( text ) - if text =~ ATX_RE - tag = "h#{$1.length}" - blk, cont = "<#{tag}>#{$2}\n\n", $' - blocks cont - text.replace( blk + cont ) - end - end + MARKDOWN_BQ_RE = /\A(^ *> ?.+$(.+\n)*\n*)+/m - MARKDOWN_BQ_RE = /\A(^ *> ?.+$(.+\n)*\n*)+/m + def block_markdown_bq( text ) + text.gsub!( MARKDOWN_BQ_RE ) do |blk| + blk.gsub!( /^ *> ?/, '' ) + flush_left blk + blocks blk + blk.gsub!( /^(\S)/, "\t\\1" ) + "
    \n#{blk}\n
    \n\n" + end + end - def block_markdown_bq( text ) - text.gsub!( MARKDOWN_BQ_RE ) do |blk| - blk.gsub!( /^ *> ?/, '' ) - flush_left blk - blocks blk - blk.gsub!( /^(\S)/, "\t\\1" ) - "
    \n#{blk}\n
    \n\n" - end - end + MARKDOWN_RULE_RE = /^(#{ + ['*', '-', '_'].collect { |ch| ' ?(' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' ) + })$/ - MARKDOWN_RULE_RE = /^(#{ - ['*', '-', '_'].collect { |ch| ' ?(' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' ) - })$/ + def block_markdown_rule( text ) + text.gsub!( MARKDOWN_RULE_RE ) do |blk| + "
    " + end + end - def block_markdown_rule( text ) - text.gsub!( MARKDOWN_RULE_RE ) do |blk| - "
    " - end - end + # XXX TODO XXX + def block_markdown_lists( text ) + end - # XXX TODO XXX - def block_markdown_lists( text ) - end + def inline_textile_span( text ) + QTAGS.each do |qtag_rc, ht, qtag_re, rtype| + text.gsub!( qtag_re ) do |m| + case rtype + when :limit + sta,oqs,qtag,content,oqa = $~[1..6] + atts = nil + if content =~ /^(#{C})(.+)$/ + atts, content = $~[1..2] + end + else + qtag,atts,cite,content = $~[1..4] + sta = '' + end + atts = pba( atts ) + atts = shelve( atts ) if atts - def inline_textile_span( text ) - QTAGS.each do |qtag_rc, ht, qtag_re, rtype| - text.gsub!( qtag_re ) do |m| - case rtype - when :limit - sta,oqs,qtag,content,oqa = $~[1..6] - atts = nil - if content =~ /^(#{C})(.+)$/ - atts, content = $~[1..2] + "#{sta}#{oqs}<#{ht}#{atts}>#{content}#{oqa}" + end end - else - qtag,atts,cite,content = $~[1..4] - sta = '' end - atts = pba( atts ) - atts = shelve( atts ) if atts - - "#{sta}#{oqs}<#{ht}#{atts}>#{content}#{oqa}" - end - end - end - LINK_RE = / - ( - ([\s\[{(]|[#{PUNCT}])? # $pre - " # start - (#{C}) # $atts - ([^"\n]+?) # $text - \s? - (?:\(([^)]+?)\)(?="))? # $title - ": - ( # $url - (\/|[a-zA-Z]+:\/\/|www\.|mailto:) # $proto - [[:alnum:]_\/]\S+? - ) - (\/)? # $slash - ([^[:alnum:]_\=\/;\(\)\-]*?) # $post - ) - (?=<|\s|$) - /x - - def inline_textile_link( text ) - text.gsub!( LINK_RE ) do |m| - all,pre,atts,text,title,url,proto,slash,post = $~[1..9] - if text.include?('
    ') - all - else - url, url_title = check_refs(url) - title ||= url_title - # Idea below : an URL with unbalanced parethesis and - # ending by ')' is put into external parenthesis - if url[-1] == ")" and ((url.count("(") - url.count(")")) < 0) - url = url[0..-2] # discard closing parenth from url - post = ")" + post # add closing parenth to post - end + LINK_RE = / + ( + ([\s\[{(]|[#{PUNCT}])? # $pre + " # start + (#{C}) # $atts + ([^"\n]+?) # $text + \s? + (?:\(([^)]+?)\)(?="))? # $title + ": + ( # $url + (\/|[a-zA-Z]+:\/\/|www\.|mailto:) # $proto + [[:alnum:]_\/]\S+? + ) + (\/)? # $slash + ([^[:alnum:]_\=\/;\(\)\-]*?) # $post + ) + (?=<|\s|$) + /x + + def inline_textile_link( text ) + text.gsub!( LINK_RE ) do |m| + all,pre,atts,text,title,url,proto,slash,post = $~[1..9] + if text.include?('
    ') + all + else + url, url_title = check_refs(url) + title ||= url_title + # Idea below : an URL with unbalanced parethesis and + # ending by ')' is put into external parenthesis + if url[-1] == ")" and ((url.count("(") - url.count(")")) < 0) + url = url[0..-2] # discard closing parenth from url + post = ")" + post # add closing parenth to post + end - url = htmlesc(url.dup) - next all if url.downcase.start_with?('javascript:') + url = htmlesc(url.dup) + next all if url.downcase.start_with?('javascript:') - atts = pba(atts) - atts = +" href=\"#{url}#{slash}\"#{atts}" - atts << " title=\"#{htmlesc title}\"" if title - atts = shelve(atts) if atts - external = (url =~ /^https?:\/\//) ? ' class="external"' : '' - "#{pre}#{text}#{post}" - end - end - end + atts = pba(atts) + atts = +" href=\"#{url}#{slash}\"#{atts}" + atts << " title=\"#{htmlesc title}\"" if title + atts = shelve(atts) if atts + external = (url =~ /^https?:\/\//) ? ' class="external"' : '' + "#{pre}#{text}#{post}" + end + end + end - MARKDOWN_REFLINK_RE = / - \[([^\[\]]+)\] # $text - [ ]? # opt. space - (?:\n[ ]*)? # one optional newline followed by spaces - \[(.*?)\] # $id - /x - - def inline_markdown_reflink( text ) - text.gsub!( MARKDOWN_REFLINK_RE ) do |m| - text, id = $~[1..2] - - if id.empty? - url, title = check_refs( text ) - else - url, title = check_refs( id ) - end + MARKDOWN_REFLINK_RE = / + \[([^\[\]]+)\] # $text + [ ]? # opt. space + (?:\n[ ]*)? # one optional newline followed by spaces + \[(.*?)\] # $id + /x - atts = " href=\"#{url}\"" - atts << " title=\"#{title}\"" if title - atts = shelve( atts ) + def inline_markdown_reflink( text ) + text.gsub!( MARKDOWN_REFLINK_RE ) do |m| + text, id = $~[1..2] - "#{text}" - end - end + if id.empty? + url, title = check_refs( text ) + else + url, title = check_refs( id ) + end - MARKDOWN_LINK_RE = / - \[([^\[\]]+)\] # $text - \( # open paren - [ \t]* # opt space - ? # $href - [ \t]* # opt space - (?: # whole title - (['"]) # $quote - (.*?) # $title - \3 # matching quote - )? # title is optional - \) - /x - - def inline_markdown_link( text ) - text.gsub!( MARKDOWN_LINK_RE ) do |m| - text, url, quote, title = $~[1..4] - - atts = " href=\"#{url}\"" - atts << " title=\"#{title}\"" if title - atts = shelve( atts ) - - "#{text}" - end - end + atts = " href=\"#{url}\"" + atts << " title=\"#{title}\"" if title + atts = shelve( atts ) - TEXTILE_REFS_RE = /(^ *)\[([^\[\n]+?)\](#{HYPERLINK})(?=\s|$)/ - MARKDOWN_REFS_RE = /(^ *)\[([^\n]+?)\]:\s+?(?:\s+"((?:[^"]|\\")+)")?(?=\s|$)/m + "#{text}" + end + end - def refs( text ) - @rules.each do |rule_name| - method( rule_name ).call( text ) if rule_name.to_s.match? /^refs_/ - end - end + MARKDOWN_LINK_RE = / + \[([^\[\]]+)\] # $text + \( # open paren + [ \t]* # opt space + ? # $href + [ \t]* # opt space + (?: # whole title + (['"]) # $quote + (.*?) # $title + \3 # matching quote + )? # title is optional + \) + /x + + def inline_markdown_link( text ) + text.gsub!( MARKDOWN_LINK_RE ) do |m| + text, url, quote, title = $~[1..4] + + atts = " href=\"#{url}\"" + atts << " title=\"#{title}\"" if title + atts = shelve( atts ) + + "#{text}" + end + end - def refs_textile( text ) - text.gsub!( TEXTILE_REFS_RE ) do |m| - flag, url = $~[2..3] - @urlrefs[flag.downcase] = [url, nil] - nil - end - end + TEXTILE_REFS_RE = /(^ *)\[([^\[\n]+?)\](#{HYPERLINK})(?=\s|$)/ + MARKDOWN_REFS_RE = /(^ *)\[([^\n]+?)\]:\s+?(?:\s+"((?:[^"]|\\")+)")?(?=\s|$)/m - def refs_markdown( text ) - text.gsub!( MARKDOWN_REFS_RE ) do |m| - flag, url = $~[2..3] - title = $~[6] - @urlrefs[flag.downcase] = [url, title] - nil - end - end + def refs( text ) + @rules.each do |rule_name| + method( rule_name ).call( text ) if rule_name.to_s.match? /^refs_/ + end + end - def check_refs( text ) - ret = @urlrefs[text.downcase] if text - ret || [text, nil] - end + def refs_textile( text ) + text.gsub!( TEXTILE_REFS_RE ) do |m| + flag, url = $~[2..3] + @urlrefs[flag.downcase] = [url, nil] + nil + end + end - IMAGE_RE = / - (>|\s|^) # start of line? - \! # opening - (\<|\=|\>)? # optional alignment atts - (#{C}) # optional style,class atts - (?:\. )? # optional dot-space - ([^\s(!]+?) # presume this is the src - \s? # optional space - (?:\(((?:[^\(\)]|\([^\)]+\))+?)\))? # optional title - \! # closing - (?::#{HYPERLINK})? # optional href - /x - - def inline_textile_image( text ) - text.gsub!( IMAGE_RE ) do |m| - stln,algn,atts,url,title,href,href_a1,href_a2 = $~[1..8] - htmlesc title - atts = pba( atts ) - atts = +" src=\"#{htmlesc url.dup}\"#{atts}" - atts << " title=\"#{title}\"" if title - atts << " alt=\"#{title}\"" - # size = @getimagesize($url); - # if($size) $atts.= " $size[3]"; - - href, alt_title = check_refs( href ) if href - url, url_title = check_refs( url ) - - next m unless uri_with_safe_scheme?(url.partition('?').first) - if href - href = htmlesc(href.dup) - next m if href.downcase.start_with?('javascript:') - end + def refs_markdown( text ) + text.gsub!( MARKDOWN_REFS_RE ) do |m| + flag, url = $~[2..3] + title = $~[6] + @urlrefs[flag.downcase] = [url, title] + nil + end + end - out = +'' - out << "" if href - out << "" - out << "#{href_a1}#{href_a2}" if href - - if algn - algn = h_align( algn ) - if stln == "

    " - out = "

    #{out}" - else - out = "#{stln}#{out}" + def check_refs( text ) + ret = @urlrefs[text.downcase] if text + ret || [text, nil] end - else - out = stln + out - end - out - end - end + IMAGE_RE = / + (>|\s|^) # start of line? + \! # opening + (\<|\=|\>)? # optional alignment atts + (#{C}) # optional style,class atts + (?:\. )? # optional dot-space + ([^\s(!]+?) # presume this is the src + \s? # optional space + (?:\(((?:[^\(\)]|\([^\)]+\))+?)\))? # optional title + \! # closing + (?::#{HYPERLINK})? # optional href + /x + + def inline_textile_image( text ) + text.gsub!( IMAGE_RE ) do |m| + stln,algn,atts,url,title,href,href_a1,href_a2 = $~[1..8] + htmlesc title + atts = pba( atts ) + atts = +" src=\"#{htmlesc url.dup}\"#{atts}" + atts << " title=\"#{title}\"" if title + atts << " alt=\"#{title}\"" + # size = @getimagesize($url); + # if($size) $atts.= " $size[3]"; + + href, alt_title = check_refs( href ) if href + url, url_title = check_refs( url ) + + next m unless uri_with_safe_scheme?(url.partition('?').first) + if href + href = htmlesc(href.dup) + next m if href.downcase.start_with?('javascript:') + end - def shelve( val ) - @shelf << val - " :redsh##{@shelf.length}:" - end + out = +'' + out << "" if href + out << "" + out << "#{href_a1}#{href_a2}" if href + + if algn + algn = h_align( algn ) + if stln == "

    " + out = "

    #{out}" + else + out = "#{stln}#{out}" + end + else + out = stln + out + end - def retrieve( text ) - text.gsub!(/ :redsh#(\d+):/) do - @shelf[$1.to_i - 1] || $& - end - end + out + end + end - def incoming_entities( text ) - ## turn any incoming ampersands into a dummy character for now. - ## This uses a negative lookahead for alphanumerics followed by a semicolon, - ## implying an incoming html entity, to be skipped + def shelve( val ) + @shelf << val + " :redsh##{@shelf.length}:" + end - text.gsub!( /&(?![#a-z0-9]+;)/i, "x%x%" ) - end + def retrieve( text ) + text.gsub!(/ :redsh#(\d+):/) do + @shelf[$1.to_i - 1] || $& + end + end - def no_textile( text ) - text.gsub!(/(^|\s)==([^=]+.*?)==(\s|$)?/, - '\1\2\3') - text.gsub!(/^ *==([^=]+.*?)==/m, - '\1\2\3') - end + def incoming_entities( text ) + ## turn any incoming ampersands into a dummy character for now. + ## This uses a negative lookahead for alphanumerics followed by a semicolon, + ## implying an incoming html entity, to be skipped - def clean_white_space( text ) - # normalize line breaks - text.gsub!( /\r\n/, "\n" ) - text.tr!( "\r", "\n" ) - text.gsub!( /\t/, ' ' ) - text.gsub!( /^ +$/, '' ) - text.gsub!( /\n{3,}/, "\n\n" ) - text.gsub!( /"$/, "\" " ) - - # if entire document is indented, flush - # to the left side - flush_left text - end + text.gsub!( /&(?![#a-z0-9]+;)/i, "x%x%" ) + end - def flush_left( text ) - if /(?![\r\n\t ])[[:cntrl:]]/.match?(text) - text.gsub!(/(?![\r\n\t ])[[:cntrl:]]/, '') - end - if /^ +\S/.match?(text) - indt = 0 - indt += 1 until /^ {#{indt}}\S/.match?(text) - if indt.nonzero? - text.gsub!( /^ {#{indt}}/, '' ) - end - end - end + def no_textile( text ) + text.gsub!(/(^|\s)==([^=]+.*?)==(\s|$)?/, + '\1\2\3') + text.gsub!(/^ *==([^=]+.*?)==/m, + '\1\2\3') + end - def footnote_ref( text ) - text.gsub!(/\b\[([0-9]+?)\](\s)?/, - '\1\2') - end + def clean_white_space( text ) + # normalize line breaks + text.gsub!( /\r\n/, "\n" ) + text.tr!( "\r", "\n" ) + text.gsub!( /\t/, ' ' ) + text.gsub!( /^ +$/, '' ) + text.gsub!( /\n{3,}/, "\n\n" ) + text.gsub!( /"$/, "\" " ) + + # if entire document is indented, flush + # to the left side + flush_left text + end - OFFTAGS = /(code|pre|kbd|notextile)/ - OFFTAG_MATCH = /(?:(<\/#{OFFTAGS}\b>)|(<#{OFFTAGS}\b[^>]*>))(.*?)(?=<\/?#{OFFTAGS}\b\W|\Z)/mi - OFFTAG_OPEN = /<#{OFFTAGS}/ - OFFTAG_CLOSE = /<\/?#{OFFTAGS}/ - HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m - ALLTAG_MATCH = /(<\/?\w[^\n]*?>)|.*?(?=<\/?\w[^\n]*?>|$)/m - - def glyphs_textile( text, level = 0 ) - if text !~ HASTAG_MATCH - pgl text - footnote_ref text - else - codepre = 0 - text.gsub!( ALLTAG_MATCH ) do |line| - ## matches are off if we're between , 

     etc.
-                if $1
-                    if OFFTAG_OPEN.match?(line)
-                        codepre += 1
-                    elsif OFFTAG_CLOSE.match?(line)
-                        codepre -= 1
-                        codepre = 0 if codepre < 0
+                def flush_left( text )
+                    if /(?![\r\n\t ])[[:cntrl:]]/.match?(text)
+                        text.gsub!(/(?![\r\n\t ])[[:cntrl:]]/, '')
+                    end
+                    if /^ +\S/.match?(text)
+                        indt = 0
+                        indt += 1 until /^ {#{indt}}\S/.match?(text)
+                        if indt.nonzero?
+                            text.gsub!( /^ {#{indt}}/, '' )
+                        end
                     end
-                elsif codepre.zero?
-                    glyphs_textile( line, level + 1 )
-                else
-                    htmlesc( line, :NoQuotes )
                 end
-                # p [level, codepre, line]
 
-                line
-            end
-        end
-    end
+                def footnote_ref( text )
+                    text.gsub!(/\b\[([0-9]+?)\](\s)?/,
+                            '\1\2')
+                end
 
-    def rip_offtags( text, escape_aftertag=true, escape_line=true )
-        if text =~ /<.*>/
-            ## strip and encode 
     content
-            codepre, used_offtags = 0, {}
-            text.gsub!( OFFTAG_MATCH ) do |line|
-                if $3
-                    first, offtag, aftertag = $3, $4, $5
-                    codepre += 1
-                    used_offtags[offtag] = true
-                    if codepre - used_offtags.length > 0
-                        htmlesc( line, :NoQuotes ) if escape_line
-                        @pre_list.last << line
-                        line = +""
+                OFFTAGS = /(code|pre|kbd|notextile)/
+                OFFTAG_MATCH = /(?:(<\/#{OFFTAGS}\b>)|(<#{OFFTAGS}\b[^>]*>))(.*?)(?=<\/?#{OFFTAGS}\b\W|\Z)/mi
+                OFFTAG_OPEN = /<#{OFFTAGS}/
+                OFFTAG_CLOSE = /<\/?#{OFFTAGS}/
+                HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m
+                ALLTAG_MATCH = /(<\/?\w[^\n]*?>)|.*?(?=<\/?\w[^\n]*?>|$)/m
+
+                def glyphs_textile( text, level = 0 )
+                    if text !~ HASTAG_MATCH
+                        pgl text
+                        footnote_ref text
                     else
-                        ### htmlesc is disabled between CODE tags which will be parsed with highlighter
-                        ### Regexp in formatter.rb is : /\s?(.+)/m
-                        ### NB: some changes were made not to use $N variables, because we use "match"
-                        ###   and it breaks following lines
-                        htmlesc( aftertag, :NoQuotes ) if aftertag && escape_aftertag && !first.match(//)
-                        line = +""
-                        first.match(/<#{OFFTAGS}([^>]*)>/)
-                        tag = $1
-                        $2.to_s.match(/(class\=("[^"]+"|'[^']+'))/i)
-                        tag << " #{$1}" if $1 && tag == 'code'
-                        @pre_list << +"<#{tag}>#{aftertag}"
+                        codepre = 0
+                        text.gsub!( ALLTAG_MATCH ) do |line|
+                            ## matches are off if we're between , 
     etc.
+                            if $1
+                                if OFFTAG_OPEN.match?(line)
+                                    codepre += 1
+                                elsif OFFTAG_CLOSE.match?(line)
+                                    codepre -= 1
+                                    codepre = 0 if codepre < 0
+                                end
+                            elsif codepre.zero?
+                                glyphs_textile( line, level + 1 )
+                            else
+                                htmlesc( line, :NoQuotes )
+                            end
+                            # p [level, codepre, line]
+
+                            line
+                        end
                     end
-                elsif $1 and codepre > 0
-                    if codepre - used_offtags.length > 0
-                        htmlesc( line, :NoQuotes ) if escape_line
-                        @pre_list.last << line
-                        line = +""
+                end
+
+                def rip_offtags( text, escape_aftertag=true, escape_line=true )
+                    if text =~ /<.*>/
+                        ## strip and encode 
     content
+                        codepre, used_offtags = 0, {}
+                        text.gsub!( OFFTAG_MATCH ) do |line|
+                            if $3
+                                first, offtag, aftertag = $3, $4, $5
+                                codepre += 1
+                                used_offtags[offtag] = true
+                                if codepre - used_offtags.length > 0
+                                    htmlesc( line, :NoQuotes ) if escape_line
+                                    @pre_list.last << line
+                                    line = +""
+                                else
+                                    ### htmlesc is disabled between CODE tags which will be parsed with highlighter
+                                    ### Regexp in formatter.rb is : /\s?(.+)/m
+                                    ### NB: some changes were made not to use $N variables, because we use "match"
+                                    ###   and it breaks following lines
+                                    htmlesc( aftertag, :NoQuotes ) if aftertag && escape_aftertag && !first.match(//)
+                                    line = +""
+                                    first.match(/<#{OFFTAGS}([^>]*)>/)
+                                    tag = $1
+                                    $2.to_s.match(/(class\=("[^"]+"|'[^']+'))/i)
+                                    tag << " #{$1}" if $1 && tag == 'code'
+                                    @pre_list << +"<#{tag}>#{aftertag}"
+                                end
+                            elsif $1 and codepre > 0
+                                if codepre - used_offtags.length > 0
+                                    htmlesc( line, :NoQuotes ) if escape_line
+                                    @pre_list.last << line
+                                    line = +""
+                                end
+                                codepre -= 1 unless codepre.zero?
+                                used_offtags = {} if codepre.zero?
+                            end
+                            line
+                        end
                     end
-                    codepre -= 1 unless codepre.zero?
-                    used_offtags = {} if codepre.zero?
+                    text
                 end
-                line
-            end
-        end
-        text
-    end
 
-    def smooth_offtags( text )
-        unless @pre_list.empty?
-            ## replace 
     content
-            text.gsub!( // ) { @pre_list[$1.to_i] }
-        end
-    end
+                def smooth_offtags( text )
+                    unless @pre_list.empty?
+                        ## replace 
     content
+                        text.gsub!( // ) { @pre_list[$1.to_i] }
+                    end
+                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
-        end
-    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
+                    end
+                end
 
-    def h_align( text )
-        H_ALGN_VALS[text]
-    end
+                def h_align( text )
+                    H_ALGN_VALS[text]
+                end
 
-    def v_align( text )
-        V_ALGN_VALS[text]
-    end
+                def v_align( text )
+                    V_ALGN_VALS[text]
+                end
 
-    def textile_popup_help( name, windowW, windowH )
-        ' ' + name + '
    '
-    end
+                def textile_popup_help( name, windowW, windowH )
+                    ' ' + name + '
    '
+                end
 
-    # HTML cleansing stuff
-    BASIC_TAGS = {
-        'a' => ['href', 'title'],
-        'img' => ['src', 'alt', 'title'],
-        'br' => [],
-        'i' => nil,
-        'u' => nil,
-        'b' => nil,
-        'pre' => nil,
-        'kbd' => nil,
-        'code' => ['lang'],
-        'cite' => nil,
-        'strong' => nil,
-        'em' => nil,
-        'ins' => nil,
-        'sup' => nil,
-        'sub' => nil,
-        'del' => nil,
-        'table' => nil,
-        'tr' => nil,
-        'td' => ['colspan', 'rowspan'],
-        'th' => nil,
-        'ol' => nil,
-        'ul' => nil,
-        'li' => nil,
-        'p' => nil,
-        'h1' => nil,
-        'h2' => nil,
-        'h3' => nil,
-        'h4' => nil,
-        'h5' => nil,
-        'h6' => nil,
-        'blockquote' => ['cite']
-    }
-
-    def clean_html( text, tags = BASIC_TAGS )
-        text.gsub!( /]*)>/ ) do
-            raw = $~
-            tag = raw[2].downcase
-            if tags.has_key? tag
-                pcs = [tag]
-                tags[tag].each do |prop|
-                    ['"', "'", ''].each do |q|
-                        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+:}
-                            pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
-                            break
+                # HTML cleansing stuff
+                BASIC_TAGS = {
+                    'a' => ['href', 'title'],
+                    'img' => ['src', 'alt', 'title'],
+                    'br' => [],
+                    'i' => nil,
+                    'u' => nil,
+                    'b' => nil,
+                    'pre' => nil,
+                    'kbd' => nil,
+                    'code' => ['lang'],
+                    'cite' => nil,
+                    'strong' => nil,
+                    'em' => nil,
+                    'ins' => nil,
+                    'sup' => nil,
+                    'sub' => nil,
+                    'del' => nil,
+                    'table' => nil,
+                    'tr' => nil,
+                    'td' => ['colspan', 'rowspan'],
+                    'th' => nil,
+                    'ol' => nil,
+                    'ul' => nil,
+                    'li' => nil,
+                    'p' => nil,
+                    'h1' => nil,
+                    'h2' => nil,
+                    'h3' => nil,
+                    'h4' => nil,
+                    'h5' => nil,
+                    'h6' => nil,
+                    'blockquote' => ['cite']
+                }
+
+                def clean_html( text, tags = BASIC_TAGS )
+                    text.gsub!( /]*)>/ ) do
+                        raw = $~
+                        tag = raw[2].downcase
+                        if tags.has_key? tag
+                            pcs = [tag]
+                            tags[tag].each do |prop|
+                                ['"', "'", ''].each do |q|
+                                    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+:}
+                                        pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
+                                        break
+                                    end
+                                end
+                            end if tags[tag]
+                            "<#{raw[1]}#{pcs.join " "}>"
+                        else
+                            " "
                         end
                     end
-                end if tags[tag]
-                "<#{raw[1]}#{pcs.join " "}>"
-            else
-                " "
-            end
-        end
-    end
+                end
 
-    ALLOWED_TAGS = %w(redpre pre code kbd notextile)
-    def escape_html_tags(text)
-        text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) do |m|
-            if ALLOWED_TAGS.include?($2) && $3.present?
-                "<#{$1}#{$3}"
-            else
-                "<#{$1}#{'>' unless $3.blank?}"
+                ALLOWED_TAGS = %w(redpre pre code kbd notextile)
+                def escape_html_tags(text)
+                    text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) do |m|
+                        if ALLOWED_TAGS.include?($2) && $3.present?
+                            "<#{$1}#{$3}"
+                        else
+                            "<#{$1}#{'>' unless $3.blank?}"
+                        end
+                    end
+                end
             end
         end
     end
-end
+end
\ No newline at end of file
-- 
2.11.0