diff options
author | Ralph Amissah <ralph@amissah.com> | 2010-03-22 20:09:56 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2010-03-22 20:09:56 -0400 |
commit | f0dbbacfc14b6b1bd46daeea6cc684ea8dcf223c (patch) | |
tree | 5de047b8a05108958075c7cd1c5c0ba5270a28cf /lib/sisu/v2/shared_metadata.rb | |
parent | debian/changelog (diff) | |
parent | update: changelog, version (2.0.3) (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/shared_metadata.rb')
-rw-r--r-- | lib/sisu/v2/shared_metadata.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sisu/v2/shared_metadata.rb b/lib/sisu/v2/shared_metadata.rb index 7c8cc971..f39b2f79 100644 --- a/lib/sisu/v2/shared_metadata.rb +++ b/lib/sisu/v2/shared_metadata.rb @@ -474,6 +474,7 @@ WOK def meta_para url_brace=SiSU_Viz::Skin.new.url_decoration if @inf.class==String + @inf.gsub!(/<br>/,'<br />') @inf.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '<text:a xlink:type="simple" xlink:href="\1">\1</text:a>') #http ftp matches escaped, no decoration @inf.gsub!(/(#{Mx[:lnk_c]})#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, @@ -484,7 +485,7 @@ WOK %{#{url_brace.xml_open}<text:a xlink:type="simple" xlink:href="mailto:\\1">\\1</text:a>#{url_brace.xml_close}}) if @inf !~/http:\/\// # improve upon, document crash where url contains '@' symbol end <<WOK -<text:p text:style-name="P1">#{@tag.capitalize}: #{@inf}</text:p>} +<text:p text:style-name="P1">#{@tag.capitalize}: #{@inf}</text:p> WOK end def metadata |