Index: src/TDHtmlSyntaxHighlighter.h
===================================================================
--- src/TDHtmlSyntaxHighlighter.h (revision 40)
+++ src/TDHtmlSyntaxHighlighter.h (working copy)
@@ -30,6 +30,8 @@
TDToken *scriptToken;
TDToken *endScriptToken;

+ NSString *contentType;
+
NSMutableAttributedString *highlightedString;
NSDictionary *headerNameAttributes;
NSDictionary *headerValueAttributes;
@@ -44,7 +46,9 @@
- (id)initWithAttributesForDarkBackground:(BOOL)isDark;

- (NSAttributedString *)attributedStringForString:(NSString *)s;
+-(void) parseHeaderContentType:(NSString *)s;

+@property (nonatomic, retain) NSString *contentType;
@property (nonatomic, retain) NSMutableAttributedString *highlightedString;
@property (nonatomic, retain) NSDictionary *headerNameAttributes;
@property (nonatomic, retain) NSDictionary *headerValueAttributes;
Index: src/TDHtmlSyntaxHighlighter.m
===================================================================
--- src/TDHtmlSyntaxHighlighter.m (revision 40)
+++ src/TDHtmlSyntaxHighlighter.m (working copy)
@@ -70,6 +70,8 @@
if (self != nil) {
isDarkBG = isDark;

+ self.contentType = @"text/plain";
+
self.tokenizer = [TDTokenizer tokenizer];

// configure tokenizer
@@ -192,6 +194,7 @@
self.eqToken = nil;
self.scriptToken = nil;
self.endScriptToken = nil;
+ self.contentType = nil;
self.highlightedString = nil;
self.headerNameAttributes = nil;
self.headerValueAttributes = nil;
@@ -220,6 +223,12 @@
NSInteger i = r.location + 1;
NSString *name = [line substringToIndex:i];
NSString *value = [NSString stringWithFormat:@"%@\r\n", [line substringFromIndex:i]];
+
+ // [JAS]: Store the content-type for later use in formatting
+ if([name caseInsensitiveCompare:@"Content-Type"]) {
+ [self parseHeaderContentType:value];
+ }
+
as = [[NSAttributedString alloc] initWithString:name attributes:headerNameAttributes];
[highlightedString appendAttributedString:as];
[as release];
@@ -233,7 +242,24 @@
[as release];
}

+// [JAS]: Store the content type so it can determine syntax highlighting.
+-(void) parseHeaderContentType:(NSString *)s {
+ NSRange rContentType = [s rangeOfString:@";"];
+ NSMutableString *contentTypeString;

+ // Strip off a charset if provided
+ if(NSNotFound != rContentType.location) {
+ contentTypeString = [NSMutableString stringWithString:[s substringToIndex:rContentType.location+1]];
+ } else {
+ contentTypeString = [NSMutableString stringWithString:s];
+ }
+
+ // Trim any whitespace
+ CFStringTrimWhitespace((CFMutableStringRef) contentTypeString);
+
+ self.contentType = contentTypeString;
+}
+
- (NSAttributedString *)attributedStringForString:(NSString *)s {
self.stack = [NSMutableArray array];
self.highlightedString = [[[NSMutableAttributedString alloc] init] autorelease];
@@ -243,6 +269,11 @@
[self parseHeaders:[s substringToIndex:r.location]];
s = [s substringFromIndex:r.location + r.length];
}
+
+ // [JAS]: HTML or XML
+ if(NSOrderedSame == [contentType caseInsensitiveCompare:@"text/html"]
+ || NSOrderedSame == [contentType caseInsensitiveCompare:@"text/xml"]
+ ) {
NSInteger lengthOfHeaders = highlightedString.length;

tokenizer.string = s;
@@ -311,6 +342,14 @@
}
}

+ // [JAS]: Not HTML or XML (plaintext, javascript/JSON, etc.)
+ // Can be expanded on to do new modes of syntax highlighting.
+ } else {
+ NSAttributedString *as = [[NSAttributedString alloc] initWithString:s attributes:textAttributes];
+ [highlightedString appendAttributedString:as];
+ [as release];
+ }
+
NSAttributedString *result = [[highlightedString copy] autorelease];
self.stack = nil;
self.highlightedString = nil;
@@ -641,6 +680,7 @@
@synthesize eqToken;
@synthesize scriptToken;
@synthesize endScriptToken;
+@synthesize contentType;
@synthesize highlightedString;
@synthesize headerNameAttributes;
@synthesize headerValueAttributes;