From 67b6edcf9cde716d8370a5e7f88c11fc01d30f84 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 7 Dec 2010 09:36:10 -0500 Subject: document manifest link (plaintext, odf) * plaintext, link to "document manifest" fix(links to individual output types removed) * odf, manifest link fix * html, cosmetic touch --- lib/sisu/v2/html_format.rb | 2 +- lib/sisu/v2/odf.rb | 2 +- lib/sisu/v2/plaintext.rb | 16 ++++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index 06d6d352..8074a7ee 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -298,7 +298,7 @@ WOK #{@vz.banner_band} - + #{doc_types} diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb index ad1f45d1..769870eb 100644 --- a/lib/sisu/v2/odf.rb +++ b/lib/sisu/v2/odf.rb @@ -151,7 +151,7 @@ module SiSU_ODF end url=@md.fnb fn=@md.fn[:manifest] - manifest="#{@vz.url_root_http}/#{url}/#{fn}" + manifest="#{@env.url.root}/#{@md.fnb}/#{@md.fn[:manifest]}" @@odf[:tail] << %{Available document outputs:
<#{manifest}>
} @@odf[:tail] << %{\nSiSU: <www.jus.uio.no/sisu> and <www.sisudoc.org>} @@odf[:tail] << "\n" diff --git a/lib/sisu/v2/plaintext.rb b/lib/sisu/v2/plaintext.rb index bc83702b..e919af78 100644 --- a/lib/sisu/v2/plaintext.rb +++ b/lib/sisu/v2/plaintext.rb @@ -117,7 +117,6 @@ module SiSU_Plaintext def initialize(data,md,wrap_width) @data,@md,@wrap_width=data,md,wrap_width @brace_url=SiSU_Viz::Skin.new.url_decoration - @vz=SiSU_Env::Get_init.instance.skin @tab="\t" @@endnotes_=case md.mod.inspect when /--footnote/; false @@ -188,7 +187,9 @@ WOK end def plaintext_tail SiSU_Env::Info_skin.new(@md).select + env=SiSU_Env::Info_env.new(@md.fns) vz=SiSU_Env::Get_init.instance.skin + base_url="#{env.url.root}/#{@md.fnb}" 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}" @@ -198,18 +199,13 @@ WOK end @plaintext[:tail] <<<