coradoc-adoc 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99b9b654a8eebde5418dfbee6f7b184e65bbbcd830b24f0211963d61ed6c1201
-  data.tar.gz: 93e69befaf29a65358e5b6655b7b6cf63d0fb9baab9a828848d7468290c87e3b
+  metadata.gz: d8b381debf5d0742992318f775804846b9a2560e59dcff0dad3518999fcb39ad
+  data.tar.gz: 5556652e925b9d3081562849790252900e9a2b2493ca7f6eb8ae023d888ed38a
 SHA512:
-  metadata.gz: 1480db996c2768544ae15657c7f394bcaed954c31c79bdf1bfd3f3493b608aad77dc078ed44058ac0964632626585f096a7c96d6047a256ed07f902291ac204a
-  data.tar.gz: b3d0d2044b40702ad13d2f500e06e4e5881e865eda9ac0bc3f01fba94c82175b9b1752e3076b05781d7fd03075af7d276b8af55ef18b4be08576ea5018ea07b0
+  metadata.gz: 7bae7c856ed3b6c8c804c614e009a1efe36327c94cd8d1b5b48429b1fe849f75e99df68f1c85f719c63d57b05fd9584a707881bd01e8d232a5cf189bc9c7e69f
+  data.tar.gz: 121f12dea70e459c11f7f91233fb7189dedf92bdc0ad8665063c427df67456a8bf0d0bfa035dec43f46919b851fad078bf48598cdac323ff2c86a02102b560f4

data/lib/coradoc/asciidoc/parser/attribute_list.rb

@@ -44,7 +44,7 @@ module Coradoc
         end
 
         def positional_value_unquoted
-          match('[^\]\s,]').repeat(1) >> space.absent?
+          match('[^\],]').repeat(1)
         end
 
         def positional_value_single_quote

data/lib/coradoc/asciidoc/parser/inline.rb

@@ -118,6 +118,7 @@ module Coradoc
 
         def inline_image
           (str('image:').present? >> str('image:') >>
+            str(':').absent? >>
             match('[A-Za-z0-9_.\\-:/&?=+,%#~;]+').repeat(1).as(:path) >>
             (str('[') >> match('[^\\]]').repeat(1).as(:text) >> str(']')).maybe
           ).as(:inline_image)

data/lib/coradoc/asciidoc/parser/list.rb

@@ -72,11 +72,35 @@ module Coradoc
         def ulist_marker(nesting_level = 1)
           line_start? >>
             (nesting_level > 1 ? literal_space.maybe : str('')) >>
-            str('*' * nesting_level) >>
+            (
+              asterisk_marker(nesting_level) |
+              dash_marker(nesting_level)
+            )
+        end
+
+        # AsciiDoc standard bullet: `*`, `**`, `***`, ... matching the
+        # nesting level. Excludes table delimiters (`|===`) and deeper
+        # asterisk runs that belong to a sibling level.
+        def asterisk_marker(nesting_level)
+          str('*' * nesting_level) >>
             str('*').absent? >>
             str('===').absent?
         end
 
+        # Markdown-style dash bullet: `-`. Accepted only at the top level
+        # because Markdown nests via indentation rather than multi-char
+        # markers — deeper levels stay on the AsciiDoc `*` form. Guards
+        # exclude em-dashes (`--`), delimited-block fences (`----`),
+        # and negative-number runs (`-1`, `-42`) which are not list
+        # markers in any common dialect.
+        def dash_marker(nesting_level)
+          return match('').absent? unless nesting_level == 1
+
+          str('-') >>
+            str('-').absent? >>
+            match('[0-9]').absent?
+        end
+
         def ulist_item(nesting_level = 1)
           item = ulist_marker(nesting_level).as(:marker) >>
                  str(' [[[').absent? >>

data/lib/coradoc/asciidoc/transform/element_transformers/block_transformer.rb

@@ -128,7 +128,7 @@ module Coradoc
 
             def transform_typed_block(block, klass, extra_attrs = {})
               raw_lines = Array(block.lines)
-              has_nested_blocks = raw_lines.any?(Coradoc::AsciiDoc::Model::Block::Core)
+              has_nested_blocks = raw_lines.any? { |line| block_level_child?(line) }
 
               if has_nested_blocks
                 children = raw_lines.reject do |line|
@@ -195,6 +195,17 @@ module Coradoc
               groups << current if current.any?
               groups
             end
+
+            # A line that should be emitted as a direct child of the
+            # enclosing block rather than joined into a paragraph sibling.
+            # The AsciiDoc model layer declares level via `block_level?`
+            # (true for Block::Core delimited blocks, BlockImage, Table,
+            # List::Core, Section, CommentBlock, Attached). Inline content
+            # (String, TextElement, LineBreak, PageBreak) returns false and
+            # stays inside paragraphs.
+            def block_level_child?(line)
+              line.is_a?(Coradoc::AsciiDoc::Model::Base) && line.block_level?
+            end
           end
         end
       end

data/lib/coradoc/asciidoc/transform/element_transformers/other_transformer.rb

@@ -27,9 +27,19 @@ module Coradoc
             def transform_image(image)
               src = image.src.to_s
               src = src[1..] if src.start_with?(':')
+              positional = image.attributes&.positional || []
+              positional_alt = positional.first&.value&.to_s || ''
+              caption = positional[1]&.value&.to_s
+              title = image.title&.to_s
+              # AsciiDoc block-title (`.Caption`) is semantically a caption,
+              # but for compatibility with the existing pipeline that treated
+              # it as alt when no positional alt was supplied, fall back to it.
+              alt = positional_alt.empty? ? title : positional_alt
               Coradoc::CoreModel::Image.new(
                 src: src,
-                alt: image.title&.to_s,
+                alt: alt,
+                caption: caption,
+                title: title,
                 width: image.attributes&.[]('width'),
                 height: image.attributes&.[]('height')
               )

data/lib/coradoc/asciidoc/transformer/block_rules.rb

@@ -46,7 +46,7 @@ module Coradoc
               id = block_image[:id]
               title = block_image[:title]
               path = block_image[:path]
-              attrs = AttributeListNormalizer.coerce(block_image[:attribute_list])
+              attrs = AttributeListNormalizer.coerce(block_image[:attribute_list_macro])
               Model::Image::BlockImage.new(
                 title: title,
                 id: id,

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.17'
+    VERSION = '2.0.18'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-adoc
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - Ribose Inc.