uniword 1.0.4 → 1.0.5

data/lib/uniword/format_converter.rb

@@ -278,18 +278,18 @@ module Uniword
     # @return [Hash] Statistics hash
     def document_stats(document)
       # Handle OOXML document
-      if document.respond_to?(:paragraphs)
+      if document.is_a?(Uniword::Wordprocessingml::DocumentRoot) || document.is_a?(Uniword::Wordprocessingml::Body)
         return {
           paragraphs: document.paragraphs.count,
-          tables: document.respond_to?(:tables) ? document.tables.count : 0,
-          images: document.respond_to?(:images) ? document.images.count : 0
+          tables: document.is_a?(Uniword::Wordprocessingml::DocumentRoot) ? document.tables.count : 0,
+          images: document.is_a?(Uniword::Wordprocessingml::DocumentRoot) ? document.images.count : 0
         }
       end
 
       # Handle MHTML document - estimate from HTML content
-      html = if document.respond_to?(:raw_html) && document.raw_html
+      html = if document.is_a?(Mhtml::Document) && document.raw_html
                document.raw_html
-             elsif document.respond_to?(:html_content) && document.html_content
+             elsif document.is_a?(Mhtml::Document) && document.html_content
                document.html_content
              end
       if html
@@ -339,8 +339,8 @@ module Uniword
     def log_conversion_start(source, source_format, target, target_format)
       return unless @logger
 
-      source_name = source.respond_to?(:path) ? source.path : source.to_s
-      target_name = target.respond_to?(:path) ? target.path : target.to_s
+      source_name = source.is_a?(IO) ? source.path : source.to_s
+      target_name = target.is_a?(IO) ? target.path : target.to_s
 
       @logger.info(
         "Converting #{source_name} (#{source_format}) → #{target_name} (#{target_format})"

data/lib/uniword/format_detector.rb

@@ -65,7 +65,7 @@ module Uniword
       return if path.is_a?(IO) || path.is_a?(StringIO)
 
       # For strings, validate as file path
-      if path.respond_to?(:empty?) && path.empty?
+      if path.is_a?(String) && path.empty?
         raise ArgumentError,
               "Path cannot be empty"
       end

data/lib/uniword/generation/document_generator.rb

@@ -67,7 +67,7 @@ module Uniword
       end
 
       def import_styles(builder, source_doc)
-        return unless source_doc.respond_to?(:styles_configuration)
+        return unless source_doc.is_a?(Uniword::Wordprocessingml::DocumentRoot)
         return unless source_doc.styles_configuration
 
         source_doc.styles_configuration.styles.each do |style|
@@ -79,7 +79,7 @@ module Uniword
       end
 
       def import_theme(builder, source_doc)
-        return unless source_doc.respond_to?(:theme)
+        return unless source_doc.is_a?(Uniword::Wordprocessingml::DocumentRoot)
         return unless source_doc.theme
 
         builder.model.theme = source_doc.theme

data/lib/uniword/infrastructure/zip_extractor.rb

@@ -126,7 +126,7 @@ module Uniword
         return if path.is_a?(IO) || path.is_a?(StringIO)
 
         # For strings, validate as file path
-        if path.respond_to?(:empty?) && path.empty?
+        if path.is_a?(String) && path.empty?
           raise ArgumentError,
                 "Path cannot be empty"
         end

data/lib/uniword/math_equation.rb

@@ -152,7 +152,9 @@ module Uniword
       # If present, it should be a Plurimath formula
       return true if formula.nil?
 
-      formula.respond_to?(:to_latex)
+      return false unless defined?(Plurimath::Formula)
+
+      formula.is_a?(Plurimath::Formula)
     end
   end
 end

data/lib/uniword/mhtml/math_converter.rb

@@ -117,7 +117,7 @@ module Uniword
       # @example Check if element is math
       #   is_math = MathConverter.math_element?(element)
       def self.math_element?(element)
-        return false unless element.respond_to?(:name)
+        return false unless element.is_a?(Nokogiri::XML::Element)
 
         math_tags = %w[math mml:math m:oMath m:oMathPara]
         return true if math_tags.include?(element.name)

data/lib/uniword/mhtml/word_css.rb

@@ -78,14 +78,14 @@ module Uniword
       # @param section_name [String] The section name
       # @return [String, nil] The CSS @page rule
       def self.build_page_rule(section, section_name)
-        properties = section.respond_to?(:properties) ? section.properties : nil
+        properties = section&.properties
         return nil unless properties
 
         rules = []
 
         # Page size
-        width = properties.respond_to?(:page_width) && properties.page_width
-        height = properties.respond_to?(:page_height) && properties.page_height
+        width = properties.page_width
+        height = properties.page_height
         if width && height
           # Convert from twips to inches (1 inch = 1440 twips)
           w_in = CssNumberFormatter.twips_to_in(width, precision: 1)
@@ -97,14 +97,14 @@ module Uniword
         end
 
         # Margins
-        rules << "margin-top: #{CssNumberFormatter.twips_to_in(properties.margin_top)}" if properties.respond_to?(:margin_top) && properties.margin_top
-        rules << "margin-bottom: #{CssNumberFormatter.twips_to_in(properties.margin_bottom)}" if properties.respond_to?(:margin_bottom) && properties.margin_bottom
-        rules << "margin-left: #{CssNumberFormatter.twips_to_in(properties.margin_left)}" if properties.respond_to?(:margin_left) && properties.margin_left
-        rules << "margin-right: #{CssNumberFormatter.twips_to_in(properties.margin_right)}" if properties.respond_to?(:margin_right) && properties.margin_right
+        rules << "margin-top: #{CssNumberFormatter.twips_to_in(properties.margin_top)}" if properties.margin_top
+        rules << "margin-bottom: #{CssNumberFormatter.twips_to_in(properties.margin_bottom)}" if properties.margin_bottom
+        rules << "margin-left: #{CssNumberFormatter.twips_to_in(properties.margin_left)}" if properties.margin_left
+        rules << "margin-right: #{CssNumberFormatter.twips_to_in(properties.margin_right)}" if properties.margin_right
 
         # Header/Footer margins
-        rules << "mso-header-margin: #{CssNumberFormatter.twips_to_in(properties.header_margin)}" if properties.respond_to?(:header_margin) && properties.header_margin
-        rules << "mso-footer-margin: #{CssNumberFormatter.twips_to_in(properties.footer_margin)}" if properties.respond_to?(:footer_margin) && properties.footer_margin
+        rules << "mso-header-margin: #{CssNumberFormatter.twips_to_in(properties.header_margin)}" if properties.header_margin
+        rules << "mso-footer-margin: #{CssNumberFormatter.twips_to_in(properties.footer_margin)}" if properties.footer_margin
 
         "@page #{section_name} {\n  #{rules.join(";\n  ")};\n}"
       end
@@ -127,16 +127,16 @@ module Uniword
         properties = []
 
         # Font properties
-        properties << "font-family: '#{style.font}'" if style.respond_to?(:font) && style.font
-        if style.respond_to?(:font_size) && style.font_size
+        properties << "font-family: '#{style.font}'" if style.font
+        if style.font_size
           properties << "font-size: #{CssNumberFormatter.format(style.font_size, 'pt',
                                                                 precision: 1)}"
         end
-        properties << "font-weight: bold" if style.respond_to?(:bold) && style.bold
-        properties << "font-style: italic" if style.respond_to?(:italic) && style.italic
+        properties << "font-weight: bold" if style.bold
+        properties << "font-style: italic" if style.italic
 
         # Paragraph properties
-        properties << "text-align: #{style.alignment}" if style.respond_to?(:alignment) && style.alignment
+        properties << "text-align: #{style.alignment}" if style.alignment
 
         return nil if properties.empty?
 

data/lib/uniword/ooxml/schema/element_serializer.rb

@@ -47,7 +47,7 @@ module Uniword
 
           # If element has its own to_xml method, use it directly
           # This ensures proper serialization with all attributes and content
-          if element.respond_to?(:to_xml) && !options[:use_schema]
+          if element.is_a?(Lutaml::Model::Serializable) && !options[:use_schema]
             xml_str = element.to_xml(pretty: options[:pretty])
 
             # Remove XML declaration unless standalone
@@ -169,7 +169,7 @@ module Uniword
 
             # Skip if no children and optional
             next if children.nil? && child_def.optional?
-            next if children.respond_to?(:empty?) && children.empty? && child_def.optional?
+            next if children.is_a?(Array) && children.empty? && child_def.optional?
 
             # Serialize child elements
             if child_def.multiple?
@@ -215,9 +215,9 @@ module Uniword
                                                            namespace_uri)
             node.content = child
             node
-          elsif child.respond_to?(:is_a?) && child.is_a?(Element)
+          elsif child.is_a?(Uniword::Element)
             # Check if this is a TextElement that needs special handling
-            if child.instance_of?(::Uniword::TextElement) && child.respond_to?(:content)
+            if child.instance_of?(::Uniword::TextElement) && child.is_a?(Uniword::TextElement)
               # TextElement: serialize as element with text content
               node = Nokogiri::XML::Node.new(local_name, doc)
               node.namespace = node.add_namespace_definition(prefix,
@@ -276,7 +276,7 @@ module Uniword
                                                            namespace_uri)
             node.content = child
             node
-          elsif child.respond_to?(:content)
+          elsif child.is_a?(Uniword::TextElement)
             # TextElement or similar - get the content
             node = Nokogiri::XML::Node.new(local_name, doc)
             node.namespace = node.add_namespace_definition(prefix,
@@ -302,10 +302,10 @@ module Uniword
           property_name = attr_def.property_name
 
           # Try to get value using property name
-          if element.respond_to?(property_name)
-            element.send(property_name)
-          elsif element.respond_to?(:attributes) && element.attributes.is_a?(Hash) && element.attributes.key?(property_name)
-            element.attributes[property_name]
+          if element.is_a?(Lutaml::Model::Serializable) && element.class.attributes.key?(property_name)
+            element.public_send(property_name)
+          elsif element.is_a?(Hash) && element.key?(property_name)
+            element[property_name]
           end
         end
 
@@ -318,10 +318,10 @@ module Uniword
           property_name = child_def.property_name
 
           # Try to get children using property name
-          if element.respond_to?(property_name)
-            element.send(property_name)
-          elsif element.respond_to?(:attributes) && element.attributes.key?(property_name)
-            element.attributes[property_name]
+          if element.is_a?(Lutaml::Model::Serializable) && element.class.attributes.key?(property_name)
+            element.public_send(property_name)
+          elsif element.is_a?(Hash) && element.key?(property_name)
+            element[property_name]
           end
         end
 
@@ -330,7 +330,7 @@ module Uniword
         # @param element [Object] Object to validate
         # @raise [ArgumentError] if not a valid element
         def validate_element(element)
-          return if element.respond_to?(:to_xml)
+          return if element.is_a?(Lutaml::Model::Serializable)
 
           raise ArgumentError,
                 "Element must respond to #to_xml, got #{element.class}"

data/lib/uniword/quality/document_checker.rb

@@ -133,10 +133,10 @@ module Uniword
       # @param document [Object] The document to validate
       # @raise [ArgumentError] if document is invalid
       def validate_document!(document)
-        return if document.respond_to?(:paragraphs) && document.respond_to?(:tables)
+        return if document.is_a?(Uniword::Wordprocessingml::DocumentRoot)
 
         raise ArgumentError,
-              "Document must respond to :paragraphs and :tables methods"
+              "Document must be a Uniword::Wordprocessingml::DocumentRoot"
       end
     end
 

data/lib/uniword/quality/rules/link_validation_rule.rb

@@ -71,7 +71,7 @@ module Uniword
       # @param link [Hyperlink] The link to check
       # @return [Boolean] true if internal link
       def internal_link?(link)
-        link.respond_to?(:anchor) && !link.anchor.nil? && !link.anchor.empty?
+        link.is_a?(Lutaml::Model::Serializable) && link.class.attributes.key?(:anchor) && !link.anchor.nil? && !link.anchor.empty?
       end
 
       # Check if link is external (URL)
@@ -83,10 +83,10 @@ module Uniword
         return false unless link
 
         # Check for id attribute (relationship-based external link)
-        return true if link.respond_to?(:id) && !link.id.nil? && !link.id.empty? && !internal_link?(link)
+        return true if link.is_a?(Lutaml::Model::Serializable) && link.class.attributes.key?(:id) && !link.id.nil? && !link.id.empty? && !internal_link?(link)
 
         # Check for target that looks like a URL
-        return !link.target.start_with?("#") if link.respond_to?(:target) && !link.target.nil? && !link.target.empty?
+        return !link.target.start_with?("#") if link.is_a?(Lutaml::Model::Serializable) && link.class.attributes.key?(:target) && !link.target.nil? && !link.target.empty?
 
         false
       end
@@ -114,7 +114,7 @@ module Uniword
       # @return [String, nil] The URL or nil
       def link_url(link)
         # External links use id attribute (relationship ID) or target
-        link.respond_to?(:target) ? link.target : link.id
+        link.is_a?(Lutaml::Model::Serializable) && link.class.attributes.key?(:target) ? link.target : link.id
       end
 
       # Validate URL format

data/lib/uniword/quality/rules/style_consistency_rule.rb

@@ -51,7 +51,7 @@ module Uniword
           next if @allow_direct_formatting
 
           para.runs.each_with_index do |run, run_index|
-            next unless run.respond_to?(:properties)
+            next unless run.is_a?(Uniword::Wordprocessingml::Run)
             next unless run.properties
 
             next unless has_direct_run_formatting?(run)

data/lib/uniword/quality/rules/table_header_rule.rb

@@ -56,7 +56,7 @@ module Uniword
         return false if table.rows.empty?
 
         first_row = table.rows.first
-        return false unless first_row.respond_to?(:cells)
+        return false unless first_row.is_a?(Uniword::Wordprocessingml::TableRow)
 
         # Check if first row cells have header properties
         # In OOXML, header rows typically have specific table cell properties

data/lib/uniword/resource/color_transformer.rb

@@ -42,7 +42,7 @@ module Uniword
         color_scheme.dup.tap do |scheme|
           # Transform each color in the scheme
           scheme.colors&.each_value do |color|
-            next unless color.respond_to?(:val) && color.val&.match?(/^[0-9A-Fa-f]{6}$/)
+            next unless color.is_a?(Uniword::Drawingml::SrgbColor) && color.val&.match?(/^[0-9A-Fa-f]{6}$/)
 
             color.val = shift_color(
               color.val,

data/lib/uniword/resource/resource_resolver.rb

@@ -93,7 +93,7 @@ module Uniword
 
       def bundled_path(subdir)
         # Use Gem.datadir if available, otherwise fall back to data/ directory
-        data_path = (Gem.datadir("uniword") if defined?(Gem) && Gem.respond_to?(:datadir))
+        data_path = (Gem.datadir("uniword") if defined?(Gem) && Gem.is_a?(Module))
         data_path ||= File.expand_path("../../../data", __dir__)
         File.join(data_path, subdir)
       end

data/lib/uniword/resource/theme_processor.rb

@@ -87,7 +87,7 @@ lightness_shift: nil)
                          fol_hlink]
 
         color_attrs.each do |attr|
-          color_obj = color_scheme.send(attr)
+          color_obj = color_scheme.public_send(attr)
           next unless color_obj&.srgb_clr&.val
 
           original = color_obj.srgb_clr.val

data/lib/uniword/resource/theme_transition.rb

@@ -66,7 +66,7 @@ module Uniword
         uniword_slug = detect_ms_theme(word_theme)
 
         # Fall back to detection by theme name
-        uniword_slug = from_ms_name(word_theme.name) if uniword_slug.nil? && word_theme.respond_to?(:name) && word_theme.name
+        uniword_slug = from_ms_name(word_theme.name) if uniword_slug.nil? && word_theme.is_a?(Uniword::Drawingml::Theme) && word_theme.name
 
         return nil unless uniword_slug
 

data/lib/uniword/review/interactive_review.rb

@@ -149,7 +149,7 @@ module Uniword
       #
       # @return [String] The character read
       def read_single_char
-        if @input.respond_to?(:getch)
+        if @input.is_a?(IO)
           @input.getch
         else
           @input.gets&.chomp&.first || "q"

data/lib/uniword/spellcheck/spell_checker.rb

@@ -58,16 +58,16 @@ module Uniword
       def extract_text(document)
         parts = []
 
-        paragraphs = if document.respond_to?(:paragraphs)
+        paragraphs = if document.is_a?(Uniword::Wordprocessingml::DocumentRoot) || document.is_a?(Uniword::Wordprocessingml::Body)
                        document.paragraphs
                      else
                        []
                      end
         paragraphs.each do |para|
-          parts << para.text if para.respond_to?(:text)
+          parts << para.text if para.is_a?(Uniword::Wordprocessingml::Paragraph)
         end
 
-        tables = if document.respond_to?(:tables)
+        tables = if document.is_a?(Uniword::Wordprocessingml::DocumentRoot)
                    document.tables
                  else
                    []
@@ -85,13 +85,13 @@ module Uniword
       # @param parts [Array<String>] Accumulator for text parts
       # @return [void]
       def extract_table_text(table, parts)
-        return unless table.respond_to?(:rows)
+        return unless table.is_a?(Uniword::Wordprocessingml::Table)
 
         table.rows.each do |row|
-          next unless row.respond_to?(:cells)
+          next unless row.is_a?(Uniword::Wordprocessingml::TableRow)
 
           row.cells.each do |cell|
-            parts << cell.text if cell.respond_to?(:text)
+            parts << cell.text if cell.is_a?(Uniword::Wordprocessingml::TableCell)
           end
         end
       end

data/lib/uniword/styleset.rb

@@ -140,7 +140,7 @@ module Uniword
     #   - :rename - Keep both, rename imported styles
     # @return [void]
     def apply_to(document, strategy: :keep_existing)
-      return unless document.respond_to?(:styles_configuration)
+      return unless document.is_a?(Uniword::Wordprocessingml::DocumentRoot)
 
       styles.each do |style|
         case strategy

data/lib/uniword/template/helpers/conditional_helper.rb

@@ -97,10 +97,9 @@ module Uniword
         # @return [void]
         def remove_element(element, document)
           # Remove from paragraphs
-          document.body.paragraphs.delete(element) if document.body.respond_to?(:paragraphs)
-
-          # Clear document cache
-          document.clear_element_cache if document.respond_to?(:clear_element_cache)
+          if document.body.is_a?(Uniword::Wordprocessingml::Body)
+            document.body.paragraphs.delete(element)
+          end
         end
       end
     end

data/lib/uniword/template/helpers/filter_helper.rb

@@ -65,7 +65,7 @@ module Uniword
         # @param format_string [String] Format string
         # @return [String] Formatted value
         def apply_format(value, format_string)
-          if value.respond_to?(:strftime)
+          if value.is_a?(Date) || value.is_a?(Time)
             value.strftime(format_string)
           else
             value.to_s

data/lib/uniword/template/helpers/loop_helper.rb

@@ -103,7 +103,7 @@ module Uniword
           # Find and replace variables in element
           # This is simplified - full implementation would
           # recursively process all text nodes
-          return unless element.respond_to?(:text)
+          return unless element.is_a?(Uniword::Wordprocessingml::Run)
 
           text = element.text
           # Simple variable replacement ({{var}})

data/lib/uniword/template/helpers/variable_helper.rb

@@ -33,7 +33,7 @@ module Uniword
             replace_cell(element, text)
           else
             # Try to treat as paragraph-like
-            replace_paragraph(element, text) if element.respond_to?(:runs)
+            replace_paragraph(element, text) if element.is_a?(Uniword::Wordprocessingml::Paragraph)
           end
         end
 

data/lib/uniword/template/template_parser.rb

@@ -62,7 +62,7 @@ module Uniword
       def parse_paragraphs(paragraphs)
         paragraphs.each_with_index do |para, index|
           # Check paragraph's own comments
-          if para.respond_to?(:comments) && para.comments
+          if para.is_a?(Uniword::CommentsPart) && para.comments
             para.comments.each do |comment|
               marker = parse_comment_text(comment.text, para, index)
               @markers << marker if marker
@@ -70,10 +70,10 @@ module Uniword
           end
 
           # Check run comments
-          next unless para.respond_to?(:runs)
+          next unless para.is_a?(Uniword::Wordprocessingml::Paragraph)
 
           para.runs.each do |run|
-            next unless run.respond_to?(:comments) && run.comments
+            next unless run.is_a?(Uniword::CommentsPart) && run.comments
 
             run.comments.each do |comment|
               marker = parse_comment_text(comment.text, run, index)
@@ -93,13 +93,13 @@ module Uniword
           base_position = @document.paragraphs.size + (table_index * 100)
 
           # Parse table rows
-          next unless table.respond_to?(:rows)
+          next unless table.is_a?(Uniword::Wordprocessingml::Table)
 
           table.rows.each_with_index do |row, row_index|
             row_position = base_position + (row_index * 10)
 
             # Check row comments
-            if row.respond_to?(:comments) && row.comments
+            if row.is_a?(Uniword::CommentsPart) && row.comments
               row.comments.each do |comment|
                 marker = parse_comment_text(comment.text, row, row_position)
                 @markers << marker if marker
@@ -107,11 +107,13 @@ module Uniword
             end
 
             # Parse cells
-            next unless row.respond_to?(:cells)
+            next unless row.is_a?(Uniword::Wordprocessingml::TableRow)
 
             row.cells.each_with_index do |cell, _cell_index|
               # Parse cell paragraphs
-              parse_paragraphs(cell.paragraphs) if cell.respond_to?(:paragraphs)
+              if cell.is_a?(Uniword::Wordprocessingml::TableCell)
+                parse_paragraphs(cell.paragraphs)
+              end
             end
           end
         end

data/lib/uniword/template/template_renderer.rb

@@ -178,10 +178,10 @@ module Uniword
       def remove_template_comments(document)
         # Remove comments from paragraphs
         document.paragraphs.each do |para|
-          next unless para.respond_to?(:comments)
+          next unless para.is_a?(Uniword::CommentsPart)
 
           # Filter out template comments
-          next unless para.respond_to?(:attached_comments)
+          next unless para.is_a?(Uniword::CommentsPart)
 
           para.attached_comments.reject! do |c|
             template_comment?(c)
@@ -194,7 +194,7 @@ module Uniword
       # @param comment [Comment] Comment to check
       # @return [Boolean] true if template comment
       def template_comment?(comment)
-        return false unless comment.respond_to?(:text)
+        return false unless comment.is_a?(Uniword::Comment)
 
         text = comment.text
         text.match?(/^\{\{.+\}\}$/)

data/lib/uniword/template/variable_resolver.rb

@@ -108,9 +108,8 @@ module Uniword
         # For hashes, use key access
         if object.is_a?(Hash)
           object[property.to_sym] || object[property]
-        # For objects with methods, call the method
-        elsif object.respond_to?(property.to_sym)
-          object.send(property.to_sym)
+        else
+          object.public_send(property.to_sym)
         end
       end
 
@@ -176,7 +175,7 @@ module Uniword
 
         return false if left_num.nil? || right_num.nil?
 
-        left_num.send(operator, right_num)
+        left_num.public_send(operator, right_num)
       end
 
       # Convert value to number
@@ -185,8 +184,8 @@ module Uniword
       # @return [Numeric, nil] Numeric value or nil
       def to_number(value)
         return value if value.is_a?(Numeric)
-        return value.to_i if value.respond_to?(:to_i) && value.to_s.match?(/^\d+$/)
-        return value.to_f if value.respond_to?(:to_f) && value.to_s.match?(/^\d+\.\d+$/)
+        return value.to_i if value.to_s.match?(/^\d+$/)
+        return value.to_f if value.to_s.match?(/^\d+\.\d+$/)
 
         nil
       end

data/lib/uniword/themes/theme_transformation.rb

@@ -182,7 +182,7 @@ module Uniword
 
         colors = {}
         COLOR_KEYS.each do |key|
-          if (color_ref = word_colors.send(key))
+          if (color_ref = word_colors.public_send(key))
             colors[key] = extract_hex_color(color_ref)
           end
         end

data/lib/uniword/toc/toc_generator.rb

@@ -145,7 +145,7 @@ module Uniword
         style_ref = paragraph.properties&.style
         return nil unless style_ref
 
-        if style_ref.respond_to?(:value)
+        if style_ref.is_a?(Uniword::Properties::StyleReference)
           style_ref.value
         else
           style_ref.to_s

data/lib/uniword/transformation/mhtml_element_renderer.rb

@@ -239,7 +239,7 @@ module Uniword
           result = %(<span style="font-size:#{size_pt}pt">#{result}</span>)
         end
 
-        if props.font.respond_to?(:ascii) && props.font.ascii
+        if props.font.is_a?(Uniword::Properties::RunFonts) && props.font.ascii
           result = %(<span style="font-family:'#{props.font.ascii}'">#{result}</span>)
         elsif props.font.is_a?(String) && !props.font.empty?
           result = %(<span style="font-family:'#{props.font}'">#{result}</span>)
@@ -582,7 +582,7 @@ module Uniword
 
         attrs = []
 
-        attrs << %(w:id="#{props.id.value}") if props.id.respond_to?(:value) && props.id.value
+        attrs << %(w:id="#{props.id.value}") if props.id&.value
 
         attrs << 'w:showingPlcHdr="t"' if props.showing_placeholder_header
 
@@ -590,14 +590,12 @@ module Uniword
 
         if props.placeholder&.doc_part
           doc_part = props.placeholder.doc_part
-          attrs << %(w:docPart="#{doc_part.value}") if doc_part.respond_to?(:value) && doc_part.value
+          attrs << %(w:docPart="#{doc_part.value}") if doc_part&.value
         end
 
-        attrs << %(w:text="#{props.text.value}") if props.text.respond_to?(:value) && props.text.value
+        attrs << %(w:tag="#{escape_xml(props.tag.value)}") if props.tag&.value
 
-        attrs << %(w:tag="#{escape_xml(props.tag.value)}") if props.tag.respond_to?(:value) && props.tag.value
-
-        attrs << %(w:alias="#{escape_xml(props.alias_name.value)}") if props.alias_name.respond_to?(:value) && props.alias_name.value
+        attrs << %(w:alias="#{escape_xml(props.alias_name.value)}") if props.alias_name&.value
 
         attrs.empty? ? "" : " #{attrs.join(' ')}"
       end