From d98f27086318452017b80952a297f2ccb05bc4b1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 1 Oct 2012 16:09:17 -0400
Subject: v3: some fixes, cleaning, removing

---
 lib/sisu/v3/param.rb | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'lib/sisu/v3/param.rb')

diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index 64baf271..492b8044 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -554,36 +554,36 @@ module SiSU_Param
             and copyright.translation \
             and not copyright.translation.empty?
               v=sep(copyright.translation)
-              s +='<br> translation ' + copyright.translation + v
+              s +='\\\\ translation ' + copyright.translation + v
             end
             if defined? copyright.illustrations \
             and copyright.illustrations \
             and not copyright.illustrations.empty?
               v=sep(copyright.illustrations)
-              s +='<br> illustrations ' + copyright.illustrations + v
+              s +='\\\\ illustrations ' + copyright.illustrations + v
             end
             if defined? copyright.photographs \
             and copyright.photographs \
             and not copyright.photographs.empty?
               v=sep(copyright.photographs)
-              s +='<br> photographs ' + copyright.photographs + v
+              s +='\\\\ photographs ' + copyright.photographs + v
             end
             if defined? copyright.digitization \
             and copyright.digitization \
             and not copyright.digitization.empty?
               v=sep(copyright.digitization)
-              s +='<br> digitization ' + copyright.digitization + v
+              s +='\\\\ digitization ' + copyright.digitization + v
             end
             if defined? copyright.audio \
             and copyright.audio \
             and not copyright.audio.empty?
               v=sep(copyright.audio)
-              s +='<br> audio ' + copyright.audio + v
+              s +='\\\\ audio ' + copyright.audio + v
             end
             if defined? copyright.license \
             and copyright.license \
             and not copyright.license.empty?
-              s +='<br> License: ' + copyright.license
+              s +='\\\\ License: ' + copyright.license
             end
             if s.empty?
               SiSU_Screen::Ansi.new(@opt.cmd,'WARNING Document Rights information missing; provide @rights: :copyright:').warn unless @opt.cmd =~/q/
@@ -812,8 +812,8 @@ module SiSU_Param
             matches=''
             w.each do |x|
               c=(x[1] =~/[i],/) ? :i : :s
-              matches=matches + x[0].gsub(/([${}])/,'\\\\\1') + '|'  
-              arr_hash << { 
+              matches=matches + x[0].gsub(/([${}])/,'\\\\\1') + '|'
+              arr_hash << {
                 match: x[0].gsub(/([${}])/,'\\\\\1'),
                 replace: x[2],
                 case_s: c
@@ -1025,7 +1025,6 @@ module SiSU_Param
       end
       def links
         a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
-        a
       end
       def notes
         a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
@@ -1230,13 +1229,13 @@ module SiSU_Param
               @notes=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).notes
             when /^@links:\s+(.+?)\Z/m                                         #% * header metadata - links
               doc_links=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).links
-              count=1
+              a_idx=0
               @links=[]
               doc_links.each do |doc_link|
                 if doc_link=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
-                  @links[count]={}
-                  @links[count][:say],@links[count][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2]
-                  count +=1
+                  @links[a_idx]={}
+                  @links[a_idx][:say],@links[a_idx][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2]
+                  a_idx +=1
                 end
               end
               @lnk=@links
@@ -1397,6 +1396,12 @@ module SiSU_Param
             @sem_tag=true if para=~/[:;]\{.+?\}[:;][a-z+]/ #refix later
           end
         end                                                                    #% here endeth the document loop
+        unless @make
+          if @opt.cmd =~/[VM]/
+            SiSU_Screen::Ansi.new(@opt.cmd,'@make:','header absent').warn
+          end
+          @make=SiSU_Param::Parameters::Md.new('@make: ',@opt,@env).make
+        end
         if @ec[:image].length > 0
           @ec[:image]=@ec[:image].flatten.uniq
           @ec[:image].delete_if {|x| x =~/https?:\/\// }
@@ -1491,7 +1496,7 @@ module SiSU_Param
             @dgst_skin=skin ? (@sys.md5(skin)) : nil
           end
         end
-        @publisher ||= "#@@publisher (this copy)"
+        @publisher ||= "#{@@publisher} (this copy)"
         fn_set_lang=SiSU_Env::StandardiseLanguage.new(@opt.lng).language
         unless @language[:code] \
         and @language[:name]
-- 
cgit v1.2.3