diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-10-09 23:11:53 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-10-09 23:11:53 -0400 |
| commit | 74c8847f7a177e934837e8bd2560336fe6712acb (patch) | |
| tree | 44a6e904d65569b4628678521edef76a76859822 /lib/sisu/v2/odf.rb | |
| parent | debian/changelog 2.7.4-1 (diff) | |
| parent | version date (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/odf.rb')
| -rw-r--r-- | lib/sisu/v2/odf.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb index 41229249..ad1f45d1 100644 --- a/lib/sisu/v2/odf.rb +++ b/lib/sisu/v2/odf.rb @@ -461,9 +461,9 @@ module SiSU_ODF word.each do |w| # _ - / # | : ! ^ ~ unless dob =~/^(?:#{Rx[:meta]}|%+ )/m w.gsub!(/&#(?:126|152);/,'~') #126 usual - if w !~/&\S{1,7};/ \ - or w =~/ / - w.gsub!(/&/,'&') #watch + w.gsub!(/ /,' ') + if w !~/&\S{2,7}?;/ + w.gsub!(/&/,'&') end w.gsub!(/(&\S{1,7};)+&/,'\1&') #could break things end |