From 88ed8a0c1376fbe6d45059694ce31db597fde3e9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 14 Apr 2020 11:10:59 -0400 Subject: ruby 2.7 fix --- lib/sisu/texpdf.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/sisu/texpdf.rb') diff --git a/lib/sisu/texpdf.rb b/lib/sisu/texpdf.rb index 57202bfd..923b7ad1 100644 --- a/lib/sisu/texpdf.rb +++ b/lib/sisu/texpdf.rb @@ -639,7 +639,7 @@ module SiSU_TeX dob else 'error' #should never occur end - dob=enclose(dob) unless dob.tmp =~/^$/ + dob=enclose(dob) unless (dob.tmp.is_a?(String) && dob.tmp =~/^$/) dob else tst=SiSU_TeX_Pdf::FormatTextObject.new(@md,dob) @@ -710,11 +710,11 @@ module SiSU_TeX dob.tmp=tst.hang else dob.tmp=dob.tmp.strip - dob=enclose(dob) unless dob.tmp =~/^$/ + dob=enclose(dob) unless (dob.tmp.is_a?(String) && dob.tmp =~/^$/) end else dob.tmp=dob.tmp.strip unless dob.is==:code - dob=enclose(dob) unless dob.tmp =~/^$/ + dob=enclose(dob) unless (dob.tmp.is_a?(String) && dob.tmp =~/^$/) end if dob.is_a?(String) dob.tmp=dob.tmp.gsub(/\s*(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,' \newline '). #% tread with care @@ -722,20 +722,20 @@ module SiSU_TeX end dob end - if dob.tmp =~/(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image\b)/m \ + if (dob.tmp.is_a?(String) and dob.tmp =~/(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image\b)/m) \ && dob.is !=:code dob=SiSU_TeX_Pdf::BareUrls.new(@md,dob).bare_urls tst=SiSU_TeX_Pdf::FormatTextObject.new(@md,dob) dob=tst.urls_txt_and_images dob - elsif dob.tmp =~/https?:\/\/\S+\b/m \ + elsif (dob.tmp.is_a?(String) and dob.tmp =~/https?:\/\/\S+\b/m) \ && dob.is ==:code \ && @codeblock_box !='listings' dob=SiSU_TeX_Pdf::BareUrls.new(@md,dob).bare_urls_in_code dob end if dob.class !=Hash \ - && dob.tmp =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}image\b/ \ + && (dob.tmp.is_a?(String) and dob.tmp =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}image\b/) \ && dob.is !=:code tst=SiSU_TeX_Pdf::FormatTextObject.new(@md,dob) end -- cgit v1.2.3