rdiscount 2.1.6 → 2.1.7

data/BUILDING

@@ -20,7 +20,8 @@ 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
+    $ ./configure.sh --with-fenced-code --with-github-tags --with-dl=both
+    $ make  # ensure it compiles
     $ cd ..
     $ rake gather
     $ rake build
@@ -88,7 +89,7 @@ You should also look for RDiscount-specific bugs & feature requests in the
 GitHub tracker and fix a few.
 
 If any bugs were fixed or features added, be sure to rerun the
-release tests mentioned above.
+release tests mentioned above. And don't forget to add new tests!
 
 Update the CHANGELOG.
 

data/README.markdown

@@ -8,7 +8,7 @@ passes the [Markdown 1.0 test suite][2].
 
 CODE: `git clone git://github.com/davidfstr/rdiscount.git`  
 HOME: <http://dafoster.net/projects/rdiscount/>  
-DOCS: <http://rdoc.info/github/davidfstr/rdiscount/RDiscount>  
+DOCS: <http://rdoc.info/github/davidfstr/rdiscount/master/RDiscount>  
 BUGS: <http://github.com/davidfstr/rdiscount/issues>  
 
 Discount was developed by [David Loren Parsons][3]. The Ruby extension

data/ext/VERSION

@@ -1 +1 @@
-2.1.6
+2.1.7

data/ext/config.h

@@ -13,6 +13,10 @@
 /* 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/generate.c

@@ -73,6 +73,10 @@ isthisspace(MMIOT *f, int i)
 {
     int c = peek(f, i);
 
+    if ( c == EOF )
+	return 1;
+    if ( c & 0x80 )
+	return 0;
     return isspace(c) || (c < ' ');
 }
 
@@ -1582,11 +1586,17 @@ printblock(Paragraph *pp, MMIOT *f)
 
 
 static void
-printcode(Line *t, MMIOT *f)
+printcode(Line *t, char *lang, MMIOT *f)
 {
     int blanks;
 
-    Qstring("<pre><code>", f);
+    Qstring("<pre><code", f);
+    if (lang) {
+      Qstring(" class=\"", f);
+      Qstring(lang, f);
+      Qstring("\"", f);
+    }
+    Qstring(">", f);
     for ( blanks = 0; t ; t = t->next ) {
 	if ( S(t->text) > t->dle ) {
 	    while ( blanks ) {
@@ -1699,7 +1709,7 @@ display(Paragraph *p, MMIOT *f)
 	break;
 	
     case CODE:
-	printcode(p->text, f);
+	printcode(p->text, p->lang, f);
 	break;
 	
     case QUOTE:

data/ext/markdown.c

@@ -177,6 +177,9 @@ splitline(Line *t, int cutpoint)
 }
 
 #define UNCHECK(l) ((l)->flags &= ~CHECKED)
+#define UNLESS_FENCED(t) if (fenced) { \
+    other = 1; l->count += (c == ' ' ? 0 : -1); \
+  } else { t; }
 
 /*
  * walk a line, seeing if it's any of half a dozen interesting regular
@@ -188,8 +191,8 @@ checkline(Line *l)
     int eol, i;
     int dashes = 0, spaces = 0,
 	equals = 0, underscores = 0,
-	stars = 0, tildes = 0,
-	backticks = 0;
+	stars = 0, tildes = 0, other = 0,
+	backticks = 0, fenced = 0;
 
     l->flags |= CHECKED;
     l->kind = chk_text;
@@ -206,16 +209,19 @@ checkline(Line *l)
 	if ( c != ' ' ) l->count++;
 
 	switch (c) {
-	case '-':  dashes = 1; break;
-	case ' ':  spaces = 1; break;
+	case '-':  UNLESS_FENCED(dashes = 1); break;
+	case ' ':  UNLESS_FENCED(spaces = 1); break;
 	case '=':  equals = 1; break;
-	case '_':  underscores = 1; break;
+	case '_':  UNLESS_FENCED(underscores = 1); break;
 	case '*':  stars = 1; break;
 #if WITH_FENCED_CODE
-	case '~':  tildes = 1; break;
-	case '`':  backticks = 1; break;
+	case '~':  if (other) return; fenced = 1; tildes = 1; break;
+	case '`':  if (other) return; fenced = 1; backticks = 1; break;
 #endif
-	default:   return;
+	default:
+    other = 1;
+    l->count--;
+    if (!fenced) return;
 	}
     }
 
@@ -638,6 +644,14 @@ fencedcodeblock(ParagraphRoot *d, Line **ptr)
 	if ( iscodefence(r->next, first->count, first->kind) ) {
 	    (*ptr) = r->next->next;
 	    ret = Pp(d, first->next, CODE);
+      if (S(first->text) - first->count > 0) {
+        char *lang_attr = T(first->text) + first->count;
+        while ( *lang_attr != 0 && *lang_attr == ' ' ) lang_attr++;
+        ret->lang = strdup(lang_attr);
+      }
+      else {
+        ret->lang = 0;
+      }
 	    ___mkd_freeLine(first);
 	    ___mkd_freeLine(r->next);
 	    r->next = 0;

data/ext/markdown.h

@@ -49,6 +49,7 @@ typedef struct paragraph {
     struct paragraph *down;	/* recompiled contents of this paragraph */
     struct line *text;		/* all the text in this paragraph */
     char *ident;		/* %id% tag for QUOTE */
+    char *lang;         /* lang attribute for CODE */
     enum { WHITESPACE=0, CODE, QUOTE, MARKUP,
 	   HTML, STYLE, DL, UL, OL, AL, LISTITEM,
 	   HDR, HR, TABLE, SOURCE } typ;

data/ext/resource.c

@@ -51,6 +51,8 @@ ___mkd_freeParagraph(Paragraph *p)
 	___mkd_freeLines(p->text);
     if (p->ident)
 	free(p->ident);
+    if (p->lang)
+	free(p->lang);
     free(p);
 }
 

data/ext/tags.c

@@ -26,6 +26,9 @@ mkd_define_tag(char *id, int selfclose)
      * either the standard or extra tag tables.
      */
     if ( !(p = mkd_search_tags(id, strlen(id))) ) {
+	/* extratags could be deallocated */
+	if ( S(extratags) == 0 )
+	    CREATE(extratags);
 	p = &EXPAND(extratags);
 	p->id = id;
 	p->size = strlen(id);

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '2.1.6'
+  VERSION = '2.1.7'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -93,6 +93,8 @@ class RDiscount
   # * <tt>:autolink</tt> - Greedily urlify links.
   # * <tt>:safelink</tt> - Do not make links for unknown URL types.
   # * <tt>:no_pseudo_protocols</tt> - Do not process pseudo-protocols.
+  # * <tt>:no_superscript</tt> - Disable superscript processing.
+  # * <tt>:no_strikethrough</tt> - Disable strikethrough processing.
   #
   def initialize(text, *extensions)
     @text  = text

data/rdiscount.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '2.1.6'
+  s.version = '2.1.7'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2013-05-28'
+  s.date = '2013-10-13'
   s.email = 'davidfstr@gmail.com'
   s.homepage = 'http://dafoster.net/projects/rdiscount/'
   s.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White", "David Foster"]

data/test/rdiscount_test.rb

@@ -204,7 +204,7 @@ EOS
     assert_equal "<pre><code>line 1\n\nline 2\n</code></pre>\n", rd.to_html
   end
   
-    def test_that_pandoc_code_blocks_work
+  def test_that_pandoc_code_blocks_work
     rd = RDiscount.new(<<EOS)
 ~~~
 line 1
@@ -214,4 +214,32 @@ line 2
 EOS
     assert_equal "<pre><code>line 1\n\nline 2\n</code></pre>\n", rd.to_html
   end
+  
+  def test_that_discount_definition_lists_work
+    rd = RDiscount.new(<<EOS)
+=tag1=
+=tag2=
+    data.
+EOS
+    assert_equal <<EOS, rd.to_html
+<dl>
+<dt>tag1</dt>
+<dt>tag2</dt>
+<dd>data.</dd>
+</dl>
+EOS
+  end
+  
+  def test_that_php_definition_lists_work
+    rd = RDiscount.new(<<EOS)
+tag1
+: data
+EOS
+    assert_equal <<EOS, rd.to_html
+<dl>
+<dt>tag1</dt>
+<dd>data</dd>
+</dl>
+EOS
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdiscount
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: davidfstr@gmail.com