diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-09-05 20:58:22 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-09-05 20:58:22 +0100 |
| commit | ed8d2cf5a987c943e9f13ca6b4ab13645838d5d8 (patch) | |
| tree | 1dc05f04282f9e0bb42cec4f23ad492aa79bc180 /lib/sisu/v0/composite.rb | |
| parent | Updated sisu-0.58.1 (diff) | |
| parent | code-block exceptions for composite documents sisu-0.58.2 (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/composite.rb')
| -rw-r--r-- | lib/sisu/v0/composite.rb | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb index 2569474b..6223743c 100644 --- a/lib/sisu/v0/composite.rb +++ b/lib/sisu/v0/composite.rb @@ -151,12 +151,19 @@ module SiSU_Assemble rgx_image=/([a-zA-Z0-9._-]+?\.(?:png|jpg|gif))/ #file[:prepared] << "#% Date " << "\n" file[:prepared] << "\n% |#{fni}|@|^|>>ok\n" + @code_flag=false insert_array.each do |i| - i.gsub!(/^([12]|:?[AB])~\? /,'% [conditional heading:] \1~ ') #off conditional heading (consider syntax) - if i =~/^0~|^@\S+?:/ - i.gsub!(/\n/m,"\n% ") - i.gsub!(/\n%\s+$/m,'') - i.gsub!(/^0~|^@\S+?:/m,"\n% [imported header:] ") #off imported headers + @code_flag=if i =~/^code\{/; true + elsif i =~/^\}code/; false + else @code_flag + end + unless @code_flag + i.gsub!(/^([12]|:?[AB])~\? /,'% [conditional heading:] \1~ ') #off conditional heading (consider syntax) + if i =~/^0~|^@\S+?:/ + i.gsub!(/\n/m,"\n% ") + i.gsub!(/\n%\s+$/m,'') + i.gsub!(/^0~|^@\S+?:/m,"\n% [imported header:] ") #off imported headers + end end file[:prepared] << i file[:images] << i.scan(rgx_image).uniq if i =~rgx_image #flag |