Merge tag 'sisu_4.0.8' into debian/sid

SiSU 4.0.8

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/sisu/v4/epub_tune.rb b/lib/sisu/v4/epub_tune.rb
index bce4aed7..fbb42bc4 100644
--- a/lib/sisu/v4/epub_tune.rb
+++ b/lib/sisu/v4/epub_tune.rb
@@ -123,7 +123,7 @@ module SiSU_EPUB_Tune
       begin
         @cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
         SiSU_Screen::Ansi.new(@md.opt.cmd,'Tune').txt_grey if @md.opt.cmd =~/[MVv]/
-        data=SiSU_EPUB_Tune::Tune.new(@data,@md).amp_html
+        data=SiSU_EPUB_Tune::Tune.new(@data,@md).amp_angle_brackets
         data=SiSU_EPUB_Tune::Tune.new(data,@md).endnotes_html
         data=SiSU_EPUB_Tune::Tune.new(data,@md).url_markup
         data=SiSU_EPUB_Tune::Tune.new(data,@md).markup
@@ -156,6 +156,7 @@ module SiSU_EPUB_Tune
           gsub(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,'<tt>\1</tt>'). # tt, kbd
           gsub(/#{Mx[:mk_o]}:name#(\S+?)#{Mx[:mk_c]}/,'').
           gsub(/#{Mx[:gl_bullet]}/m,"●#{$ep[:hsp]*2}").
+          gsub(/#{Dx[:url_o]}/,Dx[:url_o_xml]).gsub(/#{Dx[:url_c]}/,Dx[:url_o_xml]).
           gsub(/#{Mx[:nbsp]}/,$ep[:hsp]).
           gsub(/<(p|br)>/,'<\1 />')
         dob.obj=SiSU_EPUB_Tune::CleanXHTML.new(dob.obj).clean
@@ -274,10 +275,12 @@ module SiSU_EPUB_Tune
         @tuned_file << dob
       end
     end
-    def amp_html
+    def amp_angle_brackets
       data,data_new=@data,[]
       data.each do |dob|
-        dob.obj=dob.obj.gsub(/&/u,'&amp;')
+        dob.obj=dob.obj.
+          gsub(/&/u,'&amp;').
+          gsub(/</u,'&lt;').gsub(/>/u,'&gt;')
         data_new << dob
       end
       data_new