aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/odf.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2008-02-05 23:50:34 +0000
committerRalph Amissah <ralph@amissah.com>2008-02-05 23:50:34 +0000
commitad21750ba3c44303d0c2ad91269771605612a8e6 (patch)
treefb1c5ce2737a1cf04069e409563e20540dcea9ff /lib/sisu/v0/odf.rb
parentUpdated sisu-0.64.2 (diff)
parentversion rolled back, not ready to open ruby 1.9 some libraries not yet available (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/odf.rb')
-rw-r--r--lib/sisu/v0/odf.rb12
1 files changed, 6 insertions, 6 deletions
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 =~ /<!Th?/ #elsif para =~ /<!Th?¡/
+ elsif para =~ /<!Th?/ #elsif para =~ /<!Th?¡/u
@@odf[:body] << table(para)
@@odf[:body] << @br*2
else
@@ -457,7 +457,7 @@ module SiSU_ODF
wordlist
end
def markup(data) # Used for major markup instructions
- safe_characters=/[^a-zA-Z0-9}{\/?,."';:)(><\-_&!@%~#\]\[*=$| \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>(.+?)<\/sup>/,'<text:span text:style-name="T4">\1</text:span>')
para.gsub!(/<sub>(.+?)<\/sub>/,'<text:span text:style-name="T5">\1</text:span>')
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,'&#060;')
para.gsub!(/\\copy(?:right)?\b/,'&#169;')
para.gsub!(/\\trademark\b|\\tm\b/,'&#174;')