diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-11-21 00:16:10 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-11-21 00:16:10 -0500 |
| commit | dc9dad19359b04687b25588c8e8b158e00e6e117 (patch) | |
| tree | 0bb2c3e145643a6bbff523c2e0411bd7d373e5b6 /lib/sisu/v3/param.rb | |
| parent | debian/changelog (3.1.4-1) (diff) | |
| parent | v3: odf:odt v1.2 (diff) | |
Merge commit 'sisu_3.1.5' into debian/sid
Diffstat (limited to 'lib/sisu/v3/param.rb')
| -rw-r--r-- | lib/sisu/v3/param.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index ef8e9389..045fd767 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -966,7 +966,7 @@ module SiSU_Param @lang_code_insert=(@opt.dir_structure_by =~/language/) \ ? '' : ".#{@opt.lng}" - @rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ + @rgx_image=/(?:^|[^_\\])\{(?:\s*|\~\^\s+)(\S+?\.(?:png|jpg|gif)\b)/m @rgx_audio=/\{\s*(\S+?\.(?:mp3|ogg))/ @rgx_mm=/\{\s*(\S+?\.(?:ogg|mpeg))/ #expand and distinguish ogg begin @@ -1272,6 +1272,7 @@ module SiSU_Param end end end + para.gsub!(/<:=(\S+?)>/,'{ c_\1.png 14x14 }image') # embedded symbol (image) if para !~/^%+\s/ \ and para =~@rgx_image @ec[:image] << para.scan(@rgx_image).uniq |