From 32fd8f3908bc8632e2d8ab4d872f6e4362fe031b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 12 Oct 2014 10:52:35 -0400
Subject: v5: merge v6: remove defaults.rb & some relics related to sisu skins

---
 lib/sisu/v5/manpage.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'lib/sisu/v5/manpage.rb')

diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index a42c7dfe..1dff0bde 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -63,10 +63,10 @@ module SiSU_Manpage
   require_relative 'se'                                 # se.rb
     include SiSU_Env
   include SiSU_Param
-  include SiSU_Viz
   require_relative 'manpage_format'                     # manpage_format.rb
     include SiSU_ManpageFormat
   require_relative 'shared_metadata'                    # shared_metadata.rb
+  require_relative 'generic_parts'                      # generic_parts.rb
   require_relative 'txt_shared'                         # txt_shared.rb
   @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
   @@tablefoot=''
@@ -122,14 +122,11 @@ module SiSU_Manpage
     end
     private
     class Scroll <Source
-      require_relative 'defaults'                       # defaults.rb
-      require_relative 'txt_shared'                     # txt_shared.rb
-        include SiSU_TextUtils
+      include SiSU_Parts_Generic
+      include SiSU_TextUtils
       @@endnotes={ para: [], end: [] }
       def initialize(md,data)
         @md,@data=md,data
-        @brace_url=SiSU_Viz::Defaults.new.url_decoration
-        @vz=SiSU_Viz::Defaults.new
         @tab="\t"
         @@notes=:end
         @manpage={ body: [], open: [], close: [], head: [], metadata: [], tail: [], endnotes: [] }
@@ -300,9 +297,9 @@ WOK
               "\n.I \\1\\2#{Mx[:br_line]}")
           unless dob.is==:code
             dob.obj=dob.obj.gsub(/(?:^|\s)#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}([,.:!?](?: |$))?/,
-                "\\1 #{@brace_url.txt_open}\\2#{@brace_url.txt_close}\\3").
+                "\\1 #{the_text.url_open}\\2#{the_text.url_close}\\3").
               gsub(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}([,.:!?](?: |$))?/,
-                "\\1#{@brace_url.txt_open}\\2#{@brace_url.txt_close}\\3")
+                "\\1#{the_text.url_open}\\2#{the_text.url_close}\\3")
             @manpage[:endnotes]=extract_endnotes(dob)
             dob.obj=dob.obj.gsub(/#{Mx[:en_a_o]}([\d*+]+)\s*(?:.+?)#{Mx[:en_a_c]}/m,'[^\1]'). # endnote marker marked up
               gsub(/#{Mx[:en_b_o]}([\d*+]+)\s*(?:.+?)#{Mx[:en_b_c]}/m,'[^\1]'). # endnote marker marked up
-- 
cgit v1.2.3