omml 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda4c28c48972ee48e21e79fbec32b5dcdfb63ffb2f3aa503fef7de30e3c4ca9
-  data.tar.gz: 8acc0ec6b5465135f64e65e2f9d5ed430efbc5e3fa10f24fd10c4f056f3a3c15
+  metadata.gz: 6940ed4402f47df60c0de9c7768720da480a64725187434630c836bd77d31e66
+  data.tar.gz: 73f8119d2186095dfd4d061db0c2d096b7412ca984c713ed2b2933a6bb32e011
 SHA512:
-  metadata.gz: 18b8ce8eab3d4114104bcf90d87faf2edb8be5d42542ee4d347faca30dd8cc78ff258cd911af62cd05b5a1d0c5e177471a9dc040ae8ff165e8fe7d4a11543c79
-  data.tar.gz: 5d5fd0178c24ce73e0b18985604e214e66b84d9b1de01725e50349942065a0a3ff64c7f53a97e36dc6e74659eaeefcf9bd4f9137fed56bc9abdd0863f369f83b
+  metadata.gz: 4545f65afd76963f930e49396b165e183e1b6b440edfcfb80c7c2b2cc80a6df7531589b2071fdcb61990c65265394ca66432f29b632f0837ea86446f1cee7c32
+  data.tar.gz: 5cb71bf1eef0b864459dd7bce5ef5f9aabcf1a3132c3dacbc1aeb3e940cfd0becce3ee5c444dc8f54f859403c37ae3bc37100a62ab7a57da91c116fafec11bd2

data/.gitignore

@@ -1,2 +1,3 @@
 .rspec_status
 Gemfile.lock
+TODO.bugs/

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-01 11:14:00 UTC using RuboCop version 1.86.1.
+# on 2026-07-15 04:20:07 UTC using RuboCop version 1.86.1.
 # 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
@@ -12,8 +12,14 @@ Metrics/AbcSize:
   Exclude:
     - 'spec/omml_fixture_round_trip_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: .
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
-  EnforcedStyle: receive
+# Offense count: 2
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - '**/spec/features/**/*'
+    - '**/spec/requests/**/*'
+    - '**/spec/routing/**/*'
+    - '**/spec/system/**/*'
+    - '**/spec/views/**/*'
+    - 'spec/omml/qualified_namespace_spec.rb'
+    - 'spec/omml/wordprocessing_in_math_spec.rb'

data/Gemfile

@@ -5,9 +5,6 @@ source "https://rubygems.org"
 gemspec
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-# TODO: remove this override once lutaml-model 0.8.0 is released.
-gem "lutaml-model", github: "lutaml/lutaml-model", branch: "main"
-
 gem "pry"
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"

data/lib/omml/models/ct_br.rb

@@ -9,7 +9,7 @@ module Omml
       xml do
         element "CT_Br"
 
-        namespace Omml::Namespace
+        namespace Omml::WordprocessingNamespace
 
         map_attribute :type, to: :type
         map_attribute :clear, to: :clear

data/lib/omml/models/ct_r.rb

@@ -6,6 +6,7 @@ module Omml
       attribute :r_pr, :ct_rpr, collection: 0..1
       import_model_attributes :eg_word_r_pr
       choice(min: 0, max: Float::INFINITY) do
+        import_model_attributes :eg_word_run_inner_content
         import_model_attributes :eg_run_inner_content
       end
 
@@ -17,6 +18,7 @@ module Omml
         sequence do
           map_element :rPr, to: :r_pr
           import_model_mappings :eg_word_r_pr
+          import_model_mappings :eg_word_run_inner_content
           import_model_mappings :eg_run_inner_content
         end
       end

data/lib/omml/models/ct_wordprocessing_empty.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    # WordprocessingML empty marker type, parallel to CTEmpty (math).
+    # Per OOXML schema, several elements inside a math run (`<m:r>`) are
+    # WordprocessingML primitives with empty content model: `<w:cr/>`,
+    # `<w:tab/>`, `<w:noBreakHyphen/>`, `<w:pgNum/>`, etc. These resolve
+    # to the wordprocessing `CT_Empty`, not the math one.
+    #
+    # The container class (`EGWordRunInnerContent`) already declares the
+    # wordprocessing namespace, but lutaml-model matches elements by the
+    # TYPE's namespace during parsing. Without this parallel type,
+    # math-namespaced CTEmpty won't match `<w:cr/>` and the element is
+    # silently dropped.
+    class CTWordprocessingEmpty < Base
+      xml do
+        element "CT_Empty"
+
+        namespace Omml::WordprocessingNamespace
+      end
+    end
+  end
+end

data/lib/omml/models/ct_wordprocessing_text.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    # WordprocessingML text type, parallel to CTText (math).
+    # Per OOXML schema, `<w:delText>`, `<w:instrText>`, and
+    # `<w:delInstrText>` inside a math run (`<m:r>`) resolve to the
+    # wordprocessing `CT_Text`, not the math one (`<m:t>`).
+    #
+    # Behavior is identical to CTText (string content + `xml:space`
+    # attribute); only the XML namespace differs.
+    class CTWordprocessingText < Base
+      attribute :content, :st_string
+      attribute :space, ::Lutaml::Xml::W3c::XmlSpaceType
+
+      xml do
+        element "CT_Text"
+
+        namespace Omml::WordprocessingNamespace
+
+        map_content to: :content
+        map_attribute :space, to: :space
+      end
+    end
+  end
+end

data/lib/omml/models/groups/eg_run_inner_content.rb

@@ -2,79 +2,18 @@
 
 module Omml
   module Models
+    # Math run inner content. Per shared-math.xsd CT_R, the math schema
+    # contributes only the `t` element (CT_Text) inside a math run; all
+    # other run inner content (br, cr, tab, delText, etc.) belongs to
+    # the WordprocessingML namespace via EGWordRunInnerContent.
     class EGRunInnerContent < Base
       choice(min: 1, max: 1) do
-        attribute :br, :string
         attribute :t, :ct_text
-        attribute :del_text, :ct_text
-        attribute :instr_text, :ct_text
-        attribute :del_instr_text, :ct_text
-        attribute :no_break_hyphen, :ct_empty
-        attribute :soft_hyphen, :ct_empty, collection: 0..1
-        attribute :day_short, :ct_empty, collection: 0..1
-        attribute :month_short, :ct_empty, collection: 0..1
-        attribute :year_short, :ct_empty, collection: 0..1
-        attribute :day_long, :ct_empty, collection: 0..1
-        attribute :month_long, :ct_empty, collection: 0..1
-        attribute :year_long, :ct_empty, collection: 0..1
-        attribute :annotation_ref, :ct_empty, collection: 0..1
-        attribute :footnote_ref, :ct_empty, collection: 0..1
-        attribute :endnote_ref, :ct_empty, collection: 0..1
-        attribute :separator, :ct_empty, collection: 0..1
-        attribute :continuation_separator, :ct_empty, collection: 0..1
-        attribute :sym, :ct_sym, collection: 0..1
-        attribute :pg_num, :ct_empty, collection: 0..1
-        attribute :cr, :ct_empty, collection: 0..1
-        attribute :tab, :ct_empty, collection: 0..1
-        attribute :object, :ct_object
-        attribute :pict, :ct_picture
-        attribute :fld_char, :ct_fld_char
-        attribute :ruby, :ct_ruby
-        attribute :footnote_reference, :ct_ftn_edn_ref
-        attribute :endnote_reference, :ct_ftn_edn_ref
-        attribute :comment_reference, :ct_markup
-        attribute :drawing, :ct_drawing
-        attribute :ptab, :ct_p_tab, collection: 0..1
-        attribute :last_rendered_page_break, :ct_empty, collection: 0..1
       end
 
       xml do
         type_name "EG_RunInnerContent"
-        map_element :br, to: :br, render_empty: true, namespace: nil
         map_element :t, to: :t, render_empty: true
-        map_element :delText, to: :del_text, render_empty: true
-        map_element :instrText, to: :instr_text, render_empty: true
-        map_element :delInstrText, to: :del_instr_text, render_empty: true
-        map_element :noBreakHyphen, to: :no_break_hyphen, render_empty: true
-        map_element :softHyphen, to: :soft_hyphen
-        map_element :dayShort, to: :day_short
-        map_element :monthShort, to: :month_short
-        map_element :yearShort, to: :year_short
-        map_element :dayLong, to: :day_long
-        map_element :monthLong, to: :month_long
-        map_element :yearLong, to: :year_long
-        map_element :annotationRef, to: :annotation_ref
-        map_element :footnoteRef, to: :footnote_ref
-        map_element :endnoteRef, to: :endnote_ref
-        map_element :separator, to: :separator
-        map_element :continuationSeparator, to: :continuation_separator
-        map_element :sym, to: :sym
-        map_element :pgNum, to: :pg_num
-        map_element :cr, to: :cr
-        map_element :tab, to: :tab
-        map_element :object, to: :object, render_empty: true
-        map_element :pict, to: :pict, render_empty: true
-        map_element :fldChar, to: :fld_char, render_empty: true
-        map_element :ruby, to: :ruby, render_empty: true
-        map_element :footnoteReference, to: :footnote_reference,
-                                        render_empty: true
-        map_element :endnoteReference, to: :endnote_reference,
-                                       render_empty: true
-        map_element :commentReference, to: :comment_reference,
-                                       render_empty: true
-        map_element :drawing, to: :drawing, render_empty: true
-        map_element :ptab, to: :ptab
-        map_element :lastRenderedPageBreak, to: :last_rendered_page_break
       end
     end
   end

data/lib/omml/models/groups/eg_word_run_inner_content.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    # WordprocessingML run inner content elements referenced from CT_R via
+    # <xsd:group ref="w:EG_RunInnerContent" /> in shared-math.xsd.
+    #
+    # Every element here belongs to the WordprocessingML namespace regardless
+    # of its containing parent. Per the global rule "define your own types",
+    # Omml owns these wordprocessing stubs so the gem is self-contained;
+    # consumers (e.g. Uniword) substitute their own wordprocessing classes
+    # via the register substitution mechanism.
+    class EGWordRunInnerContent < Base
+      choice(min: 1, max: 1) do
+        attribute :br, :ct_br
+        attribute :del_text, :ct_wordprocessing_text
+        attribute :instr_text, :ct_wordprocessing_text
+        attribute :del_instr_text, :ct_wordprocessing_text
+        attribute :no_break_hyphen, :ct_wordprocessing_empty
+        attribute :soft_hyphen, :ct_wordprocessing_empty, collection: 0..1
+        attribute :day_short, :ct_wordprocessing_empty, collection: 0..1
+        attribute :month_short, :ct_wordprocessing_empty, collection: 0..1
+        attribute :year_short, :ct_wordprocessing_empty, collection: 0..1
+        attribute :day_long, :ct_wordprocessing_empty, collection: 0..1
+        attribute :month_long, :ct_wordprocessing_empty, collection: 0..1
+        attribute :year_long, :ct_wordprocessing_empty, collection: 0..1
+        attribute :annotation_ref, :ct_wordprocessing_empty, collection: 0..1
+        attribute :footnote_ref, :ct_wordprocessing_empty, collection: 0..1
+        attribute :endnote_ref, :ct_wordprocessing_empty, collection: 0..1
+        attribute :separator, :ct_wordprocessing_empty, collection: 0..1
+        attribute :continuation_separator, :ct_wordprocessing_empty,
+                  collection: 0..1
+        attribute :sym, :ct_sym, collection: 0..1
+        attribute :pg_num, :ct_wordprocessing_empty, collection: 0..1
+        attribute :cr, :ct_wordprocessing_empty, collection: 0..1
+        attribute :tab, :ct_wordprocessing_empty, collection: 0..1
+        attribute :object, :ct_object
+        attribute :pict, :ct_picture
+        attribute :fld_char, :ct_fld_char
+        attribute :ruby, :ct_ruby
+        attribute :footnote_reference, :ct_ftn_edn_ref
+        attribute :endnote_reference, :ct_ftn_edn_ref
+        attribute :comment_reference, :ct_markup
+        attribute :drawing, :ct_drawing
+        attribute :ptab, :ct_p_tab, collection: 0..1
+        attribute :last_rendered_page_break, :ct_wordprocessing_empty,
+                  collection: 0..1
+      end
+
+      xml do
+        type_name "EG_WordRunInnerContent"
+        namespace Omml::WordprocessingNamespace
+
+        map_element :br, to: :br, render_empty: true
+        map_element :delText, to: :del_text, render_empty: true
+        map_element :instrText, to: :instr_text, render_empty: true
+        map_element :delInstrText, to: :del_instr_text, render_empty: true
+        map_element :noBreakHyphen, to: :no_break_hyphen, render_empty: true
+        map_element :softHyphen, to: :soft_hyphen
+        map_element :dayShort, to: :day_short
+        map_element :monthShort, to: :month_short
+        map_element :yearShort, to: :year_short
+        map_element :dayLong, to: :day_long
+        map_element :monthLong, to: :month_long
+        map_element :yearLong, to: :year_long
+        map_element :annotationRef, to: :annotation_ref
+        map_element :footnoteRef, to: :footnote_ref
+        map_element :endnoteRef, to: :endnote_ref
+        map_element :separator, to: :separator
+        map_element :continuationSeparator, to: :continuation_separator
+        map_element :sym, to: :sym
+        map_element :pgNum, to: :pg_num
+        map_element :cr, to: :cr
+        map_element :tab, to: :tab
+        map_element :object, to: :object, render_empty: true
+        map_element :pict, to: :pict, render_empty: true
+        map_element :fldChar, to: :fld_char, render_empty: true
+        map_element :ruby, to: :ruby, render_empty: true
+        map_element :footnoteReference, to: :footnote_reference,
+                                        render_empty: true
+        map_element :endnoteReference, to: :endnote_reference,
+                                       render_empty: true
+        map_element :commentReference, to: :comment_reference,
+                                       render_empty: true
+        map_element :drawing, to: :drawing, render_empty: true
+        map_element :ptab, to: :ptab
+        map_element :lastRenderedPageBreak, to: :last_rendered_page_break
+      end
+    end
+  end
+end

data/lib/omml/models.rb

@@ -180,6 +180,10 @@ module Omml
     autoload :CTWrapTopBottom, "omml/models/ct_wrap_top_bottom"
     autoload :CTXAlign, "omml/models/ct_x_align"
     autoload :CTYAlign, "omml/models/ct_y_align"
+    autoload :CTWordprocessingEmpty,
+             "omml/models/ct_wordprocessing_empty"
+    autoload :CTWordprocessingText,
+             "omml/models/ct_wordprocessing_text"
 
     autoload :OMath, "omml/models/o_math"
     autoload :OMathPara, "omml/models/o_math_para"
@@ -202,6 +206,8 @@ module Omml
     autoload :EGRunLevelElts, "omml/models/groups/eg_run_level_elts"
     autoload :EGScriptStyle, "omml/models/groups/eg_script_style"
     autoload :EGWordRPr, "omml/models/groups/eg_word_r_pr"
+    autoload :EGWordRunInnerContent,
+             "omml/models/groups/eg_word_run_inner_content"
     autoload :EGWrapType, "omml/models/groups/eg_wrap_type"
 
     autoload :EnumString, "omml/models/simple_types/enum_string"

data/lib/omml/namespace.rb

@@ -4,6 +4,8 @@ module Omml
   class Namespace < Lutaml::Xml::W3c::XmlNamespace
     uri "http://schemas.openxmlformats.org/officeDocument/2006/math"
     prefix_default "m"
+    # Per shared-math.xsd: elementFormDefault="qualified"
+    element_form_default :qualified
     attribute_form_default :qualified
   end
 end

data/lib/omml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Omml
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/omml/wordprocessing_namespace.rb

@@ -4,6 +4,8 @@ module Omml
   class WordprocessingNamespace < Lutaml::Xml::W3c::XmlNamespace
     uri "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
     prefix_default "w"
+    # Per wml.xsd: elementFormDefault="qualified"
+    element_form_default :qualified
     attribute_form_default :qualified
   end
 end