From 04f0cb8ea5e1f31409c11ed445bac13adca03d11 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 17 Jan 2015 16:18:56 -0800
Subject: Put check for fence close with the other checks for end-of-block.

This is a more logical arrangement and follows recent changes to
the JS implementation.
---
 src/blocks.c    |  63 ++---
 src/scanners.c  | 723 ++++++++++++++++++++++++++++----------------------------
 src/scanners.re |   3 +-
 3 files changed, 388 insertions(+), 401 deletions(-)

diff --git a/src/blocks.c b/src/blocks.c
index b2ea5ad..9e76723 100644
--- a/src/blocks.c
+++ b/src/blocks.c
@@ -592,14 +592,21 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes)
 				} else {
 					all_matched = false;
 				}
-			} else {
-				if (container->as.code.fence_length == -1) {
-					// -1 means we've seen closer
+			} else { // fenced
+				matched = 0;
+				if (indent <= 3 &&
+					(peek_at(&input, first_nonspace) ==
+					 container->as.code.fence_char)) {
+					matched = scan_close_code_fence(&input,
+							first_nonspace);
+				}
+				if (matched >= container->as.code.fence_length) {
+					// closing fence - and since we're at
+					// the end of a line, we can return:
 					all_matched = false;
-					if (blank) {
-						container->last_line_blank =
-							true;
-					}
+					offset += matched;
+					finalize(parser, container);
+					goto finished;
 				} else {
 					// skip opt. spaces of fence offset
 					i = container->as.code.fence_offset;
@@ -614,21 +621,16 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes)
 
 			// a header can never contain more than one line
 			all_matched = false;
-			if (blank) {
-				container->last_line_blank = true;
-			}
 
 		} else if (container->type == NODE_HTML) {
 
 			if (blank) {
-				container->last_line_blank = true;
 				all_matched = false;
 			}
 
 		} else if (container->type == NODE_PARAGRAPH) {
 
 			if (blank) {
-				container->last_line_blank = true;
 				all_matched = false;
 			}
 
@@ -786,7 +788,11 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes)
 	indent = first_nonspace - offset;
 	blank = peek_at(&input, first_nonspace) == '\n';
 
-	// cmark_node quote lines are never blank as they start with >
+	if (blank && container->last_child) {
+		container->last_child->last_line_blank = true;
+	}
+
+	// block quote lines are never blank as they start with >
 	// and we don't count blanks in fenced code for purposes of tight/loose
 	// lists or breaking out of lists.  we also don't set last_line_blank
 	// on an empty list item.
@@ -821,32 +827,8 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes)
 			assert(cur != NULL);
 		}
 
-		if (container->type == NODE_CODE_BLOCK &&
-		    !container->as.code.fenced) {
-
-			add_line(container, &input, offset);
-
-		} else if (container->type == NODE_CODE_BLOCK &&
-		           container->as.code.fenced) {
-			matched = 0;
-
-			if (indent <= 3 &&
-			    peek_at(&input, first_nonspace) == container->as.code.fence_char) {
-				int fence_len = scan_close_code_fence(&input, first_nonspace);
-				if (fence_len > container->as.code.fence_length)
-					matched = 1;
-			}
-
-			if (matched) {
-				// if closing fence, set fence length to -1.
-				// it will be closed when the next line is
-				// processed.
-				container->as.code.fence_length = -1;
-			} else {
-				add_line(container, &input, offset);
-			}
-
-		} else if (container->type == NODE_HTML) {
+		if (container->type == NODE_CODE_BLOCK ||
+		    container->type == NODE_HTML) {
 
 			add_line(container, &input, offset);
 
@@ -855,7 +837,7 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes)
 			// ??? do nothing
 
 		} else if (container->type == NODE_HEADER) {
-
+			// TODO move to normalization?:
 			chop_trailing_hashtags(&input);
 			add_line(container, &input, first_nonspace);
 			container = finalize(parser, container);
@@ -877,6 +859,7 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes)
 
 		parser->current = container;
 	}
+finished:
 	parser->last_line_length = parser->curline->size -
 	                           (parser->curline->ptr[parser->curline->size - 1] == '\n' ?
 	                            1 : 0);
diff --git a/src/scanners.c b/src/scanners.c
index a49546c..21c0744 100644
--- a/src/scanners.c
+++ b/src/scanners.c
@@ -11614,13 +11614,12 @@ int _scan_close_code_fence(const unsigned char *p)
 
 {
 	unsigned char yych;
-	unsigned int yyaccept = 0;
 	static const unsigned char yybm[] = {
 		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,  32,  64,   0,   0,   0,   0,   0, 
+		  0,  64,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
-		 32,   0,   0,   0,   0,   0,   0,   0, 
+		 64,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -11631,7 +11630,7 @@ int _scan_close_code_fence(const unsigned char *p)
 		128,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,  16,   0, 
+		  0,   0,   0,   0,   0,   0,  32,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -11660,12 +11659,10 @@ int _scan_close_code_fence(const unsigned char *p)
 yy1272:
 	{ return 0; }
 yy1273:
-	yyaccept = 0;
 	yych = *(marker = ++p);
-	if (yych == '`') goto yy1285;
+	if (yych == '`') goto yy1284;
 	goto yy1272;
 yy1274:
-	yyaccept = 0;
 	yych = *(marker = ++p);
 	if (yych == '~') goto yy1276;
 	goto yy1272;
@@ -11674,21 +11671,17 @@ yy1275:
 	goto yy1272;
 yy1276:
 	yych = *++p;
-	if (yybm[0+yych] & 16) {
+	if (yybm[0+yych] & 32) {
 		goto yy1278;
 	}
 yy1277:
 	p = marker;
-	if (yyaccept == 0) {
-		goto yy1272;
-	} else {
-		goto yy1284;
-	}
+	goto yy1272;
 yy1278:
 	marker = p + 1;
 	++p;
 	yych = *p;
-	if (yybm[0+yych] & 32) {
+	if (yybm[0+yych] & 64) {
 		goto yy1280;
 	}
 	if (yych == '\n') goto yy1282;
@@ -11697,37 +11690,47 @@ yy1278:
 yy1280:
 	++p;
 	yych = *p;
-	if (yybm[0+yych] & 32) {
+	if (yybm[0+yych] & 64) {
 		goto yy1280;
 	}
 	if (yych != '\n') goto yy1277;
 yy1282:
-	yyaccept = 1;
-	marker = ++p;
-	yych = *p;
-	if (yybm[0+yych] & 32) {
-		goto yy1280;
-	}
-	if (yych == '\n') goto yy1282;
-yy1284:
+	++p;
 	p = marker;
 	{ return (p - start); }
-yy1285:
+yy1284:
 	yych = *++p;
 	if (yybm[0+yych] & 128) {
-		goto yy1286;
+		goto yy1285;
 	}
 	goto yy1277;
-yy1286:
+yy1285:
 	marker = p + 1;
 	++p;
 	yych = *p;
-	if (yybm[0+yych] & 32) {
-		goto yy1280;
+	if (yybm[0+yych] & 128) {
+		goto yy1285;
 	}
-	if (yych == '\n') goto yy1282;
-	if (yych == '`') goto yy1286;
-	goto yy1277;
+	if (yych <= '\n') {
+		if (yych <= 0x08) goto yy1277;
+		if (yych >= '\n') goto yy1289;
+	} else {
+		if (yych != ' ') goto yy1277;
+	}
+yy1287:
+	++p;
+	yych = *p;
+	if (yych <= '\n') {
+		if (yych <= 0x08) goto yy1277;
+		if (yych <= '\t') goto yy1287;
+	} else {
+		if (yych == ' ') goto yy1287;
+		goto yy1277;
+	}
+yy1289:
+	++p;
+	p = marker;
+	{ return (p - start); }
 }
 
 }
@@ -11742,664 +11745,664 @@ int _scan_entity(const unsigned char *p)
 {
 	unsigned char yych;
 	yych = *p;
-	if (yych == '\n') goto yy1290;
-	if (yych == '&') goto yy1291;
-	goto yy1292;
-yy1290:
+	if (yych == '\n') goto yy1293;
+	if (yych == '&') goto yy1294;
+	goto yy1295;
+yy1293:
 	{ return 0; }
-yy1291:
+yy1294:
 	yych = *(marker = ++p);
 	if (yych <= '@') {
-		if (yych == '#') goto yy1293;
-		goto yy1290;
+		if (yych == '#') goto yy1296;
+		goto yy1293;
 	} else {
-		if (yych <= 'Z') goto yy1295;
-		if (yych <= '`') goto yy1290;
-		if (yych <= 'z') goto yy1295;
-		goto yy1290;
+		if (yych <= 'Z') goto yy1298;
+		if (yych <= '`') goto yy1293;
+		if (yych <= 'z') goto yy1298;
+		goto yy1293;
 	}
-yy1292:
+yy1295:
 	yych = *++p;
-	goto yy1290;
-yy1293:
+	goto yy1293;
+yy1296:
 	yych = *++p;
 	if (yych <= 'W') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1330;
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1333;
 	} else {
-		if (yych <= 'X') goto yy1329;
-		if (yych == 'x') goto yy1329;
+		if (yych <= 'X') goto yy1332;
+		if (yych == 'x') goto yy1332;
 	}
-yy1294:
+yy1297:
 	p = marker;
-	goto yy1290;
-yy1295:
+	goto yy1293;
+yy1298:
 	yych = *++p;
 	if (yych <= '@') {
-		if (yych <= '/') goto yy1294;
-		if (yych >= ':') goto yy1294;
+		if (yych <= '/') goto yy1297;
+		if (yych >= ':') goto yy1297;
 	} else {
-		if (yych <= 'Z') goto yy1296;
-		if (yych <= '`') goto yy1294;
-		if (yych >= '{') goto yy1294;
+		if (yych <= 'Z') goto yy1299;
+		if (yych <= '`') goto yy1297;
+		if (yych >= '{') goto yy1297;
 	}
-yy1296:
-	yych = *++p;
-	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1299;
-		if (yych <= ':') goto yy1294;
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
-			goto yy1299;
-		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych <= 'z') goto yy1299;
-			goto yy1294;
-		}
-	}
-yy1297:
-	++p;
-	{ return (p - start); }
 yy1299:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1300;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
-		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
-		}
-	}
-yy1300:
-	yych = *++p;
-	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1301;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
-		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
-		}
-	}
-yy1301:
-	yych = *++p;
-	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1302;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
+			goto yy1302;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych <= 'z') goto yy1302;
+			goto yy1297;
 		}
 	}
+yy1300:
+	++p;
+	{ return (p - start); }
 yy1302:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1303;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1303:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1304;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1304:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1305;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1305:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1306;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1306:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1307;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1307:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1308;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1308:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1309;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1309:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1310;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1310:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1311;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1311:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1312;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1312:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1313;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1313:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1314;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1314:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1315;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1315:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1316;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1316:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1317;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1317:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1318;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1318:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1319;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1319:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1320;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1320:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1321;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1321:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1322;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1322:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1323;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1323:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1324;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1324:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1325;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1325:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1326;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1326:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1327;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1327:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
+		if (yych <= '/') goto yy1297;
 		if (yych <= '9') goto yy1328;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= '{') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
 		}
 	}
 yy1328:
 	yych = *++p;
-	if (yych == ';') goto yy1297;
-	goto yy1294;
+	if (yych <= ';') {
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1329;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
+	} else {
+		if (yych <= 'Z') {
+			if (yych <= '@') goto yy1297;
+		} else {
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
+		}
+	}
 yy1329:
 	yych = *++p;
-	if (yych <= '@') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1337;
-		goto yy1294;
+	if (yych <= ';') {
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1330;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
-		if (yych <= 'F') goto yy1337;
-		if (yych <= '`') goto yy1294;
-		if (yych <= 'f') goto yy1337;
-		goto yy1294;
+		if (yych <= 'Z') {
+			if (yych <= '@') goto yy1297;
+		} else {
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
+		}
 	}
 yy1330:
 	yych = *++p;
-	if (yych <= '/') goto yy1294;
-	if (yych <= '9') goto yy1331;
-	if (yych == ';') goto yy1297;
-	goto yy1294;
+	if (yych <= ';') {
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1331;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
+	} else {
+		if (yych <= 'Z') {
+			if (yych <= '@') goto yy1297;
+		} else {
+			if (yych <= '`') goto yy1297;
+			if (yych >= '{') goto yy1297;
+		}
+	}
 yy1331:
 	yych = *++p;
-	if (yych <= '/') goto yy1294;
-	if (yych <= '9') goto yy1332;
-	if (yych == ';') goto yy1297;
-	goto yy1294;
+	if (yych == ';') goto yy1300;
+	goto yy1297;
 yy1332:
 	yych = *++p;
-	if (yych <= '/') goto yy1294;
-	if (yych <= '9') goto yy1333;
-	if (yych == ';') goto yy1297;
-	goto yy1294;
+	if (yych <= '@') {
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1340;
+		goto yy1297;
+	} else {
+		if (yych <= 'F') goto yy1340;
+		if (yych <= '`') goto yy1297;
+		if (yych <= 'f') goto yy1340;
+		goto yy1297;
+	}
 yy1333:
 	yych = *++p;
-	if (yych <= '/') goto yy1294;
+	if (yych <= '/') goto yy1297;
 	if (yych <= '9') goto yy1334;
-	if (yych == ';') goto yy1297;
-	goto yy1294;
+	if (yych == ';') goto yy1300;
+	goto yy1297;
 yy1334:
 	yych = *++p;
-	if (yych <= '/') goto yy1294;
+	if (yych <= '/') goto yy1297;
 	if (yych <= '9') goto yy1335;
-	if (yych == ';') goto yy1297;
-	goto yy1294;
+	if (yych == ';') goto yy1300;
+	goto yy1297;
 yy1335:
 	yych = *++p;
-	if (yych <= '/') goto yy1294;
+	if (yych <= '/') goto yy1297;
 	if (yych <= '9') goto yy1336;
-	if (yych == ';') goto yy1297;
-	goto yy1294;
+	if (yych == ';') goto yy1300;
+	goto yy1297;
 yy1336:
 	yych = *++p;
-	if (yych <= '/') goto yy1294;
-	if (yych <= '9') goto yy1328;
-	if (yych == ';') goto yy1297;
-	goto yy1294;
+	if (yych <= '/') goto yy1297;
+	if (yych <= '9') goto yy1337;
+	if (yych == ';') goto yy1300;
+	goto yy1297;
 yy1337:
+	yych = *++p;
+	if (yych <= '/') goto yy1297;
+	if (yych <= '9') goto yy1338;
+	if (yych == ';') goto yy1300;
+	goto yy1297;
+yy1338:
+	yych = *++p;
+	if (yych <= '/') goto yy1297;
+	if (yych <= '9') goto yy1339;
+	if (yych == ';') goto yy1300;
+	goto yy1297;
+yy1339:
+	yych = *++p;
+	if (yych <= '/') goto yy1297;
+	if (yych <= '9') goto yy1331;
+	if (yych == ';') goto yy1300;
+	goto yy1297;
+yy1340:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1338;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1341;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'F') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= 'g') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= 'g') goto yy1297;
 		}
 	}
-yy1338:
+yy1341:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1339;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1342;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'F') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= 'g') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= 'g') goto yy1297;
 		}
 	}
-yy1339:
+yy1342:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1340;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1343;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'F') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= 'g') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= 'g') goto yy1297;
 		}
 	}
-yy1340:
+yy1343:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1341;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1344;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'F') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= 'g') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= 'g') goto yy1297;
 		}
 	}
-yy1341:
+yy1344:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1342;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1345;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'F') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= 'g') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= 'g') goto yy1297;
 		}
 	}
-yy1342:
+yy1345:
 	yych = *++p;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1343;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1346;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'F') {
-			if (yych <= '@') goto yy1294;
+			if (yych <= '@') goto yy1297;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych >= 'g') goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych >= 'g') goto yy1297;
 		}
 	}
-yy1343:
+yy1346:
 	++p;
 	if ((yych = *p) <= ';') {
-		if (yych <= '/') goto yy1294;
-		if (yych <= '9') goto yy1328;
-		if (yych <= ':') goto yy1294;
-		goto yy1297;
+		if (yych <= '/') goto yy1297;
+		if (yych <= '9') goto yy1331;
+		if (yych <= ':') goto yy1297;
+		goto yy1300;
 	} else {
 		if (yych <= 'F') {
-			if (yych <= '@') goto yy1294;
-			goto yy1328;
+			if (yych <= '@') goto yy1297;
+			goto yy1331;
 		} else {
-			if (yych <= '`') goto yy1294;
-			if (yych <= 'f') goto yy1328;
-			goto yy1294;
+			if (yych <= '`') goto yy1297;
+			if (yych <= 'f') goto yy1331;
+			goto yy1297;
 		}
 	}
 }
diff --git a/src/scanners.re b/src/scanners.re
index ca25c16..d83efde 100644
--- a/src/scanners.re
+++ b/src/scanners.re
@@ -216,7 +216,8 @@ int _scan_close_code_fence(const unsigned char *p)
   const unsigned char *marker = NULL;
   const unsigned char *start = p;
 /*!re2c
-  ([`]{3,} | [~]{3,}) / spacechar* [\n] { return (p - start); }
+  [`]{3,} / [ \t]*[\n] { return (p - start); }
+  [~]{3,} / [ \t]*[\n] { return (p - start); }
   .? { return 0; }
 */
 }
-- 
cgit v1.2.3