From 34cee0148a445bcee5e97997575b7323df0a02b9 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 10 May 2008 12:07:29 -0400
Subject: introduced particulars (rename later) for commonly used document and
 environment details, and cleaned up some requires

---
 lib/sisu/v0/digests.rb | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'lib/sisu/v0/digests.rb')

diff --git a/lib/sisu/v0/digests.rb b/lib/sisu/v0/digests.rb
index 0d2707ff..0c859010 100644
--- a/lib/sisu/v0/digests.rb
+++ b/lib/sisu/v0/digests.rb
@@ -59,12 +59,8 @@
 
 =end
 module SiSU_Digest_view
-  require "#{SiSU_lib}/dal"
-  require "#{SiSU_lib}/sysenv"
+  require "#{SiSU_lib}/particulars"
   require "#{SiSU_lib}/i18n"
-  include SiSU_Env
-  include SiSU_Param
-  include SiSU_Viz
   pwd=Dir.pwd
   class Source
     @@dg=nil
@@ -74,11 +70,11 @@ module SiSU_Digest_view
       @@endnotes_para=[]
       @@dg=nil
       @dg=@@dg ||=SiSU_Env::Info_env.new.digest.type
-      @env=SiSU_Env::Info_env.new(@opt.fns)
+      @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt)
     end
     def read
       begin
-        @md=SiSU_Param::Parameters.new(@opt).get
+        @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array
         tool=if @opt.cmd =~/[MVv]/; "#{@env.program.text_editor} #{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:digest]}"
         else ''
         end
@@ -87,8 +83,7 @@ module SiSU_Digest_view
         tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:digest]}")
         tell.flow if @opt.cmd =~/[MV]/
         my_make=SiSU_Env::Create_file.new(@opt.cmd,@opt.fns)
-        @dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
-        SiSU_Digest_view::Source::Scroll.new(@dal_array,@md).songsheet
+        SiSU_Digest_view::Source::Scroll.new(@particulars).songsheet
         SiSU_Env::Info_skin.new(@md).select
       rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
@@ -99,13 +94,13 @@ module SiSU_Digest_view
       @@dl=nil
       @@ds={}
       @@description,@@ds[:digests],@@ds[:tree],@@ds[:summary],@@sc_info=[],[],[],[],[]
-      def initialize(data='',md='')
-        @data,@md=data,md
+      def initialize(particulars) #data='',md='')
+        @particulars=particulars
+        @data,@env,@md=@particulars.dal_array,@particulars.env,@particulars.md
         SiSU_Env::SiSU_file.new(@md).mkdir
-        @@dg ||=SiSU_Env::Info_env.new.digest.type
-        @@dl ||=SiSU_Env::Info_env.new.digest.length
+        @@dg ||=@env.digest.type
+        @@dl ||=@env.digest.length
         @dg,@dl=@@dg,@@dl
-        @env=SiSU_Env::Info_env.new(@md.fns)
         l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns)
         @language=l[:l]
         @tr=SiSU_Translate::Source.new(@md,@language)
-- 
cgit v1.2.3