stepmod-utils 0.3.33 → 0.3.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f7acac9019851b25ebb422edd329f4eb94926619330d6e668f6b15043022ad
-  data.tar.gz: b78786ab56c61b2db0168e95e2bfdddeef597b95d61f2de7ef518a52c96ede8d
+  metadata.gz: d49969e2f3e60a1f5c56132b91a492f695aa1339bb9312b5264d72d54a4d4163
+  data.tar.gz: 8cc9498d0a6bdd52e4b387b32ebf90ec4735d3be3a009a92dfad35cd0a30c21c
 SHA512:
-  metadata.gz: 7b98ed913144b1c570d0ef21cb61ec40497862e12d46eed97edf781426f669674c8a915e17e557ab0ce1907a43e6e915f3402910f26cd54f1763fe8a7efdca62
-  data.tar.gz: 34e2019fe8b382a52452d21d6829a0868a86cacbe2796a470d3f21acfdc8bc5c23223a3a0ac517380a889397afa7193a98cb3f00745b9de2a7ae3257b09d3552
+  metadata.gz: c95c28d9b783137773da3bfc003dfdda5488368f48c3eb49a5494b62a47a60f2aa55ed218f3f0042ab558d386ea2d47445a1a44573078365725b5ac04b1246f6
+  data.tar.gz: c9a1d29d6d777f4914596724b5fad8fb256a6ce15ffcc857cbe8a233c37c01db5eebea9dbc7104537037a273d3080cbafc8f9db11d545fecdb5bd3293a970026

data/exe/stepmod-annotate-all

@@ -31,6 +31,31 @@ def all_express_files(stepmod_dir)
   files.filter { |file| File.exist?(file) }
 end
 
+# On MacOS File.exist? was behaving case sensitive while on
+# Github Actions it was behaving as case in-sensitive, e.g
+# File.exist?(`../resource_docs/geometric_and_topological_representation/RationalLRsurf.gif`)
+# was returning true on MacOS and false on Github Action runner. Because
+# the original filepath was `geometric_and_topological_representation/RationalLRSurf.gif` (notice the capital `S` for Surf.gif)
+# So this method is to find the actual path of the file based on
+# downcased name of the file,
+#
+# Example:
+#
+# Given `../resource_docs/geometric_and_topological_representation/RationalLRsurf.gif`
+#   return `../resource_docs/geometric_and_topological_representation/RationalLRSurf.gif`
+# It will return nil if the file does not exist
+def file_system_path(filepath, filename_cache)
+  dir = File.dirname(filepath)
+  filename = File.basename(filepath)
+
+  return filename_cache[dir][filepath.downcase] if filename_cache[dir]
+
+  files = Dir.glob(File.join(dir, "*")).map { |f| [f.downcase, f] }.to_h
+  filename_cache[dir] = files
+
+  filename_cache[dir][filepath.downcase]
+end
+
 MAX_THREADS = 1 #[2, Concurrent.processor_count].max * 2
 MAX_QUEUE_SIZE = MAX_THREADS * 4
 # https://github.com/ruby-concurrency/concurrent-ruby/blob/master/docs-source/thread_pools.md
@@ -42,6 +67,7 @@ MAX_QUEUE_SIZE = MAX_THREADS * 4
 # )
 
 files = all_express_files(stepmod_dir)
+filename_cache = {}
 
 files.each do |file|
   puts "#{Thread.current.object_id}: Processing #{file}"
@@ -60,13 +86,14 @@ files.each do |file|
 
   result[:images_references].each do |source, destination|
     source_path = File.join(stepmod_dir, "data", source)
+    system_source_path = file_system_path(source_path, filename_cache)
     destination_path = File.join(File.dirname(file), destination)
 
     puts "#{Thread.current.object_id}:     Starting to copy file from #{source_path} to #{destination_path}"
-    next if File.exist?(destination_path) || !File.exist?(source_path)
+    next if !system_source_path
 
-    FileUtils.cp(source_path, destination_path)
-    puts "#{Thread.current.object_id}:     Done copying #{source_path} to #{destination_path}"
+    FileUtils.cp(system_source_path, destination_path)
+    puts "#{Thread.current.object_id}:     Done copying #{system_source_path} to #{destination_path}"
   end
 
   puts "#{Thread.current.object_id}: Done processing #{File.basename(file)} => #{annotated_file_path}."

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

@@ -6,7 +6,9 @@ module Stepmod
       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]
+          if state[:equation]
+            "ii(#{content.strip})"
+          elsif content.strip.empty? || state[:already_italic]
             content
           else
             "#{content[/^\s*/]}_#{content.strip}_#{content[/\s*$/]}"

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.33".freeze
+    VERSION = "0.3.35".freeze
   end
 end

metadata

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