aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2015-04-06 22:10:39 -0400
committerRalph Amissah <ralph@amissah.com>2015-04-08 23:05:39 -0400
commit16615136e7f2d4cfc1d5dced985e2dbfe7f058d9 (patch)
tree8000b4291980609529b53c2cf8c6851fb4b9d45b
parentgitignore, minor adjustment (diff)
c&d: cleaning
-rw-r--r--lib/sisu/current/ao_images.rb4
-rw-r--r--lib/sisu/current/dp_make.rb2
-rw-r--r--lib/sisu/current/se_programs.rb2
-rw-r--r--lib/sisu/develop/ao_images.rb4
-rw-r--r--lib/sisu/develop/dp_make.rb2
-rw-r--r--lib/sisu/develop/html_manifest.rb7
-rw-r--r--lib/sisu/develop/se_programs.rb2
7 files changed, 8 insertions, 15 deletions
diff --git a/lib/sisu/current/ao_images.rb b/lib/sisu/current/ao_images.rb
index 86dcb2ca..c0c45712 100644
--- a/lib/sisu/current/ao_images.rb
+++ b/lib/sisu/current/ao_images.rb
@@ -119,7 +119,7 @@ module SiSU_AO_Images
).warn
end
imgk=SiSU_Env::SystemCall.new.imagemagick
- gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ gmgk=SiSU_Env::SystemCall.new.graphicsmagick
if imgk or gmgk
if imgk
imgsys=`identify #{image_path}/#{image}`.strip #system call
@@ -129,7 +129,7 @@ module SiSU_AO_Images
img_col,img_row=/(\d+)x(\d+)/m.match(imgsys)[1,2]
img_col,img_row=img_col.to_i,img_row.to_i
else
- errmsg='imagemagick or graphicksmagick are required to process images'
+ errmsg='imagemagick or graphicsmagick are required to process images'
if @md.opt.act[:no_stop][:set]==:on
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error("#{errmsg}, proceeding (as requested) without image processing")
diff --git a/lib/sisu/current/dp_make.rb b/lib/sisu/current/dp_make.rb
index ad2cb32e..f65717bb 100644
--- a/lib/sisu/current/dp_make.rb
+++ b/lib/sisu/current/dp_make.rb
@@ -426,7 +426,7 @@ module SiSU_Param_Make
end
def get_image_dimensions(img)
imgk=SiSU_Env::SystemCall.new.imagemagick
- gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ gmgk=SiSU_Env::SystemCall.new.graphicsmagick
img_pth={
sst: @env.path.image_source_include,
pod: File.expand_path("../../../sisupod/image" )
diff --git a/lib/sisu/current/se_programs.rb b/lib/sisu/current/se_programs.rb
index e85b9be7..ee85725f 100644
--- a/lib/sisu/current/se_programs.rb
+++ b/lib/sisu/current/se_programs.rb
@@ -247,7 +247,7 @@ module SiSU_Sys_Call
#STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
- def graphicksmagick #graphicsmagick is a image manipulation program
+ def graphicsmagick #graphicsmagick is a image manipulation program
program='gm'
#program_ref="\n\t\tsee <http://www.graphicsmagick.org/>"
found=(program_found?(program)) ? true : false
diff --git a/lib/sisu/develop/ao_images.rb b/lib/sisu/develop/ao_images.rb
index e0f20d33..f6ef8e12 100644
--- a/lib/sisu/develop/ao_images.rb
+++ b/lib/sisu/develop/ao_images.rb
@@ -118,7 +118,7 @@ module SiSU_AO_Images
).warn
end
imgk=SiSU_Env::SystemCall.new.imagemagick
- gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ gmgk=SiSU_Env::SystemCall.new.graphicsmagick
if imgk or gmgk
if imgk
imgsys=`identify #{image_path}/#{image}`.strip #system call
@@ -128,7 +128,7 @@ module SiSU_AO_Images
img_col,img_row=/(\d+)x(\d+)/m.match(imgsys)[1,2]
img_col,img_row=img_col.to_i,img_row.to_i
else
- errmsg='imagemagick or graphicksmagick are required to process images'
+ errmsg='imagemagick or graphicsmagick are required to process images'
if @md.opt.act[:no_stop][:set]==:on
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error("#{errmsg}, proceeding (as requested) without image processing")
diff --git a/lib/sisu/develop/dp_make.rb b/lib/sisu/develop/dp_make.rb
index a7ba2e06..62b5ed21 100644
--- a/lib/sisu/develop/dp_make.rb
+++ b/lib/sisu/develop/dp_make.rb
@@ -426,7 +426,7 @@ module SiSU_Param_Make
end
def get_image_dimensions(img)
imgk=SiSU_Env::SystemCall.new.imagemagick
- gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ gmgk=SiSU_Env::SystemCall.new.graphicsmagick
img_pth={
sst: @env.path.image_source_include,
pod: File.expand_path("../../../sisupod/image" )
diff --git a/lib/sisu/develop/html_manifest.rb b/lib/sisu/develop/html_manifest.rb
index 2e2b775d..514727e6 100644
--- a/lib/sisu/develop/html_manifest.rb
+++ b/lib/sisu/develop/html_manifest.rb
@@ -455,13 +455,6 @@ module SiSU_Manifest
desc,id,file='XML Scaffold collapsed structure','xml_collapsed',@f.base_filename.xml_scaffold_structure_collapse
summarize(desc,id,file,pth,rel,url)
end
- #if FileTest.file?(@f.place_file.json.dir)==true ###
- # pth=@f.output_path.json.dir
- # rel=@f.output_path.json.rel_sm
- # url=@f.output_path.json.url
- # desc,id,file='JSON',@f.base_filename.json_sax
- # summarize(desc,id,file,pth,rel,url)
- #end
if FileTest.file?(@f.place_file.info.dir)==true
pth=@f.output_path.texinfo.dir
rel=@f.output_path.texinfo.rel_sm
diff --git a/lib/sisu/develop/se_programs.rb b/lib/sisu/develop/se_programs.rb
index 611507c4..ba3a7b26 100644
--- a/lib/sisu/develop/se_programs.rb
+++ b/lib/sisu/develop/se_programs.rb
@@ -257,7 +257,7 @@ module SiSU_Sys_Call
#STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
- def graphicksmagick #graphicsmagick is a image manipulation program
+ def graphicsmagick #graphicsmagick is a image manipulation program
program='gm'
#program_ref="\n\t\tsee <http://www.graphicsmagick.org/>"
found=(program_found?(program)) ? true : false