rdiscount 2.2.7 → 2.2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094c22178c083e6161282414c5c91b355d3982e92e8db075df6083b5e5618404'
-  data.tar.gz: d051989d5cb908c4753a5e6d05ead744e91031b98eda30a3a90a59568b6145ca
+  metadata.gz: 7cf15c9535d4e5016d31ce5259672abac80df8a2e5669adc6e0cb91e8b1fc7d5
+  data.tar.gz: 49d680d21cadadce16d98786249999d0546ff513f043feebbaf4b86aac8a77f5
 SHA512:
-  metadata.gz: 61a686cfbad1d1a5e28801bbce4a456d7a409fe2e8f104a67791bb35304518fcb5f36fc5ed9cb4ed4963577f4e2862e636f916dd9259f8bfd273d2924bd7daef
-  data.tar.gz: 185f481096dd9f823473ed0dfae4161232631ab388828915e25831c842dc257be9fe45e987685eb653e1734f8787f9f11e59e24fdf3ad0780a96251bde21356d
+  metadata.gz: 90c7ade6956dc384ba04e2fb212caab6cc3f8b8ef6ee4126114a8bfd668f6dececcabd206c048e31a58d8e1d06d337bd5ba77f94fb4d0e43f8739674fad73acd
+  data.tar.gz: 8e4083908e90fb651cae41fa04c5e059593fe80571cb495e39c500b5baf67f788260c85ba8b778fc5e78800c68e94a4c21a832cb424c7e054ece2365e4b92156

data/BUILDING

@@ -17,7 +17,7 @@ grabbing the discount submodule into the root of the project and then running
 the rake gather task to copy discount source files into the ext/ directory:
 
     $ git submodule update --init
-    Submodule 'discount' (git://github.com/davidfstr/discount.git) registered for path 'discount'
+    Submodule 'discount' (git@github.com:Orc/discount.git) registered for path 'discount'
     Cloning into discount...
     $ cd discount
     $ ./configure.sh
@@ -100,7 +100,7 @@ And don't forget to rerun the preexisting tests.
 
 Update the CHANGELOG.
 
-Update rdiscount.gemspec with the new RDiscount version number and date.
+Update rdiscount.gemspec with the new RDiscount version number.
 Also update the VERSION constant in lib/rdiscount.rb.
 Push that change as the final commit with a message in the format
 "2.0.7 release".

data/ext/VERSION

@@ -1 +1 @@
-2.2.7c
+2.2.7d

data/ext/generate.c

@@ -757,22 +757,29 @@ linkylinky(int image, MMIOT *f)
 	else {
 	    int goodlink, implicit_mark = mmiottell(f);
 
-	    if ( isspace(peek(f,1)) )
-		pull(f);
-
-	    if ( peek(f,1) == '[' ) {
-		pull(f);	/* consume leading '[' */
-		goodlink = linkylabel(f, &key.tag);
+	    if ( is_flag_set(f->flags, MKD_EXTRA_FOOTNOTE)
+		      && !is_flag_set(f->flags, MKD_STRICT)
+		      && (!image)
+		      && S(name)
+		      && T(name)[0] == '^' ) {
+		extra_footnote = 1;
+		goodlink = 1;
 	    }
 	    else {
-		/* new markdown implicit name syntax doesn't
-		 * require a second []
-		 */
-		mmiotseek(f, implicit_mark);
-		goodlink = !is_flag_set(f->flags, MKD_1_COMPAT);
+		if ( isspace(peek(f,1)) )
+		    pull(f);
 
-		if ( is_flag_set(f->flags, MKD_EXTRA_FOOTNOTE) && (!image) && S(name) && T(name)[0] == '^' )
-		    extra_footnote = 1;
+		if ( peek(f,1) == '[' ) {
+		    pull(f);	/* consume leading '[' */
+		    goodlink = linkylabel(f, &key.tag);
+		}
+		else {
+		    /* new markdown implicit name syntax doesn't
+		     * require a second []
+		     */
+		    mmiotseek(f, implicit_mark);
+		    goodlink = !is_flag_set(f->flags, MKD_1_COMPAT);
+		}
 	    }
 
 	    if ( goodlink ) {

data/ext/rdiscount.c

@@ -18,6 +18,7 @@ typedef struct {
  * - 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.
+ * - MKD_NOSTYLE: Set unless the "filter_styles" accessor returns true.
  * 
  * See rb_rdiscount__get_flags() for the detailed implementation.
  */
@@ -53,6 +54,11 @@ int rb_rdiscount__get_flags(VALUE ruby_obj)
     if ( rb_funcall(ruby_obj, rb_intern("smart"), 0) != Qtrue ) {
         flags = flags | MKD_NOPANTS;
     }
+
+    /* The "filter_styles" accessor turns OFF the MKD_NOSTYLE flag. */
+    if ( rb_funcall(ruby_obj, rb_intern("filter_styles"), 0) != Qtrue ) {
+        flags = flags | MKD_NOSTYLE;
+    }
     
     /* Handle standard flags declared in ACCESSOR_2_FLAG */
     for ( entry = ACCESSOR_2_FLAG; entry->accessor_name; entry++ ) {

data/ext/ruby-config.h

@@ -0,0 +1,10 @@
+// These data types may be already defined if building on Windows (using MinGW)
+#ifndef DWORD
+  #define DWORD unsigned int
+#endif
+#ifndef WORD
+  #define WORD unsigned short
+#endif
+#ifndef BYTE
+  #define BYTE unsigned char
+#endif

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '2.2.7'
+  VERSION = '2.2.7.2'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '2.2.7'
+  s.version = '2.2.7.2'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
   s.email = 'david@dafoster.net'
   s.homepage = 'http://dafoster.net/projects/rdiscount/'
@@ -14,12 +14,13 @@ 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
@@ -43,11 +44,11 @@ Gem::Specification.new do |s|
     ext/pgm_options.h
     ext/rdiscount.c
     ext/resource.c
+    ext/ruby-config.h
     ext/setup.c
     ext/tags.c
     ext/tags.h
     ext/toc.c
-    ext/VERSION
     ext/version.c
     ext/xml.c
     ext/xmlpage.c

data/test/rdiscount_test.rb

@@ -183,10 +183,25 @@ EOS
   end
   
   def test_that_style_tag_is_not_filtered_by_default
-    rd = RDiscount.new("Hello<style>p { margin: 5px; }</style>")
-    assert_equal "<p>Hello<style>p { margin: 5px; }</style></p>\n", rd.to_html
+    rd = RDiscount.new(<<EOS)
+Hello
+<style>
+p { margin: 5px; }
+</style>
+EOS
+    assert_equal "<p>Hello</p>\n\n<style>\np { margin: 5px; }\n</style>\n\n", rd.to_html
   end
   
+  def test_that_style_tag_is_filtered_with_flag
+    rd = RDiscount.new(<<EOS, :filter_styles)
+Hello
+<style>
+p { margin: 5px; }
+</style>
+EOS
+    assert_equal "<p>Hello</p>\n\n\n", rd.to_html
+  end
+
   def test_that_tables_can_have_leading_and_trailing_pipes
     rd = RDiscount.new(<<EOS)
 | A | B |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdiscount
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.7.2
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies: []
 description:
 email: david@dafoster.net
@@ -58,6 +58,7 @@ files:
 - ext/pgm_options.h
 - ext/rdiscount.c
 - ext/resource.c
+- ext/ruby-config.h
 - ext/setup.c
 - ext/tags.c
 - ext/tags.h