rdiscount 2.2.0.2 → 2.2.7

data/ext/pgm_options.c

@@ -8,9 +8,6 @@
 #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>
@@ -34,8 +31,8 @@ static struct _opt {
     { "tabstop",       "default (4-space) tabstops", 0, 0, 1, MKD_TABSTOP  },
     { "image",         "images",                     1, 0, 1, MKD_NOIMAGE  },
     { "links",         "links",                      1, 0, 1, MKD_NOLINKS  },
-    { "relax",         "emphasis inside words",      1, 1, 1, MKD_STRICT   },
-    { "strict",        "emphasis inside words",      0, 0, 1, MKD_STRICT   },
+    { "relax",         "Markdown.pl compatibility",  1, 1, 1, MKD_STRICT   },
+    { "strict",        "Markdown.pl compatibility",  0, 0, 1, MKD_STRICT   },
     { "tables",        "tables",                     1, 0, 1, MKD_NOTABLES },
     { "header",        "pandoc-style headers",       1, 0, 1, MKD_NOHEADER },
     { "html",          "raw html",                   1, 0, 1, MKD_NOHTML   },
@@ -62,7 +59,10 @@ static struct _opt {
     { "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 },
+    { "urlencodedanchor", "html5-style anchors", 0, 0, 0, MKD_URLENCODEDANCHOR },
+    { "html5anchor",   "html5-style anchors", 0, 1, 0, MKD_URLENCODEDANCHOR },
+    { "latex",         "handle LaTeX escapes",         0, 0, 1, MKD_LATEX },
+    { "explicitlist",  "do not merge adjacent numeric/bullet lists", 0, 0, 1, MKD_EXPLICITLIST },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
@@ -84,7 +84,7 @@ sort_by_flag(struct _opt *a, struct _opt *b)
 
 
 void
-show_flags(int byname)
+show_flags(int byname, int verbose)
 {
     int i;
 
@@ -92,14 +92,14 @@ show_flags(int byname)
 	qsort(opts, NR(opts), sizeof(opts[0]), (stfu)sort_by_name);
     
 	for (i=0; i < NR(opts); i++)
-	    if ( ! opts[i].skip )
+	    if ( verbose || !opts[i].skip )
 		fprintf(stderr, "%16s : %s\n", opts[i].name, opts[i].desc);
     }
     else {
 	qsort(opts, NR(opts), sizeof(opts[0]), (stfu)sort_by_flag);
 	
 	for (i=0; i < NR(opts); i++)
-	    if ( ! opts[i].skip ) {
+	    if ( !opts[i].skip ) {
 		fprintf(stderr, "%08lx : ", (long)opts[i].flag);
 		if ( opts[i].sayenable )
 		    fprintf(stderr, opts[i].off ? "disable " : "enable ");
@@ -109,7 +109,7 @@ show_flags(int byname)
 }
     
 
-int
+char *
 set_flag(mkd_flag_t *flags, char *optionstring)
 {
     int i;
@@ -140,7 +140,7 @@ set_flag(mkd_flag_t *flags, char *optionstring)
 		*flags &= ~opts[i].flag;
 	}
 	else
-	    return 0;
+	    return arg;
     }
-    return 1;
+    return 0;
 }

data/ext/pgm_options.h

@@ -3,7 +3,7 @@
 
 #include <mkdio.h>
 
-int set_flag(mkd_flag_t *flags, char *optionstring);
-void show_flags(int byname);
+char *set_flag(mkd_flag_t *flags, char *optionstring);
+void show_flags(int byname, int verbose);
 
 #endif/*PGM_OPTIONS_D*/

data/ext/rdiscount.c

@@ -34,6 +34,9 @@ static AccessorFlagPair ACCESSOR_2_FLAG[] = {
     { "no_pseudo_protocols", MKD_NO_EXT },
     { "no_superscript", MKD_NOSUPERSCRIPT },
     { "no_strikethrough", MKD_NOSTRIKETHROUGH },
+    { "latex", MKD_LATEX },
+    { "explicitlist", MKD_EXPLICITLIST },
+    { "md1compat", MKD_1_COMPAT },
     { NULL, 0 }     /* sentinel */
 };
 

data/ext/resource.c

@@ -65,6 +65,7 @@ ___mkd_freefootnote(Footnote *f)
     DELETE(f->tag);
     DELETE(f->link);
     DELETE(f->title);
+    if ( f->text) ___mkd_freeParagraph(f->text);
 }
 
 

data/ext/setup.c

@@ -31,7 +31,7 @@ mkd_initialize()
 }
 
 
-void
+void DESTRUCTOR
 mkd_shlib_destructor()
 {
     mkd_deallocate_tags();

data/ext/tags.c

@@ -1,5 +1,7 @@
 /* block-level tags for passing html blocks through the blender
  */
+#include "config.h"
+
 #define __WITHOUT_AMALLOC 1
 #include "cstring.h"
 #include "tags.h"

data/ext/toc.c

@@ -25,12 +25,14 @@ mkd_toc(Document *p, char **doc)
     Cstring res;
     int size;
     int first = 1;
+    extern void Csreparse(Cstring *, char *, int, mkd_flag_t);
+    
     
     if ( !(doc && p && p->ctx) ) return -1;
 
     *doc = 0;
     
-    if ( ! (p->ctx->flags & MKD_TOC) ) return 0;
+    if ( ! is_flag_set(p->ctx->flags, MKD_TOC) ) return 0;
 
     CREATE(res);
     RESERVE(res, 100);
@@ -38,7 +40,7 @@ mkd_toc(Document *p, char **doc)
     for ( tp = p->code; tp ; tp = tp->next ) {
 	if ( tp->typ == SOURCE ) {
 	    for ( srcp = tp->down; srcp; srcp = srcp->next ) {
-		if ( srcp->typ == HDR && srcp->text ) {
+		if ( (srcp->typ == HDR) && srcp->text ) {
 	    
 		    while ( last_hnumber > srcp->hnumber ) {
 			if ( (last_hnumber - srcp->hnumber) > 1 )
@@ -62,11 +64,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,p->ctx->flags);
+					 (mkd_sta_function_t)Csputc,
+					 &res,1,p->ctx);
 		    Csprintf(&res, "\">");
-		    mkd_string_to_anchor(T(srcp->text->text),
-					 S(srcp->text->text),
-					 (mkd_sta_function_t)Csputc, &res,0,p->ctx->flags);
+		    Csreparse(&res, T(srcp->text->text),
+				    S(srcp->text->text), IS_LABEL);
 		    Csprintf(&res, "</a>");
 
 		    first = 0;
@@ -82,16 +84,12 @@ mkd_toc(Document *p, char **doc)
     }
 
     if ( (size = S(res)) > 0 ) {
+	/* null-terminate & strdup into a free()able memory chunk
+	 */
 	EXPAND(res) = 0;
-			/* HACK ALERT! HACK ALERT! HACK ALERT! */
-	*doc = T(res);  /* we know that a T(Cstring) is a character pointer
-			 * so we can simply pick it up and carry it away,
-			 * leaving the husk of the Ctring on the stack
-			 * END HACK ALERT
-			 */
+	*doc = strdup(T(res));
     }
-    else
-	DELETE(res);
+    DELETE(res);
     return size;
 }
 

data/ext/version.c

@@ -1,13 +1,13 @@
 #include "config.h"
 
-char markdown_version[] = VERSION
+char markdown_version[] = BRANCH VERSION
 #if 4 != 4
 		" TAB=4"
 #endif
 #if USE_AMALLOC
 		" DEBUG"
 #endif
-#if WITH_LATEX
-		" LATEX"
+#if GITHUB_CHECKBOX
+		" GITHUB_CHECKBOX"
 #endif
 		;

data/ext/xml.c

@@ -74,9 +74,10 @@ mkd_xml(char *p, int size, char **res)
 	else
 	    Csputc(c, &f);
     }
-			/* HACK ALERT! HACK ALERT! HACK ALERT! */
-    *res = T(f);	/* we know that a T(Cstring) is a character pointer */
-			/* so we can simply pick it up and carry it away, */
-    return S(f);	/* leaving the husk of the Ctring on the stack */
-			/* END HACK ALERT */
+    /* null terminate, strdup() into a free()able memory block,
+     * and return the size of everything except the null terminator
+     */
+    EXPAND(f) = 0;
+    *res = strdup(T(f));
+    return S(f)-1;
 }

data/ext/xmlpage.c

@@ -5,18 +5,13 @@
  * The redistribution terms are provided in the COPYRIGHT file that must
  * be distributed with this source code.
  */
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
-
-#include "cstring.h"
-#include "markdown.h"
-#include "amalloc.h"
+#include <markdown.h>
 
 
 int
-mkd_xhtmlpage(Document *p, int flags, FILE *out)
+mkd_xhtmlpage(Document *p, mkd_flag_t flags, FILE *out)
 {
     char *title;
     extern char *mkd_doc_title(Document *);
@@ -29,9 +24,11 @@ mkd_xhtmlpage(Document *p, int flags, FILE *out)
 				"<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n") );
 
 	DO_OR_DIE( fprintf(out, "<head>\n") );
+	DO_OR_DIE( fprintf(out, "<title>") );
 	if ( title = mkd_doc_title(p) ) {
-	    DO_OR_DIE( fprintf(out, "<title>%s</title>\n", title) );
+	    DO_OR_DIE( fprintf(out, "%s", title) );
 	}
+	DO_OR_DIE( fprintf(out, "</title>\n") );
 	DO_OR_DIE( mkd_generatecss(p, out) );
 	DO_OR_DIE( fprintf(out, "</head>\n"
 				"<body>\n") );

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '2.2.0.2'
+  VERSION = '2.2.7'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -75,6 +75,15 @@ class RDiscount
   # Disable strikethrough processing.
   attr_accessor :no_strikethrough
 
+  # Keep LaTeX inside $$ intact.
+  attr_accessor :latex
+
+  # Don't merge adjacent list into a single list.
+  attr_accessor :explicitlist
+
+  # Not documented: run in markdown 1 compat mode (only used for MarkdownTest1.0)
+  attr_accessor :md1compat
+
   # Create a RDiscount Markdown processor. The +text+ argument
   # should be a string containing Markdown text. Additional arguments may be
   # supplied to set various processing options:
@@ -95,6 +104,8 @@ class RDiscount
   # * <tt>:no_pseudo_protocols</tt> - Do not process pseudo-protocols.
   # * <tt>:no_superscript</tt> - Disable superscript processing.
   # * <tt>:no_strikethrough</tt> - Disable strikethrough processing.
+  # * <tt>:latex</tt> - Keep LaTeX inside $$ intact.
+  # * <tt>:explicitlist</tt> - Don't merge adjacent list into a single list.
   #
   def initialize(text, *extensions)
     @text  = text

data/rdiscount.gemspec

@@ -1,11 +1,10 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '2.2.0.2'
+  s.version = '2.2.7'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  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.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White", "David Foster", "l33tname"]
   s.license = "BSD-3-Clause"
   # = MANIFEST =
   s.files = %w[
@@ -15,13 +14,12 @@ Gem::Specification.new do |s|
     Rakefile
     bin/rdiscount
     discount
-    ext/Csio.c
-    ext/VERSION
     ext/amalloc.c
     ext/amalloc.h
     ext/basename.c
     ext/blocktags
     ext/config.h
+    ext/Csio.c
     ext/css.c
     ext/cstring.h
     ext/docheader.c
@@ -30,13 +28,17 @@ Gem::Specification.new do |s|
     ext/extconf.rb
     ext/flags.c
     ext/generate.c
+    ext/gethopt.c
+    ext/gethopt.h
     ext/github_flavoured.c
+    ext/h1title.c
     ext/html5.c
     ext/markdown.c
     ext/markdown.h
     ext/mkdio.c
     ext/mkdio.h
     ext/mktags.c
+    ext/notspecial.c
     ext/pgm_options.c
     ext/pgm_options.h
     ext/rdiscount.c
@@ -45,6 +47,7 @@ Gem::Specification.new do |s|
     ext/tags.c
     ext/tags.h
     ext/toc.c
+    ext/VERSION
     ext/version.c
     ext/xml.c
     ext/xmlpage.c
@@ -65,7 +68,4 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/extconf.rb"]
   s.executables = ["rdiscount"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = 'wink'
-  # Ruby 1.9.2 has a known bug in mkmf. Ruby 1.9.3 or later is fine.
-  s.required_ruby_version = '!= 1.9.2'
 end

data/test/markdown_test.rb

@@ -138,7 +138,6 @@ class MarkdownTest < Test::Unit::TestCase
   Dir["#{MARKDOWN_TEST_DIR}/Tests/*.text"].each do |text_file|
 
     basename = File.basename(text_file).sub(/\.text$/, '')
-    html_file = text_file.sub(/text$/, 'html')
     method_name = basename.gsub(/[-,()]/, '').gsub(/\s+/, '_').downcase
 
     define_method "test_#{method_name}" do

data/test/rdiscount_test.rb

@@ -7,7 +7,7 @@ require 'rdiscount'
 
 class RDiscountTest < Test::Unit::TestCase
   def test_that_version_looks_valid
-    if not /^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?$/ =~ RDiscount::VERSION
+    if not (/^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?$/) =~ RDiscount::VERSION
       assert false, 'Expected RDiscount::VERSION to be a 3 or 4 component version string but found ' + RDiscount::VERSION.to_s
     end
   end
@@ -54,24 +54,24 @@ class RDiscountTest < Test::Unit::TestCase
   def test_that_generate_toc_sets_toc_ids
     rd = RDiscount.new("# Level 1\n\n## Level 2", :generate_toc)
     assert rd.generate_toc
-    assert_equal %(<a name="Level.1"></a>\n<h1>Level 1</h1>\n\n<a name="Level.2"></a>\n<h2>Level 2</h2>\n), rd.to_html
+    assert_equal %(<a name="Level-1"></a>\n<h1>Level 1</h1>\n\n<a name="Level-2"></a>\n<h2>Level 2</h2>\n), rd.to_html
   end
 
   def test_should_get_the_generated_toc
     rd = RDiscount.new("# Level 1\n\n## Level 2", :generate_toc)
-    exp = %(<ul>\n <li><a href=\"#Level.1\">Level 1</a>\n <ul>\n  <li><a href=\"#Level.2\">Level 2</a></li>\n </ul>\n </li>\n</ul>)
+    exp = %(<ul>\n <li><a href=\"#Level-1\">Level 1</a>\n <ul>\n  <li><a href=\"#Level-2\">Level 2</a></li>\n </ul>\n </li>\n</ul>)
     assert_equal exp, rd.toc_content.strip
   end
   
   def test_toc_should_escape_apostropes
     rd = RDiscount.new("# A'B\n\n## C", :generate_toc)
-    exp = %(<ul>\n <li><a href=\"#A.B\">A'B</a>\n <ul>\n  <li><a href=\"#C\">C</a></li>\n </ul>\n </li>\n</ul>)
+    exp = %(<ul>\n <li><a href=\"#A-27-B\">A'B</a>\n <ul>\n  <li><a href=\"#C\">C</a></li>\n </ul>\n </li>\n</ul>)
     assert_equal exp, rd.toc_content.strip
   end
   
   def test_toc_should_escape_question_marks
     rd = RDiscount.new("# A?B\n\n## C", :generate_toc)
-    exp = %(<ul>\n <li><a href=\"#A.B\">A?B</a>\n <ul>\n  <li><a href=\"#C\">C</a></li>\n </ul>\n </li>\n</ul>)
+    exp = %(<ul>\n <li><a href=\"#A-3f-B\">A?B</a>\n <ul>\n  <li><a href=\"#C\">C</a></li>\n </ul>\n </li>\n</ul>)
     assert_equal exp, rd.toc_content.strip
   end
 
@@ -139,12 +139,6 @@ EOS
   end
 
   def test_that_tags_can_have_dashes_and_underscores
-    if RDiscount::VERSION.start_with? "2.0.7"
-      # Skip test for 2.0.7.x series due to upstream behavioral change in
-      # Discount 2.0.7. This test can be fixed in Discount 2.1.5 using the
-      # WITH_GITHUB_TAGS compile-time flag.
-      return
-    end
     rd = RDiscount.new("foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b>")
     assert_equal "<p>foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b></p>\n", rd.to_html
   end
@@ -249,7 +243,47 @@ EOS
 </dl>
 EOS
   end
-  
+
+  def test_latex_passtrough_dont_render_link
+    rd = RDiscount.new("$$[(1+2)*3-4](1-2)$$", :latex)
+    assert_equal "<p>$$[(1+2)*3-4](1-2)$$</p>\n", rd.to_html
+  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
+
+  def test_taht
+    rd = RDiscount.new(<<EOS, :explicitlist)
+- Bullet
+- Bullet
+
+1. Numbered
+2. Numbered
+EOS
+
+    assert_equal <<EOS, rd.to_html
+<ul>
+<li>Bullet</li>
+<li>Bullet</li>
+</ul>
+
+
+<ol>
+<li>Numbered</li>
+<li>Numbered</li>
+</ol>
+
+EOS
+  end
+
   def test_that_extra_definition_lists_work
     rd = RDiscount.new(<<EOS)
 tag1
@@ -262,15 +296,4 @@ 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,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rdiscount
 version: !ruby/object:Gem::Version
-  version: 2.2.0.2
+  version: 2.2.7
 platform: ruby
 authors:
 - Ryan Tomayko
 - David Loren Parsons
 - Andrew White
 - David Foster
+- l33tname
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-09 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies: []
 description:
 email: david@dafoster.net
@@ -42,13 +43,17 @@ files:
 - ext/extconf.rb
 - ext/flags.c
 - ext/generate.c
+- ext/gethopt.c
+- ext/gethopt.h
 - ext/github_flavoured.c
+- ext/h1title.c
 - ext/html5.c
 - ext/markdown.c
 - ext/markdown.h
 - ext/mkdio.c
 - ext/mkdio.h
 - ext/mktags.c
+- ext/notspecial.c
 - ext/pgm_options.c
 - ext/pgm_options.h
 - ext/rdiscount.c
@@ -80,16 +85,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "!="
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Fast Implementation of Gruber's Markdown in C