aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v5/shared_metadata.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-05-25 10:06:59 -0400
committerRalph Amissah <ralph@amissah.com>2014-05-25 10:06:59 -0400
commitdcb004beebc9551e19e8380702aaa7c38224d787 (patch)
tree786d575295c7f7a1536ba9ba954043d475fd8a49 /lib/sisu/v5/shared_metadata.rb
parentdebian/changelog (5.3.6-1) (diff)
parentv5: merge v6 to v5, version bump to 5.4.*, reason adds structure check (diff)
Merge tag 'sisu_5.4.0' into debian/sid
SiSU 5.4.0
Diffstat (limited to 'lib/sisu/v5/shared_metadata.rb')
-rw-r--r--lib/sisu/v5/shared_metadata.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/sisu/v5/shared_metadata.rb b/lib/sisu/v5/shared_metadata.rb
index da396040..4ada2db1 100644
--- a/lib/sisu/v5/shared_metadata.rb
+++ b/lib/sisu/v5/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>}