From da4acc732746fef2af1759e64574c9e376966057 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 31 Oct 2011 21:59:00 -0400 Subject: v3: header, bold & italic pattern matching, ignore case (possibility reinstated) * (bold & italic pattern matching) @make: :bold: :italic: /[regex]/i --- lib/sisu/v3/param.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/sisu/v3/param.rb') diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index 674b8cba..37ffeea7 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -774,26 +774,26 @@ module SiSU_Param end def bold m=@h['bold'] - x=(m=~/\/i$/)? 'i' : '' + i=(m=~/\/i$/)? 'i' : '' z=if m - m.gsub!(/^\/(.+?)\/i?/,'\1') - m.gsub!(/\(/,'(?:') # avoid need to escape use of brackets within regex provided + x=m.gsub(/^\/(.+?)\/i?/,'\1') + x.gsub!(/\(/,'(?:') # avoid need to escape use of brackets within regex provided rgx='\b(' + m + ')\b' - y=((x =~/i/) ? (/#{rgx}/i) : (/#{rgx}/)) - { str: '\b(?:' + m + ')\b', regx: y } + y=((i =~/i/) ? (/#{rgx}/i) : (/#{rgx}/)) + { str: '\b(?:' + m + ')\b', regx: y, i: i } else nil end z end def italics m=@h['italics'] - x=((m=~/\/i$/) ? 'i' : '') + i=((m=~/\/i$/) ? 'i' : '') z=if m - m.gsub!(/^\/(.+?)\/i?/,'\1') - m.gsub!(/\(/,'(?:') # avoid need to escape use of brackets within regex provided + x=m.gsub(/^\/(.+?)\/i?/,'\1') + x.gsub!(/\(/,'(?:') # avoid need to escape use of brackets within regex provided rgx='\b(' + m + ')\b' - y=((x =~/i/) ? (/#{rgx}/i) : (/#{rgx}/)) - { str: '\b(?:' + m + ')\b', regx: y } + y=((i =~/i/) ? (/#{rgx}/i) : (/#{rgx}/)) + { str: '\b(?:' + m + ')\b', regx: y, i: i } else nil end z -- cgit v1.2.3