From 18be6c97345955f1dfab52d19e253df5edff2206 Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Wed, 15 Apr 2026 17:28:57 +0800 Subject: [PATCH] fix: upgrade mml to 2.3.2 to make things work --- .rubocop_todo.yml | 32 +++- Gemfile | 1 - lib/unitsml/formula.rb | 4 + lib/unitsml/unit.rb | 21 ++- spec/unitsml/conv/plurimath_spec.rb | 266 ++++++++++++++-------------- unitsml.gemspec | 4 +- 6 files changed, 179 insertions(+), 149 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 90c8e52..e29121b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,24 +1,25 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2026-04-04 03:19:03 UTC using RuboCop version 1.86.0. +# on 2026-04-15 09:29:09 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 # versions of RuboCop, may require this file to be generated again. -# Offense count: 2 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation. -Bundler/OrderedGems: - Exclude: - - 'Gemfile' - # Offense count: 1 Gemspec/RequiredRubyVersion: Exclude: - 'unitsml.gemspec' -# Offense count: 75 +# Offense count: 1 +# This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: EnforcedStyle, IndentationWidth. +# SupportedStyles: with_first_argument, with_fixed_indentation +Layout/ArgumentAlignment: + Exclude: + - 'lib/unitsml/unit.rb' + +# Offense count: 76 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings. # URISchemes: http, https @@ -40,6 +41,13 @@ Layout/LineLength: - 'spec/unitsml/conv/xml_spec.rb' - 'unitsml.gemspec' +# Offense count: 1 +# This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: AllowInHeredoc. +Layout/TrailingWhitespace: + Exclude: + - 'lib/unitsml/unit.rb' + # Offense count: 3 Lint/ReturnInVoidContext: Exclude: @@ -160,6 +168,12 @@ RSpec/SpecFilePathFormat: - 'spec/unitsml/conv/unicode_spec.rb' - 'spec/unitsml/conv/xml_spec.rb' +# Offense count: 1 +# This cop supports safe autocorrection (--autocorrect). +Style/MultilineIfModifier: + Exclude: + - 'lib/unitsml/unit.rb' + # Offense count: 2 # Configuration parameters: AllowedMethods. # AllowedMethods: respond_to_missing? diff --git a/Gemfile b/Gemfile index 7c1cff3..3ca96ab 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,6 @@ gemspec gem "canon" gem "lutaml-model", "~> 0.8.0", github: "lutaml/lutaml-model", branch: "main" -gem "mml" gem "oga" gem "ox" gem "plurimath", github: "plurimath/plurimath", branch: "rt-lutaml-080" diff --git a/lib/unitsml/formula.rb b/lib/unitsml/formula.rb index 1cce999..f3b2373 100644 --- a/lib/unitsml/formula.rb +++ b/lib/unitsml/formula.rb @@ -196,10 +196,14 @@ def plurimath_available? end def nullify_mml_models + return unless defined?(Plurimath::Mathml::Parser::CONFIGURATION) + Plurimath::Mathml::Parser::CONFIGURATION.each_key { |klass| klass.model(klass) } end def reset_mml_models + return unless defined?(Plurimath::Mathml::Parser::CONFIGURATION) + ::Mml::V4::Configuration.custom_models = Plurimath::Mathml::Parser::CONFIGURATION end diff --git a/lib/unitsml/unit.rb b/lib/unitsml/unit.rb index b32ad62..4cacaae 100644 --- a/lib/unitsml/unit.rb +++ b/lib/unitsml/unit.rb @@ -35,10 +35,14 @@ def unit_symbols end def to_mathml(options) - value = unit_symbols&.mathml - tag_name = value.match(/^<(?\w+)/)[:tag] - value = ::Mml::V4.const_get(tag_name.capitalize).from_xml(value) - value.value = "#{prefix.to_mathml(options)}#{value.value}" if prefix + raw_mathml = unit_symbols&.mathml + tag_name = raw_mathml.match(/^<(?\w+)/)[:tag] + klass = ::Mml::V4.const_get(tag_name.capitalize) + value = klass.from_xml(raw_mathml) + if prefix + value = with_updated_value(value, + "#{prefix.to_mathml(options)}#{value.value}") + end if power_numerator value = msup_tag( { method_name: tag_name, value: value }, @@ -126,6 +130,15 @@ def system_reference unit_instance.unit_system_reference end + def with_updated_value(element, new_value) + attrs = element.class.attributes.each_with_object({}) do |(name, _), h| + val = element.public_send(name) + h[name] = val unless val.nil? + end + attrs[:value] = new_value + element.class.new(**attrs) + end + def msup_tag(value, options) msup = ::Mml::V4::Msup.new msup.ordered = true diff --git a/spec/unitsml/conv/plurimath_spec.rb b/spec/unitsml/conv/plurimath_spec.rb index a13ab7d..dda6aa4 100644 --- a/spec/unitsml/conv/plurimath_spec.rb +++ b/spec/unitsml/conv/plurimath_spec.rb @@ -28,23 +28,23 @@ Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("mm"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("s"), - "normal", + "rm", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("2"), ]), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ), ]) @@ -90,7 +90,7 @@ Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("g"), - "normal", + "rm", ), ]) end @@ -105,8 +105,8 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( - Plurimath::Math::Symbols::Symbol.new("µm"), - "normal", + Plurimath::Math::Symbols::Symbol.new("µm"), + "rm", ), ]) end @@ -124,49 +124,49 @@ Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("kg"), - "normal", + "rm", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("1"), ]), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("m"), - "normal", + "rm", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("3"), ]), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("s"), - "normal", + "rm", ), Plurimath::Math::Number.new("4"), ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("A"), - "normal", + "rm", ), Plurimath::Math::Number.new("2"), ), @@ -184,35 +184,35 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("g"), - "normal", + "rm", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Number.new("3"), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ]) end @@ -228,7 +228,7 @@ Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("g"), - "normal", + "rm", ), ]) end @@ -246,22 +246,22 @@ Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("J"), - "normal", + "rm", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("kg"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ]) end @@ -277,40 +277,40 @@ Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("J"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("kg"), - "normal", + "rm", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("1"), ]), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("1"), ]), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ), ]) @@ -327,27 +327,27 @@ Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("J"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("mol"), - "normal", + "rm", ), Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("1"), ]), ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("1"), ]), ), @@ -365,27 +365,27 @@ Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("J"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("mol"), - "normal", + "rm", ), Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("1"), ]), ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), Plurimath::Math::Formula.new([ - Plurimath::Math::Symbols::Minus.new, + Plurimath::Math::Symbols::Minus.new("−"), Plurimath::Math::Number.new("1"), ]), ), @@ -402,23 +402,23 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("mol"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("J"), - "normal", + "rm", ), ]) end @@ -433,23 +433,23 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("mol"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("J"), - "normal", + "rm", ), ]) end @@ -464,29 +464,29 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("mol"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("J"), - "normal", + "rm", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ]) end @@ -501,34 +501,34 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("mol"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("J"), - "normal", + "rm", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("K"), - "normal", + "rm", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ]) end @@ -544,22 +544,22 @@ Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("E"), - "normal", + "rm", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("mm"), - "normal", + "rm", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::Normal.new( Plurimath::Math::Symbols::Symbol.new("kg"), - "normal", + "rm", ), ]) end @@ -574,18 +574,18 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::UpcaseTheta.new, + Plurimath::Math::Symbols::UpcaseTheta.new("Θ"), "sans-serif", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::Phi.new, + Plurimath::Math::Symbols::Phi.new("φ"), "sans-serif", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ]) end @@ -600,14 +600,14 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::UpcaseTheta.new, + Plurimath::Math::Symbols::UpcaseTheta.new("Θ"), "sans-serif", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::FontStyle::SansSerif.new( Plurimath::Math::Symbols::Symbol.new("L"), @@ -626,10 +626,10 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::UpcaseTheta.new, + Plurimath::Math::Symbols::UpcaseTheta.new("Θ"), "sans-serif", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::SansSerif.new( Plurimath::Math::Symbols::Symbol.new("L"), "sans-serif", @@ -647,23 +647,23 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::Phi.new, + Plurimath::Math::Symbols::Phi.new("φ"), "sans-serif", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::UpcaseTheta.new, + Plurimath::Math::Symbols::UpcaseTheta.new("Θ"), "sans-serif", ), - Plurimath::Math::Symbols::Cdot.new, + Plurimath::Math::Symbols::Cdot.new("⋅"), Plurimath::Math::Function::FontStyle::SansSerif.new( Plurimath::Math::Symbols::Symbol.new("L"), "sans-serif", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ]) end @@ -678,44 +678,44 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::Phi.new, + Plurimath::Math::Symbols::Phi.new("φ"), "sans-serif", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::SansSerif.new( Plurimath::Math::Symbols::Symbol.new("I"), "sans-serif", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::UpcaseTheta.new, + Plurimath::Math::Symbols::UpcaseTheta.new("Θ"), "sans-serif", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::FontStyle::SansSerif.new( Plurimath::Math::Symbols::Symbol.new("L"), "sans-serif", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ]) end @@ -730,31 +730,31 @@ let(:expected_value) do Plurimath::Math::Formula.new([ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::Phi.new, + Plurimath::Math::Symbols::Phi.new("φ"), "sans-serif", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::SansSerif.new( Plurimath::Math::Symbols::Symbol.new("I"), "sans-serif", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Function::FontStyle::SansSerif.new( - Plurimath::Math::Symbols::UpcaseTheta.new, + Plurimath::Math::Symbols::UpcaseTheta.new("Θ"), "sans-serif", ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), Plurimath::Math::Function::Power.new( Plurimath::Math::Function::FontStyle::SansSerif.new( @@ -762,15 +762,15 @@ "sans-serif", ), Plurimath::Math::Function::Fenced.new( - Plurimath::Math::Symbols::Paren::Lround.new, + Plurimath::Math::Symbols::Paren::Lround.new("("), [ Plurimath::Math::Number.new("12"), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ), ], - Plurimath::Math::Symbols::Paren::Rround.new, + Plurimath::Math::Symbols::Paren::Rround.new(")"), ), ]) end diff --git a/unitsml.gemspec b/unitsml.gemspec index e2e95c2..6c7a3b4 100644 --- a/unitsml.gemspec +++ b/unitsml.gemspec @@ -30,11 +30,11 @@ Gem::Specification.new do |spec| spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } - spec.require_paths = ["lib", "unitsdb/**/*.yaml"] + spec.require_paths = ["lib"] spec.add_dependency "htmlentities" spec.add_dependency "lutaml-model", "~> 0.8.0" - spec.add_dependency "mml" + spec.add_dependency "mml", "~> 2.3.2" spec.add_dependency "parslet" spec.add_dependency "unitsdb", "~> 2.2.1" end