aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-07-11 00:07:04 -0400
committerRalph Amissah <ralph@amissah.com>2014-07-11 00:07:04 -0400
commitcc3380a5050a839e4be9b5b12277cd83ce738d02 (patch)
tree25af6811f7dbbf90bad3627ea66d640bb50c9d79 /lib
parentv5 v6: ao_numbering, check that all auto given number based seg names are unique (diff)
v5 v6: ao_composite, variable name
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v5/ao_composite.rb38
-rw-r--r--lib/sisu/v6/ao_composite.rb38
2 files changed, 38 insertions, 38 deletions
diff --git a/lib/sisu/v5/ao_composite.rb b/lib/sisu/v5/ao_composite.rb
index a7d0e48c..b35b2419 100644
--- a/lib/sisu/v5/ao_composite.rb
+++ b/lib/sisu/v5/ao_composite.rb
@@ -174,19 +174,19 @@ module SiSU_Assemble
).grey_title_hi unless @opt.act[:quiet][:set]==:on
fns_array.each do |para|
if para =~/^<<\s+(\S+?\.ss[it])$/
- loadfile=$1.strip
+ loadfilename=$1.strip
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'loading:',
- loadfile,
+ loadfilename,
).txt_grey
end
- tuned_file << if loadfile =~ /(?:https?|file):\/\/\S+?\.ss[it]$/ # and NetTest
+ tuned_file << if loadfilename =~ /(?:https?|file):\/\/\S+?\.ss[it]$/ # and NetTest
imagedir = /((?:https?|file):\/\/\S+?)\/[^\/]+?\.ss[it]$/.
- match(loadfile).captures.join +
+ match(loadfilename).captures.join +
'/_sisu/image' #watch
begin
require 'uri'
@@ -197,20 +197,20 @@ module SiSU_Assemble
error('uri, open-uri or pp NOT FOUND (LoadError)')
end
image_uri=URI.parse(imagedir)
- insert=open(loadfile)
+ insert=open(loadfilename)
insert_array=insert.dup
insert.close
- file=insertion(loadfile,insert_array)
+ file=insertion(loadfilename,insert_array)
@@imager[image_uri] ||=[]
@@imager[image_uri] << file[:images]
file[:prepared]
- elsif loadfile =~ /\.ss[it]$/ \
- and FileTest.file?(loadfile)
- insert_array=IO.readlines(loadfile,'')
- file=insertion(loadfile,insert_array)
+ elsif loadfilename =~ /\.ss[it]$/ \
+ and FileTest.file?(loadfilename)
+ insert_array=IO.readlines(loadfilename,'')
+ file=insertion(loadfilename,insert_array)
file[:prepared]
else
- STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfile}"}
+ STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfilename}"}
$process_document = :skip; break #remove this line to continue processing documents that have missing include files
para
end
@@ -256,23 +256,23 @@ module SiSU_Assemble
@ssm=[@opt.fns]
fns_array.each do |para|
if para =~/^<<\s+(\S+?\.ss[it])$/
- loadfile=$1.strip
+ loadfilename=$1.strip
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'loading:',
- loadfile,
+ loadfilename,
).txt_grey
end
- tuned_file << if loadfile =~ /(?:https?|file):\/\/\S+?\.ss[it]$/
- @ssm << loadfile
- elsif loadfile =~ /\.ss[it]$/ \
- and FileTest.file?(loadfile)
- @ssm << loadfile
+ tuned_file << if loadfilename =~ /(?:https?|file):\/\/\S+?\.ss[it]$/
+ @ssm << loadfilename
+ elsif loadfilename =~ /\.ss[it]$/ \
+ and FileTest.file?(loadfilename)
+ @ssm << loadfilename
else
- STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfile}"}
+ STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfilename}"}
$process_document = :skip; break #remove this line to continue processing documents that have missing include files
para
end
diff --git a/lib/sisu/v6/ao_composite.rb b/lib/sisu/v6/ao_composite.rb
index 2f864228..efe3815f 100644
--- a/lib/sisu/v6/ao_composite.rb
+++ b/lib/sisu/v6/ao_composite.rb
@@ -174,19 +174,19 @@ module SiSU_Assemble
).grey_title_hi unless @opt.act[:quiet][:set]==:on
fns_array.each do |para|
if para =~/^<<\s+(\S+?\.ss[it])$/
- loadfile=$1.strip
+ loadfilename=$1.strip
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'loading:',
- loadfile,
+ loadfilename,
).txt_grey
end
- tuned_file << if loadfile =~ /(?:https?|file):\/\/\S+?\.ss[it]$/ # and NetTest
+ tuned_file << if loadfilename =~ /(?:https?|file):\/\/\S+?\.ss[it]$/ # and NetTest
imagedir = /((?:https?|file):\/\/\S+?)\/[^\/]+?\.ss[it]$/.
- match(loadfile).captures.join +
+ match(loadfilename).captures.join +
'/_sisu/image' #watch
begin
require 'uri'
@@ -197,20 +197,20 @@ module SiSU_Assemble
error('uri, open-uri or pp NOT FOUND (LoadError)')
end
image_uri=URI.parse(imagedir)
- insert=open(loadfile)
+ insert=open(loadfilename)
insert_array=insert.dup
insert.close
- file=insertion(loadfile,insert_array)
+ file=insertion(loadfilename,insert_array)
@@imager[image_uri] ||=[]
@@imager[image_uri] << file[:images]
file[:prepared]
- elsif loadfile =~ /\.ss[it]$/ \
- and FileTest.file?(loadfile)
- insert_array=IO.readlines(loadfile,'')
- file=insertion(loadfile,insert_array)
+ elsif loadfilename =~ /\.ss[it]$/ \
+ and FileTest.file?(loadfilename)
+ insert_array=IO.readlines(loadfilename,'')
+ file=insertion(loadfilename,insert_array)
file[:prepared]
else
- STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfile}"}
+ STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfilename}"}
$process_document = :skip; break #remove this line to continue processing documents that have missing include files
para
end
@@ -256,23 +256,23 @@ module SiSU_Assemble
@ssm=[@opt.fns]
fns_array.each do |para|
if para =~/^<<\s+(\S+?\.ss[it])$/
- loadfile=$1.strip
+ loadfilename=$1.strip
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'loading:',
- loadfile,
+ loadfilename,
).txt_grey
end
- tuned_file << if loadfile =~ /(?:https?|file):\/\/\S+?\.ss[it]$/
- @ssm << loadfile
- elsif loadfile =~ /\.ss[it]$/ \
- and FileTest.file?(loadfile)
- @ssm << loadfile
+ tuned_file << if loadfilename =~ /(?:https?|file):\/\/\S+?\.ss[it]$/
+ @ssm << loadfilename
+ elsif loadfilename =~ /\.ss[it]$/ \
+ and FileTest.file?(loadfilename)
+ @ssm << loadfilename
else
- STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfile}"}
+ STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfilename}"}
$process_document = :skip; break #remove this line to continue processing documents that have missing include files
para
end