adium 3167:3b5cc684aa98: Another font flag fix by kbotc. Refs #9594
commits at adium.im
commits at adium.im
Thu Apr 1 20:42:05 UTC 2010
details: http://hg.adium.im/adium/rev/3b5cc684aa98
revision: 3167:3b5cc684aa98
author: Andreas Monitzer <am at adiumx.com>
date: Thu Apr 01 22:41:37 2010 +0200
Another font flag fix by kbotc. Refs #9594
diffs (35 lines):
diff -r 278eca3d6068 -r 3b5cc684aa98 Frameworks/Adium Framework/Source/AIHTMLDecoder.m
--- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Thu Apr 01 22:27:02 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Thu Apr 01 22:41:37 2010 +0200
@@ -310,6 +310,7 @@
//Close any existing font tags, and open a new one
if (thingsToInclude.closingFontTags && openFontTag) {
[string appendString:@"</FONT>"];
+ openFontTag = NO;
}
if (!thingsToInclude.simpleTagsOnly) {
openFontTag = YES;
@@ -320,6 +321,7 @@
//Family
if (thingsToInclude.fontTags && familyName && (![familyName isEqualToString:currentFamily] || thingsToInclude.closingFontTags)) {
if (thingsToInclude.simpleTagsOnly) {
+ openFontTag = YES;
[string appendString:[NSString stringWithFormat:@"<FONT FACE=\"%@\">",familyName]];
} else {
//(traits | NSNonStandardCharacterSetFontMask) seems to be the proper test... but it is true for all fonts!
@@ -344,6 +346,7 @@
//Color
if (color) {
if (thingsToInclude.simpleTagsOnly) {
+ openFontTag = YES;
[string appendString:[NSString stringWithFormat:@"<FONT COLOR=\"#%@\">",color]];
} else {
[string appendString:[NSString stringWithFormat:@" COLOR=\"#%@\"",color]];
@@ -676,6 +679,7 @@
if (thingsToInclude.closingFontTags && openFontTag) {
//Close any open font tag
[string appendString:@"</FONT>"];
+ openFontTag = NO;
}
if (rightToLeft) {
//Close any open div
More information about the commits
mailing list