From b19886a01a945ea846f51956ec201f9f32e1eca5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 21 Nov 2011 00:11:52 -0500 Subject: v3: param, sisupod_make, sisu markup embedded symbol images regex, case added --- lib/sisu/v3/sisupod_make.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/sisu/v3/sisupod_make.rb') diff --git a/lib/sisu/v3/sisupod_make.rb b/lib/sisu/v3/sisupod_make.rb index b154bc1d..e4423641 100644 --- a/lib/sisu/v3/sisupod_make.rb +++ b/lib/sisu/v3/sisupod_make.rb @@ -160,8 +160,8 @@ module SiSU_Doc end @skin end - def images_extract(f,images) - rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ + def images_extract(f,images) # consider using param info + rgx_image=/(?:^|[^_\\])\{(?:\s*|\~\^\s+)(\S+?\.(?:png|jpg|gif)\b)/m if f !~/^%+\s/ \ and f =~rgx_image images << f.scan(rgx_image).uniq @@ -183,6 +183,7 @@ module SiSU_Doc file_array.each do |f| #% work area if f !~/^%+\s/ skin << f.scan(@rgx_skin).uniq.flatten if f =~@rgx_skin + f.gsub!(/<:=(\S+?)>/,'{ c_\1.png 14x14 }image') # embedded symbol (image) if f !~/^%+\s/ \ and f =~@rgx_image images=images_extract(f,images) -- cgit v1.2.3