@@ -70,40 +70,39 @@ module TextyHelper # Pre-process encoding unless text.nil? if encoding == 'utf-8' - # Some strange caracters to handle - text.gsub!("\342\200\042", "–") # en-dash - text.gsub!("\342\200\041", "—") # em-dash - text.gsub!("\342\200\174", "…") # elipse - text.gsub!("\342\200\176", "‘") # single quote - text.gsub!("\342\200\177", "’") # single quote - text.gsub!("\342\200\230", "’") # single quote - text.gsub!("\342\200\231", "’") # single quote - text.gsub!("\342\200\234", "“") # Double quote, right - text.gsub!("\342\200\235", "”") # Double quote, left + text.gsub!("\342\200\042", "–") # en-dash + text.gsub!("\342\200\041", "—") # em-dash + text.gsub!("\342\200\174", "…") # elipse + text.gsub!("\342\200\176", "‘") # single quote + text.gsub!("\342\200\177", "’") # single quote + text.gsub!("\342\200\230", "’") # single quote + text.gsub!("\342\200\231", "’") # single quote + text.gsub!("\342\200\234", "“") # Double quote, right + text.gsub!("\342\200\235", "”") # Double quote, left text.gsub!("\342\200\242", ".") - text.gsub!("\342\202\254", "€"); # Euro symbol - text.gsub!(/\S\200\S/, " ") # every strange character send to the moon - text.gsub!("\176", "\'") # single quote - text.gsub!("\177", "\'") # single quote - text.gsub!("\205", "-"); # ISO-Latin1 horizontal elipses (0x85) - text.gsub!("\221", "\'"); # ISO-Latin1 left single-quote - text.gsub!("\222", "\'"); # ISO-Latin1 right single-quote - text.gsub!("\223", "\""); # ISO-Latin1 left double-quote - text.gsub!("\224", "\""); # ISO-Latin1 right double-quote - text.gsub!("\225", "\*"); # ISO-Latin1 bullet - text.gsub!("\226", "-"); # ISO-Latin1 en-dash (0x96) - text.gsub!("\227", "-"); # ISO-Latin1 em-dash (0x97) - text.gsub!("\230", "\'") # single quote - text.gsub!("\231", "\'") # single quote - text.gsub!("\233", ">"); # ISO-Latin1 single right angle quote - text.gsub!("\234", "\"") # Double quote - text.gsub!("\235", "\"") # Double quote - text.gsub!("\240", " "); # ISO-Latin1 nonbreaking space - text.gsub!("\246", "\|"); # ISO-Latin1 broken vertical bar - text.gsub!("\255", ""); # ISO-Latin1 soft hyphen (0xAD) - text.gsub!("\264", "\'"); # ISO-Latin1 spacing acute - text.gsub!("\267", "\*"); # ISO-Latin1 middle dot (0xB7) + text.gsub!("\342\202\254", "€"); # Euro symbol + text.gsub!(/\S\200\S/, " ") # every strange character send to the moon + text.gsub!("\176", "\'") # single quote + text.gsub!("\177", "\'") # single quote + text.gsub!("\205", "-") # ISO-Latin1 horizontal elipses (0x85) + text.gsub!("\221", "\'") # ISO-Latin1 left single-quote + text.gsub!("\222", "\'") # ISO-Latin1 right single-quote + text.gsub!("\223", "\"") # ISO-Latin1 left double-quote + text.gsub!("\224", "\"") # ISO-Latin1 right double-quote + text.gsub!("\225", "\*") # ISO-Latin1 bullet + text.gsub!("\226", "-") # ISO-Latin1 en-dash (0x96) + text.gsub!("\227", "-") # ISO-Latin1 em-dash (0x97) + text.gsub!("\230", "\'") # single quote + text.gsub!("\231", "\'") # single quote + text.gsub!("\233", ">") # ISO-Latin1 single right angle quote + text.gsub!("\234", "\"") # Double quote + text.gsub!("\235", "\"") # Double quote + text.gsub!("\240", " ") # ISO-Latin1 nonbreaking space + text.gsub!("\246", "\|") # ISO-Latin1 broken vertical bar + text.gsub!("\255", "") # ISO-Latin1 soft hyphen (0xAD) + text.gsub!("\264", "\'") # ISO-Latin1 spacing acute + text.gsub!("\267", "\*") # ISO-Latin1 middle dot (0xB7) ic = Iconv.new('UTF-8//IGNORE', 'UTF-8') text = ic.iconv(text + ' ')[0..-2] elsif encoding == 'iso-8859-15' @@ -117,9 +116,8 @@ module TextyHelper text = conversion # Post-process encoding unless text.nil? or text.blank? or text.kind_of? ArgumentError - if encoding == 'utf-8' - text.gsub!(/[\240-\377]/) { |c| "&#%d;" % c[0] } - elsif encoding == 'iso-8859-15' + text.gsub!(/[\240-\377]/) { |c| "&#%d;" % c[0] } + if encoding == 'iso-8859-15' text.gsub!("’", "'") end end lib/texty_helper.rb 17af1e7ad5cb019f5a10fe81e762cffc96c92b32 wwwfeev wwwfeev@2117fd12-192b-0410-bd5d-90befd50b342 http://github.com/alx/feevy/commit/2a28b1c29317a28b9c0721526ae28b652a96c239 2a28b1c29317a28b9c0721526ae28b652a96c239 2007-07-31T09:37:56-07:00 2007-07-31T09:37:56-07:00 correct Balearweb problem git-svn-id: svn+ssh://64.22.96.6/var/www/apps/feevy/repos/trunk@290 2117fd12-192b-0410-bd5d-90befd50b342 0a60f7eb1d62d50bc68e3acb6eb73c23d50c3592 wwwfeev wwwfeev@2117fd12-192b-0410-bd5d-90befd50b342