rdiscount 2.1.8 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 405bc946f3603de05c87ad440e64d3b22f111991
-  data.tar.gz: f6dcc0125d0eb194721a3f4979bccad2b6afc69e
+  metadata.gz: 5fa600678c5314e67b7b61b113b1a061ed42f5a8
+  data.tar.gz: c9fef34817017c9be900f6897647471d10dac7fe
 SHA512:
-  metadata.gz: b7573a6ccf9a830cff5f4768bc3d21625d189f88f93f7b1ed35bcc9c1cb1636b22013c8354d19f4b2d135568f96e4bd7072a0462eef28aa64c94566933f03305
-  data.tar.gz: 4b88d0299ed378916b70b5159a96092062c22760ebb8fdd3fd98a519d5a528a7f40d652a29f450a9c6c4c006b380d944b234303267620eb6493b3f6be9a71589
+  metadata.gz: 7e29504a28c0dc25eb1a863e48484940c16a05a1ebb1f73046c2ef86f818ab0503e7425f0fa8733b3465b65c54a6592c6ccb58ad263425c61a27ae6ea64ebf0c
+  data.tar.gz: 91f0960039b2e8a9d0f44c7be7cbdecdca768f490bef418e04754d5ecfa9c47fdb336742bbd777fae72bb186d3f2a2febc335097862cb14128efb346d1b66fdd

data/BUILDING

@@ -20,7 +20,7 @@ the rake gather task to copy discount source files into the ext/ directory:
     Submodule 'discount' (git://github.com/davidfstr/discount.git) registered for path 'discount'
     Cloning into discount...
     $ cd discount
-    $ ./configure.sh --with-fenced-code --with-github-tags --with-dl=both
+    $ ./configure.sh
     $ make  # ensure it compiles
     $ cd ..
     $ rake gather
@@ -52,6 +52,9 @@ ext. This must be done manually. Here's a quick way to get the full list:
 
     $ echo ext/*.c ext/*.h ext/*.rb ext/blocktags ext/VERSION | tr ' ' "\n" | sort
 
+(There is an old Rakefile target called "rdiscount.gemspec" that looks like it
+ is designed to perform an update of these files, however I haven't tested it.)
+
 Build the RDiscount gem. If you get errors related to missing files
 in ext, make sure you updated the gemspec correctly in the previous step.
 

data/README.markdown

@@ -1,6 +1,7 @@
 Discount Markdown Processor for Ruby
 ====================================
-[![Build Status](https://travis-ci.org/davidfstr/rdiscount.png)](https://travis-ci.org/davidfstr/rdiscount)
+[![Build Status](https://travis-ci.org/davidfstr/rdiscount.svg?branch=master)](https://travis-ci.org/davidfstr/rdiscount)
+[![Build status](https://ci.appveyor.com/api/projects/status/47i0qxrnvjbg724f/branch/master?svg=true)](https://ci.appveyor.com/project/DavidFoster/rdiscount/branch/master)
 
 Discount is an implementation of John Gruber's Markdown markup language in C. It
 implements all of the language described in [the markdown syntax document][1] and

data/ext/VERSION

@@ -1 +1 @@
-2.1.8
+2.2.0

data/ext/amalloc.c

@@ -8,7 +8,7 @@
 
 #define MAGIC 0x1f2e3d4c
 
-struct alist { int magic, size; struct alist *next, *last; };
+struct alist { int magic, size, index; int *end; struct alist *next, *last; };
 
 static struct alist list =  { 0, 0, 0, 0 };
 
@@ -16,14 +16,32 @@ static int mallocs=0;
 static int reallocs=0;
 static int frees=0;
 
+static int index = 0;
+
+static void
+die(char *msg, int index)
+{
+    fprintf(stderr, msg, index);
+    abort();
+}
+
+
 void *
-acalloc(int size, int count)
+acalloc(int count, int size)
 {
-    struct alist *ret = calloc(size + sizeof(struct alist), count);
+    struct alist *ret;
+
+    if ( size > 1 ) {
+	count *= size;
+	size = 1;
+    }
 
-    if ( ret ) {
+    if ( ret = calloc(count + sizeof(struct alist) + sizeof(int), size) ) {
 	ret->magic = MAGIC;
 	ret->size = size * count;
+	ret->index = index ++;
+	ret->end = (int*)(count + (char*) (ret + 1));
+	*(ret->end) = ~MAGIC;
 	if ( list.next ) {
 	    ret->next = list.next;
 	    ret->last = &list;
@@ -54,6 +72,8 @@ afree(void *ptr)
     struct alist *p2 = ((struct alist*)ptr)-1;
 
     if ( p2->magic == MAGIC ) {
+	if ( ! (p2->end && *(p2->end) == ~MAGIC) )
+	    die("goddam: corrupted memory block %d in free()!\n", p2->index);
 	p2->last->next = p2->next;
 	p2->next->last = p2->last;
 	++frees;
@@ -71,12 +91,16 @@ arealloc(void *ptr, int size)
     struct alist save;
 
     if ( p2->magic == MAGIC ) {
+	if ( ! (p2->end && *(p2->end) == ~MAGIC) )
+	    die("goddam: corrupted memory block %d in realloc()!\n", p2->index);
 	save.next = p2->next;
 	save.last = p2->last;
-	p2 = realloc(p2, sizeof(*p2) + size);
+	p2 = realloc(p2, sizeof(int) + sizeof(*p2) + size);
 
 	if ( p2 ) {
 	    p2->size = size;
+	    p2->end = (int*)(size + (char*) (p2 + 1));
+	    *(p2->end) = ~MAGIC;
 	    p2->next->last = p2;
 	    p2->last->next = p2;
 	    ++reallocs;

data/ext/config.h

@@ -7,16 +7,6 @@
 /* tabs are four spaces */
 #define TABSTOP 4
 
-/* enable fenced code blocks */
-#define WITH_FENCED_CODE 1
-
-/* include - and _ as acceptable characters in HTML tag names */
-#define WITH_GITHUB_TAGS 1
-
-/* enable discount and PHP Markdown Extra definition lists */
-#define USE_EXTRA_DL 1
-#define USE_DISCOUNT_DL 1
-
 /* these are setup by extconf.rb */
 #if HAVE_RANDOM
 #define COINTOSS() (random()&1)

data/ext/css.c

@@ -75,11 +75,13 @@ int
 mkd_generatecss(Document *d, FILE *f)
 {
     char *res;
-    int written = EOF, size = mkd_css(d, &res);
+    int written;
+    int size = mkd_css(d, &res);
 
-    if ( size > 0 )
-	written = fwrite(res, 1, size, f);
+    written = (size > 0) ? fwrite(res,1,size,f) : 0;
+    
     if ( res )
 	free(res);
+    
     return (written == size) ? size : EOF;
 }

data/ext/dumptree.c

@@ -145,7 +145,6 @@ mkd_dump(Document *doc, FILE *out, int flags, char *title)
 	dumptree(doc->code, &stack, out);
 	DELETE(stack);
 
-	mkd_cleanup(doc);
 	return 0;
     }
     return -1;

data/ext/extconf.rb

@@ -8,7 +8,7 @@ HAVE_RAND = have_func('rand')
 HAVE_SRAND = have_func('srand')
 
 def sized_int(size, types)
-  types.find { |type| check_sizeof(type) == 4 } ||
+  types.find { |type| check_sizeof(type) == size } ||
     abort("no int with size #{size}")
 end
 

data/ext/flags.c

@@ -30,6 +30,12 @@ static struct flagnames flagnames[] = {
     { MKD_NODLIST,        "!DLIST" },
     { MKD_EXTRA_FOOTNOTE, "FOOTNOTE" },
     { MKD_NOSTYLE,        "!STYLE" },
+    { MKD_NODLDISCOUNT,   "!DLDISCOUNT" },
+    { MKD_DLEXTRA,        "DLEXTRA" },
+    { MKD_FENCEDCODE,     "FENCEDCODE" },
+    { MKD_IDANCHOR,       "IDANCHOR" },
+    { MKD_GITHUBTAGS,     "GITHUBTAGS" },
+    { MKD_URLENCODEDANCHOR, "URLENCODEDANCHOR" },
 };
 #define NR(x)	(sizeof x/sizeof x[0])
 

data/ext/generate.c

@@ -786,7 +786,7 @@ mangle(char *s, int len, MMIOT *f)
 {
     while ( len-- > 0 ) {
 #if DEBIAN_GLITCH
-	Qprintf(f, "&#02d;", *((unsigned char*)(s++)) );
+	Qprintf(f, "&#%02d;", *((unsigned char*)(s++)) );
 #else
 	Qstring("&#", f);
 	Qprintf(f, COINTOSS() ? "x%02x;" : "%02d;", *((unsigned char*)(s++)) );
@@ -860,7 +860,6 @@ code(MMIOT *f, char *s, int length)
 	    cputc(c, f);
 } /* code */
 
-
 /*  delspan() -- write out a chunk of text, blocking with <del>...</del>
  */
 static void
@@ -1009,11 +1008,9 @@ maybe_tag_or_link(MMIOT *f)
 	}
 	else if ( isspace(c) )
 	    break;
-#if WITH_GITHUB_TAGS
-	else if ( ! (c == '/' || c == '-' || c == '_' || isalnum(c) ) )
-#else
-	else if ( ! (c == '/' || isalnum(c) ) )
-#endif
+	else if ( ! (c == '/'
+		     || (f->flags & MKD_GITHUBTAGS && (c == '-' || c == '_'))
+		     || isalnum(c) ) )
 	    maybetag=0;
     }
 
@@ -1064,6 +1061,8 @@ maybe_autolink(MMIOT *f)
 	     if ( peek(f, size+2) != EOF )
 		++size;
 	}
+	else if ( c & 0x80 )	/* HACK: ignore utf-8 extended characters */
+	    continue;
 	else if ( isspace(c) || strchr("'\"()[]{}<>`", c) || c == MKD_EOLN )
 	    break;
     }
@@ -1208,6 +1207,29 @@ smartypants(int c, int *flags, MMIOT *f)
 } /* smartypants */
 
 
+#if WITH_LATEX
+/* process latex with arbitrary 2-character ( $$ .. $$, \[ .. \], \( .. \)
+ * delimiters
+ */
+static int
+mathhandler(MMIOT *f, int e1, int e2)
+{
+    int i = 0;
+
+    while(peek(f, ++i) != EOF) {
+        if (peek(f, i) == e1 && peek(f, i+1) == e2) {
+	    cputc(peek(f,-1), f);
+	    cputc(peek(f, 0), f);
+	    while ( i-- > -1 )
+		cputc(pull(f), f);
+            return 1;
+        }
+    }
+    return 0;
+}
+#endif
+
+
 /* process a body of text encased in some sort of tick marks.   If it
  * works, generate the output and return 1, otherwise just return 0 and
  * let the caller figure it out.
@@ -1283,6 +1305,7 @@ text(MMIOT *f)
 		    else
 			Qchar(c, f);
 		    break;
+
 	case '[':   if ( tag_text(f) || !linkylinky(0, f) )
 			Qchar(c, f);
 		    break;
@@ -1386,7 +1409,14 @@ text(MMIOT *f)
 				
 		    case EOF:	Qchar('\\', f);
 				break;
-				
+
+#if WITH_LATEX
+		    case '[':
+		    case '(':   if ( mathhandler(f, '\\', (c =='(')?')':']') )
+				    break;
+				/* else fall through to default */
+#endif
+			
 		    default:    if ( escaped(f,c) ||
 				     strchr(">#.-+{}]![*_\\()`", c) )
 				    Qchar(c, f);
@@ -1412,6 +1442,16 @@ text(MMIOT *f)
 			Qchar(c, f);
 		    break;
 
+#if WITH_LATEX
+	case '$':   if ( peek(f, 1) == '$' ) {
+			pull(f);
+			if ( mathhandler(f, '$', '$') )
+			    break;
+			Qchar('$', f);
+		    }
+		    /* fall through to default */
+#endif
+	
 	default:    Qchar(c, f);
 		    break;
 	}
@@ -1426,26 +1466,26 @@ text(MMIOT *f)
 static void
 printheader(Paragraph *pp, MMIOT *f)
 {
-#if WITH_ID_ANCHOR
-    Qprintf(f, "<h%d", pp->hnumber);
-    if ( f->flags & MKD_TOC ) {
-	Qstring(" id=\"", f);
-	mkd_string_to_anchor(T(pp->text->text),
-			     S(pp->text->text),
-			     (mkd_sta_function_t)Qchar, f, 1);
-	Qchar('"', f);
-    }
-    Qchar('>', f);
-#else
-    if ( f->flags & MKD_TOC ) {
-	Qstring("<a name=\"", f);
-	mkd_string_to_anchor(T(pp->text->text),
-			     S(pp->text->text),
-			     (mkd_sta_function_t)Qchar, f, 1);
-	Qstring("\"></a>\n", f);
+    if ( f->flags & MKD_IDANCHOR ) {
+	Qprintf(f, "<h%d", pp->hnumber);
+	if ( f->flags & MKD_TOC ) {
+	    Qstring(" id=\"", f);
+	    mkd_string_to_anchor(T(pp->text->text),
+				 S(pp->text->text),
+				 (mkd_sta_function_t)Qchar, f, 1, f->flags);
+	    Qchar('"', f);
+	}
+	Qchar('>', f);
+    } else {
+	if ( f->flags & MKD_TOC ) {
+	    Qstring("<a name=\"", f);
+	    mkd_string_to_anchor(T(pp->text->text),
+				 S(pp->text->text),
+				 (mkd_sta_function_t)Qchar, f, 1, f->flags);
+	    Qstring("\"></a>\n", f);
+	}
+	Qprintf(f, "<h%d>", pp->hnumber);
     }
-    Qprintf(f, "<h%d>", pp->hnumber);
-#endif
     push(T(pp->text->text), S(pp->text->text), f);
     text(f);
     Qprintf(f, "</h%d>", pp->hnumber);
@@ -1812,15 +1852,19 @@ mkd_document(Document *p, char **res)
 	    if ( p->ctx->flags & MKD_EXTRA_FOOTNOTE )
 		mkd_extra_footnotes(p->ctx);
 	    p->html = 1;
-	}
-
-	size = S(p->ctx->out);
+	    size = S(p->ctx->out);
 	
-	if ( (size == 0) || T(p->ctx->out)[size-1] )
-	    EXPAND(p->ctx->out) = 0;
+	    if ( (size == 0) || T(p->ctx->out)[size-1] ) {
+		/* Add a null byte at the end of the generated html,
+		 * but pretend it doesn't exist.
+		 */
+		EXPAND(p->ctx->out) = 0;
+		--S(p->ctx->out);
+	    }
+	}
 	
 	*res = T(p->ctx->out);
-	return size;
+	return S(p->ctx->out);
     }
     return EOF;
 }

data/ext/markdown.c

@@ -178,20 +178,16 @@ splitline(Line *t, int cutpoint)
 
 #define UNCHECK(l) ((l)->flags &= ~CHECKED)
 
-#ifdef WITH_FENCED_CODE
-# define UNLESS_FENCED(t) if (fenced) { \
+#define UNLESS_FENCED(t) if (fenced) { \
     other = 1; l->count += (c == ' ' ? 0 : -1); \
   } else { t; }
-#else
-# define UNLESS_FENCED(t) t;
-#endif
 
 /*
  * walk a line, seeing if it's any of half a dozen interesting regular
  * types.
  */
 static void
-checkline(Line *l)
+checkline(Line *l, DWORD flags)
 {
     int eol, i;
     int dashes = 0, spaces = 0,
@@ -210,6 +206,7 @@ checkline(Line *l)
 
     for (i=l->dle; i<eol; i++) {
 	register int c = T(l->text)[i];
+	int is_fence_char = 0;
 
 	if ( c != ' ' ) l->count++;
 
@@ -219,14 +216,20 @@ checkline(Line *l)
 	case '=':  equals = 1; break;
 	case '_':  UNLESS_FENCED(underscores = 1); break;
 	case '*':  stars = 1; break;
-#if WITH_FENCED_CODE
-	case '~':  if (other) return; fenced = 1; tildes = 1; break;
-	case '`':  if (other) return; fenced = 1; backticks = 1; break;
-#endif
 	default:
-    other = 1;
-    l->count--;
-    if (!fenced) return;
+	    if (flags & MKD_FENCEDCODE) {
+		switch (c) {
+		case '~':  if (other) return; is_fence_char = 1; tildes = 1; break;
+		case '`':  if (other) return; is_fence_char = 1; backticks = 1; break;
+		}
+		if (is_fence_char) {
+		    fenced = 1;
+		    break;
+		}
+	    }
+	    other = 1;
+	    l->count--;
+	    if (!fenced) return;
 	}
     }
 
@@ -242,28 +245,32 @@ checkline(Line *l)
     if ( stars || underscores ) { l->kind = chk_hr; }
     else if ( dashes ) { l->kind = chk_dash; }
     else if ( equals ) { l->kind = chk_equal; }
-#if WITH_FENCED_CODE
     else if ( tildes ) { l->kind = chk_tilde; }
     else if ( backticks ) { l->kind = chk_backtick; }
-#endif
 }
 
 
 
+/* markdown only does special handling of comments if the comment end
+ * is at the end of a line
+ */
 static Line *
 commentblock(Paragraph *p, int *unclosed)
 {
     Line *t, *ret;
     char *end;
 
-    for ( t = p->text; t ; t = t->next) {
-	if ( end = strstr(T(t->text), "-->") ) {
-	    splitline(t, 3 + (end - T(t->text)) );
-	    ret = t->next;
-	    t->next = 0;
-	    return ret;
-	}
+       for ( t = p->text; t ; t = t->next) {
+	   if ( end = strstr(T(t->text), "-->") ) {
+	       if ( nextnonblank(t, 3 + (end - T(t->text))) < S(t->text) )
+		   continue;
+	       /*splitline(t, 3 + (end - T(t->text)) );*/
+	       ret = t->next;
+	       t->next = 0;
+	       return ret;
+	   }
     }
+
     *unclosed = 1;
     return t;
 
@@ -307,8 +314,8 @@ htmlblock(Paragraph *p, struct kw *tag, int *unclosed)
 	    else { 
 		if ( closing = (c == '/') ) c = flogetc(&f);
 
-		for ( i=0; i < tag->size; c=flogetc(&f) ) {
-		    if ( tag->id[i++] != toupper(c) )
+		for ( i=0; i < tag->size; i++, c=flogetc(&f) ) {
+		    if ( tag->id[i] != toupper(c) )
 			break;
 		}
 
@@ -372,10 +379,10 @@ iscode(Line *t)
 
 
 static inline int
-ishr(Line *t)
+ishr(Line *t, DWORD flags)
 {
     if ( ! (t->flags & CHECKED) )
-	checkline(t);
+	checkline(t, flags);
 
     if ( t->count > 2 )
 	return t->kind == chk_hr || t->kind == chk_dash || t->kind == chk_equal;
@@ -384,7 +391,7 @@ ishr(Line *t)
 
 
 static int
-issetext(Line *t, int *htyp)
+issetext(Line *t, int *htyp, DWORD flags)
 {
     Line *n;
     
@@ -394,7 +401,7 @@ issetext(Line *t, int *htyp)
 
     if ( (n = t->next) ) {
 	if ( !(n->flags & CHECKED) )
-	    checkline(n);
+	    checkline(n, flags);
 
 	if ( n->kind == chk_dash || n->kind == chk_equal ) {
 	    *htyp = SETEXT;
@@ -406,7 +413,7 @@ issetext(Line *t, int *htyp)
 
 
 static int
-ishdr(Line *t, int *htyp)
+ishdr(Line *t, int *htyp, DWORD flags)
 {
     /* ANY leading `#`'s make this into an ETX header
      */
@@ -417,27 +424,28 @@ ishdr(Line *t, int *htyp)
 
     /* And if not, maybe it's a SETEXT header instead
      */
-    return issetext(t, htyp);
+    return issetext(t, htyp, flags);
 }
 
 
 static inline int
-end_of_block(Line *t)
+end_of_block(Line *t, DWORD flags)
 {
     int dummy;
     
     if ( !t )
 	return 0;
 	
-    return ( (S(t->text) <= t->dle) || ishr(t) || ishdr(t, &dummy) );
+    return ( (S(t->text) <= t->dle) || ishr(t, flags) || ishdr(t, &dummy, flags) );
 }
 
 
 static Line*
-is_discount_dt(Line *t, int *clip)
+is_discount_dt(Line *t, int *clip, DWORD flags)
 {
-#if USE_DISCOUNT_DL
-    if ( t && t->next
+    if ( !(flags & MKD_NODLDISCOUNT)
+	   && t
+	   && t->next
 	   && (S(t->text) > 2)
 	   && (t->dle == 0)
 	   && (T(t->text)[0] == '=')
@@ -447,9 +455,8 @@ is_discount_dt(Line *t, int *clip)
 	    return t;
 	}
 	else
-	    return is_discount_dt(t->next, clip);
+	    return is_discount_dt(t->next, clip, flags);
     }
-#endif
     return 0;
 }
 
@@ -463,15 +470,15 @@ is_extra_dd(Line *t)
 
 
 static Line*
-is_extra_dt(Line *t, int *clip)
+is_extra_dt(Line *t, int *clip, DWORD flags)
 {
-#if USE_EXTRA_DL
-    
-    if ( t && t->next && S(t->text) && T(t->text)[0] != '='
+    if ( flags & MKD_DLEXTRA
+	   && t
+	   && t->next && S(t->text) && T(t->text)[0] != '='
 		      && T(t->text)[S(t->text)-1] != '=') {
 	Line *x;
     
-	if ( iscode(t) || end_of_block(t) )
+	if ( iscode(t) || end_of_block(t, flags) )
 	    return 0;
 
 	if ( (x = skipempty(t->next)) && is_extra_dd(x) ) {
@@ -479,25 +486,24 @@ is_extra_dt(Line *t, int *clip)
 	    return t;
 	}
 	
-	if ( x=is_extra_dt(t->next, clip) )
+	if ( x=is_extra_dt(t->next, clip, flags) )
 	    return x;
     }
-#endif
     return 0;
 }
 
 
 static Line*
-isdefinition(Line *t, int *clip, int *kind)
+isdefinition(Line *t, int *clip, int *kind, DWORD flags)
 {
     Line *ret;
 
     *kind = 1;
-    if ( ret = is_discount_dt(t,clip) )
+    if ( ret = is_discount_dt(t,clip,flags) )
 	return ret;
 
     *kind=2;
-    return is_extra_dt(t,clip);
+    return is_extra_dt(t,clip,flags);
 }
 
 
@@ -507,10 +513,10 @@ islist(Line *t, int *clip, DWORD flags, int *list_type)
     int i, j;
     char *q;
     
-    if ( end_of_block(t) )
+    if ( end_of_block(t, flags) )
 	return 0;
 
-    if ( !(flags & (MKD_NODLIST|MKD_STRICT)) && isdefinition(t,clip,list_type) )
+    if ( !(flags & (MKD_NODLIST|MKD_STRICT)) && isdefinition(t,clip,list_type,flags) )
 	return DL;
 
     if ( strchr("*-+", T(t->text)[t->dle]) && isspace(T(t->text)[t->dle+1]) ) {
@@ -615,12 +621,14 @@ codeblock(Paragraph *p)
 }
 
 
-#ifdef WITH_FENCED_CODE
 static int
-iscodefence(Line *r, int size, line_type kind)
+iscodefence(Line *r, int size, line_type kind, DWORD flags)
 {
+    if ( !(flags & MKD_FENCEDCODE) )
+	return 0;
+
     if ( !(r->flags & CHECKED) )
-	checkline(r);
+	checkline(r, flags);
 
     if ( kind )
 	return (r->kind == kind) && (r->count >= size);
@@ -629,7 +637,7 @@ iscodefence(Line *r, int size, line_type kind)
 }
 
 static Paragraph *
-fencedcodeblock(ParagraphRoot *d, Line **ptr)
+fencedcodeblock(ParagraphRoot *d, Line **ptr, DWORD flags)
 {
     Line *first, *r;
     Paragraph *ret;
@@ -638,14 +646,14 @@ fencedcodeblock(ParagraphRoot *d, Line **ptr)
     
     /* don't allow zero-length code fences
      */
-    if ( (first->next == 0) || iscodefence(first->next, first->count, 0) )
+    if ( (first->next == 0) || iscodefence(first->next, first->count, 0, flags) )
 	return 0;
 
     /* find the closing fence, discard the fences,
      * return a Paragraph with the contents
      */
     for ( r = first; r && r->next; r = r->next )
-	if ( iscodefence(r->next, first->count, first->kind) ) {
+	if ( iscodefence(r->next, first->count, first->kind, flags) ) {
 	    (*ptr) = r->next->next;
 	    ret = Pp(d, first->next, CODE);
       if (S(first->text) - first->count > 0) {
@@ -663,7 +671,6 @@ fencedcodeblock(ParagraphRoot *d, Line **ptr)
 	}
     return 0;
 }
-#endif
 
 
 static int
@@ -689,7 +696,7 @@ endoftextblock(Line *t, int toplevelblock, DWORD flags)
 {
     int z;
 
-    if ( end_of_block(t) || isquote(t) )
+    if ( end_of_block(t, flags) || isquote(t) )
 	return 1;
 
     /* HORRIBLE STANDARDS KLUDGES:
@@ -878,9 +885,9 @@ listitem(Paragraph *p, int indent, DWORD flags, linefn check)
 	    indent = clip ? clip : 2;
 	}
 
-	if ( (q->dle < indent) && (ishr(q) || islist(q,&z,flags,&z)
+	if ( (q->dle < indent) && (ishr(q,flags) || islist(q,&z,flags,&z)
 					   || (check && (*check)(q)))
-			       && !issetext(q,&z) ) {
+			       && !issetext(q,&z,flags) ) {
 	    q = t->next;
 	    t->next = 0;
 	    return q;
@@ -902,7 +909,7 @@ definition_block(Paragraph *top, int clip, MMIOT *f, int kind)
 
     while (( labels = q )) {
 
-	if ( (q = isdefinition(labels, &z, &kind)) == 0 )
+	if ( (q = isdefinition(labels, &z, &kind, f->flags)) == 0 )
 	    break;
 
 	if ( (text = skipempty(q->next)) == 0 )
@@ -1254,11 +1261,9 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 	    
 	    ptr = codeblock(p);
 	}
-#if WITH_FENCED_CODE
-	else if ( iscodefence(ptr,3,0) && (p=fencedcodeblock(&d, &ptr)) )
+	else if ( iscodefence(ptr,3,0,f->flags) && (p=fencedcodeblock(&d, &ptr, f->flags)) )
 	    /* yay, it's already done */ ;
-#endif
-	else if ( ishr(ptr) ) {
+	else if ( ishr(ptr, f->flags) ) {
 	    p = Pp(&d, 0, HR);
 	    r = ptr;
 	    ptr = ptr->next;
@@ -1280,7 +1285,7 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 	    p->down = compile(p->text, 1, f);
 	    p->text = 0;
 	}
-	else if ( ishdr(ptr, &hdr_type) ) {
+	else if ( ishdr(ptr, &hdr_type, f->flags) ) {
 	    p = Pp(&d, ptr, HDR);
 	    ptr = headerblock(p, hdr_type);
 	}
@@ -1321,14 +1326,24 @@ mkd_compile(Document *doc, DWORD flags)
     if ( !doc )
 	return 0;
 
-    if ( doc->compiled )
-	return 1;
+    flags &= USER_FLAGS;
+    
+    if ( doc->compiled ) {
+	if ( doc->ctx->flags == flags )
+	    return 1;
+	else {
+	    if ( doc->code)
+		___mkd_freeParagraph(doc->code);
+	    if ( doc->ctx->footnotes )
+		___mkd_freefootnotes(doc->ctx);
+	}
+    }
 
     doc->compiled = 1;
     memset(doc->ctx, 0, sizeof(MMIOT) );
     doc->ctx->ref_prefix= doc->ref_prefix;
     doc->ctx->cb        = &(doc->cb);
-    doc->ctx->flags     = flags & USER_FLAGS;
+    doc->ctx->flags     = flags;
     CREATE(doc->ctx->in);
     doc->ctx->footnotes = malloc(sizeof doc->ctx->footnotes[0]);
     doc->ctx->footnotes->reference = 0;

data/ext/markdown.h

@@ -129,8 +129,14 @@ typedef struct mmiot {
 #define MKD_NODLIST	0x00100000
 #define MKD_EXTRA_FOOTNOTE 0x00200000
 #define MKD_NOSTYLE	0x00400000
-#define IS_LABEL	0x08000000
-#define USER_FLAGS	0x0FFFFFFF
+#define MKD_NODLDISCOUNT 0x00800000
+#define	MKD_DLEXTRA	0x01000000
+#define MKD_FENCEDCODE	0x02000000
+#define MKD_IDANCHOR	0x04000000
+#define MKD_GITHUBTAGS	0x08000000
+#define MKD_URLENCODEDANCHOR 0x10000000
+#define IS_LABEL	0x20000000
+#define USER_FLAGS	0x3FFFFFFF
 #define INPUT_MASK	(MKD_NOHEADER|MKD_TABSTOP)
 
     Callback_data *cb;
@@ -190,7 +196,7 @@ extern int  mkd_generateline(char *, int, FILE*, DWORD);
 extern void mkd_basename(Document*, char *);
 
 typedef int (*mkd_sta_function_t)(const int,const void*);
-extern void mkd_string_to_anchor(char*,int, mkd_sta_function_t, void*, int);
+extern void mkd_string_to_anchor(char*,int, mkd_sta_function_t, void*, int, DWORD);
 
 extern Document *mkd_in(FILE *, DWORD);
 extern Document *mkd_string(const char*,int, DWORD);
@@ -224,4 +230,9 @@ extern void __mkd_header_dle(Line *);
 
 extern int  __mkd_io_strget(struct string_stream *);
 
+/* utility function to do some operation and exit the current function
+ * if it fails
+ */
+#define DO_OR_DIE(op) if ( (op) == EOF ) return EOF; else 1
+
 #endif/*_MARKDOWN_D*/

data/ext/mkdio.c

@@ -16,6 +16,7 @@
 
 typedef ANCHOR(Line) LineAnchor;
 
+
 /* create a new blank Document
  */
 Document*
@@ -183,15 +184,13 @@ mkd_generatehtml(Document *p, FILE *output)
     char *doc;
     int szdoc;
 
-    if ( (szdoc = mkd_document(p, &doc)) != EOF ) {
-	if ( p->ctx->flags & MKD_CDATA )
-	    mkd_generatexml(doc, szdoc, output);
-	else
-	    fwrite(doc, szdoc, 1, output);
-	putc('\n', output);
-	return 0;
-    }
-    return -1;
+    DO_OR_DIE( szdoc = mkd_document(p,&doc) );
+    if ( p->ctx->flags & MKD_CDATA )
+	DO_OR_DIE( mkd_generatexml(doc, szdoc, output) );
+    else if ( fwrite(doc, szdoc, 1, output) != 1 )
+	return EOF;
+    DO_OR_DIE( putc('\n', output) );
+    return 0;
 }
 
 
@@ -213,37 +212,33 @@ markdown(Document *document, FILE *out, int flags)
  */
 void
 mkd_string_to_anchor(char *s, int len, mkd_sta_function_t outchar,
-				       void *out, int labelformat)
+				       void *out, int labelformat,
+				       DWORD flags)
 {
-#if WITH_URLENCODED_ANCHOR
     static const unsigned char hexchars[] = "0123456789abcdef";
-#endif
     unsigned char c;
 
     int i, size;
     char *line;
 
     size = mkd_line(s, len, &line, IS_LABEL);
-    
-#if !WITH_URLENCODED_ANCHOR
-    if ( labelformat && (size>0) && !isalpha(line[0]) )
+
+    if ( !(flags & MKD_URLENCODEDANCHOR)
+	 && labelformat
+	 && (size>0) && !isalpha(line[0]) )
 	(*outchar)('L',out);
-#endif
     for ( i=0; i < size ; i++ ) {
 	c = line[i];
 	if ( labelformat ) {
 	    if ( isalnum(c) || (c == '_') || (c == ':') || (c == '-') || (c == '.' ) )
 		(*outchar)(c, out);
-	    else
-#if WITH_URLENCODED_ANCHOR
-	    {
+	    else if ( flags & MKD_URLENCODEDANCHOR ) {
 		(*outchar)('%', out);
 		(*outchar)(hexchars[c >> 4 & 0xf], out);
 		(*outchar)(hexchars[c      & 0xf], out);
 	    }
-#else
+	    else
 		(*outchar)('.', out);
-#endif
 	}
 	else
 	    (*outchar)(c,out);
@@ -302,15 +297,16 @@ int
 mkd_generateline(char *bfr, int size, FILE *output, DWORD flags)
 {
     MMIOT f;
+    int status;
 
     mkd_parse_line(bfr, size, &f, flags);
     if ( flags & MKD_CDATA )
-	mkd_generatexml(T(f.out), S(f.out), output);
+	status = mkd_generatexml(T(f.out), S(f.out), output) != EOF;
     else
-	fwrite(T(f.out), S(f.out), 1, output);
+	status = fwrite(T(f.out), S(f.out), 1, output) == S(f.out);
 
     ___mkd_freemmiot(&f, 0);
-    return 0;
+    return status ? 0 : EOF;
 }
 
 

data/ext/mkdio.h

@@ -106,6 +106,13 @@ void mkd_ref_prefix(MMIOT*, char*);
 #define MKD_NODLIST	0x00100000	/* forbid definition lists */
 #define MKD_EXTRA_FOOTNOTE 0x00200000	/* enable markdown extra-style footnotes */
 #define MKD_NOSTYLE	0x00400000	/* don't extract <style> blocks */
+#define MKD_NODLDISCOUNT 0x00800000	/* disable discount-style definition lists */
+#define	MKD_DLEXTRA	0x01000000	/* enable extra-style definition lists */
+#define MKD_FENCEDCODE	0x02000000	/* enabled fenced code blocks */
+#define MKD_IDANCHOR	0x04000000	/* use id= anchors for TOC links */
+#define MKD_GITHUBTAGS	0x08000000	/* allow dash and underscore in element names */
+#define MKD_URLENCODEDANCHOR 0x10000000 /* urlencode non-identifier chars instead of replacing with dots */
+
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
 /* special flags for mkd_in() and mkd_string()

data/ext/pgm_options.c

@@ -25,7 +25,7 @@ static struct _opt {
     char *name;
     char *desc;
     int off;
-    int skip;
+    int skip; /* this opt is a synonym */
     int sayenable;
     mkd_flag_t flag;
 } opts[] = {
@@ -55,6 +55,12 @@ static struct _opt {
     { "footnotes",     "markdown extra footnotes",   0, 0, 1, MKD_EXTRA_FOOTNOTE },
     { "footnote",      "markdown extra footnotes",   0, 1, 1, MKD_EXTRA_FOOTNOTE },
     { "style",         "extract style blocks",       1, 0, 1, MKD_NOSTYLE },
+    { "dldiscount",    "discount-style definition lists", 1, 0, 1, MKD_NODLDISCOUNT },
+    { "dlextra",       "extra-style definition lists", 0, 0, 1, MKD_DLEXTRA },
+    { "fencedcode",    "fenced code blocks",         0, 0, 1, MKD_FENCEDCODE },
+    { "idanchor",      "id= anchors in TOC",         0, 0, 1, MKD_IDANCHOR },
+    { "githubtags",    "permit - and _ in element names", 0, 0, 0, MKD_GITHUBTAGS },
+    { "urlencodedanchor", "urlencode special chars in TOC links", 0, 0, 0, MKD_URLENCODEDANCHOR },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])

data/ext/rdiscount.c

@@ -14,6 +14,9 @@ typedef struct {
  * The following flags are handled specially:
  * - MKD_TABSTOP: Always set.
  * - MKD_NOHEADER: Always set.
+ * - MKD_DLEXTRA: Always set. (For compatibility with RDiscount 2.1.8 and earlier.)
+ * - MKD_FENCEDCODE: Always set. (For compatibility with RDiscount 2.1.8 and earlier.)
+ * - MKD_GITHUBTAGS: Always set. (For compatibility with RDiscount 2.1.8 and earlier.)
  * - MKD_NOPANTS: Set unless the "smart" accessor returns true.
  * 
  * See rb_rdiscount__get_flags() for the detailed implementation.
@@ -119,7 +122,7 @@ int rb_rdiscount__get_flags(VALUE ruby_obj)
     AccessorFlagPair *entry;
     
     /* compile flags */
-    int flags = MKD_TABSTOP | MKD_NOHEADER;
+    int flags = MKD_TABSTOP | MKD_NOHEADER | MKD_DLEXTRA | MKD_FENCEDCODE | MKD_GITHUBTAGS;
     
     /* The "smart" accessor turns OFF the MKD_NOPANTS flag. */
     if ( rb_funcall(ruby_obj, rb_intern("smart"), 0) != Qtrue ) {

data/ext/toc.c

@@ -62,11 +62,11 @@ mkd_toc(Document *p, char **doc)
 		    Csprintf(&res, "%*s<li><a href=\"#", srcp->hnumber, "");
 		    mkd_string_to_anchor(T(srcp->text->text),
 					 S(srcp->text->text),
-					 (mkd_sta_function_t)Csputc, &res,1);
+					 (mkd_sta_function_t)Csputc, &res,1,p->ctx->flags);
 		    Csprintf(&res, "\">");
 		    mkd_string_to_anchor(T(srcp->text->text),
 					 S(srcp->text->text),
-					 (mkd_sta_function_t)Csputc, &res,0);
+					 (mkd_sta_function_t)Csputc, &res,0,p->ctx->flags);
 		    Csprintf(&res, "</a>");
 
 		    first = 0;

data/ext/version.c

@@ -7,24 +7,7 @@ char markdown_version[] = VERSION
 #if USE_AMALLOC
 		" DEBUG"
 #endif
-#if USE_DISCOUNT_DL
-# if USE_EXTRA_DL
-		" DL=BOTH"
-# else
-		" DL=DISCOUNT"
-# endif
-#elif USE_EXTRA_DL
-		" DL=EXTRA"
-#else
-		" DL=NONE"
-#endif
-#if WITH_ID_ANCHOR
-		" ID-ANCHOR"
-#endif
-#if WITH_GITHUB_TAGS
-		" GITHUB-TAGS"
-#endif
-#if WITH_FENCED_CODE
-		" FENCED-CODE"
+#if WITH_LATEX
+		" LATEX"
 #endif
 		;

data/ext/xml.c

@@ -47,9 +47,9 @@ mkd_generatexml(char *p, int size, FILE *out)
 	c = *p++;
 
 	if ( entity = mkd_xmlchar(c) )
-	    fputs(entity, out);
+	    DO_OR_DIE( fputs(entity, out) );
 	else
-	    fputc(c, out);
+	    DO_OR_DIE( fputc(c, out) );
     }
     return 0;
 }

data/ext/xmlpage.c

@@ -22,27 +22,25 @@ mkd_xhtmlpage(Document *p, int flags, FILE *out)
     extern char *mkd_doc_title(Document *);
     
     if ( mkd_compile(p, flags) ) {
-	fprintf(out, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-	fprintf(out, "<!DOCTYPE html "
-		     " PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
-		     " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
+	DO_OR_DIE( fprintf(out, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+				"<!DOCTYPE html "
+				" PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
+				" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"
+				"<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n") );
 
-	fprintf(out, "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n");
-
-	fprintf(out, "<head>\n");
-	if ( title = mkd_doc_title(p) )
-	    fprintf(out, "<title>%s</title>\n", title);
-	mkd_generatecss(p, out);
-	fprintf(out, "</head>\n");
-	
-	fprintf(out, "<body>\n");
-	mkd_generatehtml(p, out);
-	fprintf(out, "</body>\n");
-	fprintf(out, "</html>\n");
+	DO_OR_DIE( fprintf(out, "<head>\n") );
+	if ( title = mkd_doc_title(p) ) {
+	    DO_OR_DIE( fprintf(out, "<title>%s</title>\n", title) );
+	}
+	DO_OR_DIE( mkd_generatecss(p, out) );
+	DO_OR_DIE( fprintf(out, "</head>\n"
+				"<body>\n") );
 	
-	mkd_cleanup(p);
+	DO_OR_DIE( mkd_generatehtml(p, out) );
+	DO_OR_DIE( fprintf(out, "</body>\n"
+				"</html>\n") );
 
 	return 0;
     }
-    return -1;
+    return EOF;
 }

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '2.1.8'
+  VERSION = '2.2.0'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '2.1.8'
+  s.version = '2.2.0'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
   s.date = '2015-02-01'
-  s.email = 'davidfstr@gmail.com'
+  s.email = 'david@dafoster.net'
   s.homepage = 'http://dafoster.net/projects/rdiscount/'
   s.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White", "David Foster"]
-  s.license = "BSD"
+  s.license = "BSD-3-Clause"
   # = MANIFEST =
   s.files = %w[
     BUILDING

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdiscount
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.2.0
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -14,7 +14,7 @@ cert_chain: []
 date: 2015-02-01 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: davidfstr@gmail.com
+email: david@dafoster.net
 executables:
 - rdiscount
 extensions:
@@ -72,7 +72,7 @@ files:
 - test/rdiscount_test.rb
 homepage: http://dafoster.net/projects/rdiscount/
 licenses:
-- BSD
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wink
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fast Implementation of Gruber's Markdown in C