From 4c36cadd7fef8b4bbdb0f423bdc4b7c7365d5699 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 5 Feb 2008 05:02:54 +0000 Subject: ruby 1.9 open; future pgsql testing on 8.3; encoding utf-8 checks; version bump 0.65.0 * ruby 1.9 use opened, testing required * db sql pgsql future testing on version 8.3 * encoding utf-8 some compatibility checks --- lib/sisu/v0/odf.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/sisu/v0/odf.rb') diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb index 874f87e1..f168ddc4 100644 --- a/lib/sisu/v0/odf.rb +++ b/lib/sisu/v0/odf.rb @@ -440,7 +440,7 @@ module SiSU_ODF elsif para =~ /<:code(?:-end)?>/ @@odf[:body] << code(para) @@odf[:body] << @br*2 - elsif para =~ /<\-_&!@%~#\]\[*=$| \n+`¡]/ + safe_characters=/[^a-zA-Z0-9}{\/?,."';:)(><\-_&!@%~#\]\[*=$| \n+`¡]/u dir=SiSU_Env::Info_env.new(@md.fns) @data_mod,@endnotes,@level,@cont,@copen,@odf_contents_close=Array.new(6){[]} @rcdc=false @@ -508,10 +508,10 @@ module SiSU_ODF para.gsub!(/(.+?)<\/sup>/,'\1') para.gsub!(/(.+?)<\/sub>/,'\1') para.gsub!(/`/,"'") - para.gsub!(/­/,'-') - para.gsub!(/·/,'*') - para.gsub!(/[“”]/,'""') - para.gsub!(/[­–—]/,'-') #— – chk + para.gsub!(/­/u,'-') + para.gsub!(/·/u,'*') + para.gsub!(/[“”]/u,'""') + para.gsub!(/[­–—]/u,'-') #— – chk para.gsub!(/ < /i,'<') para.gsub!(/\\copy(?:right)?\b/,'©') para.gsub!(/\\trademark\b|\\tm\b/,'®') -- cgit v1.2.3