coradoc 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a167bf671c487f25b37d0df4019bee6bd324636fdf9a681b799764f4a14b2d
-  data.tar.gz: 89345da1186b5ad1fc3ed0315b536a09e445015b1744094fd3ff187382023818
+  metadata.gz: 69f496efd91c2d85e4e057be629f8ee00492c40497661c0af940be65f148e092
+  data.tar.gz: a2668ca45e7d23bf613d966c36b4c5da70311be0dcdbc0fba4d988844f49b65f
 SHA512:
-  metadata.gz: 5a7ead748469ceecbe303de9fd0e65b0081c4765cb8cda371f11cdd76173dcb60372f89ff2c5fc1d30b74fab0bff349fd0149b62ddd65df5b944a350dea14cc9
-  data.tar.gz: 41c5de35c416b7bfcc74ba8043bc26771e4bc8a332f59211de6f0c7f6bae7019fa096458ab705bd7e54b0c248c352df70c04467679f156c315e02c00ef4fdf5d
+  metadata.gz: '04584b5faee36ac872400d4d17458221931de4f733aae75839dc40f282d4f863948c9105eb80fefb84f6945639c76c55ccf62fd93d8fd442268f36698950625d'
+  data.tar.gz: 00c91cfd40f731c1fffab6ae507d326140e5c7830a8d10bf6a5bb75857ba0b69a552fc4a27d8bd3abb95d4a16159a516df62232bc538fd79fe55a7023e95af0b

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-06 19:17:34 UTC using RuboCop version 1.75.8.
+# on 2026-05-08 04:52:25 UTC using RuboCop version 1.75.8.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -15,6 +15,28 @@ Gemspec/RequiredRubyVersion:
     - 'coradoc-html/coradoc-html.gemspec'
     - 'coradoc.gemspec'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'coradoc-adoc/lib/coradoc/asciidoc/serializer/serializers/document.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/ClosingParenthesisIndentation:
+  Exclude:
+    - 'lib/coradoc/document_manipulator.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
+Layout/FirstArgumentIndentation:
+  Exclude:
+    - 'lib/coradoc/document_manipulator.rb'
+
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
@@ -22,6 +44,21 @@ Gemspec/RequiredRubyVersion:
 Layout/LineLength:
   Max: 235
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: symmetrical, new_line, same_line
+Layout/MultilineMethodCallBraceLayout:
+  Exclude:
+    - 'lib/coradoc/document_manipulator.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'coradoc-adoc/lib/coradoc/asciidoc/serializer/serializers/document.rb'
+
 # Offense count: 1
 Lint/BinaryOperatorWithIdenticalOperands:
   Exclude:
@@ -96,7 +133,7 @@ Lint/Void:
   Exclude:
     - 'coradoc-html/lib/coradoc/html.rb'
 
-# Offense count: 237
+# Offense count: 236
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 178
@@ -117,12 +154,12 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Max: 556
 
-# Offense count: 186
+# Offense count: 179
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 383
+# Offense count: 384
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 246
@@ -138,7 +175,7 @@ Metrics/ParameterLists:
   Max: 7
   MaxOptionalParameters: 4
 
-# Offense count: 125
+# Offense count: 122
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 27
@@ -201,6 +238,12 @@ Naming/VariableName:
   Exclude:
     - 'coradoc-markdown/lib/coradoc/markdown.rb'
 
+# Offense count: 12
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'coradoc-adoc/spec/coradoc/asciidoc/model/element_classification_spec.rb'
+
 # Offense count: 1
 RSpec/BeforeAfterAll:
   Exclude:
@@ -209,11 +252,19 @@ RSpec/BeforeAfterAll:
     - '**/spec/support/**/*.rb'
     - 'spec/benchmark/performance_spec.rb'
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Enabled: false
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
+# SupportedStyles: described_class, explicit
+RSpec/DescribedClass:
+  Exclude:
+    - 'coradoc-adoc/spec/coradoc/asciidoc/model/base_spec.rb'
+
 # Offense count: 485
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
@@ -265,7 +316,7 @@ RSpec/MessageSpies:
 RSpec/MultipleDescribes:
   Enabled: false
 
-# Offense count: 613
+# Offense count: 619
 RSpec/MultipleExpectations:
   Max: 12
 
@@ -344,7 +395,7 @@ Style/ClassVars:
     - 'coradoc-adoc/lib/coradoc/asciidoc/serializer/element_registry.rb'
     - 'coradoc-html/lib/coradoc/html/input/converters.rb'
 
-# Offense count: 291
+# Offense count: 292
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -380,6 +431,12 @@ Style/HashLikeCase:
     - 'coradoc-html/lib/coradoc/html/input/converters/table.rb'
     - 'coradoc-html/lib/coradoc/html/input/converters/td.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/MultilineIfModifier:
+  Exclude:
+    - 'coradoc-adoc/lib/coradoc/asciidoc/serializer/serializers/document.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.

data/coradoc-adoc/lib/coradoc/asciidoc/model/attached.rb

@@ -17,6 +17,9 @@ module Coradoc
       # @see Coradoc::AsciiDoc::Model::Block::Core
       #
       class Attached < Base
+        def block_level?
+          true
+        end
       end
     end
   end

data/coradoc-adoc/lib/coradoc/asciidoc/model/base.rb

@@ -35,6 +35,16 @@ module Coradoc
 
         attribute :id, :string
 
+        # Element classification for spacing and serialization decisions.
+        # Subclasses override these to declare their level.
+        def block_level?
+          false
+        end
+
+        def inline?
+          false
+        end
+
         # Generate a warning message whenever this method is called.
         def simplify_block_content(content)
           warn '[DEPRECATION] #simplify_block_content is called inside a Lutaml Model.  This is still a WIP.'

data/coradoc-adoc/lib/coradoc/asciidoc/model/comment_block.rb

@@ -21,6 +21,10 @@ module Coradoc
       # @see Coradoc::AsciiDoc::Model::CommentLine Single-line comments
       #
       class CommentBlock < Base
+        def block_level?
+          true
+        end
+
         attribute :text, :string
         attribute :line_break, :string, default: -> { "\n" }
       end

data/coradoc-adoc/lib/coradoc/asciidoc/model/image/block_image.rb

@@ -5,6 +5,10 @@ module Coradoc
     module Model
       module Image
         class BlockImage < Coradoc::AsciiDoc::Model::Image::Core
+          def block_level?
+            true
+          end
+
           # Autoload nested AttributeList class
           autoload :AttributeList, 'coradoc/asciidoc/model/image/block_image/attribute_list'
 

data/coradoc-adoc/lib/coradoc/asciidoc/model/image/inline_image.rb

@@ -5,6 +5,10 @@ module Coradoc
     module Model
       module Image
         class InlineImage < Coradoc::AsciiDoc::Model::Image::Core
+          def inline?
+            true
+          end
+
           attribute :colons, :string, default: -> { ':' }
         end
       end

data/coradoc-adoc/lib/coradoc/asciidoc/model/inline/base.rb

@@ -5,6 +5,9 @@ module Coradoc
     module Model
       module Inline
         class Base < Coradoc::AsciiDoc::Model::Base
+          def inline?
+            true
+          end
         end
       end
     end

data/coradoc-adoc/lib/coradoc/asciidoc/model/inline/hard_line_break.rb

@@ -14,6 +14,9 @@ module Coradoc
         #   break.to_adoc # => " +"
         #
         class HardLineBreak < Base
+          def inline?
+            :hardbreak
+          end
         end
       end
     end

data/coradoc-adoc/lib/coradoc/asciidoc/model/list/core.rb

@@ -29,6 +29,10 @@ module Coradoc
         class Core < Nestable
           include Coradoc::AsciiDoc::Model::Anchorable
 
+          def block_level?
+            true
+          end
+
           attribute :id, :string
           attribute :prefix, :string
           # attribute :anchor, Inline::Anchor, default: -> {

data/coradoc-adoc/lib/coradoc/asciidoc/model/list/item.rb

@@ -65,23 +65,6 @@ module Coradoc
                     initialize_empty: true
 
           attribute :nested, Coradoc::AsciiDoc::Model::List::Nestable
-
-          HARDBREAK_MARKERS = %i[hardbreak init].freeze
-          STRIP_UNICODE_BEGIN_MARKERS = (HARDBREAK_MARKERS.dup + [false]).freeze
-          STRIP_UNICODE_END_MARKERS = [:hardbreak, :end, false].freeze
-
-          def inline?(elem)
-            case elem
-            when Inline::HardLineBreak
-              :hardbreak
-            when ->(i) { i.class.name.to_s.include? '::Inline::' }
-              true
-            when String, TextElement, Image::InlineImage
-              true
-            else
-              false
-            end
-          end
         end
       end
     end

data/coradoc-adoc/lib/coradoc/asciidoc/model/section.rb

@@ -39,6 +39,10 @@ module Coradoc
       class Section < Base
         include Coradoc::AsciiDoc::Model::Anchorable
 
+        def block_level?
+          true
+        end
+
         attribute :id, :string
         attribute :content, :string
         attribute :title, Coradoc::AsciiDoc::Model::Title

data/coradoc-adoc/lib/coradoc/asciidoc/model/table.rb

@@ -26,6 +26,10 @@ module Coradoc
       class Table < Base
         include Coradoc::AsciiDoc::Model::Anchorable
 
+        def block_level?
+          true
+        end
+
         attribute :id, :string
         attribute :title, :string
         attribute :rows, Coradoc::AsciiDoc::Model::TableRow, collection: true

data/coradoc-adoc/lib/coradoc/asciidoc/model/text_element.rb

@@ -4,6 +4,10 @@ module Coradoc
   module AsciiDoc
     module Model
       class TextElement < Base
+        def inline?
+          true
+        end
+
         attribute :id, :string
         attribute :content,
                   Lutaml::Model::Serializable,

data/coradoc-adoc/lib/coradoc/asciidoc/serializer/serializers/base.rb

@@ -120,17 +120,6 @@ module Coradoc
             end
           end
 
-          # Helper to check if element is block-level
-          # @param element [Object] Element to check
-          # @return [Boolean] True if block-level
-          def block_level_element?(element)
-            element.is_a?(Coradoc::AsciiDoc::Model::Block::Core) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Section) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Paragraph) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::List) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Table)
-          end
-
           # Helper to add spacing between elements
           # @param elements [Array] Elements to space
           # @param options [Hash] Spacing options

data/coradoc-adoc/lib/coradoc/asciidoc/serializer/serializers/list/item.rb

@@ -94,16 +94,10 @@ module Coradoc
             private
 
             def inline?(elem)
-              case elem
-              when Coradoc::AsciiDoc::Model::Inline::HardLineBreak
-                :hardbreak
-              when ->(i) { i.class.name.to_s.include?('::Inline::') }
-                true
-              when String, Coradoc::AsciiDoc::Model::TextElement, Coradoc::AsciiDoc::Model::Image::InlineImage
-                true
-              else
-                false
-              end
+              return true if elem.is_a?(String)
+              return false unless elem.is_a?(Coradoc::AsciiDoc::Model::Base)
+
+              elem.inline?
             end
 
             def gen_anchor(inline: false)

data/coradoc-adoc/lib/coradoc/asciidoc/serializer/spacing_strategy.rb

@@ -47,19 +47,11 @@ module Coradoc
             end
           end
 
-          # Check if element is block-level
-          # @param element [Object] Element to check
-          # @return [Boolean] True if block-level
           def block_level?(element)
             return false if element.nil?
+            return true if element.is_a?(String)
 
-            element.is_a?(Coradoc::AsciiDoc::Model::Block::Core) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Section) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Paragraph) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::List) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Table) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::CommentBlock) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Admonition)
+            element.block_level?
           end
 
           # Check if element is inline-level
@@ -67,15 +59,9 @@ module Coradoc
           # @return [Boolean] True if inline-level
           def inline_level?(element)
             return false if element.nil?
+            return true if element.is_a?(String)
 
-            element.is_a?(String) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::TextElement) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Inline::Bold) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Inline::Italic) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Inline::Monospace) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Inline::Highlight) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Inline::Superscript) ||
-              element.is_a?(Coradoc::AsciiDoc::Model::Inline::Subscript)
+            element.inline?
           end
         end
       end

data/coradoc-adoc/spec/coradoc/asciidoc/model/base_spec.rb

@@ -33,10 +33,24 @@ RSpec.describe Coradoc::AsciiDoc::Model::Base do
   end
 
   describe '#to_adoc' do
-    it 'is defined on Base' do
+    it 'serializes via ElementRegistry' do
       instance = test_class.new(name: 'test')
 
-      expect(instance).to respond_to(:to_adoc)
+      expect(instance).to be_a(described_class)
+    end
+  end
+
+  describe 'element classification' do
+    it 'defaults block_level? to false' do
+      instance = test_class.new
+
+      expect(instance.block_level?).to be(false)
+    end
+
+    it 'defaults inline? to false' do
+      instance = test_class.new
+
+      expect(instance.inline?).to be(false)
     end
   end
 

data/coradoc-adoc/spec/coradoc/asciidoc/model/element_classification_spec.rb

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Element classification' do
+  describe 'block_level?' do
+    it 'Section is block-level' do
+      expect(Coradoc::AsciiDoc::Model::Section.new.block_level?).to be(true)
+    end
+
+    it 'Paragraph is block-level' do
+      expect(Coradoc::AsciiDoc::Model::Paragraph.new.block_level?).to be(true)
+    end
+
+    it 'Admonition is block-level' do
+      expect(Coradoc::AsciiDoc::Model::Admonition.new.block_level?).to be(true)
+    end
+
+    it 'CommentBlock is block-level' do
+      expect(Coradoc::AsciiDoc::Model::CommentBlock.new.block_level?).to be(true)
+    end
+
+    it 'Table is block-level' do
+      expect(Coradoc::AsciiDoc::Model::Table.new.block_level?).to be(true)
+    end
+
+    it 'Block::Core is block-level' do
+      expect(Coradoc::AsciiDoc::Model::Block::Core.new.block_level?).to be(true)
+    end
+
+    it 'Block::Listing is block-level (inherits from Core)' do
+      expect(Coradoc::AsciiDoc::Model::Block::Listing.new.block_level?).to be(true)
+    end
+
+    it 'Block::Quote is block-level (inherits from Core)' do
+      expect(Coradoc::AsciiDoc::Model::Block::Quote.new.block_level?).to be(true)
+    end
+
+    it 'List::Ordered is block-level' do
+      expect(Coradoc::AsciiDoc::Model::List::Ordered.new.block_level?).to be(true)
+    end
+
+    it 'List::Unordered is block-level' do
+      expect(Coradoc::AsciiDoc::Model::List::Unordered.new.block_level?).to be(true)
+    end
+
+    it 'BlockImage is block-level' do
+      expect(Coradoc::AsciiDoc::Model::Image::BlockImage.new.block_level?).to be(true)
+    end
+  end
+
+  describe 'inline?' do
+    it 'Inline::Bold is inline' do
+      expect(Coradoc::AsciiDoc::Model::Inline::Bold.new.inline?).to be(true)
+    end
+
+    it 'Inline::Italic is inline' do
+      expect(Coradoc::AsciiDoc::Model::Inline::Italic.new.inline?).to be(true)
+    end
+
+    it 'Inline::Monospace is inline' do
+      expect(Coradoc::AsciiDoc::Model::Inline::Monospace.new.inline?).to be(true)
+    end
+
+    it 'Inline::Highlight is inline' do
+      expect(Coradoc::AsciiDoc::Model::Inline::Highlight.new.inline?).to be(true)
+    end
+
+    it 'Inline::Superscript is inline' do
+      expect(Coradoc::AsciiDoc::Model::Inline::Superscript.new.inline?).to be(true)
+    end
+
+    it 'Inline::Subscript is inline' do
+      expect(Coradoc::AsciiDoc::Model::Inline::Subscript.new.inline?).to be(true)
+    end
+
+    it 'Inline::Link is inline' do
+      expect(Coradoc::AsciiDoc::Model::Inline::Link.new.inline?).to be(true)
+    end
+
+    it 'Inline::Anchor is inline' do
+      expect(Coradoc::AsciiDoc::Model::Inline::Anchor.new.inline?).to be(true)
+    end
+
+    it 'TextElement is inline' do
+      expect(Coradoc::AsciiDoc::Model::TextElement.new.inline?).to be(true)
+    end
+
+    it 'InlineImage is inline' do
+      expect(Coradoc::AsciiDoc::Model::Image::InlineImage.new.inline?).to be(true)
+    end
+
+    it 'HardLineBreak returns :hardbreak' do
+      expect(Coradoc::AsciiDoc::Model::Inline::HardLineBreak.new.inline?).to eq(:hardbreak)
+    end
+  end
+
+  describe 'non-block, non-inline elements' do
+    it 'Title is neither block nor inline' do
+      title = Coradoc::AsciiDoc::Model::Title.new
+      expect(title.block_level?).to be(false)
+      expect(title.inline?).to be(false)
+    end
+
+    it 'List::Item is neither block nor inline' do
+      item = Coradoc::AsciiDoc::Model::List::Item.new
+      expect(item.block_level?).to be(false)
+      expect(item.inline?).to be(false)
+    end
+
+    it 'AttributeList is neither block nor inline' do
+      attrs = Coradoc::AsciiDoc::Model::AttributeList.new
+      expect(attrs.block_level?).to be(false)
+      expect(attrs.inline?).to be(false)
+    end
+  end
+
+  describe 'SpacingStrategy integration' do
+    let(:strategy) { Coradoc::AsciiDoc::Serializer::SpacingStrategy }
+
+    it 'uses polymorphic block_level? for spacing' do
+      para = Coradoc::AsciiDoc::Model::Paragraph.new
+      section = Coradoc::AsciiDoc::Model::Section.new
+
+      expect(strategy.block_level?(para)).to be(true)
+      expect(strategy.block_level?(section)).to be(true)
+    end
+
+    it 'uses polymorphic inline? for spacing' do
+      bold = Coradoc::AsciiDoc::Model::Inline::Bold.new
+      text = Coradoc::AsciiDoc::Model::TextElement.new
+
+      expect(strategy.inline_level?(bold)).to be(true)
+      expect(strategy.inline_level?(text)).to be(true)
+    end
+
+    it 'returns false for nil' do
+      expect(strategy.block_level?(nil)).to be(false)
+      expect(strategy.inline_level?(nil)).to be(false)
+    end
+
+    it 'treats strings as inline' do
+      expect(strategy.inline_level?('text')).to be(true)
+    end
+  end
+end

data/coradoc-docx/lib/coradoc/docx/transform/context.rb

@@ -62,7 +62,7 @@ module Coradoc
         private
 
         def extract_paragraph_text(paragraph)
-          return '' unless paragraph.respond_to?(:text)
+          return '' unless paragraph.is_a?(Uniword::Wordprocessingml::Paragraph) || paragraph.is_a?(Uniword::Wordprocessingml::Run)
 
           paragraph.text.to_s
         end

data/coradoc-docx/lib/coradoc/docx/transform/from_core_model.rb

@@ -242,11 +242,19 @@ module Coradoc
         end
 
         def add_list_to_builder(list_block, builder)
-          method = list_block.marker_type == 'numbered' ? :numbered_list : :bullet_list
+          list_method = list_block.marker_type == 'numbered' ? :numbered_list : :bullet_list
 
-          builder.send(method) do |list|
-            list_block.items.each do |item|
-              list.item(item.flat_text)
+          if list_method == :numbered_list
+            builder.numbered_list do |list|
+              list_block.items.each do |item|
+                list.item(item.flat_text)
+              end
+            end
+          else
+            builder.bullet_list do |list|
+              list_block.items.each do |item|
+                list.item(item.flat_text)
+              end
             end
           end
         end
@@ -334,8 +342,7 @@ module Coradoc
             va.value = 'superscript'
             props.vertical_align = va
           when 'monospace'
-            # Monospace via font
-            props.font = 'Courier New' if props.respond_to?(:font=)
+            props.fonts = Uniword::Wordprocessingml::RFonts.new(ascii: 'Courier New')
           when 'link'
             # Links need to be at the paragraph level (w:hyperlink)
             # Return the run; caller should wrap in Hyperlink

data/coradoc-docx/lib/coradoc/docx/transform/numbering_resolver.rb

@@ -61,8 +61,8 @@ module Coradoc
         def build_num_map(config)
           return {} unless config
 
-          instances = config.respond_to?(:instances) ? config.instances : []
-          return {} if instances.empty?
+          instances = config.instances
+          return {} if instances.nil? || instances.empty?
 
           map = {}
           instances.each do |inst|
@@ -73,8 +73,8 @@ module Coradoc
             definition = find_definition(config, abstract_num_id)
             next unless definition
 
-            levels = definition.respond_to?(:levels) ? definition.levels : []
-            level = levels.first
+            levels = definition.levels
+            level = levels&.first
             next unless level
 
             fmt = extract_num_fmt(level)
@@ -93,11 +93,13 @@ module Coradoc
           aid = instance.abstract_num_id
           return nil unless aid
 
-          aid.respond_to?(:value) ? aid.value : aid
+          aid.is_a?(Uniword::Wordprocessingml::AbstractNumId) ? aid.val : aid
         end
 
         def find_definition(config, abstract_num_id)
-          defs = config.respond_to?(:definitions) ? config.definitions : []
+          defs = config.definitions
+          return [] unless defs
+
           defs.find { |d| d.abstract_num_id == abstract_num_id }
         end
 
@@ -105,7 +107,7 @@ module Coradoc
           nf = level.numFmt
           return 'bullet' unless nf
 
-          nf.respond_to?(:val) ? nf.val.to_s : nf.to_s
+          nf.is_a?(Uniword::Wordprocessingml::NumFmt) ? nf.val.to_s : nf.to_s
         end
 
         def marker_type_for(fmt)