Changeset 2414 for lang/ruby/ssb

Timestamp:

12/04/07 17:05:18 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: fix numeric character reference convert

Files:

• lang/ruby/ssb/trunk/libs/ssb/emoji.rb (modified) (1 diff)

lang/ruby/ssb/trunk/libs/ssb/emoji.rb

@@ -40 +40 @@
 
       # SJIS Binary
-      ret.gsub!(RE_IMODE_SJIS) do |s|
-        orig_match = $1
-        if not $2.nil?
-          sprintf '<img class="emoji" src="emoji/docomo/%X.gif" />', orig_match.unpack('n')[0]
-        else
-          orig_match
+      if term.get_carrier == KtaiSpec::CARRIER_DOCOMO
+        ret.gsub!(RE_IMODE_SJIS) do |s|
+          orig_match = $1
+          if not $2.nil?
+            sprintf '<img class="emoji" src="emoji/docomo/%X.gif" />', orig_match.unpack('n')[0]
+          else
+            orig_match
+          end
         end
-      end
 
-      # UTF8 BINARY
-      if term.get_carrier == KtaiSpec::CARRIER_DOCOMO and is_utf8
-        ret.gsub!(/./) do |c|
-          sjis = SSB::Emoji.docomo_uni2sjis("%X" % c.unpack("U")[0])
-          sjis ? sprintf('<img class="emoji" src="emoji/docomo/%s.gif" />', sjis) : c
+        # UTF8 BINARY
+        if is_utf8
+          ret.gsub!(/./) do |c|
+            sjis = SSB::Emoji.docomo_uni2sjis("%X" % c.unpack("U")[0])
+            sjis ? sprintf('<img class="emoji" src="emoji/docomo/%s.gif" />', sjis) : c
+          end
         end
-      end
 
-      # SJIS 10進数実体参照
-      ret.gsub!(/&#([0-9]+);/) do |s|
-        '<img class="emoji" src="emoji/docomo/' + $1.to_i.to_s(16).upcase + '.gif" />'
-      end
+        # SJIS 10進数実体参照
+        ret.gsub!(/&#([0-9]+);/) do |s|
+          '<img class="emoji" src="emoji/docomo/' + $1.to_i.to_s(16).upcase + '.gif" />'
+        end
 
-      # UNICODE 16進数実体参照 (とりあえず拡張絵文字だけ)
-      ret.gsub!(/(&#x([0-9a-zA-Z]+);)/) do |s|
-        code =
-          case ($2.hex)
-          when 0xE63E..0xE69B
-            # 4705
-            $2.hex + 4705
-          when 0xE69C..0xE6DA, 0xE6AC..0xE6BA
-            # 4772
-            $2.hex + 4772
-          when 0xE6DB..0xE70A, 0xE70C..0xE757
-            # 4773
-            $2.hex + 4773
+        # UNICODE 16進数実体参照 (とりあえず拡張絵文字だけ)
+        ret.gsub!(/(&#x([0-9a-zA-Z]+);)/) do |s|
+          code =
+            case ($2.hex)
+            when 0xE63E..0xE69B
+              # 4705
+              $2.hex + 4705
+            when 0xE69C..0xE6DA, 0xE6AC..0xE6BA
+              # 4772
+              $2.hex + 4772
+            when 0xE6DB..0xE70A, 0xE70C..0xE757
+              # 4773
+              $2.hex + 4773
+            else
+              $1
+            end
+          if code.is_a?(Integer)
+            '<img class="emoji" src="emoji/docomo/' + (code).to_s(16).upcase + '.gif" />'
           else
-            $1
+            code
           end
-        if code.is_a?(Integer)
-          '<img class="emoji" src="emoji/docomo/' + (code).to_s(16).upcase + '.gif" />'
-        else
-          code
         end
       end