aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-10-11 22:41:31 -0400
committerRalph Amissah <ralph@amissah.com>2010-10-11 22:41:31 -0400
commita852856b10efdcdab044c9f85ba4311b3f71a59f (patch)
tree94d00fc4c25e85e9c5237fc110ac9f9e0952dcb5 /lib
parentdebian/changelog 2.7.5-1 (diff)
parentupdate version (2.7.6) (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v2/shared_metadata.rb2
-rw-r--r--lib/sisu/v2/texpdf.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/sisu/v2/shared_metadata.rb b/lib/sisu/v2/shared_metadata.rb
index e589c598..f27cf5ba 100644
--- a/lib/sisu/v2/shared_metadata.rb
+++ b/lib/sisu/v2/shared_metadata.rb
@@ -496,7 +496,7 @@ WOK
@inf.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,
%{#{url_brace.xml_open}<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>#{url_brace.xml_close}}) #http ftp matches with decoration
else
- @inf.gsub!(/(https?:\/\/[^<>'"\s]+)/,
+ @inf.gsub!(/(https?:\/\/[^<>()'"\s]+)/,
%{#{url_brace.xml_open}<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>#{url_brace.xml_close}}) #http ftp matches with decoration
end
@inf.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/,
diff --git a/lib/sisu/v2/texpdf.rb b/lib/sisu/v2/texpdf.rb
index 91cd84b6..32b0d2ff 100644
--- a/lib/sisu/v2/texpdf.rb
+++ b/lib/sisu/v2/texpdf.rb
@@ -438,6 +438,7 @@ module SiSU_TeX
dob.tmp=sp_char.special_characters_safe
dob.tmp.gsub!(/#{Mx[:nbsp]}/,'{~}')
#dob.tmp.gsub!(/#{Mx[:nbsp]}\s*/,'{~}')
+ dob.tmp.gsub!(/ \\( |#{Mx[:br_nl]})/,' {\textbackslash}\1')
dob.tmp.gsub!(/(?:#{Mx[:br_nl]}\s*)+/,' \\\\\\ ') #watch
dob.tmp.gsub!(/\n\n\n/m," \\newline\n\n") #watch
ocn=SiSU_TeX_Pdf::Format_text_object.new(@md).ocn_display(dob)