uniword 1.7.2 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3fa44e3714e442378ed0314c1513b673aef06059b5d02ddf92e91ea37fdca2
-  data.tar.gz: 7cddc2e3d00bd3c17b34967746642592f7ecd6bcc1fb224267c6abea92025a52
+  metadata.gz: 2a24f8db82e2282b67f93ac3f8c464f60de00a192a783aecf8f36769e945ed4e
+  data.tar.gz: 6dc5e353053ed9f51c3753952081b05d6d7c2799e604ceb721ed16b90b0ad08e
 SHA512:
-  metadata.gz: 68694569d14d4bef307578bb562dba32e5ef512d94d3dab303fac9afce6e078a3d550531fa96250228aece9b9cf687bd2aab2957c9272fd6a383ca4d6f945a85
-  data.tar.gz: abd7e230281b420942921792d1711647f6cf9f26e6e129570ef6cad8c4a680d63c0fbd2334115cd44399ec03012172dd553cbd854f6ad6ed181ae8f0197d50f6
+  metadata.gz: bed041bdc107608b569797dec4b52c58f1ce827d7e8e9a22f6a17d65d1177bbb19ece843254dc1679728171abf3770c9152ff0479a6688cd7c1f7a814c65dc74
+  data.tar.gz: 2d9b56ccb93f611274fea3756385731e45a1328a6117237b1ebeadf5ad23f08d681016fd758970b8b3e93af6dbd3b21265c0e3537914de25ba7ccfcd25c7340a

data/lib/uniword/converter/plain_text.rb

@@ -27,6 +27,8 @@ module Uniword
     # * tables with a header row
     # * links (bridge resolves relationship ids to target URLs)
     # * bookmarks (heading/paragraph anchor id propagation)
+    # * footnotes (coradoc-docx 0.1.6 carries them into the core
+    #   model; to md/adoc emits GFM [^id] + definitions)
     #
     # Dropped or degraded (recorded on PlainTextResult, warned about;
     # +strict: true+ raises FidelityError):
@@ -36,18 +38,18 @@ module Uniword
     # * tracked changes (w:ins/w:del)
     # * structured document tags (content survives, wrapper unwrapped)
     # * math (OMML)
-    # * images (docx extractor does not carry drawings)
-    # * footnotes (coradoc-docx 0.1.4 cannot read the current Footnotes
-    #   collection; the bridge sets it aside for the conversion)
+    # * images (docx extractor does not carry drawings; coradoc#322)
     #
     # Never carried by any plain-text format (not detected per document):
     # themes, settings, font table, and other package-level parts.
     #
     # From the plain-text side, links written to DOCX resolve to real
-    # External relationships on save. One upstream flattening remains:
+    # External relationships on save. Upstream flattenings that remain:
     # coradoc-markdown's CoreModel transform emits inline Markdown links
     # as literal text, so from_markdown keeps links as text while
-    # from_asciidoc builds real hyperlinks.
+    # from_asciidoc builds real hyperlinks (coradoc#320); the same
+    # inline parser gap leaves from_markdown footnote REFERENCES as
+    # literal text (definitions do convert, coradoc#320).
     #
     # @example Document to Markdown
     #   md = Uniword::Converter::PlainText.new.to_markdown(document)
@@ -136,9 +138,28 @@ module Uniword
         core = with_conversion_guards(document, drops) do
           ::Coradoc::Docx.parse_to_core(document)
         end
+        adoc_model = ::Coradoc::AsciiDoc::Transform::FromCoreModel
+          .transform(core)
+        normalize_emphasis_constraint!(adoc_model)
         build_result(format: :asciidoc, direction: :docx_to_asciidoc,
-                     core: core, drops: drops, text:
-                     ::Coradoc::AsciiDoc.serialize(core))
+                     core: core, drops: drops, text: adoc_model.to_adoc)
+      end
+
+      # CoreModel carries no emphasis constraint, and the framework's
+      # flank guess can downgrade boundary-flanked runs to the
+      # constrained spelling, which does not reparse mid-word. The
+      # DOCX contract emits the unconstrained forms (`**bold**`,
+      # `__italic__`) — they parse unconditionally — so the
+      # converter restores the emphasis models' own unconstrained
+      # default after the transform.
+      def normalize_emphasis_constraint!(model)
+        model.visit do |element, _phase|
+          element.unconstrained = true if element.is_a?(
+            ::Coradoc::AsciiDoc::Model::Inline::Bold,
+          ) || element.is_a?(::Coradoc::AsciiDoc::Model::Inline::Italic)
+          element
+        end
+        model
       end
 
       # Parse AsciiDoc into a document model.
@@ -194,7 +215,6 @@ module Uniword
         end
         features << "math (OMML)" if any_paragraph?(document) { |p| math?(p) }
         features << "images" if any_paragraph?(document) { |p| drawing?(p) }
-        features << "footnotes" if user_footnotes?(document)
         features
       end
 
@@ -204,23 +224,12 @@ module Uniword
         raise FidelityError.new(format, drops)
       end
 
-      # Temporarily set aside content that would break or pollute the
-      # conversion (footnotes crash coradoc-docx 0.1.4) and rewrite
-      # hyperlink rIds to their target URLs so the writers emit real
-      # links; every mutation is restored after the conversion.
-      def with_conversion_guards(document, drops)
-        stash = {}
-        if drops.include?("footnotes")
-          stash[:footnotes] = document.footnotes
-          document.footnotes = nil
-        end
+      # Rewrite hyperlink rIds to their target URLs so coradoc's
+      # writers emit real links; every mutation is restored after the
+      # conversion.
+      def with_conversion_guards(document, _drops)
         rewrites = resolve_link_targets(document)
-        begin
-          yield
-        ensure
-          restore_link_targets(rewrites)
-          document.footnotes = stash[:footnotes] if stash.key?(:footnotes)
-        end
+        yield.tap { restore_link_targets(rewrites) }
       end
 
       # Rewrite w:hyperlink r:id attributes to their relationship
@@ -411,16 +420,6 @@ module Uniword
         end
       end
 
-      def user_footnotes?(document)
-        footnotes = document.footnotes
-        unless footnotes.is_a?(Uniword::Wordprocessingml::Footnotes)
-          return false
-        end
-
-        footnotes.footnote_entries.any? do |entry|
-          entry.type != "separator" && entry.type != "continuationSeparator"
-        end
-      end
     end
   end
 end

data/lib/uniword/omml_integration.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "omml"
+
+module Uniword
+  # Registers Uniword's WordprocessingML classes as substitutions for
+  # Omml::Models' minimal WordprocessingML stubs. When an Omml model
+  # (e.g. CTOMath) resolves a WordprocessingML type symbol (e.g.
+  # +:ct_br+), the Register's substitution table redirects resolution
+  # to the corresponding Uniword class.
+  #
+  # This keeps a single source of truth for WordprocessingML types:
+  # Uniword owns the rich, builder-friendly classes; omml owns the math
+  # schema. The two meet through register substitution, not through
+  # duplicate model definitions.
+  module OmmlIntegration
+    SUBSTITUTIONS = {
+      "Omml::Models::CTBr" => "Uniword::Wordprocessingml::Break",
+    }.freeze
+
+    class << self
+      def register
+        ensure_omml_context
+        register_substitutions
+      end
+
+      private
+
+      def ensure_omml_context
+        return if Lutaml::Model::GlobalContext.context(:uniword)
+
+        Omml::Configuration.register_in(:uniword)
+        Lutaml::Model::Config.default_register = :uniword
+      end
+
+      def register_substitutions
+        register_handle = Lutaml::Model::GlobalRegister.lookup(:uniword)
+        return unless register_handle
+
+        SUBSTITUTIONS.each do |omml_class_name, uniword_class_name|
+          omml_class = constantize(omml_class_name)
+          uniword_class = constantize(uniword_class_name)
+          next unless omml_class && uniword_class
+
+          register_handle.register_global_type_substitution(
+            from_type: omml_class,
+            to_type: uniword_class,
+          )
+        end
+      end
+
+      def constantize(class_name)
+        parts = class_name.split("::")
+        parts.reduce(Object) do |scope, part|
+          scope.const_get(part)
+        end
+      rescue NameError
+        nil
+      end
+    end
+  end
+end

data/lib/uniword/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uniword
-  VERSION = "1.7.2"
+  VERSION = "1.7.4"
 end

data/lib/uniword.rb

@@ -47,10 +47,16 @@ module Uniword
   # directly, falling back to :default for Uniword's own types. Setting
   # Config.default_register means from_xml/to_xml calls without an explicit
   # register: argument use :uniword automatically.
+  #
+  # OmmlIntegration (autoloaded below) then substitutes omml's minimal
+  # WordprocessingML stubs with Uniword's richer classes via the Register's
+  # type substitution mechanism — single source of truth for WordprocessingML.
   require "omml"
   Omml::Configuration.register_in(:uniword)
   Lutaml::Model::Config.default_register = :uniword
 
+  autoload :OmmlIntegration, "uniword/omml_integration"
+
   # Version constant
   autoload :VERSION, "uniword/version"
   autoload :ModelAttributeAccess, "uniword/model_attribute_access"
@@ -396,4 +402,8 @@ module Uniword
       from_html(html).to_file(path)
     end
   end
+
+  # Register WordprocessingML substitutions after autoloads are declared
+  # so OmmlIntegration can resolve Uniword class constants via const_get.
+  OmmlIntegration.register
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uniword
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-02 00:00:00.000000000 Z
+date: 2026-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.391
+        version: 1.9.412
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.391
+        version: 1.9.412
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.148
+        version: 0.8.170
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.148
+        version: 0.8.170
 - !ruby/object:Gem::Dependency
   name: omml
   requirement: !ruby/object:Gem::Requirement
@@ -1164,6 +1164,7 @@ files:
 - lib/uniword/office/top.rb
 - lib/uniword/office/writing_style.rb
 - lib/uniword/office/zoom.rb
+- lib/uniword/omml_integration.rb
 - lib/uniword/ooxml.rb
 - lib/uniword/ooxml/additional_characteristics.rb
 - lib/uniword/ooxml/app_properties.rb