uniword 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1c6924b201809b0adcd798ea5453ceb06a6628e9ea54ec30221d4d4b325ca4
-  data.tar.gz: 45d19527778e0c36b9acb7a2a7ce98e83ea9f841df619c2bf1eb3ae4f77fbc46
+  metadata.gz: a62022223f8643943947659aae4d0e27b5d8566cab7486e0c688566cc0428208
+  data.tar.gz: 61727290e9fac98b2e4cf3b43bb1fd70f09c4b9648206eb861d1bc3766b964d9
 SHA512:
-  metadata.gz: 9ff4355adebd0f8eb10843ca4ae83b43df148340b3ab562d1bd43b1317d6384fd0dd3fe713e741df9d57dbad2eca70684e946565dc9823bb923c75cc2f302226
-  data.tar.gz: 92b190e3421fce1634462ce0b6bdff183138c6eaefa41ef96cce9b441eba72661988a36ae652fa5df8afdd1ef3eeb3d62bdd9e7eb1cd09b10a7ae7863023b331
+  metadata.gz: f99053000864fae5910ee3c34f07504daf4afb061093aced4a5589f0a80c335cca44fa48a72bad5f1725d87a82346dc5abc577c14e6238875a9a175bfd33c788
+  data.tar.gz: cf9546e5ad9b15a3d4973785b922589d29bbd8bea8a34c75b1012f10a2a9190988abaccae1c5e0f41217589fc9f27151342210373ca9a00c355f86ad2218b15c

data/lib/uniword/builder/comment_builder.rb

@@ -11,8 +11,8 @@ module Uniword
     class CommentBuilder
       attr_reader :model
 
-      def initialize(author:, comment_id: nil, date: nil, initials: nil)
-        @model = Comment.new(
+      def initialize(model: nil, author: nil, comment_id: nil, date: nil, initials: nil)
+        @model = model || Comment.new(
           author: author,
           comment_id: comment_id,
           date: date,
@@ -22,9 +22,7 @@ module Uniword
 
       # Wrap an existing Comment model
       def self.from_model(model)
-        builder = allocate
-        builder.instance_variable_set(:@model, model)
-        builder
+        new(model: model)
       end
 
       # Append text to the comment (creates a paragraph)

data/lib/uniword/builder.rb

@@ -148,15 +148,25 @@ module Uniword
       run
     end
 
-    # Factory: creates a Run with a tab character
+    # Factory: creates a Run containing a tab character.
+    # Use this with ParagraphBuilder#<< to append a tab to a paragraph.
     #
     # @return [Wordprocessingml::Run]
+    # @see .tab_element for the bare Tab element
     def self.tab
       run = Wordprocessingml::Run.new
-      run.tab = Wordprocessingml::Tab.new
+      run.tab = tab_element
       run
     end
 
+    # Factory: creates a bare Tab element for direct assignment to Run#tab.
+    # Most callers should use .tab instead, which wraps the Tab in a Run.
+    #
+    # @return [Wordprocessingml::Tab]
+    def self.tab_element
+      Wordprocessingml::Tab.new
+    end
+
     # Factory: creates a Run containing a line break
     #
     # @return [Wordprocessingml::Run]

data/lib/uniword/docx/package_serialization.rb

@@ -33,18 +33,14 @@ document_rels)
 document_rels)
         # Package infrastructure
         content["[Content_Types].xml"] =
-          content_types.to_xml(encoding: "UTF-8", declaration: true,
-                               standalone: true)
+          serialize_infrastructure(content_types)
         content["_rels/.rels"] =
-          package_rels.to_xml(encoding: "UTF-8", declaration: true,
-                              standalone: true)
+          serialize_infrastructure(package_rels)
 
         # Document properties
         if core_properties
           content["docProps/core.xml"] =
-            core_properties.to_xml(encoding: "UTF-8",
-                                   prefix: true,
-                                   standalone: true)
+            serialize_part(core_properties)
         end
         if app_properties
           content["docProps/app.xml"] =
@@ -78,70 +74,57 @@ document_rels)
         # Document parts
         if document
           content["word/document.xml"] =
-            document.to_xml(encoding: "UTF-8", prefix: true,
-                            standalone: true)
+            serialize_part(document)
         end
         if styles
           content["word/styles.xml"] =
-            styles.to_xml(encoding: "UTF-8", prefix: true,
-                          standalone: true)
+            serialize_part(styles)
         end
         if numbering
           content["word/numbering.xml"] =
-            numbering.to_xml(encoding: "UTF-8", prefix: true,
-                             standalone: true)
+            serialize_part(numbering)
         end
         if settings
           content["word/settings.xml"] =
-            settings.to_xml(encoding: "UTF-8", prefix: true,
-                            standalone: true)
+            serialize_part(settings)
         end
         if font_table
           content["word/fontTable.xml"] =
-            font_table.to_xml(encoding: "UTF-8", prefix: true,
-                              standalone: true)
+            serialize_part(font_table)
         end
         if web_settings
           content["word/webSettings.xml"] =
-            web_settings.to_xml(encoding: "UTF-8", prefix: true,
-                                standalone: true)
+            serialize_part(web_settings)
         end
         if document_rels
           content["word/_rels/document.xml.rels"] =
-            document_rels.to_xml(encoding: "UTF-8", declaration: true,
-                                 standalone: true)
+            serialize_infrastructure(document_rels)
         end
 
         # Theme
         if theme
           content["word/theme/theme1.xml"] =
-            theme.to_xml(encoding: "UTF-8", prefix: true,
-                         standalone: true)
+            serialize_part(theme)
         end
         if theme_rels
           content["word/theme/_rels/theme1.xml.rels"] =
-            theme_rels.to_xml(encoding: "UTF-8", declaration: true,
-                              standalone: true)
+            serialize_infrastructure(theme_rels)
         end
 
         # Notes
         if footnotes
           content["word/footnotes.xml"] =
-            footnotes.to_xml(encoding: "UTF-8", prefix: true,
-                             standalone: true)
+            serialize_part(footnotes)
         end
         if endnotes
           content["word/endnotes.xml"] =
-            endnotes.to_xml(encoding: "UTF-8", prefix: true,
-                            standalone: true)
+            serialize_part(endnotes)
         end
 
         # Bibliography sources
         if document&.bibliography_sources
           content["word/sources.xml"] =
-            document.bibliography_sources.to_xml(encoding: "UTF-8",
-                                                 declaration: true,
-                                                 standalone: true)
+            serialize_infrastructure(document.bibliography_sources)
         end
 
         # Headers and footers
@@ -150,6 +133,16 @@ document_rels)
         serialize_header_footer_parts(content)
       end
 
+      # Serialize an OOXML document part with standard encoding
+      def serialize_part(model)
+        model.to_xml(encoding: "UTF-8", prefix: true, standalone: true)
+      end
+
+      # Serialize package infrastructure (rels, content types) with declaration
+      def serialize_infrastructure(model)
+        model.to_xml(encoding: "UTF-8", declaration: true, standalone: true)
+      end
+
       private
 
       def inject_image_parts(content, content_types, document_rels)
@@ -451,8 +444,7 @@ document_rels)
         document.headers.each_value do |header_obj|
           idx += 1
           content["word/header#{idx}.xml"] =
-            header_obj.to_xml(encoding: "UTF-8", prefix: true,
-                              standalone: true)
+            serialize_part(header_obj)
         end
       end
 
@@ -463,8 +455,7 @@ document_rels)
         document.footers.each_value do |footer_obj|
           idx += 1
           content["word/footer#{idx}.xml"] =
-            footer_obj.to_xml(encoding: "UTF-8", prefix: true,
-                              standalone: true)
+            serialize_part(footer_obj)
         end
       end
 
@@ -473,8 +464,7 @@ document_rels)
 
         document.header_footer_parts.each do |part|
           content["word/#{part[:target]}"] =
-            part[:content].to_xml(encoding: "UTF-8", prefix: true,
-                                  standalone: true)
+            serialize_part(part[:content])
         end
       end
     end

data/lib/uniword/docx/reconciler.rb

@@ -85,15 +85,14 @@ module Uniword
         ].compact
 
         parts.each do |part|
-          part.instance_variable_set(:@pending_namespace_data, nil)
-          part.instance_variable_set(:@import_declaration_plan, nil)
+          part.pending_namespace_data = nil
+          part.import_declaration_plan = nil
+          part.pending_plan_root_element = nil
+          # TODO: @xml_input_namespaces has no public accessor in lutaml-model.
+          # Replace with public API once lutaml-model exposes one.
           part.instance_variable_set(:@xml_input_namespaces, nil)
-          part.instance_variable_set(:@pending_plan_root_element, nil)
         end
       end
-
-      # -- Section Properties --
-
       def reconcile_section_properties
         return unless package.document&.body
 

data/lib/uniword/drawingml/color_scheme.rb

@@ -313,7 +313,7 @@ module Uniword
         color_name = color_name.to_sym
         # Map folHlink to fol_hlink for attribute access
         attr_name = color_name == :folHlink ? :fol_hlink : color_name
-        color_obj = instance_variable_get("@#{attr_name}")
+        color_obj = public_send(attr_name)
         color_obj&.value
       end
 
@@ -345,7 +345,7 @@ module Uniword
 
         color_obj = color_class.new
         color_obj.rgb = value
-        instance_variable_set("@#{attr_name}", color_obj)
+        public_send(:"#{attr_name}=", color_obj)
         @colors_hash[color_name] = value
       end
 

data/lib/uniword/math/o_math.rb

@@ -32,6 +32,9 @@ module Uniword
       attribute :equation_arrays, EquationArray, collection: true,
                                                  initialize_empty: true
 
+      # Transient: position among sibling runs (used by MHTML renderer)
+      attribute :run_position, :integer
+
       xml do
         element "oMath"
         namespace Uniword::Ooxml::Namespaces::MathML

data/lib/uniword/properties/boolean_formatting.rb

@@ -9,11 +9,7 @@ module Uniword
     # the generated setter.
     module BooleanElement
       def value
-        @val != "false"
-      end
-
-      def value=(v)
-        @val = v ? nil : "false"
+        val != "false"
       end
     end
 
@@ -35,7 +31,7 @@ module Uniword
                    else
                      v
                    end
-            value_set_for(:val) if @val
+            value_set_for(:val)
           end
         end
       end

data/lib/uniword/theme/theme_xml_parser.rb

@@ -79,7 +79,7 @@ module Uniword
 
           # Set the color using the appropriate attribute
           attr_name = color_name == "folHlink" ? :fol_hlink : color_name.to_sym
-          scheme.instance_variable_set("@#{attr_name}", color_obj)
+          scheme.public_send(:"#{attr_name}=", color_obj)
         end
 
         # Sync hash interface

data/lib/uniword/transformation/mhtml_element_renderer.rb

@@ -543,11 +543,11 @@ module Uniword
         parts.join
       end
 
-      # Build position-indexed map from elements that have @_run_position markers
+      # Build position-indexed map from elements that have run_position markers
       def build_position_map(elements, fallback_pos)
         by_pos = {}
         elements.each do |el|
-          pos = el.instance_variable_get(:@_run_position)
+          pos = el.run_position if el.is_a?(Uniword::Wordprocessingml::Hyperlink) || el.is_a?(Uniword::Math::OMath)
           pos ||= fallback_pos
           by_pos[pos] ||= []
           by_pos[pos] << el

data/lib/uniword/version.rb

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

data/lib/uniword/wordprocessingml/hyperlink.rb

@@ -15,6 +15,9 @@ module Uniword
       attribute :history, Uniword::Properties::HistoryValue
       attribute :runs, Run, collection: true, initialize_empty: true
 
+      # Transient: position among sibling runs (used by MHTML renderer)
+      attribute :run_position, :integer
+
       xml do
         element "hyperlink"
         namespace Uniword::Ooxml::Namespaces::WordProcessingML

data/lib/uniword/wordprocessingml/run.rb

@@ -178,34 +178,22 @@ module Uniword
       def merge_properties(base, override)
         merged = RunProperties.new
 
-        # Get all attribute names from RunProperties class
         RunProperties.attributes.each_key do |attr_name|
           override_val = override.public_send(attr_name)
           base_val = base.public_send(attr_name)
 
-          # Use override if it's non-nil AND not using default value
-          # For boolean properties like Bold, check if it was explicitly set
           use_override = if override_val.is_a?(Lutaml::Model::Serializable)
-                           # Check if the property has any non-default/non-nil values
                            override_val.class.attributes.any? do |k, _|
-                             iv = override_val.instance_variable_get(:"@#{k}")
-                             iv && !override_val.using_default?(k)
+                             !override_val.using_default?(k)
                            end
                          else
                            !override_val.nil?
                          end
 
-          begin
-            if use_override
-              merged.public_send(:"#{attr_name}=", override_val)
-            elsif base_val
-              merged.public_send(:"#{attr_name}=", base_val)
-            end
-          rescue StandardError => e
-            Uniword.logger&.debug do
-              "Skipping attribute #{attr_name}: #{e.message}"
-            end
-          end
+          value = use_override ? override_val : base_val
+          next unless value
+
+          merged.public_send(:"#{attr_name}=", value)
         end
 
         merged

data/lib/uniword/wordprocessingml/style.rb

@@ -251,10 +251,6 @@ module Uniword
       def run_properties
         rPr
       end
-
-      def to_xml(options = {})
-        super
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uniword
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-08 00:00:00.000000000 Z
+date: 2026-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger