diff options
Diffstat (limited to 'lib/sisu/v0/param.rb')
| -rw-r--r-- | lib/sisu/v0/param.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb index 8a95942a..1147cd80 100644 --- a/lib/sisu/v0/param.rb +++ b/lib/sisu/v0/param.rb @@ -253,7 +253,7 @@ module SiSU_Param end @code_flag=false fns_array.each do |para| #% Scan document - if para !~/^\%+\s/ \ + if para !~/^%+\s/ \ and para =~/<![abcdeghijklmnopqrstuvwxyz]/i # <!f not included raise "Old markup style in file #@fns, current version #{@sisu_version[:project]} #{@sisu_version[:version]} #{@sisu_version[:date_stamp]} #{@sisu_version[:date]}:\n\t\t#{para}\n\n" end @@ -629,11 +629,19 @@ module SiSU_Param end end end - @ec[:image] << para.scan(@rgx_image).uniq if para =~@rgx_image #embedded content + if para !~/^%+\s/ \ + and para =~@rgx_image + @ec[:image] << para.scan(@rgx_image).uniq + end @ec[:audio] << para.scan(@rgx_audio).uniq if para =~@rgx_audio #embedded content @ec[:multimedia] << para.scan(@rgx_mm).uniq if para =~@rgx_mm #embedded content end #% here endeth the document loop - @ec[:image].uniq!; @ec[:image].flatten!; @ec[:image].sort! + if @ec[:image].length > 0 + @ec[:image].flatten! + @ec[:image].uniq! + @ec[:image].delete_if {|x| x =~/http:\/\// } + @ec[:image].sort! + end @ec[:audio].uniq!; @ec[:audio].flatten!; @ec[:audio].sort! @ec[:multimedia].uniq!; @ec[:multimedia].flatten!; @ec[:multimedia].sort! @man_name.gsub!(/(-)/,"\\\\\\1") |