mirrors/discount
2
0
Fork 0
mirror of https://github.com/Orc/discount.git synced 2026-09-25 04:10:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Redo the superscript and relaxed emphasis flags into

Browse Source 
NOSUPERSCRIPT and NORELAXED, so the default is to have them
turned on and you need to turn them off (or do STRICT) explicitly.
This commit is contained in:
David Parsons
2010-10-21 21:10:24 -07:00
parent 0b39f0c30a
commit 1be9861064
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generate.c
+6 -6
View File
@@ -1137,9 +1137,9 @@ text(MMIOT *f)
Qchar(c, f);
break;
/* A^B -> A<sup>B</sup> */
case '^': if ( !(f->flags & MKD_SUPERSCRIPT) ||
(f->flags & (STRICT|INSIDE_TAG)) || isthisspace(f,-1)
|| isthisspace(f,1) )
case '^': if ( (f->flags & (MKD_NOSUPERSCRIPT|STRICT|INSIDE_TAG))
|| isthisspace(f,-1)
|| isthisspace(f,1) )
Qchar(c,f);
else {
char *sup = cursor(f);
@@ -1155,9 +1155,9 @@ text(MMIOT *f)
break;
case '_':
/* Underscores don't count if they're in the middle of a word */
if ( (f->flags & MKD_RELAXED) && !(f->flags & STRICT)
&& isthisalnum(f,-1)
&& isthisalnum(f,1) ) {
if ( (f->flags & (MKD_NORELAXED|STRICT))
&& isthisalnum(f,-1)
&& isthisalnum(f,1) ) {
Qchar(c, f);
break;
}
main.c
+2
View File
@@ -58,6 +58,8 @@ static struct {
{ "safelink",0, MKD_SAFELINK },
{ "del", 1, MKD_NOSTRIKETHROUGH },
{ "strikethrough", 1, MKD_NOSTRIKETHROUGH },
{ "superscript", 1, MKD_NOSUPERSCRIPT },
{ "emphasis", 0, MKD_NORELAXED },
{ "1.0", 0, MKD_1_COMPAT },
} ;
markdown.h
+2 -2
View File
@@ -85,8 +85,8 @@ typedef struct mmiot {
#define INSIDE_TAG 0x00000020
#define NO_PSEUDO_PROTO 0x00000040
#define CDATA_OUTPUT 0x00000080
#define MKD_SUPERSCRIPT 0x00000100
#define MKD_RELAXED 0x00000200
#define MKD_NOSUPERSCRIPT 0x00000100
#define MKD_NORELAXED 0x00000200
#define NOTABLES 0x00000400
#define NOSTRIKETHROUGH 0x00000800
#define TOC 0x00001000