From b28cf1c5cf4be19a5869ddfabf83e0b81f778860 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 20:54:28 -0400 Subject: v5 v6: composite, fix includes, provide extra newline after inserted comment * (Closes: #744360) [n|u] sisu: includes do not work properly --- lib/sisu/v5/composite.rb | 2 +- lib/sisu/v6/composite.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sisu') diff --git a/lib/sisu/v5/composite.rb b/lib/sisu/v5/composite.rb index 9e7ccb5c..cd281e26 100644 --- a/lib/sisu/v5/composite.rb +++ b/lib/sisu/v5/composite.rb @@ -132,7 +132,7 @@ module SiSU_Assemble def insertion(fni,insert_array) file={ prepared: [], images: [] } rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ - file[:prepared] << "\n% |#{fni}|@|^|>>ok\n" + file[:prepared] << "\n% |#{fni}|@|^|>>ok\n\n" @code_flag=false insert_array.each do |i| @code_flag=if i =~/^code\{/ then true diff --git a/lib/sisu/v6/composite.rb b/lib/sisu/v6/composite.rb index ebbd14f6..02e9543e 100644 --- a/lib/sisu/v6/composite.rb +++ b/lib/sisu/v6/composite.rb @@ -132,7 +132,7 @@ module SiSU_Assemble def insertion(fni,insert_array) file={ prepared: [], images: [] } rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ - file[:prepared] << "\n% |#{fni}|@|^|>>ok\n" + file[:prepared] << "\n% |#{fni}|@|^|>>ok\n\n" @code_flag=false insert_array.each do |i| @code_flag=if i =~/^code\{/ then true -- cgit v1.2.3