Merge tag 'sisu_5.7.0' into debian/sid

SiSU 5.7.0

1 files changed, 2 insertions, 8 deletions

diff --git a/lib/sisu/v5/xhtml_epub2_concordance.rb b/lib/sisu/v5/xhtml_epub2_concordance.rb
index 3484b1d8..02f47d5a 100644
--- a/lib/sisu/v5/xhtml_epub2_concordance.rb
+++ b/lib/sisu/v5/xhtml_epub2_concordance.rb
@@ -63,8 +63,7 @@ module SiSU_XHTML_EPUB2_Concordance
     include SiSU_Particulars
   require_relative 'se'                                 # se.rb
     include SiSU_Env
-  require_relative 'defaults'                           # defaults.rb
-    include SiSU_Viz
+  require_relative 'xhtml_parts'                        # xhtml_parts.rb
   require_relative 'xhtml_epub2_format'                 # xhtml_epub2_format.rb
     include SiSU_XHTML_EPUB2_Format
   class Source
@@ -101,13 +100,11 @@ module SiSU_XHTML_EPUB2_Concordance
     end
     private
     class DocTitle
-      include SiSU_Viz
       #revisit, both requires (html & xml_shared) needed for stand alone operation (sisu -w [filename])
       require_relative 'xhtml_epub2'                    # xhtml_epub2.rb
       def initialize(particulars)
         @particulars,@md=particulars,particulars.md
         @data=SiSU_XHTML_EPUB2::Source::XHTML_Environment.new(particulars).tuned_file_instructions
-        @vz=SiSU_Viz::Defaults.new
         @fnb=@md.fnb
         @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home"></a>}
         @doc_details =<<WOK
@@ -150,8 +147,6 @@ WOK
       end
     end
     class Words
-      require_relative 'defaults'                       # defaults.rb
-        include SiSU_Viz
       require_relative 'xhtml_epub2_format'             # xhtml_epub2_format.rb
         include SiSU_XHTML_EPUB2_Format
       require_relative 'se'                             # se.rb
@@ -159,7 +154,6 @@ WOK
       def initialize(particulars)
         @particulars=particulars
         begin
-          @vz=SiSU_Viz::Defaults.new
           @env,@md,@ao_array=particulars.env,particulars.md,particulars.ao_array
           @path="#{@env.processing_path.epub}"
           @freq=Hash.new(0)
@@ -323,7 +317,7 @@ WOK
           end
           # special cases endnotes and header levels 1 - 3
         end
-        credits=@vz.credits_sisu_epub
+        credits=SiSU_Proj_XHTML::Bits.new.credits_sisu_epub
         @file_concordance << %{</div>>#{credits}</body>\n</html>} # footer
       end
     end