Skip to content

Commit

Permalink
Added support for most common (that weren't supported) symbol HTML en…
Browse files Browse the repository at this point in the history 
…tities into the decoding process.
  • Loading branch information
Nick Toumpelis committed Mar 3, 2009
1 parent 9ef5961 commit 5c01709
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 6 deletions.
10 changes: 5 additions & 5 deletions trunk/Canary.xcodeproj/genesis.pbxuser
View file
Expand Up @@ -382,7 +382,7 @@
sepNavFolds = "{\n c = (\n {\n r = \"{313, 97}\";\n s = 0;\n },\n {\n r = \"{464, 101}\";\n s = 0;\n },\n {\n r = \"{622, 107}\";\n s = 0;\n },\n {\n r = \"{853, 1357}\";\n s = 0;\n },\n {\n r = \"{2321, 1430}\";\n s = 0;\n },\n {\n r = \"{3859, 1526}\";\n s = 0;\n },\n {\n r = \"{5561, 1392}\";\n s = 0;\n },\n {\n r = \"{7070, 1144}\";\n s = 0;\n },\n {\n r = \"{8315, 1181}\";\n s = 0;\n },\n {\n r = \"{9554, 1304}\";\n s = 0;\n }\n );\n r = \"{0, 10866}\";\n s = 0;\n}";
sepNavIntBoundsRect = "{{0, 0}, {721, 688}}";
sepNavSelRange = "{1170, 0}";
sepNavVisRange = "{49, 1188}";
sepNavVisRange = "{155, 1082}";
};
};
0535A4EE0F48A3A700513DC7 /* ORSCanaryController+Growl.h */ = {
Expand Down Expand Up @@ -457,7 +457,7 @@
fRef = 0558C1AC0E980B5F006BBA76 /* NSString+ORSCanaryAdditions.m */;
name = "NSString+ORSCanaryAdditions.m: 81";
rLen = 0;
rLoc = 3135;
rLoc = 7023;
rType = 0;
vrLen = 3143;
vrLoc = 0;
Expand Down Expand Up @@ -1148,7 +1148,7 @@
};
0558C1AB0E980B5F006BBA76 /* NSString+ORSCanaryAdditions.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {721, 593}}";
sepNavIntBoundsRect = "{{0, 0}, {721, 570}}";
sepNavSelRange = "{256, 0}";
sepNavVisRange = "{0, 316}";
};
Expand Down Expand Up @@ -1176,7 +1176,7 @@
fRef = 0558C1AC0E980B5F006BBA76 /* NSString+ORSCanaryAdditions.m */;
name = "NSString+CanaryAdditions.m: 78";
rLen = 0;
rLoc = 3136;
rLoc = 7024;
rType = 0;
vrLen = 2948;
vrLoc = 0;
Expand Down Expand Up @@ -1673,7 +1673,7 @@
sepNavFolds = "{\n c = (\n {\n r = \"{1361, 156}\";\n s = 0;\n },\n {\n r = \"{1574, 158}\";\n s = 0;\n },\n {\n r = \"{1787, 15}\";\n s = 0;\n },\n {\n r = \"{1840, 1899}\";\n s = 0;\n },\n {\n r = \"{3763, 3649}\";\n s = 0;\n },\n {\n r = \"{7456, 1450}\";\n s = 0;\n },\n {\n r = \"{9046, 340}\";\n s = 0;\n },\n {\n r = \"{9535, 63}\";\n s = 0;\n },\n {\n r = \"{9689, 438}\";\n s = 0;\n },\n {\n r = \"{10172, 67}\";\n s = 0;\n },\n {\n r = \"{10335, 2291}\";\n s = 0;\n },\n {\n r = \"{12682, 386}\";\n s = 0;\n },\n {\n r = \"{13157, 1999}\";\n s = 0;\n },\n {\n r = \"{15254, 339}\";\n s = 0;\n },\n {\n r = \"{15718, 122}\";\n s = 0;\n },\n {\n r = \"{15953, 96}\";\n s = 0;\n },\n {\n r = \"{16147, 5256}\";\n s = 0;\n },\n {\n r = \"{21495, 448}\";\n s = 0;\n },\n {\n r = \"{22031, 4882}\";\n s = 0;\n },\n {\n r = \"{27016, 1384}\";\n s = 0;\n },\n {\n r = \"{28509, 1400}\";\n s = 0;\n },\n {\n r = \"{29970, 298}\";\n s = 0;\n },\n {\n r = \"{30323, 323}\";\n s = 0;\n },\n {\n r = \"{30705, 290}\";\n s = 0;\n },\n {\n r = \"{31039, 276}\";\n s = 0;\n },\n {\n r = \"{31363, 319}\";\n s = 0;\n },\n {\n r = \"{31745, 293}\";\n s = 0;\n },\n {\n r = \"{32093, 272}\";\n s = 0;\n },\n {\n r = \"{32458, 128}\";\n s = 0;\n },\n {\n r = \"{32696, 124}\";\n s = 0;\n },\n {\n r = \"{32941, 167}\";\n s = 0;\n },\n {\n r = \"{33209, 459}\";\n s = 0;\n },\n {\n r = \"{33775, 120}\";\n s = 0;\n },\n {\n r = \"{34028, 684}\";\n s = 0;\n },\n {\n r = \"{34795, 1762}\";\n s = 0;\n },\n {\n r = \"{36699, 152}\";\n s = 0;\n },\n {\n r = \"{37014, 2297}\";\n s = 0;\n },\n {\n r = \"{39776, 1289}\";\n s = 0;\n },\n {\n r = \"{41195, 2169}\";\n s = 0;\n },\n {\n r = \"{43464, 619}\";\n s = 0;\n },\n {\n r = \"{44262, 165}\";\n s = 0;\n },\n {\n r = \"{44534, 151}\";\n s = 0;\n },\n {\n r = \"{44804, 181}\";\n s = 0;\n },\n {\n r = \"{45092, 469}\";\n s = 0;\n },\n {\n r = \"{45654, 181}\";\n s = 0;\n },\n {\n r = \"{45996, 39}\";\n s = 0;\n },\n {\n r = \"{46155, 85}\";\n s = 0;\n },\n {\n r = \"{46360, 85}\";\n s = 0;\n },\n {\n r = \"{46563, 84}\";\n s = 0;\n },\n {\n r = \"{46812, 198}\";\n s = 0;\n },\n {\n r = \"{47102, 208}\";\n s = 0;\n },\n {\n r = \"{47456, 90}\";\n s = 0;\n },\n {\n r = \"{47640, 52}\";\n s = 0;\n },\n {\n r = \"{47907, 56}\";\n s = 0;\n },\n {\n r = \"{48027, 143}\";\n s = 0;\n },\n {\n r = \"{48302, 524}\";\n s = 0;\n },\n {\n r = \"{48935, 1656}\";\n s = 0;\n },\n {\n r = \"{50707, 575}\";\n s = 0;\n },\n {\n r = \"{51470, 375}\";\n s = 0;\n },\n {\n r = \"{51930, 418}\";\n s = 0;\n },\n {\n r = \"{52503, 953}\";\n s = 0;\n },\n {\n r = \"{53610, 896}\";\n s = 0;\n },\n {\n r = \"{54661, 748}\";\n s = 0;\n },\n {\n r = \"{55563, 691}\";\n s = 0;\n },\n {\n r = \"{56379, 700}\";\n s = 0;\n },\n {\n r = \"{57235, 425}\";\n s = 0;\n },\n {\n r = \"{57772, 277}\";\n s = 0;\n },\n {\n r = \"{58164, 282}\";\n s = 0;\n },\n {\n r = \"{58561, 285}\";\n s = 0;\n },\n {\n r = \"{58959, 281}\";\n s = 0;\n },\n {\n r = \"{59359, 289}\";\n s = 0;\n },\n {\n r = \"{59775, 444}\";\n s = 0;\n },\n {\n r = \"{60378, 2222}\";\n s = 0;\n },\n {\n r = \"{62699, 1088}\";\n s = 0;\n },\n {\n r = \"{63891, 1089}\";\n s = 0;\n },\n {\n r = \"{65047, 170}\";\n s = 0;\n },\n {\n r = \"{65254, 184}\";\n s = 0;\n },\n {\n r = \"{65471, 180}\";\n s = 0;\n },\n {\n r = \"{65740, 597}\";\n s = 0;\n },\n {\n r = \"{66411, 49}\";\n s = 0;\n },\n {\n r = \"{66535, 56}\";\n s = 0;\n },\n {\n r = \"{66630, 117}\";\n s = 0;\n },\n {\n r = \"{66778, 412}\";\n s = 0;\n },\n {\n r = \"{67221, 412}\";\n s = 0;\n },\n {\n r = \"{67721, 1894}\";\n s = 0;\n },\n {\n r = \"{69701, 370}\";\n s = 0;\n },\n {\n r = \"{70224, 290}\";\n s = 0;\n },\n {\n r = \"{70651, 589}\";\n s = 0;\n },\n {\n r = \"{71357, 603}\";\n s = 0;\n },\n {\n r = \"{72063, 578}\";\n s = 0;\n },\n {\n r = \"{72729, 583}\";\n s = 0;\n },\n {\n r = \"{73424, 77}\";\n s = 0;\n },\n {\n r = \"{73585, 76}\";\n s = 0;\n },\n {\n r = \"{73770, 603}\";\n s = 0;\n },\n {\n r = \"{74499, 691}\";\n s = 0;\n },\n {\n r = \"{75282, 149}\";\n s = 0;\n },\n {\n r = \"{75502, 791}\";\n s = 0;\n },\n {\n r = \"{76407, 64}\";\n s = 0;\n },\n {\n r = \"{76553, 329}\";\n s = 0;\n },\n {\n r = \"{77007, 312}\";\n s = 0;\n },\n {\n r = \"{77367, 837}\";\n s = 0;\n }\n );\n r = \"{0, 78212}\";\n s = 0;\n}";
sepNavIntBoundsRect = "{{0, 0}, {721, 5520}}";
sepNavSelRange = "{1540, 0}";
sepNavVisRange = "{0, 1382}";
sepNavVisRange = "{0, 1364}";
sepNavWindowFrame = "{{670, 67}, {765, 711}}";
};
};
Expand Down
92 changes: 91 additions & 1 deletion trunk/NSString+ORSCanaryAdditions.m
View file
Expand Up @@ -30,7 +30,7 @@ + (NSString *) replaceHTMLEntities:(NSString *)string {
withString:@"&"];
range = [string rangeOfString:@"""];
if (range.location != NSNotFound)
return [string stringByReplacingOccurrencesOfString:@"&"
return [string stringByReplacingOccurrencesOfString:@"""
withString:@"\""];
range = [string rangeOfString:@"'"];
if (range.location != NSNotFound)
Expand Down Expand Up @@ -72,10 +72,100 @@ + (NSString *) replaceHTMLEntities:(NSString *)string {
if (range.location != NSNotFound)
return [string stringByReplacingOccurrencesOfString:@"÷"
withString:@"÷"];

range = [string rangeOfString:@"«"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"«"
withString:@"«"];
range = [string rangeOfString:@"¬"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¬"
withString:@"¬"];
range = [string rangeOfString:@"¤"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¤"
withString:@"¤"];
range = [string rangeOfString:@"¯"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¯"
withString:@"¯"];
range = [string rangeOfString:@"°"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"°"
withString:@"°"];
range = [string rangeOfString:@"±"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"±"
withString:@""];
range = [string rangeOfString:@"¨"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¨"
withString:@"¨"];
range = [string rangeOfString:@"ª"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"ª"
withString:@"ª"];
range = [string rangeOfString:@"³"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"³"
withString:@"³"];
range = [string rangeOfString:@"´"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"´"
withString:@"´"];
range = [string rangeOfString:@"µ"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"µ"
withString:@"µ"];
range = [string rangeOfString:@"¶"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¶"
withString:@""];
range = [string rangeOfString:@"·"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"·"
withString:@"·"];
range = [string rangeOfString:@"¸"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¸"
withString:@"¸"];
range = [string rangeOfString:@"¹"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¹"
withString:@"¹"];
range = [string rangeOfString:@"º"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"º"
withString:@"º"];
range = [string rangeOfString:@"»"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"»"
withString:@"»"];
range = [string rangeOfString:@"¼"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¼"
withString:@"¼"];
range = [string rangeOfString:@"½"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"½"
withString:@"¹"];
range = [string rangeOfString:@"¾"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¾"
withString:@"¾"];
range = [string rangeOfString:@"¿"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¿"
withString:@"¿"];
range = [string rangeOfString:@"’"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"’"
withString:@"’"];
range = [string rangeOfString:@"¡"];
if (range.location != NSNotFound)
return [string stringByReplacingOccurencesOfString:@"¡"
withString:@"¡"];

return string;
}
}
Expand Down

0 comments on commit 5c01709

Please sign in to comment.