From a19b7494c87f05c895bb3cc76969ad9af0bf6c08 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 19 Aug 2007 02:41:50 +0100
Subject: sisu-0.56.3 minor update, small fixes

  * manifest make file-type descriptions simpler to understand

  * copyright restricted to rights tag, unless none, in which case rights tag
    gets creator information
  * copyright mark picked up in rights if 'Copyright (C)' is used

  * tex/pdf url matching semi-colon following url

  * endnote heading, apply tag to exclude numbering and segment heading where
    there is no segment

  * html scroll endnote text minor fix

  * initialize site structure, make copy site images default (sisu -CC)
---
 lib/sisu/v0/param.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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

diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb
index 211516ad..186901a1 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v0/param.rb
@@ -262,9 +262,6 @@ module SiSU_Param
                 @creator_home, @dc_creator=$1,$2
               else @dc_creator=/(?:0~|@)(?:creator|author)-?:?\s+(.+?)$/m.match(para)[1]
               end
-              @creator_copymark=if para=~/(?:0~|@)(?:creator|author)-:?/; false
-              else                                                        true
-              end
               @dc_creator.strip!
             when /^(?:0~(?:translator|translated_by)|@(?:translator|translated_by):)\s+(.+?)$/m     #% metainfo
               @translator=$1
@@ -516,12 +513,6 @@ module SiSU_Param
             @lv4 ||=/^4~/
             @lv5 ||=/^5~/
             @lv6 ||=/^6~/
-            if @dc_creator
-              @dc_rights ||=if @dc_date =~/([12][890]\d{2})/                     #matches years 1800 through 20\d\d 2004w19
-                ('Copyright ' + @dc_creator) + ' ' + $1
-              else 'Copyright ' + @dc_creator
-              end
-            end
           else                                                                   #%
             if para =~ /^(?:1|:?A)~/                                                                      #% processing
               if para=~/^:?A~/
@@ -585,6 +576,14 @@ module SiSU_Param
             end
           end
         end #% here endeth the document loop
+        unless @dc_rights
+          if @dc_creator
+            @dc_rights ||=if @dc_date =~/([12][890]\d{2})/                     #matches years 1800 through 20\d\d 2004w19
+              "Copyright (C) #{$1} #@dc_creator"
+            else 'Copyright (C)' + @dc_creator
+            end
+          end
+        end
         if @markup_version.to_f >= 0.38 #convert values in headers to internal representation
           translated=[]
           translate_list=[@pagenew,@pagebreak,@num_top,@toc_lev_limit]
-- 
cgit v1.2.3