Merge c6ec20e into 00a6ba6

Cocoanetics · Oct 27, 2013 · bb42dd5 · bb42dd5
2 parents 00a6ba6 + c6ec20e
commit bb42dd5
Show file tree

Hide file tree

Showing 5 changed files with 392 additions and 149 deletions.
diff --git a/Demo/Common/DTMDistributionDelegate.m b/Demo/Common/DTMDistributionDelegate.m
@@ -42,21 +42,27 @@ - (void)parserDidEndDocument:(DTMarkdownParser *)parser;
 - (void)parser:(DTMarkdownParser *)parser didStartElement:(NSString *)elementName attributes:(NSDictionary *)attributeDict;
 {
 	[_subDelegates enumerateObjectsUsingBlock:^(id <DTMarkdownParserDelegate>aDelegate, NSUInteger idx, BOOL *stop) {
-		[aDelegate parser:parser didStartElement:elementName attributes:attributeDict];
+		if (elementName != nil) {
+			[aDelegate parser:parser didStartElement:elementName attributes:attributeDict];
+		}
 	}];
 }
 
 - (void)parser:(DTMarkdownParser *)parser foundCharacters:(NSString *)string;
 {
 	[_subDelegates enumerateObjectsUsingBlock:^(id <DTMarkdownParserDelegate>aDelegate, NSUInteger idx, BOOL *stop) {
-		[aDelegate parser:parser foundCharacters:string];
+		if (string != nil) {
+			[aDelegate parser:parser foundCharacters:string];
+		}
 	}];
 }
 
 - (void)parser:(DTMarkdownParser *)parser didEndElement:(NSString *)elementName;
 {
 	[_subDelegates enumerateObjectsUsingBlock:^(id <DTMarkdownParserDelegate>aDelegate, NSUInteger idx, BOOL *stop) {
-		[aDelegate parser:parser didEndElement:elementName];
+		if (elementName != nil) {
+			[aDelegate parser:parser didEndElement:elementName];
+		}
 	}];
 }
 

diff --git a/Demo/Common/SimpleHTMLGenerator.m b/Demo/Common/SimpleHTMLGenerator.m
@@ -13,7 +13,13 @@
 "<!doctype html>\n"
 "<head>\n"
 "	<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n"
+
 /*"	<link rel=\"stylesheet\" type=\"text/css\" href=\"./Shared/style.css\" charset=\"utf-8\" media=\"all\">\n"*/
+
+"	<style type=\"text/css\">\n"
+"	pre, code { background-color: #eee; font-family: Menlo, monospace; }\n"
+"	</style>\n"
+
 "	<title>%1$@</title>\n"
 "</head>\n"
 "<body>\n";
@@ -118,7 +124,11 @@ - (void)parser:(DTMarkdownParser *)parser foundCharacters:(NSString *)string;
 
 - (void)parser:(DTMarkdownParser *)parser didEndElement:(NSString *)elementName;
 {
-	NSMutableString *elementTag = [NSMutableString stringWithFormat:@"</%@>", elementName];
+	NSMutableString *elementTag = [NSMutableString string];
+	[elementTag appendString:@"</"];
+	[elementTag appendString:elementName];
+	[elementTag appendString:@">"];
+
 	if (_verbose)  NSLog(@"%@", elementTag);
 
 	BOOL isSelfClosingTag = (_immediateOpeningTagName != nil) && [_immediateOpeningTagName isEqualToString:elementName];
@@ -131,7 +141,7 @@ - (void)parser:(DTMarkdownParser *)parser didEndElement:(NSString *)elementName;
 	}
 	else {
 		if ([[[self class] blockLevelElements] containsObject:elementName]) {
-			[elementTag appendString:@"\n"];
+			[elementTag appendString:@"\n\n"];
 		}
 
 		[_HTMLString appendString:elementTag];