diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/param.rb | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 846a41cb..d54b6723 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -21,6 +21,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.3.orig.tar.xz sisu_3.1.3-1.dsc sisu_3.1.3-1.debian.tar.gz + * header, @make: :bold: :italic: fix necessary, Re (3.1.2): (bold & italic + pattern matching) possibility to ignore case (reinstated) + %% 3.1.2.orig.tar.xz (2011-10-31:44/1) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.2 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.2-1 diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index 37ffeea7..ef8e9389 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -777,10 +777,10 @@ module SiSU_Param i=(m=~/\/i$/)? 'i' : '' z=if m x=m.gsub(/^\/(.+?)\/i?/,'\1') - x.gsub!(/\(/,'(?:') # avoid need to escape use of brackets within regex provided - rgx='\b(' + m + ')\b' + x.gsub!(/\((?:\?:)?/,'(?:') # avoid need to escape use of brackets within regex provided + rgx='\b(' + x + ')\b' y=((i =~/i/) ? (/#{rgx}/i) : (/#{rgx}/)) - { str: '\b(?:' + m + ')\b', regx: y, i: i } + { str: '\b(?:' + x + ')\b', regx: y, i: i } else nil end z @@ -790,10 +790,10 @@ module SiSU_Param i=((m=~/\/i$/) ? 'i' : '') z=if m x=m.gsub(/^\/(.+?)\/i?/,'\1') - x.gsub!(/\(/,'(?:') # avoid need to escape use of brackets within regex provided - rgx='\b(' + m + ')\b' + x.gsub!(/\((?:\?:)?/,'(?:') # avoid need to escape use of brackets within regex provided + rgx='\b(' + x + ')\b' y=((i =~/i/) ? (/#{rgx}/i) : (/#{rgx}/)) - { str: '\b(?:' + m + ')\b', regx: y, i: i } + { str: '\b(?:' + x + ')\b', regx: y, i: i } else nil end z |