From 64729704f75b419aa3c41910c1729d51607965f5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 6 Dec 2014 01:16:05 -0500 Subject: d: in dp (param) project_details used instead of sisu_version --- lib/sisu/develop/dp.rb | 9 ++++----- lib/sisu/develop/html_manifest.rb | 4 ++-- lib/sisu/develop/se_info_env.rb | 2 +- lib/sisu/develop/shared_metadata.rb | 24 ++++++++++++------------ lib/sisu/develop/texpdf_format.rb | 2 +- lib/sisu/develop/txt_asciidoc.rb | 2 +- lib/sisu/develop/txt_markdown.rb | 2 +- lib/sisu/develop/txt_plain.rb | 2 +- lib/sisu/develop/txt_rst.rb | 2 +- lib/sisu/develop/txt_textile.rb | 2 +- lib/sisu/develop/wikispeak.rb | 2 +- lib/sisu/develop/xml_odf_odt_format.rb | 2 +- lib/sisu/develop/xml_shared.rb | 2 +- 13 files changed, 28 insertions(+), 29 deletions(-) (limited to 'lib') diff --git a/lib/sisu/develop/dp.rb b/lib/sisu/develop/dp.rb index 10a805e7..d5a72817 100644 --- a/lib/sisu/develop/dp.rb +++ b/lib/sisu/develop/dp.rb @@ -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 =~/Generated},'' 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 \ diff --git a/lib/sisu/develop/texpdf_format.rb b/lib/sisu/develop/texpdf_format.rb index dcb2b359..85a2ceeb 100644 --- a/lib/sisu/develop/texpdf_format.rb +++ b/lib/sisu/develop/texpdf_format.rb @@ -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 diff --git a/lib/sisu/develop/txt_asciidoc.rb b/lib/sisu/develop/txt_asciidoc.rb index bdf30a73..0b7fa669 100644 --- a/lib/sisu/develop/txt_asciidoc.rb +++ b/lib/sisu/develop/txt_asciidoc.rb @@ -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 diff --git a/lib/sisu/develop/txt_markdown.rb b/lib/sisu/develop/txt_markdown.rb index db6ce4a5..52f3b911 100644 --- a/lib/sisu/develop/txt_markdown.rb +++ b/lib/sisu/develop/txt_markdown.rb @@ -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 diff --git a/lib/sisu/develop/txt_plain.rb b/lib/sisu/develop/txt_plain.rb index 5dbe1843..2c314708 100644 --- a/lib/sisu/develop/txt_plain.rb +++ b/lib/sisu/develop/txt_plain.rb @@ -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 diff --git a/lib/sisu/develop/txt_rst.rb b/lib/sisu/develop/txt_rst.rb index 657fffca..052051fe 100644 --- a/lib/sisu/develop/txt_rst.rb +++ b/lib/sisu/develop/txt_rst.rb @@ -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 diff --git a/lib/sisu/develop/txt_textile.rb b/lib/sisu/develop/txt_textile.rb index a8a10594..4aa9c87f 100644 --- a/lib/sisu/develop/txt_textile.rb +++ b/lib/sisu/develop/txt_textile.rb @@ -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 diff --git a/lib/sisu/develop/wikispeak.rb b/lib/sisu/develop/wikispeak.rb index 5353e28c..5a740696 100644 --- a/lib/sisu/develop/wikispeak.rb +++ b/lib/sisu/develop/wikispeak.rb @@ -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 diff --git a/lib/sisu/develop/xml_odf_odt_format.rb b/lib/sisu/develop/xml_odf_odt_format.rb index 6f7b6197..8bd83e09 100644 --- a/lib/sisu/develop/xml_odf_odt_format.rb +++ b/lib/sisu/develop/xml_odf_odt_format.rb @@ -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=<