From 0607a1bd8727ed7c482fcfb0e4c4002cd24eca72 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 13 Dec 2011 22:05:41 -0500
Subject: v3: odf:odt, codeblocks, a match fix, affects e.g. "<<"

---
 lib/sisu/v3/odf.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/sisu/v3/odf.rb')

diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb
index b7b747ee..7d4fa309 100644
--- a/lib/sisu/v3/odf.rb
+++ b/lib/sisu/v3/odf.rb
@@ -535,10 +535,12 @@ module SiSU_ODF
               unless dob =~/^(?:#{Rx[:meta]}|%+ )/m
                 w.gsub!(/&#(?:126|152);/,'~') #126 usual
                 w.gsub!(/&nbsp;/,'&#160;')
-                if w !~/&\S{2,7}?;/
+                if w !~/(?:&\S{2,7}?;)+/
                   w.gsub!(/&/,'&amp;')
                 end
-                w.gsub!(/(&\S{1,7};)+&/,'\1&amp;') #could break things
+                if w !~/&\S{1,7}?;(?:&\S{1,7}?;)+/    #imperfect
+                  w.gsub!(/(&\S{1,7};)+&/,'\1&amp;')
+                end
               end
               para_array << w
             end
-- 
cgit v1.2.3