coradoc-adoc 2.0.12 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e7f028d984f0019578e97882169ce2be502e17fcfdeb376766f088d1af23958
-  data.tar.gz: 68533e4e500d008b4fc37f1beecc1fd160318adb6f9a6ed43fdf87a97ffedb31
+  metadata.gz: 36de3b63e2c80a4abafb35c88ca1ba80eb52603af631191e16f26d6482a5398c
+  data.tar.gz: 53026d0cf6835c5824636ffd6455f2baceecc3ffdd510cc26c8b79910c180c4f
 SHA512:
-  metadata.gz: 6c386bcee2e9a2bc1f3e47f2fca189b92bb7ef568fdb5105c2b59da916a43cc27bf912699c92e850c4f782e3e7575c5472a42262cb57a8da63ba14a5d1de88a3
-  data.tar.gz: 45e2116e5532d41b0f76a855c12e51066d26b648b947f3b6a95f817c7772794d0af57ee1b57fb402e7579d9b620e2eb61d44c99962b1030d6de74319f27920ff
+  metadata.gz: 8c51394ca9c3bde2a4d7c329e01648ae54d51d6e95e767a85cbaedc8aac35894fccaa50a9d46bf629477d8ac897700b70fff92d060dcbc9acad7182f92913672
+  data.tar.gz: 1bc422db9eeb898056d1a79150a1efdf81bddce0f0895cfc1760d9e6cc1953ccfc0d29aa2718da79c5e637ae1afca3565c8a08832950e4bfc0c3b102d3a4ea5a

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

@@ -4,25 +4,13 @@ module Coradoc
   module AsciiDoc
     module Parser
       module Citation
-        def xref_anchor
-          match('[^,>]').repeat(1).as(:href_arg).repeat(1, 1)
-        end
-
-        def xref_str
-          match('[^,>]').repeat(1).as(:text)
-        end
-
-        def xref_arg
-          (str('section') | str('paragraph') | str('clause') | str('annex') | str('table')).as(:key) >>
-            match('[ =]').as(:delimiter) >>
-            match('[^,>=]').repeat(1).as(:value)
-        end
-
+        # In `<<target,text>>`, the target is everything up to the first comma
+        # or closing `>`. The text is everything else up to `>` — it can
+        # contain commas, quotes, and any other punctuation.
         def cross_reference
-          (str('<<') >> xref_anchor >>
-          ((str(',') >> xref_arg).repeat(1) |
-            (str(',') >> xref_str).repeat(1)
-          ).maybe >>
+          (str('<<') >>
+            match('[^,>]').repeat(1).as(:href) >>
+            (str(',') >> match('[^>]').repeat(0).as(:text)).maybe >>
             str('>>')
           ).as(:cross_reference)
         end

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

@@ -35,6 +35,75 @@ module Coradoc
               )
             end
 
+            # Open blocks (`--`) are generic containers. AsciiDoc allows
+            # casting them to a different block type via positional
+            # attributes: verbatim types (`[source]`, `[listing]`,
+            # `[literal]`) and admonition labels (`[NOTE]`, `[TIP]`,
+            # `[WARNING]`, `[CAUTION]`, `[IMPORTANT]`). When such a cast
+            # is present, the block behaves like the corresponding
+            # delimited block. Anything else stays an OpenBlock.
+            def transform_open_block(block)
+              semantic = open_block_semantic(block)
+              case semantic
+              when :source_code
+                transform_source_block(block)
+              when :listing
+                transform_listing_from_open(block)
+              when :literal
+                transform_literal_from_open(block)
+              when :admonition
+                transform_admonition_from_open(block)
+              else
+                transform_typed_block(block, Coradoc::CoreModel::OpenBlock)
+              end
+            end
+
+            ADMONITION_TYPES = %w[note tip warning caution important].freeze
+
+            def open_block_semantic(block)
+              attrs = block.attributes
+              return nil unless attrs.is_a?(Coradoc::AsciiDoc::Model::AttributeList)
+
+              first = attrs.positional&.first
+              return nil unless first.is_a?(Coradoc::AsciiDoc::Model::AttributeListAttribute)
+
+              case first.value.to_s.downcase
+              when 'source' then :source_code
+              when 'listing' then :listing
+              when 'literal' then :literal
+              when *ADMONITION_TYPES then :admonition
+              end
+            end
+
+            def transform_admonition_from_open(block)
+              type = block.attributes.positional.first.value.to_s.downcase
+              content_lines = Array(block.lines).map { |line| ToCoreModel.extract_text_content(line) }.join("\n")
+              Coradoc::CoreModel::AnnotationBlock.new(
+                annotation_type: type,
+                content: content_lines,
+                title: ToCoreModel.extract_title_text(block.title)
+              )
+            end
+
+            def transform_listing_from_open(block)
+              content_lines = Array(block.lines).map { |line| ToCoreModel.extract_text_content(line) }.join("\n")
+              Coradoc::CoreModel::ListingBlock.new(
+                id: block.id,
+                title: ToCoreModel.extract_title_text(block.title),
+                content: content_lines,
+                language: ToCoreModel.extract_block_language(block)
+              )
+            end
+
+            def transform_literal_from_open(block)
+              content_lines = Array(block.lines).map { |line| ToCoreModel.extract_text_content(line) }.join("\n")
+              Coradoc::CoreModel::LiteralBlock.new(
+                id: block.id,
+                title: ToCoreModel.extract_title_text(block.title),
+                content: content_lines
+              )
+            end
+
             def transform_block(block, semantic_type_or_delimiter)
               content_lines = ToCoreModel.extract_block_lines(block)
               semantic_type = if semantic_type_or_delimiter.is_a?(Symbol)

data/lib/coradoc/asciidoc/transform/to_core_model_registrations.rb

@@ -52,7 +52,6 @@ module Coradoc
               Coradoc::AsciiDoc::Model::Block::Example => Coradoc::CoreModel::ExampleBlock,
               Coradoc::AsciiDoc::Model::Block::Side => Coradoc::CoreModel::SidebarBlock,
               Coradoc::AsciiDoc::Model::Block::Literal => Coradoc::CoreModel::LiteralBlock,
-              Coradoc::AsciiDoc::Model::Block::Open => Coradoc::CoreModel::OpenBlock,
               Coradoc::AsciiDoc::Model::Block::Pass => Coradoc::CoreModel::PassBlock
             }.each do |block_class, core_model_class|
               Registry.register_with_priority(
@@ -62,6 +61,12 @@ module Coradoc
               )
             end
 
+            Registry.register_with_priority(
+              Coradoc::AsciiDoc::Model::Block::Open,
+              ->(model) { Blk.transform_open_block(model) },
+              priority: 10
+            )
+
             Registry.register(
               Coradoc::AsciiDoc::Model::Block::Core,
               ->(model) { Blk.transform_block(model, model.delimiter.to_s) }

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

@@ -27,20 +27,11 @@ module Coradoc
             end
 
             # Cross reference
-            rule(href: simple(:href)) do
-              Model::Inline::CrossReference.new(href: href.to_s)
-            end
-
-            rule(
-              href: simple(:href),
-              name: simple(:name)
-            ) do
-              Model::Inline::CrossReference.new(href: href.to_s, args: [name.to_s])
-            end
-
-            rule(cross_reference: sequence(:xref)) do
-              args = xref.size > 1 ? xref[1..] : []
-              Model::Inline::CrossReference.new(href: xref[0], args:)
+            rule(cross_reference: subtree(:xref)) do
+              href = xref[:href].to_s
+              text = xref[:text]
+              args = text ? [text.to_s] : []
+              Model::Inline::CrossReference.new(href:, args:)
             end
 
             # Inline image
@@ -88,11 +79,6 @@ module Coradoc
               Coradoc::AsciiDoc::Model::Inline::Footnote.new(text: text_str)
             end
 
-            # Href arg
-            rule(href_arg: simple(:href_arg)) do
-              href_arg.to_s
-            end
-
             # Inline formatting rules generated from a single registry.
             # See InlineRules::FORMATTING_VARIANTS. `span` is special
             # because it carries `text:` + `attributes:` rather than

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.12'
+    VERSION = '2.0.14'
   end
 end

metadata

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