d: in dp (param) project_details used instead of sisu_version
authorRalph Amissah <ralph@amissah.com>
Sat, 6 Dec 2014 06:16:05 +0000 (01:16 -0500)
committerRalph Amissah <ralph@amissah.com>
Mon, 8 Dec 2014 05:18:15 +0000 (00:18 -0500)
14 files changed:
data/doc/sisu/CHANGELOG_v6
lib/sisu/develop/dp.rb
lib/sisu/develop/html_manifest.rb
lib/sisu/develop/se_info_env.rb
lib/sisu/develop/shared_metadata.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/xml_odf_odt_format.rb
lib/sisu/develop/xml_shared.rb

index 12ceb14cdfa8b8a15ad699d43b6fde814f8ede6b..76d02fd131c1223878eec0a04024bdc67367eb52 100644 (file)
@@ -58,6 +58,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
 
   * version & branch info, changes related to move of lib dirs
     * track changes to sisu_version info
+    * in dp (param) project_details used instead of sisu_version
 
 ** SiSU "UnFrozen" - prior to end of Debian Freeze
   (upstream bugfix 6.3.2 (5.7.2) intended for Jessie (packaged for Debian as
index 10a805e7f68b58b8074b64e1946c35bbb386b05e..d5a72817c34af8e0b4880d05a5c1934709a8145f 100644 (file)
@@ -899,9 +899,9 @@ module SiSU_Param
       @doc={ lv: [] }
       @doc[:fns],@doc[:fnb],@doc[:scr_suffix]='','',''
       @@publisher='SiSU scribe'
-      attr_accessor :make,:env,:path,:file,:fn,:fns,:fno,:fnb,:fnn,:fnt,:fnl,:flv,:fnz,:fnstex,:ocn,:sfx_src,:pdf,:file_type,:dir_out,:dir_tex,:dir_lout,:txt_path,:sisu,:sisu_version,:ruby_version,:title,:subtitle,:full_title,:html_title,:subtitle_tex,:creator,:classify,:author_home,:author,:author_title,:author_nationality,:authors,:authorship,:translator,:illustrator,:prepared_by,:digitized_by,:subject,:description,:publisher,:current_publisher,:contributor,:date,:date_created,:date_issued,:date_available,:date_valid,:date_modified,:date_translated,:date_added_to_site,:date_scheme,:date_created_scheme,:date_issued_scheme,:date_available_scheme,:date_valid_scheme,:date_modified_scheme,:type,:format,:identifier,:source,:language,:language_original,:relation,:coverage,:rights,:keywords,:comments,:abstract,:cls_loc,:cls_dewey,:cls_pg,:cls_isbn,:papersize,:papersize_array,:toc,:lv0,:lv1,:lv2,:lv3,:lv4,:lv5,:lv6,:lvs,:pagenew,:pagebreak,:pageline,:num_top,:bold_match_list,:italics_match_list,:substitution_match_list,:emphasis_set_to,:toc_lev_limit,:flag_endnotes,:flag_auto_endnotes,:flag_separate_endnotes,:flag_separate_endnotes_make,:markup,:markup_instruction,:flag_tables,:vocabulary,:doc_css,:yaml,:lnk,:links,:prefix_a,:prefix_b,:suffix,:information,:contact,:icon,:image,:ad_url,:ad_png,:ad_alt,:ad_began,:flag_promo,:promo,:ad_home,:stmp,:stmpd,:sc_filename,:sc_number,:sc_date,:sc_time,:sc_info,:yamladdr,:locale,:wc_lines,:wc_words,:wc_bytes,:file_encoding,:filesize,:user,:home,:hostname,:pwd,:firstseg,:programs,:author_copymark,:i18n,:lang,:lang_code_insert,:en,:notes,:dgst,:generated,:tags,:tag_array,:concord_make,:seg_names,:seg_autoname_safe,:set_header_title,:set_heading_top,:set_heading_seg,:heading_seg_first,:heading_seg_first_flag,:base_program,:ec,:opt,:sem_tag,:book_idx,:topic_register,:topic_register_array,:original,:writing_focus,:audio,:daisy,:home_button_image,:home_button_links,:footer_links,:cover_image,:man_section
+      attr_accessor :make,:env,:path,:file,:fn,:fns,:fno,:fnb,:fnn,:fnt,:fnl,:flv,:fnz,:fnstex,:ocn,:sfx_src,:pdf,:file_type,:dir_out,:dir_tex,:dir_lout,:txt_path,:sisu,:project_details,:ruby_version,:title,:subtitle,:full_title,:html_title,:subtitle_tex,:creator,:classify,:author_home,:author,:author_title,:author_nationality,:authors,:authorship,:translator,:illustrator,:prepared_by,:digitized_by,:subject,:description,:publisher,:current_publisher,:contributor,:date,:date_created,:date_issued,:date_available,:date_valid,:date_modified,:date_translated,:date_added_to_site,:date_scheme,:date_created_scheme,:date_issued_scheme,:date_available_scheme,:date_valid_scheme,:date_modified_scheme,:type,:format,:identifier,:source,:language,:language_original,:relation,:coverage,:rights,:keywords,:comments,:abstract,:cls_loc,:cls_dewey,:cls_pg,:cls_isbn,:papersize,:papersize_array,:toc,:lv0,:lv1,:lv2,:lv3,:lv4,:lv5,:lv6,:lvs,:pagenew,:pagebreak,:pageline,:num_top,:bold_match_list,:italics_match_list,:substitution_match_list,:emphasis_set_to,:toc_lev_limit,:flag_endnotes,:flag_auto_endnotes,:flag_separate_endnotes,:flag_separate_endnotes_make,:markup,:markup_instruction,:flag_tables,:vocabulary,:doc_css,:yaml,:lnk,:links,:prefix_a,:prefix_b,:suffix,:information,:contact,:icon,:image,:ad_url,:ad_png,:ad_alt,:ad_began,:flag_promo,:promo,:ad_home,:stmp,:stmpd,:sc_filename,:sc_number,:sc_date,:sc_time,:sc_info,:yamladdr,:locale,:wc_lines,:wc_words,:wc_bytes,:file_encoding,:filesize,:user,:home,:hostname,:pwd,:firstseg,:programs,:author_copymark,:i18n,:lang,:lang_code_insert,:en,:notes,:dgst,:generated,:tags,:tag_array,:concord_make,:seg_names,:seg_autoname_safe,:set_header_title,:set_heading_top,:set_heading_seg,:heading_seg_first,:heading_seg_first_flag,:base_program,:ec,:opt,:sem_tag,:book_idx,:topic_register,:topic_register_array,:original,:writing_focus,:audio,:daisy,:home_button_image,:home_button_links,:footer_links,:cover_image,:man_section
       def initialize(fns_array,opt)
-        @env=@path,@file=@fn=@fns=@fno=@fnb=@fnn=@fnt=@fnl=@flv=@fnz=@fnstex=@ocn=@sfx_src=@pdf=@file_type=@dir_out=@dir_tex=@dir_lout=@txt_path=@make=@flag_endnotes=@flag_auto_endnotes=@flag_separate_endnotes=@flag_separate_endnotes_make=@sisu=@sisu_version=@ruby_version=@title=@subtitle=@full_title=@html_title=@subtitle_tex=@creator=@classify=@author_home=@author=@author_title=@author_nationality=@translator=@illustrator=@prepared_by=@digitized_by=@subject=@description=@publisher=@current_publisher=@contributor=@date=@date_created=@date_issued=@date_available=@date_valid=@date_modified=@date_translated=@date_added_to_site=@date_scheme=@date_created_scheme=@date_issued_scheme=@date_available_scheme=@date_valid_scheme=@date_modified_scheme=@type=@format=@identifier=@source=@language=@language_original=@relation=@coverage=@rights=@keywords=@comments=@abstract=@cls_loc=@cls_dewey=@cls_pg=@cls_isbn=@papersize=@toc=@lv0=@lv1=@lv2=@lv3=@lv4=@lv5=@lv6=@pagenew=@pagebreak=@pageline=@num_top=@bold_match_list=@italics_match_list=@substitution_match_list=@emphasis_set_to=@toc_lev_limit=@flag_tables=@vocabulary=@doc_css=@yaml=@lnk=@links=@prefix_a=@prefix_b=@suffix=@information=@contact=@icon=@ad_url=@ad_png=@ad_alt=@ad_began=@promo=@ad_home=@stmp=@stmpd=@sc_filename=@sc_number=@sc_date=@sc_time=@sc_info=@yamladdr=@locale=@wc_lines=@wc_words=@wc_bytes=@file_encoding=@filesize=@firstseg=@programs=@author_copymark=@i18n=@lang=@lang_code_insert=@en=@notes=@dgst=@generated=@heading_seg_first=@base_program=@topic_register=@original=@writing_focus=@audio=@home_button_image=@home_button_links=@cover_image=@man_section=nil
+        @env=@path,@file=@fn=@fns=@fno=@fnb=@fnn=@fnt=@fnl=@flv=@fnz=@fnstex=@ocn=@sfx_src=@pdf=@file_type=@dir_out=@dir_tex=@dir_lout=@txt_path=@make=@flag_endnotes=@flag_auto_endnotes=@flag_separate_endnotes=@flag_separate_endnotes_make=@sisu=@project_details=@ruby_version=@title=@subtitle=@full_title=@html_title=@subtitle_tex=@creator=@classify=@author_home=@author=@author_title=@author_nationality=@translator=@illustrator=@prepared_by=@digitized_by=@subject=@description=@publisher=@current_publisher=@contributor=@date=@date_created=@date_issued=@date_available=@date_valid=@date_modified=@date_translated=@date_added_to_site=@date_scheme=@date_created_scheme=@date_issued_scheme=@date_available_scheme=@date_valid_scheme=@date_modified_scheme=@type=@format=@identifier=@source=@language=@language_original=@relation=@coverage=@rights=@keywords=@comments=@abstract=@cls_loc=@cls_dewey=@cls_pg=@cls_isbn=@papersize=@toc=@lv0=@lv1=@lv2=@lv3=@lv4=@lv5=@lv6=@pagenew=@pagebreak=@pageline=@num_top=@bold_match_list=@italics_match_list=@substitution_match_list=@emphasis_set_to=@toc_lev_limit=@flag_tables=@vocabulary=@doc_css=@yaml=@lnk=@links=@prefix_a=@prefix_b=@suffix=@information=@contact=@icon=@ad_url=@ad_png=@ad_alt=@ad_began=@promo=@ad_home=@stmp=@stmpd=@sc_filename=@sc_number=@sc_date=@sc_time=@sc_info=@yamladdr=@locale=@wc_lines=@wc_words=@wc_bytes=@file_encoding=@filesize=@firstseg=@programs=@author_copymark=@i18n=@lang=@lang_code_insert=@en=@notes=@dgst=@generated=@heading_seg_first=@base_program=@topic_register=@original=@writing_focus=@audio=@home_button_image=@home_button_links=@cover_image=@man_section=nil
         @data,      @path,  @fns,   @fno,   @opt=
           fns_array,opt.pth,opt.fns,opt.fno,opt #@data used as data
         @flag_tables,@set_header_title,@set_heading_top,@set_heading_seg,@heading_seg_first_flag,@flag_promo,@book_idx=
@@ -1017,8 +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
+          @project_details=ver.get_version
           @ruby_version=ver.rbversion
           @generated=Time.now
           fns_array=@data.dup
@@ -1027,7 +1026,7 @@ p ver.get_version.version
           fns_array.each do |para|                                               #% scan document
             if para !~/^%+\s/ \
             and para =~/<![abcdeghijklmnopqrstuvwxyz]/i # <!f not included
-              raise "Old markup style in file #{@fns}, current version #{@sisu_version[:project]} #{@sisu_version[:version]} #{@sisu_version[:date_stamp]} #{@sisu_version[:date]}:\n\t\t#{para}\n\n"
+              raise "Old markup style in file #{@fns}, current version #{@project_details.project} #{@project_details.version} #{@project_details.date_stamp} #{@project_details.date}:\n\t\t#{para}\n\n"
             end
             @code_flag=case para
             when /^code\{\s*$/ then true
index e49f097598bba85d6c97d026940f71480fd867c5..fc07a4c70f534bf6e839f0e96cf3bfd7938dd396 100644 (file)
@@ -852,8 +852,8 @@ WOK
           id,info=@translate.last_generated,@md.generated
           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}"
+        if @md.project_details
+          id,info=@translate.sisu_version,"#{@md.project_details.project} #{@md.project_details.version} #{@md.project_details.date_stamp} (#{@md.project_details.date})#{@md.project_details.install_method}"
           metadata(id,info)
         end
         if @md.ruby_version
index 3a2329dd10ee3070ac244be4253ce7815450ca48..8c20d085a8a2e2e3f705e5bf403d9536ab1f6b2a 100644 (file)
@@ -1283,7 +1283,7 @@ WOK
         end
         v=SiSU_Env::InfoVersion.instance.get_version
         v_dev=(DEVELOPER[:maintenance]==:true) \
-        ? "_#{v[:version]}"
+        ? "_#{v.version}"
         : ''
         path=if proposed_path_base \
         and FileTest.directory?(proposed_path_base) \
index 2f3300f6c02455c0015772e76d36230174a1a873..854e9ad1785a5bde88797415f9acf2141f001dd5 100644 (file)
@@ -280,13 +280,13 @@ module SiSU_Metadata
         @tag,@inf=%{<b><u>Generated</u></b>},''
         meta << self.meta_para
       end
-      if defined? @md.sisu_version \
-      and @md.sisu_version.version=~/\S+/
+      if defined? @md.project_details \
+      and @md.project_details.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.project_details.project} " +
+          "#{@md.project_details.version} " +
+          "of #{@md.project_details.date_stamp} " +
+          "(#{@md.project_details.date})"
         @tag,@inf,@class='Generated by',v,'ver'
         meta << self.meta_para
       end
@@ -1216,13 +1216,13 @@ WOK
         tag,inf=tr.last_generated,@md.generated
         meta << meta_para(tag,inf)
       end
-      if defined? @md.sisu_version \
-      and @md.sisu_version.version=~/\S+/
+      if defined? @md.project_details \
+      and @md.project_details.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.project_details.project} " +
+          "#{@md.project_details.version} " +
+          "of #{@md.project_details.date_stamp} " +
+          "(#{@md.project_details.date})"
         meta << meta_para(tag,inf)
       end
       if defined? @md.ruby_version \
index dcb2b359c4077651821c493ec06c8aee34c65e05..85a2ceeb70febfe6a99e68654813abea3e2fdf17 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.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
       lastdone="Last Generated on: #{Time.now}"
       rubyv="Ruby version: #{@md.ruby_version}"
       <<-WOK
index bdf30a7395a591c53e81165072df260b77f15043..0b7fa6694896ab166b1c9c36e32c42ae01fe1cc9 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.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})"  if @md.project_details.version
         lastdone="Last Generated on: #{Time.now}"
         rubyv="Ruby version: #{@md.ruby_version}"
         sc=if @md.sc_info
index db6ce4a568380818fc2a5f74c683a8ce28644f15..52f3b9115b3509d1d21d40c4831780c7ebf2c622 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.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})"  if @md.project_details.version
         lastdone="Last Generated on: #{Time.now}"
         rubyv="Ruby version: #{@md.ruby_version}"
         sc=if @md.sc_info
index 5dbe1843bffa402d52be8f643b89fc9c03e6d468..2c31470839e7c50a1a356de5a20053fd8c690767 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.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})"  if @md.project_details.version
         lastdone="Last Generated on: #{Time.now}"
         rubyv="Ruby version: #{@md.ruby_version}"
         sc=if @md.sc_info
index 657fffca5910035cfed951cefcb55c217101daaa..052051fe9145d905332a1bfc5f5013446ff74869 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.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})"  if @md.project_details.version
         lastdone="Last Generated on: #{Time.now}"
         rubyv="Ruby version: #{@md.ruby_version}"
         sc=if @md.sc_info
index a8a105940b58528fc265bd74b64508bdf1c651ae..4aa9c87f2299def54cf1b2c902f6d96e5146093d 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.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})"  if @md.project_details.version
         lastdone="Last Generated on: #{Time.now}"
         rubyv="Ruby version: #{@md.ruby_version}"
         sc=if @md.sc_info
index 5353e28c7504c45975d5c1ca649191cec2cab10a..5a740696a0301e3b204c46398445b30e38768366 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.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})"  if @md.project_details.version
         lastdone="Last Generated on: #{Time.now}"
         rubyv="Ruby version: #{@md.ruby_version}"
         sc=if @md.sc_info
index 6f7b6197c719dad62bb9b24ab09e91e026876488..8bd83e091c29bd7fc27dcb45fcb17e9b9e104d0b 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.project_details.project} #{@md.project_details.version} #{@md.project_details.date_stamp} (#{@md.project_details.date})"
     end
     def manifest_rdf
       x=<<WOK
index 33ea3674dee5f306fc7694d6e5eda5d707f20ce3..03e5a2a139dd4ba4ccb2add620cc783f00c2a383 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.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})"  if @md.project_details.version
       lastdone="Last Generated on: #{Time.now}"
       rubyv="Ruby version: #{@md.ruby_version}"
       sc=if @md.sc_info