From 4cff73e6c4fddbbea1aa23d850bccf6c5341b9bd Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 23 Apr 2010 20:10:55 -0400
Subject: sisupod_make, take new markup into account, done for :skin:
* not perfect, improve upon, should probably match @make: then :skin:
---
lib/sisu/v2/sisupod_make.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/sisu/v2/sisupod_make.rb b/lib/sisu/v2/sisupod_make.rb
index 50d55a38..0b4b56d8 100644
--- a/lib/sisu/v2/sisupod_make.rb
+++ b/lib/sisu/v2/sisupod_make.rb
@@ -161,11 +161,11 @@ module SiSU_Doc
def sisupod_build #see also sisupod in sysenv
@rgx_rb_image=/["'](\S+?\.(?:png|jpg|gif))["']/
@rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/
- @rgx_skin=/^@skin:\s+(\S+)/
+ @rgx_skin=/^\s+:skin:\s+(\S+)/
@rgx_doc_import=/^%\s\s*\|(\S+?\.ss[ti])\|@\|\^\|>>ok/
- use_file=if @opt.fns =~/(?:\.ssm|\.ssm\.sst)$/; "#{@env.path.composite_file}/#{@opt.fnb}.ssm.sst"
- else @opt.fns
- end
+ use_file=@opt.fns =~/(?:\.ssm|\.ssm\.sst)$/ \
+ ? "#{@env.path.composite_file}/#{@opt.fnb}.ssm.sst" \
+ : @opt.fns
file_array=IO.readlines(use_file,'')
skin,images,doc_import=[],[],[]
file_array.each do |f| #% work area
--
cgit v1.2.3