From 3d6deb1d4a0e3a8ab8294e441cf2c0ff1075e4c6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 23 Jan 2012 21:40:41 -0500
Subject: v3dv: call most methods by full name (include associated module &
 class names)

* messing with code, merge back now likely to become v3.2
---
 lib/sisu/v3dv/param.rb | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'lib/sisu/v3dv/param.rb')

diff --git a/lib/sisu/v3dv/param.rb b/lib/sisu/v3dv/param.rb
index d8c65e8c..4d439535 100644
--- a/lib/sisu/v3dv/param.rb
+++ b/lib/sisu/v3dv/param.rb
@@ -82,7 +82,7 @@ module SiSU_Param
         opt.fns
       else opt.fns.gsub(/\.ssm$/,'.ssm.sst')
       end
-      Instantiate.new.param_instantiate
+      SiSU_Param::Instantiate.new.param_instantiate
       @env=SiSU_Env::InfoEnv.new(@fns)
       @pstorefile="#{@env.processing_path.dal}/#{@fns}.pstore"
     end
@@ -113,8 +113,8 @@ module SiSU_Param
         else
           param_msg='Parameters extracted'
           fns_array=@env.read_source_file(@opt.fns)
-          md=Instructions.new(fns_array,@opt)
-          @md=Instructions.new(fns_array,@opt).extract
+          md=SiSU_Param::Parameters::Instructions.new(fns_array,@opt)
+          @md=SiSU_Param::Parameters::Instructions.new(fns_array,@opt).extract
           @md
         end
         if defined? @md.title.main # on removal check problems with -U
@@ -1096,27 +1096,27 @@ module SiSU_Param
           and not @code_flag #or para=~/^(?:1|:?A)~/
             case para
             when /^@title:(.+)/m                                               #% * header metadata - title
-              @title=Md.new($1.strip,@opt,@env).title
+              @title=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).title
             when /^@creator:(.+)/m                                             #% * header metadata - creator
-              @creator=Md.new($1.strip,@opt,@env).creator
+              @creator=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).creator
               @authorship=@author=@creator.author
               @authors=@creator.author_detail
             when /^@date:(.+)/m                                                #% * header metadata - date
-              @date=Md.new($1.strip,@opt,@env).date
+              @date=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).date
             when /^@publisher:\s+(.+)/m                                        #% * header metadata - publisher
-              @publisher=Md.new($1.strip,@opt,@env).current_publisher
+              @publisher=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).current_publisher
               @current_publisher=@publisher
             when /^@rights:(.+)/m;                                             #% * header metadata - rights
-              @rights=Md.new($1.strip,@opt,@env).rights
+              @rights=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).rights
             when /^@classify:(.+)/m; classify=$1                               #% * header metadata - classify
-              @classify=Md.new($1.strip,@opt,@env).classify
+              @classify=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).classify
             when /^@original:(.+)/m                                            #% * header metadata - original (document)
-              @original=Md.new($1.strip,@opt,@env).original
+              @original=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).original
               @source=@original.source
             when /^@notes?:\s(.+)\Z/m                                          #% * header metadata - notes
-              @notes=Md.new($1.strip,@opt,@env).notes
+              @notes=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).notes
             when /^@links:\s+(.+?)\Z/m                                         #% * header metadata - links
-              doc_links=Md.new($1.strip,@opt,@env).links
+              doc_links=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).links
               count=1
               @links=[]
               doc_links.each do |doc_link|
@@ -1128,7 +1128,7 @@ module SiSU_Param
               end
               @lnk=@links
             when /^@make:(.+)/m                                                #% * header processing - make
-              @make=Md.new($1.strip,@opt,@env).make
+              @make=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).make
               if defined? @make.breaks \
               and @make.breaks[:page_new]                  #clearpage
                 @pagenew=@make.breaks[:page_new]
@@ -1223,7 +1223,7 @@ module SiSU_Param
               if not defined? @title.full.nil?
                 tf=para[/^:A~\S*(.+)$/m,1]
                 tf="@title: #{tf}"
-                @title=Md.new(tf.strip,@opt,@env).title
+                @title=SiSU_Param::Parameters::Md.new(tf.strip,@opt,@env).title
               end
               @html_title=@title.full.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')
               SiSU_Screen::Ansi.new(@opt.cmd,'Parameters',@html_title).txt_grey if @opt.cmd =~/v/
@@ -1296,10 +1296,10 @@ module SiSU_Param
           and @creator.author \
           and defined? @date.published \
           and @date.published
-            @rights=MdDefault.new.rights(@creator.author,@date.published)
+            @rights=SiSU_Param::Parameters::MdDefault.new.rights(@creator.author,@date.published)
           elsif defined? @creator.author \
           and @creator.author
-            @rights=MdDefault.new.rights("[#{@creator.author}]",'')
+            @rights=SiSU_Param::Parameters::MdDefault.new.rights("[#{@creator.author}]",'')
           end
         end
         if defined? @classify.topic_register \
@@ -1423,7 +1423,7 @@ module SiSU_Param
         if @author !~/[\S]/
           if @fns =~/\.ssm$/ \
           and  @opt.inspect =~/P/
-            #@creator=Md.new('Text Insert',@opt,@env).creator
+            #@creator=SiSU_Param::Md.new('Text Insert',@opt,@env).creator
           else
             SiSU_Screen::Ansi.new(@opt.cmd,'Warning Document Author missing','please provide @creator: :author:').warn unless @opt.cmd =~/q/
           end
-- 
cgit v1.2.3