diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-10-12 10:56:59 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-10-12 10:56:59 -0400 |
commit | 2e4c214d4d2323864985ccfe93346a9796edee2f (patch) | |
tree | bd450b52b31b81fc46150ebee9d4e06bc7e1e560 /lib/sisu/v6/manpage.rb | |
parent | debian/changelog (5.6.9-1) (diff) | |
parent | v5: merge v6: remove defaults.rb & some relics related to sisu skins (diff) |
Merge tag 'sisu_5.7.0' into debian/sid
SiSU 5.7.0
Diffstat (limited to 'lib/sisu/v6/manpage.rb')
-rw-r--r-- | lib/sisu/v6/manpage.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/sisu/v6/manpage.rb b/lib/sisu/v6/manpage.rb index 2eb32e36..9ff83fd5 100644 --- a/lib/sisu/v6/manpage.rb +++ b/lib/sisu/v6/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 |