rdiscount 2.0.7.3 → 2.1.6

data/ext/pgm_options.h

@@ -0,0 +1,9 @@
+#ifndef PGM_OPTIONS_D
+#define PGM_OPTIONS_D
+
+#include <mkdio.h>
+
+int set_flag(mkd_flag_t *flags, char *optionstring);
+void show_flags(int byname);
+
+#endif/*PGM_OPTIONS_D*/

data/ext/rdiscount.c

@@ -3,6 +3,37 @@
 #include "ruby.h"
 #include "mkdio.h"
 
+typedef struct {
+    char *accessor_name;
+    int flag;
+} AccessorFlagPair;
+
+/* 
+ * Maps accessor names on the RDiscount object to Discount flags.
+ * 
+ * The following flags are handled specially:
+ * - MKD_TABSTOP: Always set.
+ * - MKD_NOHEADER: Always set.
+ * - MKD_NOPANTS: Set unless the "smart" accessor returns true.
+ * 
+ * See rb_rdiscount__get_flags() for the detailed implementation.
+ */
+static AccessorFlagPair ACCESSOR_2_FLAG[] = {
+    { "filter_html", MKD_NOHTML },
+    { "footnotes", MKD_EXTRA_FOOTNOTE },
+    { "generate_toc", MKD_TOC },
+    { "no_image", MKD_NOIMAGE },
+    { "no_links", MKD_NOLINKS },
+    { "no_tables", MKD_NOTABLES },
+    { "strict", MKD_STRICT },
+    { "autolink", MKD_AUTOLINK },
+    { "safelink", MKD_SAFELINK },
+    { "no_pseudo_protocols", MKD_NO_EXT },
+    { "no_superscript", MKD_NOSUPERSCRIPT },
+    { "no_strikethrough", MKD_NOSTRIKETHROUGH },
+    { NULL, 0 }     /* sentinel */
+};
+
 static VALUE rb_cRDiscount;
 
 static VALUE
@@ -27,7 +58,7 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
      * of at least 21 bits).
      */
     char *old_locale = strdup(setlocale(LC_CTYPE, NULL));
-    setlocale(LC_CTYPE, "C");   // ASCII (and passthru characters > 127)
+    setlocale(LC_CTYPE, "C");   /* ASCII (and passthru characters > 127) */
 
     MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
 
@@ -46,8 +77,8 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
 
     /* force the input encoding */
     if ( rb_respond_to(text, rb_intern("encoding")) ) {
-      encoding = rb_funcall(text, rb_intern("encoding"), 0);
-      rb_funcall(buf, rb_intern("force_encoding"), 1, encoding);
+        encoding = rb_funcall(text, rb_intern("encoding"), 0);
+        rb_funcall(buf, rb_intern("force_encoding"), 1, encoding);
     }
 
     return buf;
@@ -85,55 +116,24 @@ rb_rdiscount_toc_content(int argc, VALUE *argv, VALUE self)
 
 int rb_rdiscount__get_flags(VALUE ruby_obj)
 {
-  /* compile flags */
-  int flags = MKD_TABSTOP | MKD_NOHEADER;
-
-  /* smart */
-  if ( rb_funcall(ruby_obj, rb_intern("smart"), 0) != Qtrue )
-      flags = flags | MKD_NOPANTS;
-
-  /* filter_html */
-  if ( rb_funcall(ruby_obj, rb_intern("filter_html"), 0) == Qtrue )
-      flags = flags | MKD_NOHTML;
-
-  /* footnotes */
-  if ( rb_funcall(ruby_obj, rb_intern("footnotes"), 0) == Qtrue )
-      flags = flags | MKD_EXTRA_FOOTNOTE;
-
-  /* generate_toc */
-  if ( rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
-    flags = flags | MKD_TOC;
-
-  /* no_image */
-  if ( rb_funcall(ruby_obj, rb_intern("no_image"), 0) == Qtrue)
-    flags = flags | MKD_NOIMAGE;
-
-  /* no_links */
-  if ( rb_funcall(ruby_obj, rb_intern("no_links"), 0) == Qtrue)
-    flags = flags | MKD_NOLINKS;
-
-  /* no_tables */
-  if ( rb_funcall(ruby_obj, rb_intern("no_tables"), 0) == Qtrue)
-    flags = flags | MKD_NOTABLES;
-
-  /* strict */
-  if ( rb_funcall(ruby_obj, rb_intern("strict"), 0) == Qtrue)
-    flags = flags | MKD_STRICT;
-
-  /* autolink */
-  if ( rb_funcall(ruby_obj, rb_intern("autolink"), 0) == Qtrue)
-    flags = flags | MKD_AUTOLINK;
-
-  /* safelink */
-  if ( rb_funcall(ruby_obj, rb_intern("safelink"), 0) == Qtrue)
-    flags = flags | MKD_SAFELINK;
-
-  /* no_pseudo_protocols */
-  if ( rb_funcall(ruby_obj, rb_intern("no_pseudo_protocols"), 0) == Qtrue)
-    flags = flags | MKD_NO_EXT;
-
-
-  return flags;
+    AccessorFlagPair *entry;
+    
+    /* compile flags */
+    int flags = MKD_TABSTOP | MKD_NOHEADER;
+    
+    /* The "smart" accessor turns OFF the MKD_NOPANTS flag. */
+    if ( rb_funcall(ruby_obj, rb_intern("smart"), 0) != Qtrue ) {
+        flags = flags | MKD_NOPANTS;
+    }
+    
+    /* Handle standard flags declared in ACCESSOR_2_FLAG */
+    for ( entry = ACCESSOR_2_FLAG; entry->accessor_name; entry++ ) {
+        if ( rb_funcall(ruby_obj, rb_intern(entry->accessor_name), 0) == Qtrue ) {
+            flags = flags | entry->flag;
+        }
+    }
+    
+    return flags;
 }
 
 

data/ext/setup.c

@@ -18,7 +18,6 @@
 #include "amalloc.h"
 #include "tags.h"
     
-static int need_to_setup = 1;
 static int need_to_initrng = 1;
 
 void
@@ -29,19 +28,12 @@ mkd_initialize()
 	need_to_initrng = 0;
 	INITRNG(time(0));
     }
-    if ( need_to_setup ) {
-	need_to_setup = 0;
-	mkd_prepare_tags();
-    }
 }
 
 
 void
 mkd_shlib_destructor()
 {
-    if ( !need_to_setup ) {
-	need_to_setup = 1;
-	mkd_deallocate_tags();
-    }
+    mkd_deallocate_tags();
 }
 

data/ext/tags.c

@@ -4,19 +4,33 @@
 #include "cstring.h"
 #include "tags.h"
 
-STRING(struct kw) blocktags;
+STRING(struct kw) extratags;
+
+/* the standard collection of tags are built and sorted when
+ * discount is configured, so all we need to do is pull them
+ * in and use them.
+ *
+ * Additional tags still need to be allocated, sorted, and deallocated.
+ */
+#include "blocktags"
 
 
-/* define a html block tag
+/* define an additional html block tag
  */
 void
 mkd_define_tag(char *id, int selfclose)
 {
-    struct kw *p = &EXPAND(blocktags);
-
-    p->id = id;
-    p->size = strlen(id);
-    p->selfclose = selfclose;
+    struct kw *p;
+
+    /* only add the new tag if it doesn't exist in
+     * either the standard or extra tag tables.
+     */
+    if ( !(p = mkd_search_tags(id, strlen(id))) ) {
+	p = &EXPAND(extratags);
+	p->id = id;
+	p->size = strlen(id);
+	p->selfclose = selfclose;
+    }
 }
 
 
@@ -37,87 +51,41 @@ casort(struct kw *a, struct kw *b)
 typedef int (*stfu)(const void*,const void*);
 
 
-/* sort the list of html block tags for later searching
+/* sort the list of extra html block tags for later searching
  */
 void
 mkd_sort_tags()
 {
-    qsort(T(blocktags), S(blocktags), sizeof(struct kw), (stfu)casort);
+    qsort(T(extratags), S(extratags), sizeof(struct kw), (stfu)casort);
 }
 
 
-
 /* look for a token in the html block tag list
  */
 struct kw*
 mkd_search_tags(char *pat, int len)
 {
     struct kw key;
+    struct kw *ret;
     
     key.id = pat;
     key.size = len;
     
-    return bsearch(&key, T(blocktags), S(blocktags), sizeof key, (stfu)casort);
-}
-
-
-static int populated = 0;
+    if ( (ret=bsearch(&key,blocktags,NR_blocktags,sizeof key,(stfu)casort)) )
+	return ret;
 
+    if ( S(extratags) )
+	return bsearch(&key,T(extratags),S(extratags),sizeof key,(stfu)casort);
+    
+    return 0;
+}
 
-/* load in the standard collection of html tags that markdown supports
- */
-void
-mkd_prepare_tags()
-{
-
-#define KW(x)	mkd_define_tag(x, 0)
-#define SC(x)	mkd_define_tag(x, 1)
 
-    if ( populated ) return;
-    populated = 1;
-    
-    KW("STYLE");
-    KW("SCRIPT");
-    KW("ADDRESS");
-    KW("BDO");
-    KW("BLOCKQUOTE");
-    KW("CENTER");
-    KW("DFN");
-    KW("DIV");
-    KW("OBJECT");
-    KW("H1");
-    KW("H2");
-    KW("H3");
-    KW("H4");
-    KW("H5");
-    KW("H6");
-    KW("LISTING");
-    KW("NOBR");
-    KW("UL");
-    KW("P");
-    KW("OL");
-    KW("DL");
-    KW("PLAINTEXT");
-    KW("PRE");
-    KW("TABLE");
-    KW("WBR");
-    KW("XMP");
-    SC("HR");
-    SC("BR");
-    KW("IFRAME");
-    KW("MAP");
-
-    mkd_sort_tags();
-} /* mkd_prepare_tags */
-
-
-/* destroy the blocktags list (for shared libraries)
+/* destroy the extratags list (for shared libraries)
  */
 void
 mkd_deallocate_tags()
 {
-    if ( S(blocktags) > 0 ) {
-	populated = 0;
-	DELETE(blocktags);
-    }
+    if ( S(extratags) > 0 )
+	DELETE(extratags);
 } /* mkd_deallocate_tags */

data/ext/toc.c

@@ -1,7 +1,8 @@
 /*
  * toc -- spit out a table of contents based on header blocks
  *
- * Copyright (C) 2008 Jjgod Jiang, David L Parsons.
+ * Copyright (C) 2008 Jjgod Jiang, David L Parsons
+ * portions Copyright (C) 2011 Stefano D'Angelo
  * The redistribution terms are provided in the COPYRIGHT file that must
  * be distributed with this source code.
  */
@@ -23,6 +24,7 @@ mkd_toc(Document *p, char **doc)
     int last_hnumber = 0;
     Cstring res;
     int size;
+    int first = 1;
     
     if ( !(doc && p && p->ctx) ) return -1;
 
@@ -38,16 +40,23 @@ mkd_toc(Document *p, char **doc)
 	    for ( srcp = tp->down; srcp; srcp = srcp->next ) {
 		if ( srcp->typ == HDR && srcp->text ) {
 	    
-		    if ( last_hnumber >= srcp->hnumber ) {
-			while ( last_hnumber > srcp->hnumber ) {
-			    Csprintf(&res, "%*s</ul></li>\n", last_hnumber-1,"");
-			    --last_hnumber;
-			}
+		    while ( last_hnumber > srcp->hnumber ) {
+			if ( (last_hnumber - srcp->hnumber) > 1 )
+				Csprintf(&res, "\n");
+			Csprintf(&res, "</li>\n%*s</ul>\n%*s",
+				 last_hnumber-1, "", last_hnumber-1, "");
+			--last_hnumber;
 		    }
 
+		    if ( last_hnumber == srcp->hnumber )
+			Csprintf(&res, "</li>\n");
+		    else if ( (srcp->hnumber > last_hnumber) && !first )
+			Csprintf(&res, "\n");
+
 		    while ( srcp->hnumber > last_hnumber ) {
-			Csprintf(&res, "%*s%s<ul>\n", last_hnumber, "",
-				    last_hnumber ? "<li>" : "");
+			Csprintf(&res, "%*s<ul>\n", last_hnumber, "");
+			if ( (srcp->hnumber - last_hnumber) > 1 )
+			    Csprintf(&res, "%*s<li>\n", last_hnumber+1, "");
 			++last_hnumber;
 		    }
 		    Csprintf(&res, "%*s<li><a href=\"#", srcp->hnumber, "");
@@ -59,7 +68,8 @@ mkd_toc(Document *p, char **doc)
 					 S(srcp->text->text),
 					 (mkd_sta_function_t)Csputc, &res,0);
 		    Csprintf(&res, "</a>");
-		    Csprintf(&res, "</li>\n");
+
+		    first = 0;
 		}
 	    }
         }
@@ -67,7 +77,8 @@ mkd_toc(Document *p, char **doc)
 
     while ( last_hnumber > 0 ) {
 	--last_hnumber;
-	Csprintf(&res, last_hnumber ? "%*s</ul></li>\n" : "%*s</ul>\n", last_hnumber, "");
+	Csprintf(&res, "</li>\n%*s</ul>\n%*s",
+		 last_hnumber, "", last_hnumber, "");
     }
 
     if ( (size = S(res)) > 0 ) {

data/ext/version.c

@@ -18,5 +18,13 @@ char markdown_version[] = VERSION
 #else
 		" DL=NONE"
 #endif
-
+#if WITH_ID_ANCHOR
+		" ID-ANCHOR"
+#endif
+#if WITH_GITHUB_TAGS
+		" GITHUB-TAGS"
+#endif
+#if WITH_FENCED_CODE
+		" FENCED-CODE"
+#endif
 		;

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '2.0.7'
+  VERSION = '2.1.6'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -68,6 +68,12 @@ class RDiscount
 
   # Do not process pseudo-protocols like <tt>[](id:name)</tt>
   attr_accessor :no_pseudo_protocols
+  
+  # Disable superscript processing.
+  attr_accessor :no_superscript
+  
+  # Disable strikethrough processing.
+  attr_accessor :no_strikethrough
 
   # Create a RDiscount Markdown processor. The +text+ argument
   # should be a string containing Markdown text. Additional arguments may be

data/rdiscount.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '2.0.7.3'
+  s.version = '2.1.6'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2013-05-07'
+  s.date = '2013-05-28'
   s.email = 'davidfstr@gmail.com'
   s.homepage = 'http://dafoster.net/projects/rdiscount/'
   s.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White", "David Foster"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     ext/amalloc.c
     ext/amalloc.h
     ext/basename.c
+    ext/blocktags
     ext/config.h
     ext/css.c
     ext/cstring.h
@@ -28,11 +29,15 @@ Gem::Specification.new do |s|
     ext/extconf.rb
     ext/flags.c
     ext/generate.c
+    ext/github_flavoured.c
     ext/html5.c
     ext/markdown.c
     ext/markdown.h
     ext/mkdio.c
     ext/mkdio.h
+    ext/mktags.c
+    ext/pgm_options.c
+    ext/pgm_options.h
     ext/rdiscount.c
     ext/resource.c
     ext/setup.c