rdiscount 2.1.7 → 2.2.0.2

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,22 +212,31 @@ 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)
 {
+    static const unsigned char hexchars[] = "0123456789abcdef";
     unsigned char c;
 
     int i, size;
     char *line;
 
     size = mkd_line(s, len, &line, IS_LABEL);
-    
-    if ( labelformat && (size>0) && !isalpha(line[0]) )
+
+    if ( !(flags & MKD_URLENCODEDANCHOR)
+	 && labelformat
+	 && (size>0) && !isalpha(line[0]) )
 	(*outchar)('L',out);
     for ( i=0; i < size ; i++ ) {
 	c = line[i];
 	if ( labelformat ) {
 	    if ( isalnum(c) || (c == '_') || (c == ':') || (c == '-') || (c == '.' ) )
 		(*outchar)(c, out);
+	    else if ( flags & MKD_URLENCODEDANCHOR ) {
+		(*outchar)('%', out);
+		(*outchar)(hexchars[c >> 4 & 0xf], out);
+		(*outchar)(hexchars[c      & 0xf], out);
+	    }
 	    else
 		(*outchar)('.', out);
 	}
@@ -289,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

@@ -8,7 +8,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #include <mkdio.h>
 #include <errno.h>
 #include <string.h>
@@ -25,7 +27,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 +57,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.
@@ -36,6 +39,28 @@ static AccessorFlagPair ACCESSOR_2_FLAG[] = {
 
 static VALUE rb_cRDiscount;
 
+int rb_rdiscount__get_flags(VALUE ruby_obj)
+{
+    AccessorFlagPair *entry;
+    
+    /* compile flags */
+    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 ) {
+        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;
+}
+
 static VALUE
 rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
 {
@@ -114,28 +139,6 @@ rb_rdiscount_toc_content(int argc, VALUE *argv, VALUE self)
     return buf;
 }
 
-int rb_rdiscount__get_flags(VALUE ruby_obj)
-{
-    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;
-}
-
 
 void Init_rdiscount()
 {

data/ext/resource.c

@@ -76,9 +76,9 @@ ___mkd_freefootnotes(MMIOT *f)
     int i;
 
     if ( f->footnotes ) {
-	for (i=0; i < S(*f->footnotes); i++)
-	    ___mkd_freefootnote( &T(*f->footnotes)[i] );
-	DELETE(*f->footnotes);
+	for (i=0; i < S(f->footnotes->note); i++)
+	    ___mkd_freefootnote( &T(f->footnotes->note)[i] );
+	DELETE(f->footnotes->note);
 	free(f->footnotes);
     }
 }
@@ -98,7 +98,7 @@ ___mkd_initmmiot(MMIOT *f, void *footnotes)
 	    f->footnotes = footnotes;
 	else {
 	    f->footnotes = malloc(sizeof f->footnotes[0]);
-	    CREATE(*f->footnotes);
+	    CREATE(f->footnotes->note);
 	}
     }
 }

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.7'
+  VERSION = '2.2.0.2'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -1,11 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '2.1.7'
+  s.version = '2.2.0.2'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2013-10-13'
-  s.email = 'davidfstr@gmail.com'
+  s.date = '2020-08-09'
+  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-3-Clause"
   # = MANIFEST =
   s.files = %w[
     BUILDING

data/test/rdiscount_test.rb

@@ -153,6 +153,15 @@ EOS
     rd = RDiscount.new(<<EOS, :footnotes)
 Obtuse text.[^1]
 
+[^1]: Clarification
+EOS
+    assert rd.to_html.include?('<a href="#fn:1" rel="footnote">1</a>')
+  end
+  
+  def test_that_footnotes_in_span_works
+    rd = RDiscount.new(<<EOS, :footnotes)
+[Obtuse text.[^1]](class:someclass)
+
 [^1]: Clarification
 EOS
     assert rd.to_html.include?('<a href="#fn:1" rel="footnote">1</a>')
@@ -204,6 +213,17 @@ EOS
     assert_equal "<pre><code>line 1\n\nline 2\n</code></pre>\n", rd.to_html
   end
   
+  def test_that_gfm_code_blocks_work_with_language
+    rd = RDiscount.new(<<EOS)
+```ruby
+line 1
+
+line 2
+```
+EOS
+    assert_equal "<pre><code class=\"ruby\">line 1\n\nline 2\n</code></pre>\n", rd.to_html
+  end
+  
   def test_that_pandoc_code_blocks_work
     rd = RDiscount.new(<<EOS)
 ~~~
@@ -230,7 +250,7 @@ EOS
 EOS
   end
   
-  def test_that_php_definition_lists_work
+  def test_that_extra_definition_lists_work
     rd = RDiscount.new(<<EOS)
 tag1
 : data
@@ -242,4 +262,15 @@ EOS
 </dl>
 EOS
   end
+  
+  def test_that_emphasis_beside_international_characters_detected
+    rd = RDiscount.new(%(*foo ä bar*))
+    assert_equal %(<p><em>foo ä bar</em></p>\n), rd.to_html
+    
+    rd = RDiscount.new(%(*ä foobar*))
+    assert_equal %(<p><em>ä foobar</em></p>\n), rd.to_html
+    
+    rd = RDiscount.new(%(*foobar ä*))
+    assert_equal %(<p><em>foobar ä</em></p>\n), rd.to_html
+  end
 end

metadata

@@ -1,21 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rdiscount
 version: !ruby/object:Gem::Version
-  version: 2.1.7
-  prerelease: 
+  version: 2.2.0.2
 platform: ruby
 authors:
 - Ryan Tomayko
 - David Loren Parsons
 - Andrew White
 - David Foster
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies: []
-description: 
-email: davidfstr@gmail.com
+description:
+email: david@dafoster.net
 executables:
 - rdiscount
 extensions:
@@ -72,30 +71,28 @@ files:
 - test/markdown_test.rb
 - test/rdiscount_test.rb
 homepage: http://dafoster.net/projects/rdiscount/
-licenses: []
-post_install_message: 
+licenses:
+- BSD-3-Clause
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '!='
+  - - "!="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: wink
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.8
+signing_key:
+specification_version: 4
 summary: Fast Implementation of Gruber's Markdown in C
 test_files:
 - test/markdown_test.rb
 - test/rdiscount_test.rb
-has_rdoc: