diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-08-08 00:26:51 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-08-08 00:26:51 -0400 |
commit | 6f88dbf16ce50d3ab246b79e16222447cb3ddfc6 (patch) | |
tree | a5b35b294f9278ce2c20179f8ceb0e8c65877640 /lib/sisu/v4/html.rb | |
parent | debian/changelog (4.1.9-1) (diff) | |
parent | v4: merge v5 lib (5.0.10) (diff) |
Merge tag 'sisu_4.1.10' into debian/sid
SiSU 4.1.10
Diffstat (limited to 'lib/sisu/v4/html.rb')
-rw-r--r-- | lib/sisu/v4/html.rb | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/lib/sisu/v4/html.rb b/lib/sisu/v4/html.rb index 210bc0b3..d4987c4d 100644 --- a/lib/sisu/v4/html.rb +++ b/lib/sisu/v4/html.rb @@ -418,14 +418,21 @@ WOK linkname,ocn=dob.obj.strip,dob.ocn p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn) if ocn if dob.ln ==4 - seg_link=%{ <a href="#{dob.name}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top"> + fnh={ + fn: dob.name, + } + f=@md.file.base_filename.html_seg(fnh) + seg_link=%{ <a href="#{f}" target="_top"> #{dob.obj} </a> } @@seg_url=dob.name elsif dob.obj =~/\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+/ - seg_link=dob.obj.gsub(/^(\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+)(.*)/, - %{<a href="\\1#{@md.lang_code_insert}#{Sfx[:html]}" } + - %{target="_top">\\1 \\2</a> }) + fn,hd=/^(\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+)(.*)/.match(dob.obj)[1,2] + fnh={ + fn: fn, + } + f=@md.file.base_filename.html_seg(fnh) + seg_link=%{<a href="#{f}" target="_top">#{fn} #{hd}</a> } end p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn) if ocn @file=SiSU_Env::FileOp.new(@md) if @md @@ -459,8 +466,12 @@ WOK toc={} if ocn \ and ocn !~/#/ + fnh={ + fn: @@seg_url, + } + f=@md.file.base_filename.html_seg(fnh) p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn) - lnk_n_txt=%{ <a href="#{@@seg_url}#{@md.lang_code_insert}#{Sfx[:html]}##{ocn}"> + lnk_n_txt=%{ <a href="#{f}##{ocn}"> #{linkname} </a>} txt_obj={ txt: lnk_n_txt } @@ -480,8 +491,12 @@ WOK toc={} if ocn \ and ocn !~/#/ + fnh={ + fn: @@seg_url, + } + f=@md.file.base_filename.html_seg(fnh) p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn) - lnk_n_txt=%{ <a href="#{@@seg_url}#{@md.lang_code_insert}#{Sfx[:html]}##{ocn}"> + lnk_n_txt=%{ <a href="#{f}##{ocn}"> #{linkname} </a>} txt_obj={ txt: lnk_n_txt } |