1 files changed, 25 insertions, 25 deletions

diff --git a/lib/sisu/v3/dal.rb b/lib/sisu/v3/dal.rb
index 9f1d5372..13414826 100644
--- a/lib/sisu/v3/dal.rb
+++ b/lib/sisu/v3/dal.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 =begin
 
  * Name: SiSU
@@ -58,27 +58,27 @@
 
 =end
 module SiSU_DAL
-  require "#{SiSU_lib}/defaults"                           # defaults.rb
+  require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require "#{SiSU_lib}/sysenv"                             # sysenv.rb
+  require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
-  require "#{SiSU_lib}/param"                              # param.rb
+  require_relative 'param'                              # param.rb
     include SiSU_Param
-  require "#{SiSU_lib}/dal_doc_objects"                    # dal_doc_objects.rb
-  require "#{SiSU_lib}/dal_syntax"                         # dal_syntax.rb
+  require_relative 'dal_doc_objects'                    # dal_doc_objects.rb
+  require_relative 'dal_syntax'                         # dal_syntax.rb
     include SiSU_Syntax
-  require "#{SiSU_lib}/dal_doc_str"                        # dal_doc_str.rb
-  require "#{SiSU_lib}/dal_idx"                            # dal_idx.rb
-  require "#{SiSU_lib}/dal_numbering"                      # dal_numbering.rb
-  require "#{SiSU_lib}/dal_hash_digest"                    # dal_hash_digest.rb
-  require "#{SiSU_lib}/dal_endnotes"                       # dal_endnotes.rb
-  require "#{SiSU_lib}/dal_images"                         # dal_images.rb
-  require "#{SiSU_lib}/dal_metadata"                       # dal_metadata.rb
-  require "#{SiSU_lib}/dal_character_check"                # dal_character_check.rb
-  require "#{SiSU_lib}/dal_substitutions_and_insertions"   # dal_substitutions_and_insertions.rb
-  require "#{SiSU_lib}/dal_expand_insertions"              # dal_expand_insertions.rb
-  require "#{SiSU_lib}/i18n"                               # i18n.rb
-  require "#{SiSU_lib}/shared_sem"                         # shared_sem.rb
+  require_relative 'dal_doc_str'                        # dal_doc_str.rb
+  require_relative 'dal_idx'                            # dal_idx.rb
+  require_relative 'dal_numbering'                      # dal_numbering.rb
+  require_relative 'dal_hash_digest'                    # dal_hash_digest.rb
+  require_relative 'dal_endnotes'                       # dal_endnotes.rb
+  require_relative 'dal_images'                         # dal_images.rb
+  require_relative 'dal_metadata'                       # dal_metadata.rb
+  require_relative 'dal_character_check'                # dal_character_check.rb
+  require_relative 'dal_substitutions_and_insertions'   # dal_substitutions_and_insertions.rb
+  require_relative 'dal_expand_insertions'              # dal_expand_insertions.rb
+  require_relative 'i18n'                               # i18n.rb
+  require_relative 'shared_sem'                         # shared_sem.rb
   class Instantiate < SiSU_Param::Parameters::Instructions
     def initialize
       @@flag_vocab=0
@@ -87,8 +87,8 @@ module SiSU_DAL
   end
   class Source <Instantiate
     @@dal_array=[]
-    @@idx_arr={:sst=>[],:tex=>[],:html=>[],:xhtml=>[]}
-    @@map_arr={:nametags=>[],:ocn_htmlseg=>[]}
+    @@idx_arr={ sst: [], tex: [], html: [], xhtml: [] }
+    @@map_arr={ nametags: [], ocn_htmlseg: [] }
     @@fns=nil
     def initialize(opt,fnx=nil)
       @opt,@fnx=opt,fnx
@@ -261,7 +261,7 @@ module SiSU_DAL
         SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"~meta/#{@opt.fns}.meta").output if @opt.cmd =~/v/i
         SiSU_Screen::Ansi.new(@opt.cmd,"dal -> #{cf.meta}").txt_grey if @opt.cmd =~/M/
       end
-      dal.each{|s| dal_array << s}
+      dal.each {|s| dal_array << s}
       dal_array
     end
     def read_fnm
@@ -408,11 +408,11 @@ module SiSU_DAL
           end
         end
       else
-        hard="#{@dir.path.dal}/#{@md.fns}.meta"
+        hard="#{@dir.processing_path.dal}/#{@md.fns}.meta"
         File.unlink(hard) if FileTest.file?(hard)
-        hard="#{@dir.path.dal}/#{@md.fns}.txt"
+        hard="#{@dir.processing_path.dal}/#{@md.fns}.txt"
         File.unlink(hard) if FileTest.file?(hard)
-        hard="#{@dir.path.dal}/#{@md.fns}.debug.txt"
+        hard="#{@dir.processing_path.dal}/#{@md.fns}.debug.txt"
         File.unlink(hard) if FileTest.file?(hard)
       end
     end
@@ -433,7 +433,7 @@ module SiSU_DAL
           @data.each {|s| filename_meta.puts s.strip + "\n" unless s.strip.empty?}
         end
       else
-        hard_idx_html="#{@dir.path.dal}/#{@md.fns}.idx.html"
+        hard_idx_html="#{@dir.processing_path.dal}/#{@md.fns}.idx.html"
         File.unlink(hard_idx_html) if FileTest.file?(hard_idx_html)
       end
     end