commonmarker 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e957581f95994879ef4f49e98c8103ff5e6aa5c8ececb7b4e36aff6c720d2291
-  data.tar.gz: 2424ac822e2d46c3d87a534fea610aa3826cf979c556cb57018407bee815b3a5
+  metadata.gz: 362d4bf8294cd73e751f475c5b948bbec9d11aa7493f05ca10c92da121e9b70d
+  data.tar.gz: b2a32716e7715cc9cebc8924904f7f634ba545fd94e92bbcd0f5c90774ca5b9f
 SHA512:
-  metadata.gz: ba981be34c92dc9fe4d93b22d03f77406e64f53a02db8f5aa6c87a86bebafd2fbe34384ae68561a6f59d92b4f83369407dd6becf15f0a2c03c2a6dab0ecf726b
-  data.tar.gz: 2217743311c62f65885e8e842f422357f2b923f717f4cc8af9f7f285eded1539b1fba4e60faed00e25c5ccece3210bf0a79afeeb9e8499b18d21e8e9c708f22c
+  metadata.gz: d0db7681ba488119f35f3c62b43b8e28f534e4e639ad9e19a37d8f40b9d191d456247ad4604d8e04f27e580ea3bffaa3ab5eed1b246956223d989c07daefb288
+  data.tar.gz: c62db4035c2ddeaf027cb231409f8a3814c393661609bbb75698c7ac4e01278a96a6e2225a48d9fd09633ea461a471df69b5d3b4232631b52374e7cf5a067f0d

data/Cargo.lock

@@ -84,20 +84,18 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.69.5"
+version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
  "bitflags",
  "cexpr",
  "clang-sys",
  "itertools",
- "lazy_static",
- "lazycell",
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 1.1.0",
+ "rustc-hash",
  "shlex",
  "syn",
 ]
@@ -255,9 +253,9 @@ dependencies = [
 
 [[package]]
 name = "comrak"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07383e7799d964bf7ffa6fc4457d177c54a44614661c7458bb0bd91b108e32"
+checksum = "aac0b255932a9cd52fbfd664b67957f9f2e095ae4711cb0e41b4e291edef94c2"
 dependencies = [
  "bon",
  "caseless",
@@ -269,7 +267,7 @@ dependencies = [
  "jetscii",
  "phf",
  "phf_codegen",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "shell-words",
  "smallvec",
  "syntect",
@@ -484,12 +482,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "libc"
 version = "0.2.180"
@@ -725,18 +717,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.124"
+version = "0.9.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85c4188462601e2aa1469def389c17228566f82ea72f137ed096f21591bc489"
+checksum = "284799e73e899fe946fd77c7211b83bff61a1356e039ade7a2516a779e3212d0"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.124"
+version = "0.9.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568068db4102230882e6d4ae8de6632e224ca75fe5970f6e026a04e91ed635d3"
+checksum = "855fc1ad8943d12c89ef12f9147f1cc531f5bf19fb744112fdd317bb6ee7b5c5"
 dependencies = [
  "bindgen",
  "lazy_static",
@@ -788,12 +780,6 @@ version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"

data/Cargo.toml

@@ -1,7 +1,12 @@
 # This Cargo.toml is here to let externals tools (IDEs, etc.) know that this is
-# a Rust project. Your extensions depedencies should be added to the Cargo.toml
+# a Rust project. Your extensions dependencies should be added to the Cargo.toml
 # in the ext/ directory.
 
 [workspace]
 members = ["ext/commonmarker"]
 resolver = "2"
+
+[profile.release]
+codegen-units = 1
+lto = true
+strip = true

data/README.md

@@ -5,7 +5,7 @@ Ruby wrapper for Rust's [comrak](https://github.com/kivikakk/comrak) crate.
 It passes all of the CommonMark test suite, and is therefore spec-complete. It also includes extensions to the CommonMark spec as documented in the [GitHub Flavored Markdown spec](http://github.github.com/gfm/), such as support for tables, strikethroughs, and autolinking.
 
 > [!NOTE]
-> By default, several extensions not in any spec have been enabled, for the sake of end user convenience when generating HTML.
+> By default, the following extensions are enabled for end user convenience: `strikethrough`, `tagfilter`, `table`, `autolink`, `tasklist` (all from the [GFM spec](http://github.github.com/gfm/)), and `shortcodes`. The `syntax_highlighter` plugin is also enabled by default, using the `"base16-ocean.dark"` theme.
 >
 > For more information on the available options and extensions, see [the documentation below](#options-and-plugins).
 
@@ -164,6 +164,7 @@ Note that there is a distinction in comrak for "parse" options and "render" opti
 | `relaxed_autolinks`          | Enable relaxing of the autolink extension parsing, allowing links to be recognized when in brackets, as well as permitting any url scheme.  | `false` |
 | `leave_footnote_definitions` | Allow footnote definitions to remain in their original positions instead of being moved to the document's end (only affects AST)            | `false` |
 | `ignore_setext`              | Ignores setext-style headings.                                                                                                              | `false` |
+| `sourcepos_chars`            | Use character-based column tracking in source positions instead of byte-based. Relevant for multi-byte UTF-8 documents with `sourcepos`.    | `false` |
 
 ### Render options
 
@@ -203,6 +204,7 @@ Commonmarker.to_html('"Hi *there*"', options: {
 | `tasklist`                    | Enables the [task list extension](https://github.github.com/gfm/#task-list-items-extension-) from the GFM spec.     | `true`  |
 | `superscript`                 | Enables the superscript Comrak extension.                                                                           | `false` |
 | `header_ids`                  | Enables the header IDs Comrak extension. from the GFM spec.                                                         | `""`    |
+| `header_id_prefix_in_href`    | Also add the prefix to generated `href` attributes pointing to headers.                                             | `false` |
 | `footnotes`                   | Enables the footnotes extension per `cmark-gfm`.                                                                    | `false` |
 | `inline_footnotes`            | Enables the inline footnotes extension.                                                                             | `false` |
 | `description_lists`           | Enables the description lists extension.                                                                            | `false` |
@@ -221,6 +223,7 @@ Commonmarker.to_html('"Hi *there*"', options: {
 | `cjk_friendly_emphasis`       | Enables the [CJK friendly emphasis](https://github.com/tats-u/markdown-cjk-friendly) extension.                     | `false` |
 | `highlight`                   | Enables highlighting via `==`                                                                                       | `false` |
 | `insert`                      | Enables the insert extension, rendering `++text++` as `<ins>text</ins>`.                                            | `false` |
+| `block_directive`             | Enables the block directive extension.                                                                              | `false` |
 
 For more information on these options, see [the comrak documentation](https://github.com/kivikakk/comrak#usage).
 
@@ -231,6 +234,8 @@ providing further niceties.
 
 #### Syntax Highlighter Plugin
 
+The syntax highlighter plugin is **enabled by default**, using the `"base16-ocean.dark"` theme. It applies syntax highlighting to fenced code blocks that specify a language.
+
 The library comes with [a set of pre-existing themes](https://docs.rs/syntect/5.0.0/syntect/highlighting/struct.ThemeSet.html#implementations) for highlighting code:
 
 - `"base16-ocean.dark"`
@@ -261,8 +266,6 @@ puts Commonmarker.to_html(code, plugins: { syntax_highlighter: { theme: "Inspire
 # </code></pre>
 ````
 
-By default, the plugin uses the `"base16-ocean.dark"` theme to syntax highlight code.
-
 To disable this plugin, set the value to `nil`:
 
 ````ruby

data/ext/commonmarker/Cargo.toml

@@ -10,7 +10,7 @@ magnus = { version = "0.8", features = ["rb-sys"] }
 rb-sys = { version = "*", default-features = false, features = [
     "stable-api-compiled-fallback",
 ] }
-comrak = { version = "0.51", features = ["shortcodes"] }
+comrak = { version = "0.52", features = ["shortcodes"] }
 syntect = { version = "5.3", features = ["plist-load"] }
 typed-arena = "2.0"
 rctree = "0.6"

data/ext/commonmarker/build.rs

@@ -0,0 +1,9 @@
+fn main() {
+    // Ruby statically bundles Oniguruma in its Windows library (libx64-ucrt-ruby*.a),
+    // which collides with onig_sys pulled in by comrak's syntect dependency.
+    // Allow the linker to resolve duplicates by picking the first definition.
+    let target = std::env::var("TARGET").unwrap_or_default();
+    if target.contains("windows-gnu") {
+        println!("cargo:rustc-link-arg=-Wl,--allow-multiple-definition");
+    }
+}

data/ext/commonmarker/src/options.rs

@@ -10,6 +10,7 @@ const PARSE_DEFAULT_INFO_STRING: &str = "default_info_string";
 const PARSE_RELAXED_TASKLIST_MATCHING: &str = "relaxed_tasklist_matching";
 const PARSE_RELAXED_AUTOLINKS: &str = "relaxed_autolinks";
 const PARSE_LEAVE_FOOTNOTE_DEFINITIONS: &str = "leave_footnote_definitions";
+const PARSE_SOURCEPOS_CHARS: &str = "sourcepos_chars";
 
 pub fn iterate_parse_options(comrak_options: &mut comrak::options::Parse, options_hash: RHash) {
     options_hash
@@ -33,6 +34,9 @@ pub fn iterate_parse_options(comrak_options: &mut comrak::options::Parse, option
                 Cow::Borrowed(PARSE_LEAVE_FOOTNOTE_DEFINITIONS) => {
                     comrak_options.leave_footnote_definitions = TryConvert::try_convert(value)?;
                 }
+                Cow::Borrowed(PARSE_SOURCEPOS_CHARS) => {
+                    comrak_options.sourcepos_chars = TryConvert::try_convert(value)?;
+                }
                 _ => {}
             }
             Ok(ForEach::Continue)
@@ -112,6 +116,7 @@ const EXTENSION_AUTOLINK: &str = "autolink";
 const EXTENSION_TASKLIST: &str = "tasklist";
 const EXTENSION_SUPERSCRIPT: &str = "superscript";
 const EXTENSION_HEADER_IDS: &str = "header_ids";
+const EXTENSION_HEADER_ID_PREFIX_IN_HREF: &str = "header_id_prefix_in_href";
 const EXTENSION_FOOTNOTES: &str = "footnotes";
 const EXTENSION_INLINE_FOOTNOTES: &str = "inline_footnotes";
 const EXTENSION_DESCRIPTION_LISTS: &str = "description_lists";
@@ -131,6 +136,7 @@ const EXTENSION_ALERTS: &str = "alerts";
 const EXTENSION_CJK_FRIENDLY_EMPHASIS: &str = "cjk_friendly_emphasis";
 const EXTENSION_HIGHLIGHT: &str = "highlight";
 const EXTENSION_INSERT: &str = "insert";
+const EXTENSION_BLOCK_DIRECTIVE: &str = "block_directive";
 
 pub fn iterate_extension_options(
     comrak_options: &mut comrak::options::Extension,
@@ -158,7 +164,10 @@ pub fn iterate_extension_options(
                     comrak_options.superscript = TryConvert::try_convert(value)?;
                 }
                 Cow::Borrowed(EXTENSION_HEADER_IDS) => {
-                    comrak_options.header_ids = try_convert_string(value);
+                    comrak_options.header_id_prefix = try_convert_string(value);
+                }
+                Cow::Borrowed(EXTENSION_HEADER_ID_PREFIX_IN_HREF) => {
+                    comrak_options.header_id_prefix_in_href = TryConvert::try_convert(value)?;
                 }
                 Cow::Borrowed(EXTENSION_FOOTNOTES) => {
                     comrak_options.footnotes = TryConvert::try_convert(value)?;
@@ -221,6 +230,9 @@ pub fn iterate_extension_options(
                 Cow::Borrowed(EXTENSION_INSERT) => {
                     comrak_options.insert = TryConvert::try_convert(value)?;
                 }
+                Cow::Borrowed(EXTENSION_BLOCK_DIRECTIVE) => {
+                    comrak_options.block_directive = TryConvert::try_convert(value)?;
+                }
                 _ => {}
             }
             Ok(ForEach::Continue)

data/lib/commonmarker/config.rb

@@ -12,6 +12,7 @@ module Commonmarker
         relaxed_autolinks: false,
         leave_footnote_definitions: false,
         ignore_setext: false,
+        sourcepos_chars: false,
       }.freeze,
       render: {
         hardbreaks: true,
@@ -36,6 +37,7 @@ module Commonmarker
         tasklist: true,
         superscript: false,
         header_ids: "",
+        header_id_prefix_in_href: false,
         footnotes: false,
         inline_footnotes: false,
         description_lists: false,
@@ -55,6 +57,7 @@ module Commonmarker
         cjk_friendly_emphasis: false,
         highlight: false,
         insert: false,
+        block_directive: false,
       }.freeze,
       format: [:html].freeze,
     }.freeze

data/lib/commonmarker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Commonmarker
-  VERSION = "2.7.0"
+  VERSION = "2.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Garen Torikian
@@ -64,6 +64,7 @@ files:
 - LICENSE.txt
 - README.md
 - ext/commonmarker/Cargo.toml
+- ext/commonmarker/build.rs
 - ext/commonmarker/extconf.rb
 - ext/commonmarker/src/lib.rs
 - ext/commonmarker/src/node.rs
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '3.4'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: CommonMark parser and renderer. Written in Rust, wrapped in Ruby.
 test_files: []