diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-05-12 21:32:33 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-05-12 21:32:33 -0400 |
commit | d5b13ca5b8d041c13ef8fa8f8fe4764a9e24166b (patch) | |
tree | 6d7ce2f6d37c7914c3bca82dfa8314a235d1a1eb /lib/sisu/v6/shared_metadata.rb | |
parent | v5 v6: param, metadata add 'Copyright:' tag to output related to copyright (diff) |
v6: param, metadata rights, line-breaks instead of semicolons separating rights
* (Closes: #744358) remove trailing semicolon after :copyright:
Diffstat (limited to 'lib/sisu/v6/shared_metadata.rb')
-rw-r--r-- | lib/sisu/v6/shared_metadata.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/sisu/v6/shared_metadata.rb b/lib/sisu/v6/shared_metadata.rb index c2fe06b9..1fa57fa7 100644 --- a/lib/sisu/v6/shared_metadata.rb +++ b/lib/sisu/v6/shared_metadata.rb @@ -735,6 +735,13 @@ module SiSU_Metadata end @s end + def br + if @s \ + and @s.is_a?(String) + @s=@s.gsub(/(?:#{Mx[:br_line]}|\\\\)+/,'<br />') + end + @s + end def utf8 if @s \ and @s.is_a?(String) @@ -752,6 +759,7 @@ module SiSU_Metadata def xml_sax def meta_para inf_xml=char_enc(@inf).utf8 + inf_xml=char_enc(inf_xml).br <<WOK <metadata> #{Ax[:tab]}<meta>#{@tag.capitalize}:</meta> @@ -769,6 +777,7 @@ WOK def xml_dom def meta_para inf_xml=char_enc(@inf).utf8 + inf_xml=char_enc(inf_xml).br <<WOK #{Ax[:tab]}<header> #{Ax[:tab]*2}<meta>#{@tag.capitalize}:</meta> @@ -786,6 +795,7 @@ WOK def xhtml_scroll def meta_para inf_xml=char_enc(@inf).utf8 + inf_xml=char_enc(inf_xml).br <<WOK #{Ax[:tab]}<metadata> #{Ax[:tab]}<meta>#{@tag.capitalize}:</meta> @@ -805,6 +815,7 @@ WOK def meta_para inf_xml=char_enc(@inf).amp inf_xml=char_enc(inf_xml).utf8 + inf_xml=char_enc(inf_xml).br %{<p class="norm"> <b>#{@tag}</b>: #{inf_xml} </p>} |