c&d: cleaning
authorRalph Amissah <ralph@amissah.com>
Tue, 7 Apr 2015 02:10:39 +0000 (22:10 -0400)
committerRalph Amissah <ralph@amissah.com>
Thu, 9 Apr 2015 03:05:39 +0000 (23:05 -0400)
lib/sisu/current/ao_images.rb
lib/sisu/current/dp_make.rb
lib/sisu/current/se_programs.rb
lib/sisu/develop/ao_images.rb
lib/sisu/develop/dp_make.rb
lib/sisu/develop/html_manifest.rb
lib/sisu/develop/se_programs.rb

index 86dcb2caf01830f2a6928587721acc352a5649ef..c0c45712c2dd53cf840b810b8eb0783935cf6f7c 100644 (file)
@@ -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")
index ad2cb32e5f801638910eff8dd24a595c5e3b537e..f65717bbe9eeb715a107fd1986b82c9d645ed79c 100644 (file)
@@ -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" )
index e85b9be7c23a3f6a03f4d5b79ec12f8ac59ba88b..ee85725f97e9278fcee2f52453edb25452dfe8c8 100644 (file)
@@ -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
index e0f20d33113a0fc58c93fb4688ce4bb308d2b248..f6ef8e12e090834a53d007449ecf70b93aa13b27 100644 (file)
@@ -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")
index a7ba2e067f7abf25bd11fd931e593f5bc17d2401..62b5ed21f22a41a6618244b6eeb36aeb96911e0b 100644 (file)
@@ -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" )
index 2e2b775d0846e5013d468a0a200fccb08f2a2b97..514727e61e27b5d82d4174381a4663f29c1ea0bb 100644 (file)
@@ -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
index 611507c4785e0ab43a9efbd5bb05a900858aa684..ba3a7b26722b909f728fc9f69a9bd744a65c8989 100644 (file)
@@ -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