Merge branch 'upstream' into debian/sid

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/sisu/v3/concordance.rb b/lib/sisu/v3/concordance.rb
index e8d414a2..d979a6c9 100644
--- a/lib/sisu/v3/concordance.rb
+++ b/lib/sisu/v3/concordance.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 =begin
 
  * Name: SiSU
@@ -58,15 +58,15 @@
 
 =end
 module SiSU_Concordance
-  require "#{SiSU_lib}/particulars"                        # particulars.rb
+  require_relative 'particulars'                        # particulars.rb
     include SiSU_Particulars
-  require "#{SiSU_lib}/sysenv"                             # sysenv.rb
+  require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
-  require "#{SiSU_lib}/defaults"                           # defaults.rb
+  require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require "#{SiSU_lib}/html_format"                        # html_format.rb
+  require_relative 'html_format'                        # html_format.rb
     include SiSU_HTML_Format
-  require "#{SiSU_lib}/html_minitoc"                       # html_minitoc.rb
+  require_relative 'html_minitoc'                       # html_minitoc.rb
   class Source
     def initialize(opt)
       @opt=opt
@@ -101,8 +101,8 @@ module SiSU_Concordance
     class Doc_title
       include SiSU_Viz
       #revisit, both requires (html & shared_xml) needed for stand alone operation (sisu -w [filename])
-      require "#{SiSU_lib}/shared_xml"                     # shared_xml.rb
-      require "#{SiSU_lib}/html"                           # html.rb
+      require_relative 'shared_xml'                     # shared_xml.rb
+      require_relative 'html'                           # html.rb
       def initialize(particulars)
         @particulars,@md=particulars,particulars.md
         @data=SiSU_HTML::Source::Html_environment.new(particulars).tuned_file_instructions
@@ -171,11 +171,11 @@ WOK
       end
     end
     class Words
-      require "#{SiSU_lib}/defaults"                       # defaults.rb
+      require_relative 'defaults'                       # defaults.rb
         include SiSU_Viz
-      require "#{SiSU_lib}/html_format"                    # html_format.rb
+      require_relative 'html_format'                    # html_format.rb
         include SiSU_HTML_Format
-      require "#{SiSU_lib}/sysenv"                         # sysenv.rb
+      require_relative 'sysenv'                         # sysenv.rb
         include SiSU_Screen
       @@dp=nil
       def initialize(particulars)