diff options
Diffstat (limited to 'lib/sisu/v5/html_tune.rb')
| -rw-r--r-- | lib/sisu/v5/html_tune.rb | 18 | 
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb index 292087e5..7cd2a920 100644 --- a/lib/sisu/v5/html_tune.rb +++ b/lib/sisu/v5/html_tune.rb @@ -61,6 +61,7 @@ require_relative 'dp'                                   # dp.rb  module SiSU_HTML_Tune    require_relative 'se'                                 # se.rb      include SiSU_Env; include SiSU_Screen +  require_relative 'html_parts'                         # html_parts.rb    require_relative 'html_format'                        # html_format.rb #watch    @@line_mode=''    @@endnote_array=[] @@ -123,12 +124,11 @@ module SiSU_HTML_Tune      end    end    class Tune +    include SiSU_Parts_HTML      def initialize(data,md)        @data,@md=data,md -      @vz=SiSU_Viz::Defaults.new        @sys=SiSU_Env::SystemCall.new        @env=SiSU_Env::InfoEnv.new(@md.fns,@md) -      @brace_url=SiSU_Viz::Defaults.new.url_decoration      end      def songsheet        begin @@ -230,13 +230,13 @@ module SiSU_HTML_Tune            dob.obj=dob.obj.gsub(/\<:ad\s+(\S+)?\s+(\S+\.png)\s+(.+)?\;\s+(.+)?\;\s*\>/,              %{\n<center><a href="\\1" target="_top"><img src="#{@env.url.images_local}/\\2" alt="\\3"></a></center>\n})          end -        dob.obj=dob.obj.gsub(/!pick/,%{<img border="0" height="15" width="15" src="#{@env.url.images}/#{@vz.icon_choice}" alt="stellar">}). -          gsub(/!new/,%{ <img border="0" height="15" width="15" src="#{@env.url.images}/#{@vz.icon_new}" alt="new">}). +        dob.obj=dob.obj.gsub(/!pick/,%{<img border="0" height="15" width="15" src="#{@env.url.images}/#{the_icon.i_choice}" alt="stellar">}). +          gsub(/!new/,%{ <img border="0" height="15" width="15" src="#{@env.url.images}/#{the_icon.i_new}" alt="new">}).            gsub(/<:h(.{1,7}?)>/,'<a href="#h\1">\1</a>').            gsub(/<:to(\d{1,7}?)>/,'<a href="#to\1">to { \1 }</a> ').            gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'<a href="\1" target="_top">\1</a>'). #http ftp matches escaped, no decoration -          gsub(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}<a href="mailto:\\1">\\1</a>#{@brace_url.xml_close}}). -          gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}<a href="\\1" target="_top">\\1</a>#{@brace_url.xml_close}}) #http ftp matches with decoration +          gsub(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{the_url_decoration.xml_open}<a href="mailto:\\1">\\1</a>#{the_url_decoration.xml_close}}). +          gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{the_url_decoration.xml_open}<a href="\\1" target="_top">\\1</a>#{the_url_decoration.xml_close}}) #http ftp matches with decoration          if dob.obj =~/#{Xx[:html_relative2]}\/\S+/ \          and dob.obj !~/(\"#{Xx[:html_relative2]}\/\S+?\"|>\s*#{Xx[:html_relative2]}\/\S+<)/            dob.obj=dob.obj.gsub(/(#{Xx[:html_relative2]}\/\S+)/,'<a href="\1">\1</a>') @@ -245,9 +245,9 @@ module SiSU_HTML_Tune          and dob.obj !~/(\"..\/\S+?\"|>\s*..\/\S+<)/            dob.obj=dob.obj.gsub(/\.\.(\/\S+)/,%{<a href="#{Xx[:html_relative2]}\1">\1</a>})          end -        dob.obj=dob.obj.gsub(/<a href=":/,%{<a href="#{@vz.url_site}/}). -          gsub(/<a href="\.\.\//,%{<a href="#{@vz.url_site}/}). -          gsub(/<a href="#{Xx[:html_relative2]}\//,%{<a href="#{@vz.url_site}/}) +        dob.obj=dob.obj.gsub(/<a href=":/,%{<a href="#{the_url.site}/}). +          gsub(/<a href="\.\.\//,%{<a href="#{the_url.site}/}). +          gsub(/<a href="#{Xx[:html_relative2]}\//,%{<a href="#{the_url.site}/})        else          dob.obj=dob.obj.gsub(/</m,'<').gsub(/>/m,'>')        end  | 
