gitlab-glfm-markdown 0.0.38-x86_64-linux-gnu → 0.0.40-x86_64-linux-gnu

data/ext/{glfm_markdown → gitlab_glfm_markdown}/src/glfm.rs

@@ -10,6 +10,8 @@ pub struct RenderOptions {
     pub alerts: bool,
     pub autolink: bool,
     pub cjk_friendly_emphasis: bool,
+    /// Only use default comrak HTML formatting
+    pub default_html: bool,
     // pub default_info_string: String,
     pub description_lists: bool,
     pub escape: bool,
@@ -23,16 +25,27 @@ pub struct RenderOptions {
     pub github_pre_lang: bool,
     pub greentext: bool,
     pub hardbreaks: bool,
+    /// Use new header/anchor combination in HTML output, per
+    /// https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown/-/merge_requests/112.
+    pub header_accessibility: bool,
     pub header_ids: Option<String>,
     pub ignore_empty_links: bool,
     pub ignore_setext: bool,
+    /// Detect inapplicable tasks (`- [~]`)
+    pub inapplicable_tasks: bool,
     pub math_code: bool,
     pub math_dollars: bool,
     pub multiline_block_quotes: bool,
+    /// When the 'escaped_char_spans' render option is enabled, only emit `<span
+    /// data-escaped-char>` around the given characters.
+    pub only_escape_chars: Option<Vec<char>>,
+    /// Detect and mark potential placeholder variables, which
+    /// have the format `%{PLACEHOLDER}`
+    pub placeholder_detection: bool,
     pub relaxed_autolinks: bool,
     pub relaxed_tasklist_character: bool,
-    pub sourcepos: bool,
     pub smart: bool,
+    pub sourcepos: bool,
     pub spoiler: bool,
     pub strikethrough: bool,
     pub subscript: bool,
@@ -42,40 +55,11 @@ pub struct RenderOptions {
     pub tagfilter: bool,
     pub tasklist: bool,
     pub tasklist_classes: bool,
+    pub tasklist_in_table: bool,
     pub underline: bool,
     pub r#unsafe: bool,
     pub wikilinks_title_after_pipe: bool,
     pub wikilinks_title_before_pipe: bool,
-
-    /// GLFM specific options
-
-    /// Only use default comrak HTML formatting
-    pub default_html: bool,
-
-    /// Detect inapplicable tasks (`- [~]`)
-    pub inapplicable_tasks: bool,
-
-    /// Detect and mark potential placeholder variables, which
-    /// have the format `%{PLACEHOLDER}`
-    pub placeholder_detection: bool,
-
-    /// When the 'escaped_char_spans' render option is enabled, only emit `<span
-    /// data-escaped-char>` around the given characters.
-    pub only_escape_chars: Option<Vec<char>>,
-
-    pub debug: bool,
-}
-
-impl From<&RenderOptions> for RenderUserData {
-    fn from(options: &RenderOptions) -> Self {
-        RenderUserData {
-            default_html: options.default_html,
-            inapplicable_tasks: options.inapplicable_tasks,
-            placeholder_detection: options.placeholder_detection,
-            only_escape_chars: options.only_escape_chars.clone(),
-            debug: options.debug,
-        }
-    }
 }
 
 impl From<&RenderOptions> for comrak::Options<'_> {
@@ -120,10 +104,11 @@ impl From<&RenderOptions> for comrak::Options<'_> {
         comrak_options.render.r#unsafe = options.r#unsafe;
 
         // comrak_options.parse.default_info_string = options.default_info_string;
+        comrak_options.parse.ignore_setext = options.ignore_setext;
         comrak_options.parse.relaxed_autolinks = options.relaxed_autolinks;
         comrak_options.parse.relaxed_tasklist_matching = options.relaxed_tasklist_character;
         comrak_options.parse.smart = options.smart;
-        comrak_options.parse.ignore_setext = options.ignore_setext;
+        comrak_options.parse.tasklist_in_table = options.tasklist_in_table;
 
         comrak_options
     }

data/ext/{glfm_markdown → gitlab_glfm_markdown}/src/main.rs

@@ -14,6 +14,10 @@ struct Args {
     #[arg(value_name = "FILE")]
     file: Option<String>,
 
+    /// Write output to FILE instead of stdout
+    #[arg(short, long, value_name = "FILE")]
+    output: Option<String>,
+
     /// Enable 'alerts' extension
     #[arg(long)]
     alerts: bool,
@@ -22,6 +26,14 @@ struct Args {
     #[arg(long)]
     autolink: bool,
 
+    /// Enable 'cjk_friendly_emphasis' extension
+    #[arg(long)]
+    cjk_friendly_emphasis: bool,
+
+    /// Only use default comrak HTML formatting
+    #[arg(long)]
+    default_html: bool,
+
     /// Enable 'description-lists' extension
     #[arg(long)]
     description_lists: bool,
@@ -72,6 +84,11 @@ struct Args {
     #[arg(long)]
     hardbreaks: bool,
 
+    /// Use new header/anchor combination in HTML output, per
+    /// https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown/-/merge_requests/112.
+    #[arg(long)]
+    header_accessibility: bool,
+
     /// Enable the 'header IDs' extension, with the given ID prefix
     #[arg(long, value_name = "PREFIX")]
     header_ids: Option<String>,
@@ -84,6 +101,10 @@ struct Args {
     #[arg(long)]
     ignore_setext: bool,
 
+    /// Detect inapplicable tasks (`- [~]`)
+    #[arg(long)]
+    inapplicable_tasks: bool,
+
     /// Enables `math code` extension, using math code syntax
     #[arg(long)]
     math_code: bool,
@@ -96,9 +117,15 @@ struct Args {
     #[arg(long)]
     multiline_block_quotes: bool,
 
-    /// Write output to FILE instead of stdout
-    #[arg(short, long, value_name = "FILE")]
-    output: Option<String>,
+    /// When the 'escaped_char_spans' render option is enabled, only emit `<span
+    /// data-escaped-char>` around the characters in the supplied string.
+    #[arg(long)]
+    only_escape_chars: Option<String>,
+
+    /// Detect and marks potential placeholder variables, which
+    /// have the format `%{PLACEHOLDER}`
+    #[arg(long)]
+    placeholder_detection: bool,
 
     /// Enable relaxing of autolink parsing, allowing links to be recognized when in brackets
     #[arg(long)]
@@ -108,14 +135,14 @@ struct Args {
     #[arg(long)]
     relaxed_tasklist_character: bool,
 
-    /// Include source mappings in HTML attributes
-    #[arg(long)]
-    sourcepos: bool,
-
     /// Use smart punctuation
     #[arg(long)]
     smart: bool,
 
+    /// Include source mappings in HTML attributes
+    #[arg(long)]
+    sourcepos: bool,
+
     /// Enables spoilers using double vertical bars
     #[arg(long)]
     spoiler: bool,
@@ -152,6 +179,10 @@ struct Args {
     #[arg(long)]
     tasklist_classes: bool,
 
+    /// Enables parsing tasklist items within tables when they're the only content of a table cell
+    #[arg(long)]
+    tasklist_in_table: bool,
+
     /// Enables underlines using double underscores
     #[arg(long)]
     underline: bool,
@@ -167,34 +198,6 @@ struct Args {
     /// Enable 'wikilink_title_before_pipe' extension
     #[arg(long)]
     wikilinks_title_before_pipe: bool,
-
-    /// Only use default comrak HTML formatting
-    #[arg(long)]
-    default_html: bool,
-
-    /// GLFM specific options
-
-    /// Detect inapplicable tasks (`- [~]`)
-    #[arg(long)]
-    inapplicable_tasks: bool,
-
-    /// Detect and marks potential placeholder variables, which
-    /// have the format `%{PLACEHOLDER}`
-    #[arg(long)]
-    placeholder_detection: bool,
-
-    /// When the 'escaped_char_spans' render option is enabled, only emit `<span
-    /// data-escaped-char>` around the characters in the supplied string.
-    #[arg(long)]
-    only_escape_chars: Option<String>,
-
-    /// Enable 'cjk_friendly_emphasis' extension
-    #[arg(long)]
-    cjk_friendly_emphasis: bool,
-
-    /// Show debug information
-    #[arg(long)]
-    debug: bool,
 }
 
 fn main() {
@@ -216,6 +219,7 @@ fn main() {
         autolink: cli.autolink,
         cjk_friendly_emphasis: cli.cjk_friendly_emphasis,
         // default_info_string:
+        default_html: cli.default_html,
         description_lists: cli.description_lists,
         escape: cli.escape,
         escaped_char_spans: cli.escaped_char_spans,
@@ -228,6 +232,7 @@ fn main() {
         github_pre_lang: cli.github_pre_lang,
         greentext: cli.greentext,
         hardbreaks: cli.hardbreaks,
+        header_accessibility: cli.header_accessibility,
         header_ids: cli.header_ids,
         ignore_empty_links: cli.ignore_empty_links,
         ignore_setext: cli.ignore_setext,
@@ -235,10 +240,12 @@ fn main() {
         math_code: cli.math_code,
         math_dollars: cli.math_dollars,
         multiline_block_quotes: cli.multiline_block_quotes,
+        only_escape_chars: cli.only_escape_chars.map(|s| s.chars().collect()),
+        placeholder_detection: cli.placeholder_detection,
         relaxed_autolinks: cli.relaxed_autolinks,
         relaxed_tasklist_character: cli.relaxed_tasklist_character,
-        sourcepos: cli.sourcepos,
         smart: cli.smart,
+        sourcepos: cli.sourcepos,
         spoiler: cli.spoiler,
         strikethrough: cli.strikethrough,
         subscript: cli.subscript,
@@ -248,15 +255,11 @@ fn main() {
         tagfilter: cli.tagfilter,
         tasklist: cli.tasklist,
         tasklist_classes: cli.tasklist_classes,
+        tasklist_in_table: cli.tasklist_in_table,
         underline: cli.underline,
         r#unsafe: cli.r#unsafe,
         wikilinks_title_after_pipe: cli.wikilinks_title_after_pipe,
         wikilinks_title_before_pipe: cli.wikilinks_title_before_pipe,
-
-        default_html: cli.default_html,
-        placeholder_detection: cli.placeholder_detection,
-        only_escape_chars: cli.only_escape_chars.map(|s| s.chars().collect()),
-        debug: cli.debug,
     };
 
     let result = render(&source, &options);

data/lib/{glfm_markdown.rb → gitlab-glfm-markdown.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'glfm_markdown/version'
-require_relative 'glfm_markdown/loader'
+require_relative 'gitlab_glfm_markdown/version'
+require_relative 'gitlab_glfm_markdown/loader'
 
 load_rust_extension
 
@@ -27,9 +27,7 @@ module GLFMMarkdown
     tagfilter: false,
     tasklist: true,
     tasklist_classes: true,
-    unsafe: true,
-
-    debug: false
+    unsafe: true
   }.freeze
 
   class << self

data/lib/{glfm_markdown → gitlab_glfm_markdown}/loader.rb

@@ -2,7 +2,7 @@
 
 def load_rust_extension
   ruby_version = /(\d+\.\d+)/.match(RUBY_VERSION)
-  require "glfm_markdown/#{ruby_version}/glfm_markdown"
+  require "gitlab_glfm_markdown/#{ruby_version}/gitlab_glfm_markdown"
 rescue LoadError
-  require 'glfm_markdown/glfm_markdown'
+  require 'gitlab_glfm_markdown/gitlab_glfm_markdown'
 end

data/lib/{glfm_markdown → gitlab_glfm_markdown}/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GLFMMarkdown
-  VERSION = '0.0.38'
+  VERSION = '0.0.40'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-glfm-markdown
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.40
 platform: x86_64-linux-gnu
 authors:
 - Brett Walker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-10-29 00:00:00.000000000 Z
+date: 2025-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -64,20 +64,20 @@ files:
 - Cargo.lock
 - LICENSE
 - README.md
-- ext/glfm_markdown/Cargo.lock
-- ext/glfm_markdown/Cargo.toml
-- ext/glfm_markdown/extconf.rb
-- ext/glfm_markdown/src/formatter.rs
-- ext/glfm_markdown/src/glfm.rs
-- ext/glfm_markdown/src/lib.rs
-- ext/glfm_markdown/src/main.rs
-- lib/glfm_markdown.rb
-- lib/glfm_markdown/3.1/glfm_markdown.so
-- lib/glfm_markdown/3.2/glfm_markdown.so
-- lib/glfm_markdown/3.3/glfm_markdown.so
-- lib/glfm_markdown/3.4/glfm_markdown.so
-- lib/glfm_markdown/loader.rb
-- lib/glfm_markdown/version.rb
+- ext/gitlab_glfm_markdown/Cargo.lock
+- ext/gitlab_glfm_markdown/Cargo.toml
+- ext/gitlab_glfm_markdown/extconf.rb
+- ext/gitlab_glfm_markdown/src/formatter.rs
+- ext/gitlab_glfm_markdown/src/glfm.rs
+- ext/gitlab_glfm_markdown/src/lib.rs
+- ext/gitlab_glfm_markdown/src/main.rs
+- lib/gitlab-glfm-markdown.rb
+- lib/gitlab_glfm_markdown/3.1/gitlab_glfm_markdown.so
+- lib/gitlab_glfm_markdown/3.2/gitlab_glfm_markdown.so
+- lib/gitlab_glfm_markdown/3.3/gitlab_glfm_markdown.so
+- lib/gitlab_glfm_markdown/3.4/gitlab_glfm_markdown.so
+- lib/gitlab_glfm_markdown/loader.rb
+- lib/gitlab_glfm_markdown/version.rb
 homepage: https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown
 licenses:
 - MIT