stepmod-utils 0.3.34 → 0.3.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d4cd3a24127e1903a040a5edaa734ccef3adb17b65cce4c213fdcbf3d13ea5a
-  data.tar.gz: fe17db00fa97f748853ed5c0de867222a5d5ba16b3c2256a498abe20814d7694
+  metadata.gz: 0f1ebcec660e6d354c1b84750a92e0232c2428e0dd926f2aeb943f0ca3777f85
+  data.tar.gz: 794ffb15bcdac0433bdc6a881a25c89ba7b60a7c30234d43b0cb08e479c1f94b
 SHA512:
-  metadata.gz: 7dab877d377c83d22a08dffceb223c3a7c502b353bd89756829c7fc39341c57758276731623e3e013879c0a329f9bb00de19eb5daa869a8653cd2d48f3987115
-  data.tar.gz: ea50ab5f75131fc5474fb21adb8aaf7692dd48da61e453c754ac762fb76dde78948c0bbe9588f5f9750347d370189c56683481daa0c94fe57c77f10838c548a4
+  metadata.gz: 7fa30f27168e5ff50c602d297e4f3a3f7eafde2eb1eca3c8006a719fef499350f2ce8901b04d6eebd9e0bf8b0156ef91b7a3477ccf120f16d66aad93f17f48d8
+  data.tar.gz: 4fc47c6bedae4215005a7c47102b13a8185fdaaa2378847cd729d1d29f7b56ebf325fdaa95cddbcf0c93b668a79e6ea1025989828e3611bd0ddf06d34a139c5a

data/lib/stepmod/utils/converters/em_express_description.rb

@@ -5,12 +5,41 @@ module Stepmod
     module Converters
       class Em < ReverseAdoc::Converters::Base
         def convert(node, state = {})
-          content = treat_children(node, state.merge(already_italic: true))
-          if content.strip.empty? || state[:already_italic]
+          italic_converted(node, state)
+        end
+
+        private
+
+        def italic_converted(node, state)
+          cloned_node = node.clone
+          equations = extract_equations(cloned_node)
+          content = treat_children(cloned_node, state.merge(already_italic: true))
+          equation_content = equations.map do |equation|
+            treat(equation, state.merge(equation: true, already_italic: true))
+          end
+
+          content = if state[:equation] && !content.strip.empty?
+            "ii(#{content.strip})"
+          elsif content.strip.empty? || state[:already_italic]
             content
           else
             "#{content[/^\s*/]}_#{content.strip}_#{content[/\s*$/]}"
           end
+
+          [content, equation_content].compact.join("")
+        end
+
+        def extract_equations(node)
+          equations = []
+
+          node.children.each do |n|
+            next if n.name != "eqn"
+
+            equations << n
+            n.unlink
+          end
+
+          equations
         end
       end
 

data/lib/stepmod/utils/converters/eqn.rb

@@ -46,12 +46,13 @@ module Stepmod
           term = first_strong_node.text.strip
           first_strong_node.remove
           "\n\n#{term}:: #{remove_trash_symbols(treat_children(cloned_node,
-                                                               state))}\n"
+                                                               state.merge(equation: true)))}\n"
         end
 
         def stem_converted(cloned_node, state)
-          remove_tags_not_in_context(cloned_node)
-          internal_content = treat_children(cloned_node, state)
+          # We are now adding bb() or ii() for bold and italic respectively
+          # remove_tags_not_in_context(cloned_node)
+          internal_content = treat_children(cloned_node, state.merge(equation: true))
           content = Stepmod::Utils::HtmlToAsciimath.new.call(internal_content)
           res = <<~TEMPLATE
 

data/lib/stepmod/utils/converters/strong.rb

@@ -7,19 +7,46 @@ module Stepmod
         BLANK_CHARS = "{blank}"
 
         def convert(node, state = {})
-          content = treat_children(node, state.merge(already_strong: true))
-          strong_tag = state[:non_flanking_whitesapce] ? '**' : '*'
-          if content.strip.empty? || state[:already_strong] || content_is_equation?(content)
+          bold_converted(node, state)
+        end
+
+        private
+
+        def bold_converted(node, state)
+          cloned_node = node.clone
+          equations = extract_equations(cloned_node)
+          content = treat_children(cloned_node, state.merge(already_strong: true))
+          equation_content = equations.map do |equation|
+            treat(equation, state.merge(equation: true, already_strong: true))
+          end
+
+          content = if state[:equation]
+            "bb(#{content.strip})"
+          elsif content.strip.empty? || state[:already_strong]
             content
           else
+            strong_tag = state[:non_flanking_whitesapce] ? '**' : '*'
             handle_express_escape_seq(
               node,
               "#{content[/^\s*/]}#{strong_tag}#{content.strip}#{strong_tag}#{content[/\s*$/]}"
             )
           end
+
+          [content, equation_content].compact.join("")
         end
 
-        private
+        def extract_equations(node)
+          equations = []
+
+          node.children.each do |n|
+            next if n.name != "eqn"
+
+            equations << n
+            n.unlink
+          end
+
+          equations
+        end
 
         def handle_express_escape_seq(node, content)
           res = content
@@ -36,10 +63,6 @@ module Stepmod
           match = end_of_text ? /\($/ : /^\)/
           sibling&.text? && sibling.text =~ match
         end
-
-        def content_is_equation?(content)
-          content.match(/^\s*\[\[[^\]]*\]\]/) || content.match(/^\s*\[stem\]/)
-        end
       end
 
       ReverseAdoc::Converters.register :strong, Strong.new

data/lib/stepmod/utils/converters/sub.rb

@@ -6,7 +6,7 @@ module Stepmod
       class Sub < ReverseAdoc::Converters::Base
         def convert(node, state = {})
           content = treat_children(node, state)
-          return stem_notation(content) if node.parent.name == "eqn"
+          return stem_notation(content) if state[:equation]
 
           "#{content[/^\s*/]}~#{content.strip}~#{content[/\s*$/]}"
         end

data/lib/stepmod/utils/converters/sup.rb

@@ -6,7 +6,7 @@ module Stepmod
       class Sup < ReverseAdoc::Converters::Base
         def convert(node, state = {})
           content = treat_children(node, state)
-          return stem_notation(content) if node.parent.name == "eqn"
+          return stem_notation(content) if state[:equation]
 
           "#{content[/^\s*/]}^#{content.strip}^#{content[/\s*$/]}"
         end

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.34".freeze
+    VERSION = "0.3.36".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.34
+  version: 0.3.36
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby