diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-08-29 21:05:12 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-08-29 21:05:12 -0400 |
commit | aed8d0f1cae7debfb4b9e1858b56d18abbfc7bf5 (patch) | |
tree | 0296346dfc87f91371ed086e42231fad226ec455 /lib/sisu/v6/dp.rb | |
parent | debian/changelog (5.6.2-1) (diff) | |
parent | v5 v6: dp, texpdf, copyright_and_license, minor fix, used by texpdf (diff) |
Merge tag 'sisu_5.6.3' into debian/sid
SiSU 5.6.3
Diffstat (limited to 'lib/sisu/v6/dp.rb')
-rw-r--r-- | lib/sisu/v6/dp.rb | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/sisu/v6/dp.rb b/lib/sisu/v6/dp.rb index 111896d7..595cee3e 100644 --- a/lib/sisu/v6/dp.rb +++ b/lib/sisu/v6/dp.rb @@ -158,9 +158,25 @@ module SiSU_Param class MdDefault def rights(author,date) @author,@date=author,date + def assignment(author) + 'copyright not explicitly stated, ' \ + + 'program "assigning" copyright to author: ' \ + + author + end def all s=nil if @author + #puts assignment(@author) + s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \ + ? ("Copyright (C) #{$1} #{@author}") + : ('Copyright (C)' + @author)) #matches years 1400 through 21\d\d + end + s + end + def copyright_and_license + s=nil + if @author + #puts assignment(@author) s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \ ? ("Copyright (C) #{$1} #{@author}") : ('Copyright (C)' + @author)) #matches years 1400 through 21\d\d @@ -584,7 +600,7 @@ module SiSU_Param ' \\\\ ' end def copyright_and_license - s=if @h['all'] then @h['all'] + s=if @h['copyright_and_license'] then @h['copyright_and_license'] else s='' if defined? copyright.text \ |