d: track changes to sisu_version info
authorRalph Amissah <ralph@amissah.com>
Sat, 6 Dec 2014 06:09:10 +0000 (01:09 -0500)
committerRalph Amissah <ralph@amissah.com>
Mon, 8 Dec 2014 05:18:15 +0000 (00:18 -0500)
25 files changed:
data/doc/sisu/CHANGELOG_v6
lib/sisu/develop/cgi_sql_common.rb
lib/sisu/develop/dp.rb
lib/sisu/develop/html_harvest_authors.rb
lib/sisu/develop/html_harvest_topics.rb
lib/sisu/develop/html_manifest.rb
lib/sisu/develop/html_parts.rb
lib/sisu/develop/manpage.rb
lib/sisu/develop/se_get_init.rb
lib/sisu/develop/se_version.rb
lib/sisu/develop/shared_metadata.rb
lib/sisu/develop/src_shared.rb
lib/sisu/develop/sst_from_xml.rb
lib/sisu/develop/texinfo_format.rb
lib/sisu/develop/texpdf_format.rb
lib/sisu/develop/txt_asciidoc.rb
lib/sisu/develop/txt_markdown.rb
lib/sisu/develop/txt_plain.rb
lib/sisu/develop/txt_rst.rb
lib/sisu/develop/txt_textile.rb
lib/sisu/develop/wikispeak.rb
lib/sisu/develop/xhtml_parts.rb
lib/sisu/develop/xml_fictionbook2.rb
lib/sisu/develop/xml_odf_odt_format.rb
lib/sisu/develop/xml_shared.rb

index e0a9d28ecab0c7ba1b7dfb2eaae0b17eea1f91fc..12ceb14cdfa8b8a15ad699d43b6fde814f8ede6b 100644 (file)
@@ -57,6 +57,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
       (stable|unstable), alpha sorting fail (release|(next|develop))]
 
   * version & branch info, changes related to move of lib dirs
+    * track changes to sisu_version info
 
 ** SiSU "UnFrozen" - prior to end of Debian Freeze
   (upstream bugfix 6.3.2 (5.7.2) intended for Jessie (packaged for Debian as
index 0b29640db78437ee0a03ad33bce7a2974d2643ea..5a4619c1b8912108f51dcaeb4f58d534857dd8d6 100644 (file)
@@ -537,14 +537,14 @@ module SiSU_CGI_SQL
 <!-- SiSU Rights -->
   <p class="tiny_left"><font color="#666666" size="2">
     Generated by
-      #{v[:project]} #{v[:version]} #{v[:date]} (#{v[:date_stamp]})
+      #{v.project} #{v.version} #{v.date} (#{v.date_stamp})
     <br>
     <a href="http://www.sisudoc.org" >
-    <b>#{v[:project]}</b></a> <sup>&copy;</sup> Ralph Amissah
+    <b>#{v.project}</b></a> <sup>&copy;</sup> Ralph Amissah
     1993, current 2014.
     All Rights Reserved.
     <br>
-      #{v[:project]} is software for document structuring, publishing and search,
+      #{v.project} is software for document structuring, publishing and search,
     <br>
     <a href="http://www.jus.uio.no/sisu" >
       www.jus.uio.no/sisu
@@ -574,7 +574,7 @@ module SiSU_CGI_SQL
   </font></p>
 </td><td valign="top" width="45%">
   <p class="tiny_left"><font color="#666666" size="2">
-    #{v[:project]} using:
+    #{v.project} using:
     <br>Standard SiSU markup syntax,
     <br>Standard SiSU meta-markup syntax, and the
     <br>Standard SiSU <u>object citation numbering</u> and system, (object/text identifying/locating system)
@@ -601,7 +601,7 @@ module SiSU_CGI_SQL
   </font></p>
 </td><td valign="top" width="45%">
   <p class="tiny_left"><font color="#666666" size="2">
-    #{v[:project]}, developed using
+    #{v.project}, developed using
     <a href="http://www.ruby-lang.org/en/">
       Ruby
     </a>
index 3736630b7b8e5bad0b9752c1e0d79d3b2d2a1a7c..10a805e7f68b58b8074b64e1946c35bbb386b05e 100644 (file)
@@ -1017,6 +1017,7 @@ module SiSU_Param
           @flag_endnotes,@flag_auto_endnotes,@flag_separate_endnotes=false,false,false
           @flag_separate_endnotes_make=true
           ver=SiSU_Env::InfoVersion.instance
+p ver.get_version.version
           @sisu_version=ver.get_version
           @ruby_version=ver.rbversion
           @generated=Time.now
index 5fd6bc72f56ba1a2b1eaef3c834e7da08b75ee80..8298b1af33d43259b2a56e9e568fafe0b53cd7ab 100644 (file)
@@ -322,7 +322,7 @@ module SiSU_HarvestAuthors
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="dc.title" content= "SiSU metadata harvest, Authors - SiSU information Structuring Universe, Structured information Serialised Units" />
 <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
-<meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
+<meta name="generator" content="#{sv.project} #{sv.version} of #{sv.date_stamp} (n*x and Ruby!)" />
 <link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
 <link href="#{css_path}" rel="stylesheet" >
 <link rel="shortcut icon" href="../_sisu/image/rb7.ico" />
index b86f4914e36b614df0ea7405dff83ad33736e6cd..bd461377d640de697a1217cd607e211019628f99 100644 (file)
@@ -691,7 +691,7 @@ module SiSU_HarvestTopics
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="dc.title" content= "SiSU metadata harvest, Topics - SiSU information Structuring Universe, Structured information Serialised Units" />
 <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
-<meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
+<meta name="generator" content="#{sv.project} #{sv.version} of #{sv.date_stamp} (n*x and Ruby!)" />
 <link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
 <link href="#{css_path}" rel="stylesheet">
 <link rel="shortcut icon" href="../_sisu/image/rb7.ico" />
index 397f040df0f2316b6d84567cbc7cd3d22b15729d..e49f097598bba85d6c97d026940f71480fd867c5 100644 (file)
@@ -853,7 +853,7 @@ WOK
           metadata(id,info)
         end
         if @md.sisu_version
-          id,info=@translate.sisu_version,"#{@md.sisu_version[:project]} #{@md.sisu_version[:version]} #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})#{@md.sisu_version[:install_method]}"
+          id,info=@translate.sisu_version,"#{@md.sisu_version.project} #{@md.sisu_version.version} #{@md.sisu_version.date_stamp} (#{@md.sisu_version.date})#{@md.sisu_version.install_method}"
           metadata(id,info)
         end
         if @md.ruby_version
index e29b450f7260aa2b60d2f545d7acc83fe2fb57a7..4133203c48f2c1f3142fcdcc24fdab55db630d64 100644 (file)
@@ -293,7 +293,7 @@ module SiSU_Proj_HTML
       #@date=SiSU_Env::InfoDate.new #{@date.year}
     end
     def txt_generator
-      %{  <meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
+      %{  <meta name="generator" content="#{@v.project} #{@v.version} of #{@v.date_stamp} (#{@v.date}) (n*x and Ruby!)" />
     <link rel="generator" href="http://www.sisudoc.org/" />}
     end
     def widget_sisu_text
@@ -301,9 +301,9 @@ module SiSU_Proj_HTML
   <p class="tiny"><font color="#666666" size="2">
     Output generated by
     <a href="#{the_url.sisu}">
-      #{@v[:project]}
+      #{@v.project}
     </a>
-    #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]})
+    #{@v.version} #{@v.date} (#{@v.date_stamp})
   </font></p>
 WOK
     end
@@ -362,7 +362,7 @@ WOK
 <meta name="dc.publisher" content= "SiSU http://www.sisudoc.org/" />
 <meta name="dc.language" content="en" />
 <meta name="dc.rights" content="Copyright Ralph Amissah" />
-<meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
+<meta name="generator" content="#{@v.project} #{@v.version} of #{@v.date_stamp} (#{@v.date}) (n*x and Ruby!)" />
 <link rel="generator" href="http://www.sisudoc.org/" />
 <link rel="stylesheet" href="./#{@dir.path.style}/harvest.css" type="text/css" />
 <link rel="shortcut icon" href="./_sisu/image/rb7.ico" />
@@ -420,7 +420,7 @@ Outputs include: plaintext, HTML, EPUB, ODT (OpenDocumentText), (XHTML, XML,) La
 </a>
 </p>
 <p class="tiny">
-#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!), #{@date.year_static}.
+#{@v.project} #{@v.version} of #{@v.date_stamp} (#{@v.date}) (n*x and Ruby!), #{@date.year_static}.
 </p>
 <p class="tiny">
 w3 since October 3 1993.
index e0dbad21458f7b829d2cb64feb8d815b90bfe1e0..2d46a22901b5cc6c61c40a23a95a83ccbffac143 100644 (file)
@@ -380,7 +380,7 @@ WOK
         else SiSU_Env::InfoDate.new.year #date missing decide on action
         end
         proj=SiSU_Env::InfoVersion.instance.get_version
-        manpage[:open] = %{.TH "#{@md.fnb}" "#{@md.make.manpage['section']}" "#{date}" "#{proj[:version]}" "#{@md.title.main}"#{@md.make.manpage['name']}#{@md.make.manpage['synopsis']}}
+        manpage[:open] = %{.TH "#{@md.fnb}" "#{@md.make.manpage['section']}" "#{date}" "#{proj.version}" "#{@md.title.main}"#{@md.make.manpage['name']}#{@md.make.manpage['synopsis']}}
         content << manpage[:open]
         content << manpage[:head]
         content << manpage[:body]
index 569ea95e7a7fc0dbb21e4d6e67af83fc461785b5..0434aea5b603aa13f46de829e0d7f0283091f3ab 100644 (file)
@@ -83,34 +83,34 @@ module SiSU_Get_Init
       [
         $sisu_document_markup_directory_base_fixed_path \
         + '/.sisu/' \
-        + v[:branch_name],
+        + v.branch_name,
         $sisu_document_markup_directory_base_fixed_path \
         + '/.sisu/' \
-        + v[:branch_version],
+        + v.branch_version,
         $sisu_document_markup_directory_base_fixed_path \
         + '/.sisu',
         $sisu_document_markup_directory_base_fixed_path \
         + '/_sisu/' \
-        + v[:branch_name],
+        + v.branch_name,
         $sisu_document_markup_directory_base_fixed_path \
         + '/_sisu/' \
-        + v[:branch_version],
+        + v.branch_version,
         $sisu_document_markup_directory_base_fixed_path \
         + '/_sisu',
         @@home \
         + '/.sisu/' \
-        + v[:branch_name],
+        + v.branch_name,
         @@home \
         + '/.sisu/' \
-        + v[:branch_version],
+        + v.branch_version,
         @@home \
         + '/.sisu', \
         @@sisu_etc \
         + '/' \
-        + v[:branch_name],
+        + v.branch_name,
         @@sisu_etc \
         + '/' \
-        + v[:branch_version],
+        + v.branch_version,
         @@sisu_etc,
       ]
     end
index 04c61c32296ac4833ac522fc463a0638e7fcb31d..2ace68ce8894ba093be62ae1e31026ffa99117c2 100644 (file)
@@ -85,6 +85,9 @@ module SiSU_Info_Version
       if File.exist?(SiSU_is[:version_info_path])
         version=YAML::load(File::open(SiSU_is[:version_info_path]))
       end
+      version[:branch_version]=SiSU_is[:branch_version]
+      version[:branch_number]=/^v([0-9]+)/.match(version[:branch_version])[1]
+      version[:branch_name]=SiSU_is[:branch_name]
       version[:install_method]=if SiSU_is[:run_from]==:gem_install
         spec = Gem::Specification.find_by_name("sisu")
         gem_root = spec.gem_dir
@@ -92,10 +95,35 @@ module SiSU_Info_Version
         ? ' (ruby gem install)' : ''
       else ''
       end
-      version[:branch_name]=SiSU_is[:branch_name]
-      version[:branch_version]=SiSU_is[:branch_version]
-      version[:branch_number]=/^v([0-9]+)$/.match(version[:branch_version])[1]
-      version
+      @version=version
+      def version_details_hash
+        @version
+      end
+      def project
+        version_details_hash[:project]
+      end
+      def date
+        version_details_hash[:date]
+      end
+      def date_stamp
+        version_details_hash[:date_stamp]
+      end
+      def version
+        version_details_hash[:version]
+      end
+      def branch_version
+        version_details_hash[:branch_version]
+      end
+      def branch_number
+        version_details_hash[:branch_number]
+      end
+      def branch_name
+        version_details_hash[:branch_name]
+      end
+      def install_method
+        version_details_hash[:install_method]
+      end
+      self
     end
     def rbversion
       %x{ruby -v}.strip
@@ -118,7 +146,7 @@ module SiSU_Info_About
     def sisu_version
       version=SiSU_Env::InfoVersion.instance.get_version
       rb_ver=SiSU_Env::InfoVersion.instance.rbversion
-      if version[:version]
+      if version.version
         opt_cmd=if defined? @color.cmd \
         and @color.cmd =~/[ck]/
           @color.cmd
@@ -126,11 +154,11 @@ module SiSU_Info_About
         end
         SiSU_Screen::Ansi.new(
           opt_cmd,
-          version[:project],
-          version[:version],
-          version[:date_stamp],
-          version[:date],
-          version[:install_method],
+          version.project,
+          version.version,
+          version.date_stamp,
+          version.date,
+          version.install_method,
           rb_ver
         ).version
       else puts 'SiSU (version information not available)'
index 1859b5101ccb2013bf34bcf4fae92ec85a1e19cd..2f3300f6c02455c0015772e76d36230174a1a873 100644 (file)
@@ -281,12 +281,12 @@ module SiSU_Metadata
         meta << self.meta_para
       end
       if defined? @md.sisu_version \
-      and @md.sisu_version[:version]=~/\S+/
+      and @md.sisu_version.version=~/\S+/
         v="#{tr.sisu_version}: " +
-          "#{@md.sisu_version[:project]} " +
-          "#{@md.sisu_version[:version]} " +
-          "of #{@md.sisu_version[:date_stamp]} " +
-          "(#{@md.sisu_version[:date]})"
+          "#{@md.sisu_version.project} " +
+          "#{@md.sisu_version.version} " +
+          "of #{@md.sisu_version.date_stamp} " +
+          "(#{@md.sisu_version.date})"
         @tag,@inf,@class='Generated by',v,'ver'
         meta << self.meta_para
       end
@@ -1217,12 +1217,12 @@ WOK
         meta << meta_para(tag,inf)
       end
       if defined? @md.sisu_version \
-      and @md.sisu_version[:version]=~/\S+/
+      and @md.sisu_version.version=~/\S+/
         tag=tr.sisu_version
-        inf="#{@md.sisu_version[:project]} " +
-          "#{@md.sisu_version[:version]} " +
-          "of #{@md.sisu_version[:date_stamp]} " +
-          "(#{@md.sisu_version[:date]})"
+        inf="#{@md.sisu_version.project} " +
+          "#{@md.sisu_version.version} " +
+          "of #{@md.sisu_version.date_stamp} " +
+          "(#{@md.sisu_version.date})"
         meta << meta_para(tag,inf)
       end
       if defined? @md.ruby_version \
index 8b85825aee3d4ea3a05a312cfc9d44b2c3611696..ebd4f9d981d5ed7a454806e26046e31bc059b8ad 100644 (file)
@@ -63,7 +63,7 @@ module SiSU_Source
       @opt=opt
       @date=SiSU_Env::InfoDate.new.dt
       @env=SiSU_Env::InfoEnv.new(opt.fns)
-      @ver=SiSU_Env::InfoVersion.instance.get_version
+      #@ver=SiSU_Env::InfoVersion.instance.get_version
       @v=(@opt.act[:verbose_plus][:set]==:on \
       || @opt.act[:maintenance][:set]==:on) \
       ? 'v' : ''
index 401748929d6e3b3c258970ba7194e395dc6cba04..6e3f5f47f9619468282dd15e0919b35038e2455b 100644 (file)
@@ -116,7 +116,7 @@ module SiSU_sstFromXML
       out_file=File.new(@output_file_name,'w')
       head=@doc.root.get_elements('//head/header')
       body=@doc.root.get_elements('//object/text')
-      out_file.puts "% SiSU text #{@ver[:version]} (generated from a SiSU XML markup representation)\n\n"
+      out_file.puts "% SiSU text #{@ver.version} (generated from a SiSU XML markup representation)\n\n"
       head.each do |x|
         if x.name=='header'
           head=markup_head(x.to_s)
index 096e1c5c26ed2fcb5cdcbf3cf85d9084bce279b0..18276d7ad5166d253f946632b7056276d9943234 100644 (file)
@@ -90,7 +90,7 @@ module SiSU_TexInfoFormat
       author=@md.author if @md.author
       author ||=''
       author=author.gsub(/[\*]/,'') #if author
-      SiSU_Env::InfoVersion.instance.get_version
+      #SiSU_Env::InfoVersion.instance.get_version
       head =<<WOK
 \\input texinfo   @c -*-texinfo-*-
 @comment %**start of header
index 573c45d606290e13eda48515626f918ff08ba5a3..dcb2b359c4077651821c493ec06c8aee34c65e05 100644 (file)
@@ -890,7 +890,7 @@ module SiSU_TeX_Pdf
       end
     end
     def tex_head_info
-      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]
+      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}"
       <<-WOK
@@ -1560,7 +1560,7 @@ module SiSU_TeX_Pdf
       <<-WOK
 \\\\ ~
 {\\begin{footnotesize}#{base_prog_txt}
-\\\\ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\begin{tiny}[ #{v[:project]} #{v[:version]} of #{v[:date_stamp]} ]\\end{tiny} \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu}
+\\\\ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\begin{tiny}[ #{v.project} #{v.version} of #{v.date_stamp} ]\\end{tiny} \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu}
 \\\\ Copyright #{@copymark} 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved.
 \\\\ SiSU is software for document structuring, publishing and search (with object citation numbering), \\href{http://www.sisudoc.org}{www.sisudoc.org}
 \\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later, #{url_brace.tex_open}\\href{http://www.fsf.org/licenses/gpl.html}{http://www.fsf.org/licenses/gpl.html}#{url_brace.tex_close}.
@@ -1584,7 +1584,7 @@ module SiSU_TeX_Pdf
 Document version information: \\\\
 \\emph{sourcefile} \\uline{#{@md.fnstex}}; \\emph{version} \\uline{#{@md.sc_number}}; \\emph{date} \\uline{#{@md.sc_date}}; \\emph{time} \\uline{#{@md.sc_time}} \\\\
 Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- version information: \\\\
-\\uline{ #{v[:project]} #{v[:version]} of #{v[:date_stamp]}}
+\\uline{ #{v.project} #{v.version} of #{v.date_stamp}}
 \\end{footnotesize}}&
       WOK
     end
@@ -1596,7 +1596,7 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- ve
 Document information: \\\\
 \\emph{sourcefile} \\uline{#{@md.fnstex}} \\\\
 Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu } \\\\ version information: \\
-\\uline{ #{v[:project]} #{v[:version]} of #{v[:date_stamp]}}
+\\uline{ #{v.project} #{v.version} of #{v.date_stamp}}
 
 \\end{small}}&
       WOK
index 496b2025d17899c1ca2a324360b30b8d28c7da59..bdf30a7395a591c53e81165072df260b77f15043 100644 (file)
@@ -161,7 +161,7 @@ WOK
       end
       def plaintext_tail
 #       env=SiSU_Env::InfoEnv.new(@md.fns)
-        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]
+        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}"
         sc=if @md.sc_info
index d7cf988f34eeea9a474f0a04f1c82ed1bf2415bc..db6ce4a568380818fc2a5f74c683a8ce28644f15 100644 (file)
@@ -196,7 +196,7 @@ WOK
       end
       def plaintext_tail
 #       env=SiSU_Env::InfoEnv.new(@md.fns)
-        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]
+        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}"
         sc=if @md.sc_info
index 45cab3096aa2d25c7bb234ee73e979571086dfda..5dbe1843bffa402d52be8f643b89fc9c03e6d468 100644 (file)
@@ -197,7 +197,7 @@ WOK
       end
       def plaintext_tail
 #       env=SiSU_Env::InfoEnv.new(@md.fns)
-        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]
+        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}"
         sc=if @md.sc_info
index 4bba77b226225a5d88b9e282c13c90e6b4e89db4..657fffca5910035cfed951cefcb55c217101daaa 100644 (file)
@@ -197,7 +197,7 @@ WOK
       end
       def plaintext_tail
 #       env=SiSU_Env::InfoEnv.new(@md.fns)
-        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]
+        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}"
         sc=if @md.sc_info
index c515e8d1d1d995e317b12bf19dd0fe940bf4ac00..a8a105940b58528fc265bd74b64508bdf1c651ae 100644 (file)
@@ -198,7 +198,7 @@ WOK
       end
       def plaintext_tail
 #       env=SiSU_Env::InfoEnv.new(@md.fns)
-        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]
+        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}"
         sc=if @md.sc_info
index e8c45c1b8be818cd5f87432d983be2978aaf550c..5353e28c7504c45975d5c1ca649191cec2cab10a 100644 (file)
@@ -185,7 +185,7 @@ WOK
         end
       end
       def wiki_tail
-        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]
+        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}"
         sc=if @md.sc_info
index 36a8cd9a1eb0328a3aa117222f4bf2c300cf9df3..85d18ba719c997ec3be759cc7058355464ef84d2 100644 (file)
@@ -174,7 +174,7 @@ module SiSU_Proj_XHTML
     end
     def credits_sisu_epub
       %{<div class="substance">
-<p class="center"><a href="http://www.openebook.org"><b>EPUB</b></a> generated by <a href="http://www.sisudoc.org"><b>#{@v[:project]}</b></a> v#{@v[:version]}, GPL3</p>
+<p class="center"><a href="http://www.openebook.org"><b>EPUB</b></a> generated by <a href="http://www.sisudoc.org"><b>#{@v.project}</b></a> v#{@v.version}, GPL3</p>
 </div>}
       ''
     end
index 45f5b74aebb5b16f345180fc4e6dafc0f4fd4de9..f3c1a0eb7f751727ae028dced3170a0c89237194 100644 (file)
@@ -204,8 +204,8 @@ module SiSU_XML_Fictionbook
       <last-name/>
       <nickname/>
     </author>
-    <program-used>#{version[:project]} #{version[:version]} and #{rb_ver}</program-used>
-    <date value="#{version[:date]}">#{version[:date]}</date>
+    <program-used>#{version.project} #{version.version} and #{rb_ver}</program-used>
+    <date value="#{version.date}">#{version.date}</date>
     <src-url>#{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}</src-url>
     <id></id>
     <version>1.0</version>
index 4de504a0fd73442f793a15c000b4ab91551be629..6f7b6197c719dad62bb9b24ab09e91e026876488 100644 (file)
@@ -265,7 +265,7 @@ module SiSU_XML_ODF_ODT_Format
   class ODT_Head_1_2
     def initialize(md)
       @md=md
-      @generator="#{@md.sisu_version[:project]} #{@md.sisu_version[:version]} #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})"
+      @generator="#{@md.sisu_version.project} #{@md.sisu_version.version} #{@md.sisu_version.date_stamp} (#{@md.sisu_version.date})"
     end
     def manifest_rdf
       x=<<WOK
index b24b2f7a1b423a05b329ed8ff01308d95222ca3e..33ea3674dee5f306fc7694d6e5eda5d707f20ce3 100644 (file)
@@ -608,7 +608,7 @@ module SiSU_XML_Tags #Format
       rdftoc
     end
     def comment_xml(extra='')
-      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]
+      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}"
       sc=if @md.sc_info