metadata, variable renaming (requires testing)

metadata, variable renaming (dropped use of dc_ to signify dublin core metadata
as is subset of what is used and cumbersome to identify) - testing required

manpage minor touch

1 files changed, 60 insertions, 60 deletions

diff --git a/lib/sisu/v0/texinfo_format.rb b/lib/sisu/v0/texinfo_format.rb
index 7f669185..91e48d0f 100644
--- a/lib/sisu/v0/texinfo_format.rb
+++ b/lib/sisu/v0/texinfo_format.rb
@@ -100,7 +100,7 @@ module SiSU_Texinfo_format
         subtitle="@subtitle @value{VERSION}, @value{UPDATED}\n" #bugwatch
       end
       subtitle ||=''
-      author=@md.dc_creator if @md.dc_creator
+      author=@md.author if @md.author
       author ||=''
       author.gsub!(/[\*]/,'') #if author
       v=SiSU_Env::Info_version.new.get_version
@@ -174,68 +174,68 @@ WOK
     def dublincore
       title=spec_char_string(@md.title) if @md.title
       subtitle=spec_char_string(@md.subtitle) if @md.subtitle
-      dc_title="#{title} - #{subtitle}"
-      dc_creator=spec_char_string(@md.dc_creator) if @md.dc_creator
-      dc_subject=spec_char_string(@md.dc_subject) if @md.dc_subject
-      dc_description=spec_char_string(@md.dc_description) if @md.dc_description
-      dc_publisher=spec_char_string(@md.dc_publisher) if @md.dc_publisher
-      dc_contributor=spec_char_string(@md.dc_contributor) if @md.dc_contributor
-      dc_date=spec_char_string(@md.dc_date) if @md.dc_date
-      dc_date_created=spec_char_string(@md.dc_date_created) if @md.dc_date_created
-      dc_date_issued=spec_char_string(@md.dc_date_issued) if @md.dc_date_issued
-      dc_date_available=spec_char_string(@md.dc_date_available) if @md.dc_date_available
-      dc_date_valid=spec_char_string(@md.dc_date_valid) if @md.dc_date_valid
-      dc_date_modified=spec_char_string(@md.dc_date_modified) if @md.dc_date_modified
-      dc_type=spec_char_string(@md.dc_type) if @md.dc_type
-      dc_format=spec_char_string(@md.dc_format) if @md.dc_format
-      dc_identifier=spec_char_string(@md.dc_identifier) if @md.dc_identifier
-      dc_source=spec_char_string(@md.dc_source) if @md.dc_source
-      dc_language=spec_char_string(@md.dc_language[:name]) if @md.dc_language[:name]
+      full_title="#{title} - #{subtitle}"                                           #dc
+      author=spec_char_string(@md.author) if @md.author                             #dc
+      subject=spec_char_string(@md.subject) if @md.subject                          #dc
+      description=spec_char_string(@md.description) if @md.description              #dc
+      publisher=spec_char_string(@md.publisher) if @md.publisher                    #dc
+      contributor=spec_char_string(@md.contributor) if @md.contributor              #dc
+      date=spec_char_string(@md.date) if @md.date                                   #dc
+      date_created=spec_char_string(@md.date_created) if @md.date_created           #dc
+      date_issued=spec_char_string(@md.date_issued) if @md.date_issued              #dc
+      date_available=spec_char_string(@md.date_available) if @md.date_available     #dc
+      date_valid=spec_char_string(@md.date_valid) if @md.date_valid                 #dc
+      date_modified=spec_char_string(@md.date_modified) if @md.date_modified        #dc
+      type=spec_char_string(@md.type) if @md.type                                   #dc
+      format=spec_char_string(@md.format) if @md.format                             #dc
+      identifier=spec_char_string(@md.identifier) if @md.identifier                 #dc
+      source=spec_char_string(@md.source) if @md.source                             #dc
+      language=spec_char_string(@md.language[:name]) if @md.language[:name]         #dc
       #language_original=spec_char_string(@md.language_original[:name]) if @md.language_original[:name]
-      dc_relation=spec_char_string(@md.dc_relation) if @md.dc_relation
-      dc_coverage=spec_char_string(@md.dc_coverage) if @md.dc_coverage
-      dc_rights=spec_char_string(@md.dc_rights) if @md.dc_rights
-      dc_title="Title: #{dc_title}\n\n" if dc_title
-      dc_creator="Creator: #{dc_creator}\n\n" if dc_creator
-      dc_subject="Subject: #{dc_subject}\n\n" if dc_subject
-      dc_description="Description: #{dc_description}\n\n" if dc_description
-      dc_publisher="Publisher: #{dc_publisher}\n\n" if dc_publisher
-      dc_contributor="Contributor: #{dc_contributor}\n\n" if dc_contributor
-      dc_date="Date: #{dc_date}\n\n" if dc_date
-      dc_date_created="Date Created: #{dc_date_created}\n\n" if dc_date_created
-      dc_date_issued="Date Issued: #{dc_date_issued}\n\n" if dc_date_issued
-      dc_date_available="Date Available: #{dc_date_available}\n\n" if dc_date_available
-      dc_date_valid="Date Valid: #{dc_date_valid}\n\n" if dc_date_valid
-      dc_date_modified="Date Modified: #{dc_date_modified}\n\n" if dc_date_modified
-      dc_format="Format: #{dc_format}\n\n" if dc_format
-      dc_identifier="Identifier: #{dc_identifier}\n\n" if dc_identifier #watch
-      dc_source="Source: #{dc_source}\n\n" if dc_source
-      dc_language="Language: #{dc_language}\n\n" if dc_language
-      dc_relation="Relation: #{dc_relation}\n\n" if dc_relation
-      dc_coverage="Coverage: #{dc_coverage}\n\n" if dc_coverage
-      dc_rights="Rights: #{dc_rights}\n\n" if dc_rights
+      relation=spec_char_string(@md.relation) if @md.relation                       #dc
+      coverage=spec_char_string(@md.coverage) if @md.coverage                       #dc
+      rights=spec_char_string(@md.rights) if @md.rights                             #dc
+      full_title="Title: #{full_title}\n\n" if full_title                           #dc
+      author="Author: #{author}\n\n" if author                                      #dc
+      subject="Subject: #{subject}\n\n" if subject                                  #dc
+      description="Description: #{description}\n\n" if description                  #dc
+      publisher="Publisher: #{publisher}\n\n" if publisher                          #dc
+      contributor="Contributor: #{contributor}\n\n" if contributor                  #dc
+      date="Date: #{date}\n\n" if date                                              #dc
+      date_created="Date Created: #{date_created}\n\n" if date_created              #dc
+      date_issued="Date Issued: #{date_issued}\n\n" if date_issued                  #dc
+      date_available="Date Available: #{date_available}\n\n" if date_available      #dc
+      date_valid="Date Valid: #{date_valid}\n\n" if date_valid                      #dc
+      date_modified="Date Modified: #{date_modified}\n\n" if date_modified          #dc
+      format="Format: #{format}\n\n" if format                                      #dc
+      identifier="Identifier: #{identifier}\n\n" if identifier #watch               #dc
+      source="Source: #{source}\n\n" if source                                      #dc
+      language="Language: #{language}\n\n" if language                              #dc
+      relation="Relation: #{relation}\n\n" if relation                              #dc
+      coverage="Coverage: #{coverage}\n\n" if coverage                              #dc
+      rights="Rights: #{rights}\n\n" if rights                                      #dc
       "@node Dublin Core\n" +
         "@unnumbered Dublin Core\n" +
         "@cindex chapter, Dublin Core\n\n" +
-        "#{dc_title}" +
-        "#{dc_creator}" +
-        "#{dc_subject}" +
-        "#{dc_description}" +
-        "#{dc_publisher}" +
-        "#{dc_contributor}" +
-        "#{dc_date}" +
-        "#{dc_date_created}" +
-        "#{dc_date_issued}" +
-        "#{dc_date_available}" +
-        "#{dc_date_valid}" +
-        "#{dc_date_modified}" +
-        "#{dc_format}" +
-        "#{dc_identifier}" +
-        "#{dc_source}" +
-        "#{dc_language}" +
-        "#{dc_relation}" +
-        "#{dc_coverage}" +
-        "#{dc_rights}" +
+        "#{full_title}" +
+        "#{author}" +
+        "#{subject}" +
+        "#{description}" +
+        "#{publisher}" +
+        "#{contributor}" +
+        "#{date}" +
+        "#{date_created}" +
+        "#{date_issued}" +
+        "#{date_available}" +
+        "#{date_valid}" +
+        "#{date_modified}" +
+        "#{format}" +
+        "#{identifier}" +
+        "#{source}" +
+        "#{language}" +
+        "#{relation}" +
+        "#{coverage}" +
+        "#{rights}" +
         "\n\n"
     end
     def tail
@@ -518,4 +518,4 @@ WOK
   end
 end
 __END__
-
+watch title, might need full_title