diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-03-02 22:54:28 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-03-02 22:54:28 -0500 |
commit | 0569fd776ab4ce33689ca3337acd62f2415b6348 (patch) | |
tree | 4644037b28d876d8637a610f5df1a29535a4ef9a /lib/sisu/v3/dal_substitutions_and_insertions.rb | |
parent | debian/changelog (3.0.1-1) (diff) | |
parent | CHANGELOG_v{1,2,3}, syslink, avoid duplication (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/dal_substitutions_and_insertions.rb')
-rw-r--r-- | lib/sisu/v3/dal_substitutions_and_insertions.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/sisu/v3/dal_substitutions_and_insertions.rb b/lib/sisu/v3/dal_substitutions_and_insertions.rb index bb6e9d24..84b58756 100644 --- a/lib/sisu/v3/dal_substitutions_and_insertions.rb +++ b/lib/sisu/v3/dal_substitutions_and_insertions.rb @@ -1,4 +1,4 @@ -# coding: utf-8 +# encoding: utf-8 =begin * Name: SiSU @@ -83,53 +83,53 @@ module SiSU_substitute_and_insert i=$1 if defined? ins.insert1 para=[] - ins.insert1.split(/\n\n/).each{|x| para << x } + ins.insert1.split(/\n\n/).each {|x| para << x } else p "skin #{i} not found in #{@skin.select}" end when /^\s*<:(insert2)>\s*$/ i=$1 if defined? ins.insert2 para=[] - ins.insert2.split(/\n\n/).each{|x| para << x } + ins.insert2.split(/\n\n/).each {|x| para << x } else p "skin #{i} not found in #{@skin.select}" end when /^\s*<:(insert3)>\s*$/ i=$1 if defined? ins.insert3 para=[] - ins.insert3.split(/\n\n/).each{|x| para << x << "\n"} + ins.insert3.split(/\n\n/).each {|x| para << x << "\n"} else p "skin #{i} not found in #{@skin.select}" end when /^\s*<:(insert4)>\s*$/ i=$1 if defined? ins.insert4 para=[] - ins.insert4.split(/\n\n/).each{|x| para << x << "\n"} + ins.insert4.split(/\n\n/).each {|x| para << x << "\n"} else p "skin #{i} not found in #{@skin.select}" end when /^\s*<:(insert5)>\s*$/ i=$1 if defined? ins.insert5 para=[] - ins.insert5.split(/\n\n/).each{|x| para << x << "\n"} + ins.insert5.split(/\n\n/).each {|x| para << x << "\n"} else p "skin #{i} not found in #{@skin.select}" end when /^\s*<:(insert6)>\s*$/ i=$1 if defined? ins.insert6 para=[] - ins.insert6.split(/\n\n/).each{|x| para << x << "\n"} + ins.insert6.split(/\n\n/).each {|x| para << x << "\n"} else p "skin #{i} not found in #{@skin.select}" end when /^\s*<:(insert7)>\s*$/ i=$1 if defined? ins.insert7 para=[] - ins.insert7.split(/\n\n/).each{|x| para << x << "\n"} + ins.insert7.split(/\n\n/).each {|x| para << x << "\n"} else p "skin #{i} not found in #{@skin.select}" end end - para.each{|x| data_expand << x } + para.each {|x| data_expand << x } else data_expand << para end data_expand.flatten! |