rdiscount 2.2.0.1 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1c480b4844b3b13cbc655ed1ce44db9a7115a7bc
-  data.tar.gz: 517a7bed26d59ec1cbe770df4d24a72e288a5902
+SHA256:
+  metadata.gz: '094c22178c083e6161282414c5c91b355d3982e92e8db075df6083b5e5618404'
+  data.tar.gz: d051989d5cb908c4753a5e6d05ead744e91031b98eda30a3a90a59568b6145ca
 SHA512:
-  metadata.gz: 28170e1cd868a7046c03207e432ee0fda482e0f8b9be0ce25ede44a2716af0204e402d9e2cc8d877d5075193c5a7521ac4eb6de6fe6f1a867ee01152ee2cb97f
-  data.tar.gz: bfd089d7ffe89cb5cb48213320cc271e3d6b39198db96a0ffb229b540bf513332327211604f8fa588b89c5fb883f40bcec5f5bc909366439008c65fa02b33598
+  metadata.gz: 61a686cfbad1d1a5e28801bbce4a456d7a409fe2e8f104a67791bb35304518fcb5f36fc5ed9cb4ed4963577f4e2862e636f916dd9259f8bfd273d2924bd7daef
+  data.tar.gz: 185f481096dd9f823473ed0dfae4161232631ab388828915e25831c842dc257be9fe45e987685eb653e1734f8787f9f11e59e24fdf3ad0780a96251bde21356d

data/README.markdown

@@ -1,23 +1,22 @@
 Discount Markdown Processor for Ruby
 ====================================
-[![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)
+[![Build Status](https://github.com/davidfstr/rdiscount/actions/workflows/main.yml/badge.svg)](https://github.com/davidfstr/rdiscount/actions/workflows/main.yml)
 
-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
+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
 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/master/RDiscount>  
-BUGS: <http://github.com/davidfstr/rdiscount/issues>  
+HOME: <https://dafoster.net/projects/rdiscount/>  
+DOCS: <https://rdoc.info/github/davidfstr/rdiscount/master/RDiscount>  
+BUGS: <https://github.com/davidfstr/rdiscount/issues>
 
-Discount was developed by [David Loren Parsons][3]. The Ruby extension
-is maintained by [David Foster][4].
+Discount was developed by [David Loren Parsons][3].
+The Ruby extension is maintained by [David Foster][4].
 
-[1]: http://daringfireball.net/projects/markdown/syntax
-[2]: http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip
-[3]: http://www.pell.portland.or.us/~orc
+[1]: https://daringfireball.net/projects/markdown/syntax
+[2]: https://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip
+[3]: https://www.pell.portland.or.us/~orc
 [4]: https://github.com/davidfstr
 
 INSTALL, HACKING

data/Rakefile

@@ -53,7 +53,7 @@ task :man => 'man/rdiscount.1'
 require 'rake/testtask'
 Rake::TestTask.new('test:unit') do |t|
   t.test_files = FileList['test/*_test.rb']
-  t.ruby_opts += ['-rubygems'] if defined? Gem
+  t.ruby_opts += ['-r rubygems'] if defined? Gem
 end
 task 'test:unit' => [:build]
 
@@ -67,11 +67,20 @@ task 'test:conformance' => [:build] do |t|
     print result
     fail unless result.include? "; 0 failed."
   end
+
+  # Allow to run this rake tasks multiple times
+  # https://medium.com/@shaneilske/invoke-a-rake-task-multiple-times-1bcb01dee9d9
+  ENV.delete("MARKDOWN_TEST_VER")
+  ENV.delete("RDISCOUNT_EXTENSIONS")
+  Rake::Task["test:conformance"].reenable
 end
 
 desc 'Run version 1.0 conformance suite'
 task 'test:conformance:1.0' => [:build] do |t|
   ENV['MARKDOWN_TEST_VER'] = '1.0'
+  # see https://github.com/Orc/discount/issues/261
+  # requires flags -f1.0,tabstop,nopants
+  ENV['RDISCOUNT_EXTENSIONS'] = "md1compat"
   Rake::Task['test:conformance'].invoke
 end
 
@@ -82,7 +91,7 @@ task 'test:conformance:1.0.3' => [:build] do |t|
 end
 
 desc 'Run unit and conformance tests'
-task :test => %w[test:unit test:conformance]
+task :test => %w[test:unit test:conformance:1.0 test:conformance:1.0.3]
 
 desc 'Run benchmarks'
 task :benchmark => :build do |t|

data/bin/rdiscount

@@ -1,7 +1,13 @@
 #!/usr/bin/env ruby
-# Usage: rdiscount [<file>...]
-# Convert one or more Markdown files to HTML and write to standard output. With
+#
+# Usage: [env RDISCOUNT_EXTENSIONS='<extension>,...'] rdiscount [<file>...]
 # no <file> or when <file> is '-', read Markdown source text from standard input.
+#
+# Convert one or more Markdown files to HTML and write to standard output.
+# With no <file> or when <file> is '-', read Markdown source text from
+# standard input.  Optionally, the RDISCOUNT_EXTENSIONS environment variable
+# can specify a comma-separated list of extensions to enable in RDiscount.
+#
 if ARGV.include?('--help')
   File.read(__FILE__).split("\n").grep(/^# /).each do |line|
     puts line[2..-1]
@@ -10,4 +16,5 @@ if ARGV.include?('--help')
 end
 
 require 'rdiscount'
-STDOUT.write(RDiscount.new(ARGF.read).to_html)
+extensions = ENV['RDISCOUNT_EXTENSIONS'].to_s.split(',').map{ |key| key.to_sym }
+STDOUT.write(RDiscount.new(ARGF.read, *extensions).to_html)

data/ext/Csio.c

@@ -50,11 +50,11 @@ Cswrite(Cstring *iot, char *bfr, int size)
 /* reparse() into a cstring
  */
 void
-Csreparse(Cstring *iot, char *buf, int size, int flags)
+Csreparse(Cstring *iot, char *buf, int size, mkd_flag_t flags)
 {
     MMIOT f;
     ___mkd_initmmiot(&f, 0);
-    ___mkd_reparse(buf, size, 0, &f, 0);
+    ___mkd_reparse(buf, size, flags, &f, 0);
     ___mkd_emblock(&f);
     SUFFIX(*iot, T(f.out), S(f.out));
     ___mkd_freemmiot(&f, 0);

data/ext/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.7c

data/ext/amalloc.c

@@ -5,6 +5,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "config.h"
 
 #define MAGIC 0x1f2e3d4c
 

data/ext/blocktags

@@ -17,6 +17,7 @@ static struct kw blocktags[] = {
    { "PRE", 3, 0 },
    { "WBR", 3, 0 },
    { "XMP", 3, 0 },
+   { "FORM", 4, 0 },
    { "NOBR", 4, 0 },
    { "STYLE", 5, 0 },
    { "TABLE", 5, 0 },
@@ -30,4 +31,4 @@ static struct kw blocktags[] = {
    { "BLOCKQUOTE", 10, 0 },
 };
 
-#define NR_blocktags 29
+#define NR_blocktags 30

data/ext/config.h

@@ -7,6 +7,8 @@
 /* tabs are four spaces */
 #define TABSTOP 4
 
+#define DESTRUCTOR  __attribute__((__destructor__))
+
 /* these are setup by extconf.rb */
 #if HAVE_RANDOM
 #define COINTOSS() (random()&1)

data/ext/css.c

@@ -54,15 +54,13 @@ mkd_css(Document *d, char **res)
 	stylesheets(d->code, &f);
 			
 	if ( (size = S(f)) > 0 ) {
+	    /* null-terminate, then strdup() into a free()able memory
+	     * chunk
+	     */
 	    EXPAND(f) = 0;
-			/* 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, */
-			/* leaving the husk of the Ctring on the stack */
-			/* END HACK ALERT */
+	    *res = strdup(T(f));
 	}
-	else
-	    DELETE(f);
+	DELETE(f);
 	return size;
     }
     return EOF;

data/ext/cstring.h

@@ -72,6 +72,5 @@ typedef STRING(char) Cstring;
 extern void Csputc(int, Cstring *);
 extern int Csprintf(Cstring *, char *, ...);
 extern int Cswrite(Cstring *, char *, int);
-extern void Csreparse(Cstring *, char *, int, int);
 
 #endif/*_CSTRING_D*/

data/ext/docheader.c

@@ -17,7 +17,12 @@
 static char *
 onlyifset(Line *l)
 {
-    char *ret = T(l->text) + l->dle;
+    char *ret;
+
+    if ( l->dle < 0 || l->dle >= S(l->text) )
+	return 0;
+
+    ret = T(l->text) + l->dle;
 
     return ret[0] ? ret : 0;
 }

data/ext/dumptree.c

@@ -108,9 +108,18 @@ dumptree(Paragraph *pp, Stack *sp, FILE *f)
 	    changepfx(sp, '`');
 	printpfx(sp, f);
 
-	d = fprintf(f, "[%s", Pptype(pp->typ));
+	if ( pp->typ == HDR )
+	    d += fprintf(f, "[h%d", pp->hnumber);
+	else
+	    d = fprintf(f, "[%s", Pptype(pp->typ));
 	if ( pp->ident )
 	    d += fprintf(f, " %s", pp->ident);
+
+#ifdef GITHUB_CHECKBOX
+	if ( pp->flags )
+	    d += fprintf(f, " %x", pp->flags);
+#endif
+	    
 	if ( pp->align > 1 )
 	    d += fprintf(f, ", <%s>", Begin[pp->align]);
 
@@ -134,7 +143,7 @@ dumptree(Paragraph *pp, Stack *sp, FILE *f)
 
 
 int
-mkd_dump(Document *doc, FILE *out, int flags, char *title)
+mkd_dump(Document *doc, FILE *out, mkd_flag_t flags, char *title)
 {
     Stack stack;
 

data/ext/extconf.rb

@@ -33,6 +33,7 @@ open(File.join(File.dirname(__FILE__), "ruby-config.h"), "wb") do |f|
 end
 
 $defs.push("-DVERSION=\\\"#{VERSION}\\\"")
+$defs.push("-DBRANCH=\"\"")
 
 # Post XCode 5.1 the command line tools on OS X treat unrecognised 
 # command line options as errors and it's been seen that

data/ext/flags.c

@@ -2,7 +2,7 @@
 #include "markdown.h"
 
 struct flagnames {
-    DWORD flag;
+    mkd_flag_t flag;
     char *name;
 };
 
@@ -36,12 +36,14 @@ static struct flagnames flagnames[] = {
     { MKD_IDANCHOR,       "IDANCHOR" },
     { MKD_GITHUBTAGS,     "GITHUBTAGS" },
     { MKD_URLENCODEDANCHOR, "URLENCODEDANCHOR" },
+    { MKD_LATEX,          "LATEX" },
+    { MKD_EXPLICITLIST,   "EXPLICITLIST" },
 };
 #define NR(x)	(sizeof x/sizeof x[0])
 
 
 void
-mkd_flags_are(FILE *f, DWORD flags, int htmlplease)
+mkd_flags_are(FILE *f, mkd_flag_t flags, int htmlplease)
 {
     int i;
     int not, set, even=1;