Added documentation for ``` style fenced code block and more robust parsing

Dimitri van Heesch · Dimitri van Heesch · commit 39ba42c3b21d · 2015-04-05T20:52:42.000+02:00
diff --git a/doc/markdown.doc b/doc/markdown.doc
@@ -390,6 +390,12 @@ int func(int a,int b) { return a*b; }
 
 The curly braces and dot are optional by the way.
 
+Another way to denote fenced code blocks is to use 3 or more backticks (```):
+
+    ```
+    also a fenced code block
+    ```
+
 \subsection md_header_id Header Id Attributes
 
 Standard Markdown has no support for labeling headers, which
diff --git a/src/pre.l b/src/pre.l
@@ -2452,7 +2452,7 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 <SkipCComment>[\\@][\\@]("f{"|"f$"|"f[") {
   					  outputArray(yytext,(int)yyleng);
   					}
-<SkipCComment>"~~~"[~]*                 {
+<SkipCComment>^({B}*"*"+)?{B}{0,3}"~~~"[~]*   {
                                           static bool markdownSupport = Config_getBool("MARKDOWN_SUPPORT");
                                           if (!markdownSupport)
                                           {
@@ -2465,7 +2465,7 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
                                             BEGIN(SkipVerbatim);
                                           }
                                         }
-<SkipCComment>"```"[`]*                 {
+<SkipCComment>^({B}*"*"+)?{B}{0,3}"```"[`]*            {
                                           static bool markdownSupport = Config_getBool("MARKDOWN_SUPPORT");
                                           if (!markdownSupport)
                                           {
@@ -2612,14 +2612,14 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 					    BEGIN(SkipCComment);
 					  }
   					}
-<SkipVerbatim>"~~~"[~]*                 {
+<SkipVerbatim>^({B}*"*"+)?{B}{0,3}"~~~"[~]*                 {
   					  outputArray(yytext,(int)yyleng);
                                           if (g_fenceSize==yyleng)
                                           {
                                             BEGIN(SkipCComment);
                                           }
                                         }
-<SkipVerbatim>"```"[`]*                 {
+<SkipVerbatim>^({B}*"*"+)?{B}{0,3}"```"[`]*                 {
   					  outputArray(yytext,(int)yyleng);
                                           if (g_fenceSize==yyleng)
                                           {
@@ -2629,7 +2629,7 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 <SkipVerbatim>"*/"|"/*"			{
   					  outputArray(yytext,(int)yyleng);
   					}
-<SkipCComment,SkipVerbatim>[^*\\@\x06~\n\/]+ {
+<SkipCComment,SkipVerbatim>[^*\\@\x06~`\n\/]+ {
   					  outputArray(yytext,(int)yyleng);
   					}
 <SkipCComment,SkipVerbatim>\n		{ 
diff --git a/src/scanner.l b/src/scanner.l
@@ -6264,14 +6264,14 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           g_nestedComment=FALSE;
   					  BEGIN(DocCopyBlock);
   					}
-<DocBlock>"~~~"[~]*                     {
+<DocBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]*                {
                                           docBlock+=yytext;
                                           docBlockName="~~~";
                                           g_fencedSize=yyleng;
                                           g_nestedComment=FALSE;
                                           BEGIN(DocCopyBlock);
                                         }
-<DocBlock>"```"[`]*                     {
+<DocBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*                {
                                           docBlock+=yytext;
                                           docBlockName="```";
                                           g_fencedSize=yyleng;
@@ -6389,14 +6389,14 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    REJECT;
 					  }
   					}
-<DocCopyBlock>"~~~"[~]*                 {
+<DocCopyBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]* {
                                           docBlock+=yytext;
                                           if (g_fencedSize==yyleng)
                                           {
                                             BEGIN(DocBlock);
                                           }
                                         }
-<DocCopyBlock>"```"[`]*                 {
+<DocCopyBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*                 {
                                           docBlock+=yytext;
                                           if (g_fencedSize==yyleng)
                                           {

Original file line number	Diff line number	Diff line change
`@@ -2452,7 +2452,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")\|("'"\\."'")\|("'"[^'\\\n]{1,4}"'"))`
`2452`	`2452`	`<SkipCComment>[\\@][\\@]("f{"\|"f$"\|"f[") {`
`2453`	`2453`	`outputArray(yytext,(int)yyleng);`
`2454`	`2454`	`}`
`2455`		`-<SkipCComment>"~~~"[~]* {`
	`2455`	`+<SkipCComment>^({B}""+)?{B}{0,3}"~~~"[~]* {`
`2456`	`2456`	`static bool markdownSupport = Config_getBool("MARKDOWN_SUPPORT");`
`2457`	`2457`	`if (!markdownSupport)`
`2458`	`2458`	`{`
`@@ -2465,7 +2465,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")\|("'"\\."'")\|("'"[^'\\\n]{1,4}"'"))`
`2465`	`2465`	`BEGIN(SkipVerbatim);`
`2466`	`2466`	`}`
`2467`	`2467`	`}`
`2468`		-<SkipCComment>"```"[`]* {
	`2468`	+<SkipCComment>^({B}""+)?{B}{0,3}"```"[`]* {
`2469`	`2469`	`static bool markdownSupport = Config_getBool("MARKDOWN_SUPPORT");`
`2470`	`2470`	`if (!markdownSupport)`
`2471`	`2471`	`{`
`@@ -2612,14 +2612,14 @@ CHARLIT (("'"\\[0-7]{1,3}"'")\|("'"\\."'")\|("'"[^'\\\n]{1,4}"'"))`
`2612`	`2612`	`BEGIN(SkipCComment);`
`2613`	`2613`	`}`
`2614`	`2614`	`}`
`2615`		`-<SkipVerbatim>"~~~"[~]* {`
	`2615`	`+<SkipVerbatim>^({B}""+)?{B}{0,3}"~~~"[~]* {`
`2616`	`2616`	`outputArray(yytext,(int)yyleng);`
`2617`	`2617`	`if (g_fenceSize==yyleng)`
`2618`	`2618`	`{`
`2619`	`2619`	`BEGIN(SkipCComment);`
`2620`	`2620`	`}`
`2621`	`2621`	`}`
`2622`		-<SkipVerbatim>"```"[`]* {
	`2622`	+<SkipVerbatim>^({B}""+)?{B}{0,3}"```"[`]* {
`2623`	`2623`	`outputArray(yytext,(int)yyleng);`
`2624`	`2624`	`if (g_fenceSize==yyleng)`
`2625`	`2625`	`{`
`@@ -2629,7 +2629,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")\|("'"\\."'")\|("'"[^'\\\n]{1,4}"'"))`
`2629`	`2629`	`<SkipVerbatim>"/"\|"/" {`
`2630`	`2630`	`outputArray(yytext,(int)yyleng);`
`2631`	`2631`	`}`
`2632`		`-<SkipCComment,SkipVerbatim>[^*\\@\x06~\n\/]+ {`
	`2632`	+<SkipCComment,SkipVerbatim>[^*\\@\x06~`\n\/]+ {
`2633`	`2633`	`outputArray(yytext,(int)yyleng);`
`2634`	`2634`	`}`
`2635`	`2635`	`<SkipCComment,SkipVerbatim>\n {`
Original file line number	Diff line number	Diff line change
`@@ -6264,14 +6264,14 @@ OPERATOR "operator"{B}*({ARITHOP}\|{ASSIGNOP}\|{LOGICOP}\|{BITOP})`
`6264`	`6264`	`g_nestedComment=FALSE;`
`6265`	`6265`	`BEGIN(DocCopyBlock);`
`6266`	`6266`	`}`
`6267`		`-<DocBlock>"~~~"[~]* {`
	`6267`	`+<DocBlock>^({B}""+)?{B}{0,3}"~~~"[~]* {`
`6268`	`6268`	`docBlock+=yytext;`
`6269`	`6269`	`docBlockName="~~~";`
`6270`	`6270`	`g_fencedSize=yyleng;`
`6271`	`6271`	`g_nestedComment=FALSE;`
`6272`	`6272`	`BEGIN(DocCopyBlock);`
`6273`	`6273`	`}`
`6274`		-<DocBlock>"```"[`]* {
	`6274`	+<DocBlock>^({B}""+)?{B}{0,3}"```"[`]* {
`6275`	`6275`	`docBlock+=yytext;`
`6276`	`6276`	docBlockName="```";
`6277`	`6277`	`g_fencedSize=yyleng;`
`@@ -6389,14 +6389,14 @@ OPERATOR "operator"{B}*({ARITHOP}\|{ASSIGNOP}\|{LOGICOP}\|{BITOP})`
`6389`	`6389`	`REJECT;`
`6390`	`6390`	`}`
`6391`	`6391`	`}`
`6392`		`-<DocCopyBlock>"~~~"[~]* {`
	`6392`	`+<DocCopyBlock>^({B}""+)?{B}{0,3}"~~~"[~]* {`
`6393`	`6393`	`docBlock+=yytext;`
`6394`	`6394`	`if (g_fencedSize==yyleng)`
`6395`	`6395`	`{`
`6396`	`6396`	`BEGIN(DocBlock);`
`6397`	`6397`	`}`
`6398`	`6398`	`}`
`6399`		-<DocCopyBlock>"```"[`]* {
	`6399`	+<DocCopyBlock>^({B}""+)?{B}{0,3}"```"[`]* {
`6400`	`6400`	`docBlock+=yytext;`
`6401`	`6401`	`if (g_fencedSize==yyleng)`
`6402`	`6402`	`{`