Changeset 24020

Timestamp:

06/19/2008 05:53:00 PM (6 months ago)

Author:

zacw

Message:

Patch from jeremyw.sherman to add italics to the HTML decoder. Fixes #10086.

Files:

• trunk/Copyright.txt (modified) (1 diff)
• trunk/Frameworks/Adium Framework/Source/AIHTMLDecoder.m (modified) (1 diff)

trunk/Copyright.txt

@@ -49 +49 @@
-Adam Seering
-Chris Serino
+Jeremy W. Sherman
-David Smith
-Greg Smith

trunk/Frameworks/Adium Framework/Source/AIHTMLDecoder.m

@@ -1651 +1651 @@
-                                        } else {
-                                                [textAttributes disableTrait:NSBoldFontMask];                                           
+                                        }
+                                }
+                        }
+                        
+                        attributeRange = [style rangeOfString:@"font-style: " options:NSCaseInsensitiveSearch];
+                        if (attributeRange.location != NSNotFound) {
+                                NSRange nextSemicolon = [style rangeOfString:@";"
+                                                                                                         options:NSLiteralSearch 
+                                                                                                           range:NSMakeRange(attributeRange.location, styleLength - attributeRange.location)];
+                                if (nextSemicolon.location != NSNotFound) {
+                                        NSString *fontStyle = [style substringWithRange:NSMakeRange(NSMaxRange(attributeRange), nextSemicolon.location - NSMaxRange(attributeRange))];
+                                        [originalAttributes setObject:[NSNumber numberWithUnsignedInt:[textAttributes traits]]
+                                                                                                                                 forKey:@"setTraits:"];
+                                        if (([fontStyle caseInsensitiveCompare:@"italic"] == NSOrderedSame) ||
+                                                        ([fontStyle caseInsensitiveCompare:@"oblique"] == NSOrderedSame)) {
+                                                [textAttributes enableTrait:NSItalicFontMask];
+                                        } else {
+                                                [textAttributes disableTrait:NSItalicFontMask];
-                                        }
-                                }