diff options
| author | Ralph Amissah <ralph@amissah.com> | 2008-05-22 20:10:07 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2008-05-22 20:10:07 -0400 |
| commit | 20d89d4a254277db0ee4f4ad1750fcf61410b06d (patch) | |
| tree | 3a1ff1c1f8a563c7f009f688e746c00d15c4bfcf /lib/sisu/v0/composite.rb | |
| parent | Updated sisu-0.66.3 (diff) | |
| parent | update man pages and version (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/composite.rb')
| -rw-r--r-- | lib/sisu/v0/composite.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb index 21b6781b..9b3689c3 100644 --- a/lib/sisu/v0/composite.rb +++ b/lib/sisu/v0/composite.rb @@ -190,13 +190,10 @@ module SiSU_Assemble tell=SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',@opt.fns) tell.grey_title_hi unless @opt.cmd =~/q/ para=data.each do |para| - if para =~/^r\{(.+?)\}/ \ - or para =~/^(?:<<\s*)\{(.+?)\}(?:req(?:quire)?\b|\s*\})?/ \ + if para =~/^<<\s+(\S+?\.ss[it])$/ \ + or para =~/^<<\{(\S+?\.ss[it])\}$/ \ or para =~/^(?:<<\s*)\|(\S+?)\|@\|.+?\|(?:req(?:quire)?\b|\s*\})?/ \ - or para =~/^(?:<<\s*)<(?:URL|url):(\S+?)>(?:req(?:require)\b|\s*\})?/ \ - or para =~/^\{(.+?)\}(?:req(?:require)?)\b/ \ - or para =~/^\|(\S+?)\|@\|.+?\|(?:req(?:require)?)\b/ \ - or para =~/^<(?:URL|url):(\S+?)>(?:req(?:require))\b/ + or para =~/^r\{(.+?)\}/ #depreciated loadfile=$1.strip tell=SiSU_Screen::Ansi.new(@opt.cmd,'loading:',loadfile) tell.txt_grey if @opt.cmd =~/[MVv]/ |