From 459119df8d101ca0cf21c9cfede5ce502ff402ba Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 5 Sep 2007 20:57:59 +0100 Subject: code-block exceptions for composite documents sisu-0.58.2 --- lib/sisu/v0/composite.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'lib/sisu/v0/composite.rb') 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 -- cgit v1.2.3