diff options
Diffstat (limited to 'lib/sisu/v5/wikispeak.rb')
| -rw-r--r-- | lib/sisu/v5/wikispeak.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/sisu/v5/wikispeak.rb b/lib/sisu/v5/wikispeak.rb index 192e1cb7..c8bf1d53 100644 --- a/lib/sisu/v5/wikispeak.rb +++ b/lib/sisu/v5/wikispeak.rb @@ -62,9 +62,9 @@ module SiSU_Wikispeak require_relative 'se' # se.rb include SiSU_Env include SiSU_Param - include SiSU_Viz require_relative 'plaintext_format' # plaintext_format.rb include Format + require_relative 'html_parts' # html_parts.rb require_relative 'txt_shared' @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0 @@tablefoot='' @@ -109,7 +109,6 @@ module SiSU_Wikispeak class SplitTextObject <Source require_relative 'plaintext_format' # plaintext_format.rb include Format - include SiSU_Viz @@alt_id_count=0 @@dp=nil attr_reader :format,:lev,:text,:ocn,:lev_para_ocn @@ -155,14 +154,13 @@ module SiSU_Wikispeak end end class Scroll <Source - require_relative 'txt_shared' # txt_shared.rb - include SiSU_TextUtils + include SiSU_TextUtils + include SiSU_Parts_HTML @@endnotes_para=[] @@wiki={ body: [], open: [], close: [], head: [], metadata: [], tail: [], endnotes: [] } @@dp=nil def initialize(data,md) @data,@md=data,md - @vz=SiSU_Viz::Defaults.new @dp=@@dp ||=SiSU_Env::InfoEnv.new.digest.pattern @regx=/^(?:(?:#{Mx[:br_line]}\s*|#{Mx[:br_nl]}\s*)?#{Mx[:lv_o]}\d:(\S*?)#{Mx[:lv_c]}\s*)?(.+)/ #fix Mx[:lv_o] #m # 2004w18 pb pn removal added @tab="\t" @@ -189,7 +187,6 @@ WOK end end def wiki_tail - vz=SiSU_Viz::Defaults.new generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})" if @md.sisu_version[:version] lastdone="Last Generated on: #{Time.now}" rubyv="Ruby version: #{@md.ruby_version}" @@ -333,7 +330,7 @@ WOK para=format_text.scr_indent_one_no_paranum end end - if para !~/#{@vz.margin_txt_0}|#{@vz.margin_txt_1}|#{@vz.margin_txt_2}/ + if para !~/#{the_margin.txt_0}|#{the_margin.txt_1}|#{the_margin.txt_2}/ # i don't get the condition for no paranum end if para =~/<:center>/ |