diff options
| -rw-r--r-- | CHANGELOG_v2 | 12 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 12 | ||||
| -rw-r--r-- | data/sisu/v2/v/version.yml | 4 | ||||
| -rw-r--r-- | lib/sisu/v2/html_format.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/odf.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/plaintext.rb | 16 |
6 files changed, 28 insertions, 20 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 38a8978e..b7a1f9d3 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-04:48/6) +%% 2.7.9.orig.tar.gz (2010-12-07:49/2) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -38,8 +38,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * epub, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the viewer - * html, link to "document manifest" remains (links to other individual - outputs removed) + * document manfest links + * html, link to "document manifest" remains (links to individual output + types removed) + * plaintext, link to "document manifest" fix(links to individual output + types removed) + * odf, manifest link fix + + * html search form, configuration check %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index b87917d2..2b21fb1b 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-04:48/6) +%% 2.7.9.orig.tar.gz (2010-12-07:49/2) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -38,8 +38,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * epub, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the viewer - * html, link to "document manifest" remains (links to other individual - outputs removed) + * document manfest links + * html, link to "document manifest" remains (links to individual output + types removed) + * plaintext, link to "document manifest" fix(links to individual output + types removed) + * odf, manifest link fix + + * html search form, configuration check %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index ae204687..ff542dd2 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.9 -:date_stamp: 2010w48/6 -:date: "2010-12-04" +:date_stamp: 2010w49/2 +:date: "2010-12-07" :project: SiSU 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 <tr><td width="20%"> #{@vz.banner_band} </td> -<td width="20%"> +<td width="75%" align="center"> #{doc_types} </td> <td width="5%" align="right"> 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] << %{<text:p text:style-name="P1">Available document outputs: <br /> <<text:a xlink:type="simple" xlink:href="#{manifest}">#{manifest}</text:a>></text:p>} @@odf[:tail] << %{\n<text:p text:style-name="P1">SiSU: <<text:a xlink:type="simple" xlink:href="http://www.jus.uio.no/lm">www.jus.uio.no/sisu</text:a>> and <<text:a xlink:type="simple" xlink:href="http://www.sisudoc.org">www.sisudoc.org</text:a>></text:p>} @@odf[:tail] << "\n</office:text></office:body></office:document-content>" 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] <<<<WOK #{@br} +plaintext (plain text): + #{base_url}/#{@md.fn[:plain]}#{@br} Other versions of this document: #{@br} manifest: - #{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:manifest]}#{@br} -html: - #{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:toc]}#{@br} -pdf: - #{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:pdf_p]} - #{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:pdf_l]}#{@br} -plaintext (plain text): - #{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:plain]}#{@br} + #{base_url}/#{@md.fn[:manifest]}#{@br} at: - #{vz.url_site}#{@br} + #{env.url.root}#{@br} #{sc} * #{generator} |