stepmod-utils 0.4.14 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e899495da23543691f64da8ac653723b58d18d6c56dc3079d03de2ff4c82b76d
-  data.tar.gz: c7c95af88056dc3afccdd7e2a627539027fafe58b984e55f89f4d4e84d5d5466
+  metadata.gz: a5dc18c380e823b42d5e958c7c83008805c7ae44966481bd892ebe8e7119df9b
+  data.tar.gz: 83e1abb4edb5a8c9b585fca855024fb4cabc689a3223b858dd4b4d7c6f449897
 SHA512:
-  metadata.gz: 599a6815246bc9a9242be9bafd86e9adb0ad16d29f93295b2772eeceffe5773a6560a23a563890f7ef8d1a1a3e23e849b9f2f3d6abfc3f7a3de55d554c17491e
-  data.tar.gz: af84267ff33afbb543de2b491b7c4bbc1ecd7c837235a75a5cee8e4136d4b8fffb89b5778a6b9448a5f787fffbe31775a6e5c800c057375189dfb031f9957e4d
+  metadata.gz: b55e1bce8655edcc98ded98f9bd1658ecedafb15c413e123f9de6d5aecfe079f9ed929417683ad54b17e0586b55354baf4a798a94fc4a0908b825b58ca973209
+  data.tar.gz: 9dd2822119df10d4c6e1f66b5a49329e093c8c1a8b2bfcf05609f67660b3a5b5e0aff62fc86e8b116eb3c7da0721088d1aee91df2d9879b42da243897c10e4ba

data/.github/workflows/release.yml

@@ -7,11 +7,12 @@ on:
     inputs:
       next_version:
         description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
 
 jobs:
   release:

data/exe/stepmod-annotate-all

@@ -7,6 +7,41 @@ require "fileutils"
 require "bundler/setup"
 require "optparse"
 
+SKIP_DETACHED_SCHEMAS = %w(
+  assembly_constraint_schema
+  assembly_feature_relationship_schema
+  basis_schema
+  conditions_schema
+  domain_schema
+  equations_schema
+  explicit_constraint_schema
+  explicit_geometric_constraint_schema
+  fea_scalar_vector_tensor_schema
+  finite_element_analysis_control_and_result_schema
+  hierarchy_schema
+  iso13584_expressions_schema
+  ISO13584_expressions_schema
+  iso13584_generic_expressions_schema
+  ISO13584_generic_expressions_schema
+  mathematical_functions_schema
+  mesh_connectivity_schema
+  mesh_function_schema
+  mesh_topology_schema
+  method_definition_schema
+  parameterization_schema
+  procedural_model_schema
+  procedural_shape_model_schema
+  procedural_sketch_schema
+  process_property_representation_schema
+  process_property_schema
+  results_schema
+  sketch_schema
+  solid_shape_element_schema
+  structural_response_definition_schema
+  structural_response_representation_schema
+  variational_representation_schema
+)
+
 def log(message, indent = 0)
   indent_spaces = " " * (indent * 2)
   puts "[stepmod-utils] #{indent_spaces}#{message}"
@@ -58,17 +93,20 @@ stepmod_dir = options[:stepmod_dir]
 raise StandardError.new("--stepmod-dir not set") unless stepmod_dir
 
 stepmod_path = Pathname.new(stepmod_dir)
-unless (stepmod_path.join("data").exist? && stepmod_path.join("data").directory?)
+unless stepmod_path.join("data").exist? && stepmod_path.join("data").directory?
   raise StandardError.new("--stepmod-dir should be the root STEPmod directory and contains data/")
 end
+
 log "STEPmod data path: `#{stepmod_dir}`"
 
 srl_output_schemas_dir = options[:srl_output_schemas_dir]
 raise StandardError.new("--schemas directory for SRL schemas not set") unless srl_output_schemas_dir
+
 log "SRL schemas output path: `#{srl_output_schemas_dir}`"
 
 srl_output_docs_dir = options[:srl_output_docs_dir]
 raise StandardError.new("--documents directory for SRL documents (generated by stepmod2mn) not set") unless srl_output_docs_dir
+
 log "SRL documents path: `#{srl_output_docs_dir}`"
 
 unless File.exist?(srl_output_docs_dir) && File.directory?(srl_output_docs_dir)
@@ -88,8 +126,9 @@ def all_express_files(stepmod_dir)
     files << "#{stepmod_dir}/data/modules/#{item['name']}/mim.exp"
   end
 
+  # Skip resource schemas
   index.xpath("resources/resource").each do |item|
-    next if item["name"] == "iso13584_expressions_schema"
+    next if SKIP_DETACHED_SCHEMAS.include?(item["name"])
 
     files << "#{stepmod_dir}/data/resources/#{item['name']}/#{item['name']}.exp"
   end
@@ -126,7 +165,7 @@ def file_system_path(filepath, filename_cache)
   filename_cache[dir][filepath.downcase]
 end
 
-MAX_THREADS = 1 #[2, Concurrent.processor_count].max * 2
+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
 # pool = Concurrent::ThreadPoolExecutor.new(
@@ -143,7 +182,6 @@ FileUtils.mkdir_p(srl_output_schemas_dir)
 srl_output_schemas_path = Pathname.new(srl_output_schemas_dir)
 srl_output_docs_path = Pathname.new(srl_output_docs_dir)
 
-
 files.each do |file|
   puts "#{Thread.current.object_id}: `#{file}` processing..."
 
@@ -153,7 +191,6 @@ files.each do |file|
   ).call
 
   destination_rel_path = Pathname.new(file).dirname.relative_path_from(stepmod_path.join("data"))
-  directory_type = destination_rel_path.each_filename.to_a.first
 
   destination_path = srl_output_schemas_path.join(destination_rel_path)
   FileUtils.mkdir_p(destination_path)

data/exe/stepmod-convert-express-description

@@ -17,10 +17,8 @@ input_content = ARGF.read
 
 result = Stepmod::Utils::SmrlDescriptionConverter.convert(input_content, {})
 result.split("\n").each do |line|
-  begin
-    $stdout.puts(line)
-    $stdout.flush
-  rescue Errno::EPIPE
-    exit(74)
-  end
+  $stdout.puts(line)
+  $stdout.flush
+rescue Errno::EPIPE
+  exit(74)
 end

data/exe/stepmod-convert-express-resource

@@ -17,10 +17,8 @@ input_content = ARGF.read
 
 result = Stepmod::Utils::SmrlResourceConverter.convert(input_content, {})
 result.split("\n").each do |line|
-  begin
-    $stdout.puts(line)
-    $stdout.flush
-  rescue Errno::EPIPE
-    exit(74)
-  end
+  $stdout.puts(line)
+  $stdout.flush
+rescue Errno::EPIPE
+  exit(74)
 end

data/exe/stepmod-extract-concepts

@@ -77,7 +77,8 @@ else
   )
 end
 
-default_output_dir = File.join(File.expand_path("..", stepmod_dir), "output_yaml")
+default_output_dir = File.join(File.expand_path("..", stepmod_dir),
+                               "output_yaml")
 output_dir = options[:output_dir] || default_output_dir
 unless File.directory?(output_dir)
   FileUtils.mkdir_p(output_dir)
@@ -164,7 +165,7 @@ end
 yaml_outputs = {
   clause_4_sections: {},
   clause_5_sections: {},
-  bibliographies: {}
+  bibliographies: {},
 }
 
 part_resources.each do |(_bibdata, current_part_resources)|
@@ -204,9 +205,9 @@ extract_bibliographies(resource_concepts, yaml_outputs[:bibliographies])
 {
   clause_4_sections: "resource_sections.yaml",
   clause_5_sections: "module_sections.yaml",
-  bibliographies: "bib.yaml"
+  bibliographies: "bib.yaml",
 }.each_pair do |var, filename|
   path = File.join(output_dir, filename)
   File.write(path, yaml_outputs[var].values.to_yaml)
-  log "INFO: #{var.to_s} written to #{path}."
+  log "INFO: #{var} written to #{path}."
 end

data/exe/stepmod-srl-migrate

@@ -15,7 +15,7 @@ require "optparse"
 
 def log(message, indent = 0)
   indent_spaces = " " * (indent * 2)
-  puts "[stepmod-utils] #{message}"
+  puts "[stepmod-utils] #{indent_spaces}#{message}"
 end
 
 def copy_files_to_schemas(path, stepmod_path, srl_output_schemas_dir)
@@ -34,13 +34,12 @@ def copy_files_to_schemas(path, stepmod_path, srl_output_schemas_dir)
 end
 
 def copy_files_to_document(path, stepmod_path, srl_output_docs_dir)
-  base_path = path.dirname.relative_path_from(File.join(stepmod_path, "data"))
   file_name = path.basename
-  module_xml_path = path.dirname.join('module.xml')
+  module_xml_path = path.dirname.join("module.xml")
   # puts "module_xml_path #{module_xml_path}"
   module_xml = Nokogiri::XML(IO.read(module_xml_path)).root
 
-  part_number = module_xml.xpath('//module').first.attr('part')
+  part_number = module_xml.xpath("//module").first.attr("part")
   # module_name = module_xml.xpath('//module').first.attr('name')
 
   new_dir = File.join(srl_output_docs_dir, "iso-10303-#{part_number}")
@@ -99,19 +98,19 @@ OptionParser.new do |opts|
 end.parse!
 
 def download_stepmod2mn(path)
-  if path && path.exist?
+  if path&.exist?
     puts "Specified `stepmod2mn.jar` found, skipping download."
     return path
   end
 
   puts "Specified `stepmod2mn.jar` not found, downloading from GitHub."
 
-  require 'octokit'
+  require "octokit"
   require "down"
   require "fileutils"
 
   client = Octokit::Client.new
-  download_url = client.latest_release('metanorma/stepmod2mn').assets.first.browser_download_url
+  download_url = client.latest_release("metanorma/stepmod2mn").assets.first.browser_download_url
 
   filename = Pathname.new(download_url).basename.to_s
 
@@ -147,7 +146,7 @@ end
 
 stepmod_path = Pathname.new(stepmod_dir)
 unless stepmod_path.exist? && stepmod_path.directory? &&
-  stepmod_path.join("data").exist? && stepmod_path.join("data").directory?
+    stepmod_path.join("data").exist? && stepmod_path.join("data").directory?
   puts "Specified STEPmod directory not found, not a directory, or does not contain `data/`. Aborting."
   exit 1
 end
@@ -167,32 +166,32 @@ unless File.directory?(srl_output_docs_dir)
 end
 log "SRL output documents directory path: `#{srl_output_docs_dir}`"
 
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION] Migration starts!")
 
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION: stepmod2mn.jar] START SVG generation.")
-log("*"*30)
+log("*" * 30)
 system "java -Xss5m -jar #{stepmod2mn_path} #{stepmod_dir} --output-documents #{srl_output_docs_dir} --output-schemas #{srl_output_schemas_dir} --svg"
 
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION: stepmod2mn.jar] COMPLETE SVG generation.")
 
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION: stepmod2mn.jar] START document migration and SVG generation.")
-log("*"*30)
+log("*" * 30)
 system "java -Xss5m -jar #{stepmod2mn_path} #{stepmod_dir} --output-documents #{srl_output_docs_dir} --output-schemas #{srl_output_schemas_dir}"
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION: stepmod2mn.jar] COMPLETE document migration and SVG generation.")
 
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION: stepmod-utils] START Annotated EXPRESS generation.")
-log("*"*30)
+log("*" * 30)
 system "stepmod-annotate-all --stepmod-dir #{stepmod_dir} --documents #{srl_output_docs_dir} --schemas #{srl_output_schemas_dir}"
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION: stepmod-utils] COMPLETE Annotated EXPRESS generation.")
 
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION: stepmod-utils] START EXPRESS change YAML extraction.")
 system "stepmod-extract-changes -p #{stepmod_dir}"
 
@@ -208,10 +207,10 @@ Dir.glob("#{stepmod_dir}/data/**/changes.yaml").each do |filepath|
   copy_files_to_document(path, stepmod_dir, srl_output_docs_dir)
 end
 
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION: stepmod-utils] COMPLETE EXPRESS change YAML extraction.")
 
-log("*"*30)
+log("*" * 30)
 log("[SRL MIGRATION] Migration complete!")
 
-log("*"*30)
+log("*" * 30)

data/exe/stepmod-validate-express

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'nokogiri'
-require 'expressir'
-require 'expressir/express/parser'
-require 'expressir/express/formatter'
+require "nokogiri"
+require "expressir"
+require "expressir/express/parser"
+require "expressir/express/formatter"
 
 stepmod_dir = ARGV.pop || "iso-10303-stepmod-wg12"
 stepmod_path = Pathname.new(stepmod_dir)
@@ -38,7 +38,7 @@ end
 
 def parse_express_schema(path)
   Expressir::Express::Parser.from_file(path)
-rescue
+rescue StandardError
   puts "ERROR: Broken schema detected in #{path}!"
   nil
 end
@@ -54,7 +54,7 @@ puts REPO_INDEX_XML
 puts
 puts "NOTE: SHOULD_REWRITE mode is turned #{SHOULD_REWRITE ? 'ON' : 'OFF'}"
 
-all_express_files(stepmod_dir).each_with_index do |exp_file, i|
+all_express_files(stepmod_dir).each_with_index do |exp_file, _i|
   # puts "i #{i}"
   # next if i > 10
 
@@ -62,7 +62,6 @@ all_express_files(stepmod_dir).each_with_index do |exp_file, i|
   exp_path = Pathname.new(exp_file)
   repo = parse_express_schema(exp_file)
 
-
   schemas_status[exp_path.to_s] = repo ? true : false
 
   if repo.nil?
@@ -77,28 +76,27 @@ all_express_files(stepmod_dir).each_with_index do |exp_file, i|
     formatted_schema = format_express_schema(repo)
     # experimental_path = exp_path.dirname.join(exp_path.basename('.exp').to_s+".x.exp")
 
-    puts "rewriting : #{exp_path.to_s}"
+    puts "rewriting : #{exp_path}"
     exp_path.truncate(0)
     exp_path.write(formatted_schema)
   end
-
 end
 
-puts "*"*30
+puts "*" * 30
 
-if schemas_status.values.include?(false)
+if schemas_status.value?(false)
   puts "The following schemas failed validation:"
-  schemas_status.select do |path, status|
+  schemas_status.select do |_path, status|
     status == false
-  end.each_pair do |path, status|
+  end.each_pair do |path, _status|
     puts "SCHEMA: #{path}"
   end
-  puts "*"*30
+  puts "*" * 30
 
   exit 1
 end
 
 puts "All schemas passed validation."
-puts "*"*30
+puts "*" * 30
 
 exit 0

data/lib/stepmod/utils/change.rb

@@ -5,7 +5,7 @@ require "stepmod/utils/change_edition_collection"
 module Stepmod
   module Utils
     class Change
-      attr_accessor :schema_name
+      attr_accessor :schema_name, :mapping_table
       attr_reader :change_editions
 
       MODULE_TYPES = {
@@ -14,12 +14,19 @@ module Stepmod
         arm_longform: "arm_lf",
         mim_longform: "mim_lf",
         mapping: "mapping",
-        changes: "",
+        changes: "changes",
+        mapping_table: "mapping",
       }.freeze
 
+      TYPES_WITHOUT_EXTENSION = %w[
+        changes
+        mapping_table
+      ].freeze
+
       def initialize(stepmod_dir:, schema_name:, type:)
         @stepmod_dir = stepmod_dir
         @change_editions = Stepmod::Utils::ChangeEditionCollection.new
+        @mapping_table = {}
         @schema_name = schema_name
         @type = type
       end
@@ -42,10 +49,14 @@ module Stepmod
       alias_method :[], :fetch_change_edition
 
       def save_to_file
-        change_hash = to_h
+        change_hash = if @type == "mapping_table"
+                        @mapping_table
+                      else
+                        to_h
+                      end
         return if change_hash.empty?
 
-        File.write(filepath(@type), Psych.dump(change_hash))
+        File.write(filepath(@type), Psych.dump(stringify_keys(change_hash)))
       end
 
       def to_h
@@ -72,7 +83,7 @@ module Stepmod
       end
 
       def filename(type)
-        return "changes.yaml" if type.to_s == "changes"
+        return "#{MODULE_TYPES[type.to_sym]}.yaml" if TYPES_WITHOUT_EXTENSION.include?(type.to_s)
 
         "#{MODULE_TYPES[type.to_sym] || schema_name}.changes.yaml"
       end
@@ -84,6 +95,23 @@ module Stepmod
           "modules"
         end
       end
+
+      # Hash#transform_keys is not available in Ruby 2.4
+      # so we have to do this ourselves :(
+      # symbolize hash keys
+      def stringify_keys(hash)
+        result = {}
+        hash.each_pair do |key, value|
+          result[key.to_s] = if value.is_a?(Hash)
+                               stringify_keys(value)
+                             elsif value.is_a?(Array)
+                               value.map { |v| stringify_keys(v) }
+                             else
+                               value
+                             end
+        end
+        result
+      end
     end
   end
 end

data/lib/stepmod/utils/change_collection.rb

@@ -24,7 +24,7 @@ module Stepmod
       end
 
       def save_to_files
-        @changes.values.each(&:save_to_file)
+        @changes.each_value(&:save_to_file)
       end
 
       def count

data/lib/stepmod/utils/changes_extractor.rb

@@ -1,6 +1,7 @@
 require "nokogiri"
 require "stepmod/utils/change_collection"
 require "stepmod/utils/smrl_description_converter"
+require_relative "parsers"
 
 module Stepmod
   module Utils
@@ -30,7 +31,11 @@ module Stepmod
         all_modules_changes_files.each do |module_change_file|
           xml_changes = Nokogiri::XML(File.read(module_change_file)).root
           schema_name = Pathname.new(module_change_file).parent.basename.to_s
-          add_module_changes_to_collection(xml_changes, @collection, schema_name)
+          add_module_changes_to_collection(xml_changes, @collection,
+                                           schema_name)
+
+          add_mapping_table_changes_to_collection(xml_changes, schema_name,
+                                                  @collection)
         end
 
         @collection
@@ -38,6 +43,17 @@ module Stepmod
 
       private
 
+      def add_mapping_table_changes_to_collection(xml_data, schema_name,
+collection)
+        mapping_table = xml_data.at_xpath("//mapping_table")
+        return unless mapping_table
+
+        shale_object = Stepmod::Utils::Parsers::MappingTableParser.parse(mapping_table)
+
+        change = collection.fetch_or_initialize(schema_name, "mapping_table")
+        change.mapping_table = shale_object.to_hash
+      end
+
       # rubocop:disable Metrics/MethodLength
       def add_resource_changes_to_collection(xml_data, collection)
         xml_data.xpath("//changes").each do |changes_node|
@@ -135,17 +151,21 @@ module Stepmod
 
         change_node.xpath("mapping.changes").each do |changes|
           changes.xpath("mapping.change").each do |change|
-            mappings << { "change" => change.text }
+            mappings << { "change" => clean_string(change.text.strip) }
           end
 
           changes.xpath("description").each do |change|
-            mappings << { "description" => change.text }
+            mappings << { "description" => clean_string(change.text.strip) }
           end
         end
 
         mappings
       end
 
+      def clean_string(string)
+        string.gsub(/[\n\t]/, " ").squeeze(" ")
+      end
+
       def extract_change_edition(schema_changes, options)
         type = options[:type] || "schema"
         node_type = type.gsub("_longform", "")

data/lib/stepmod/utils/concept.rb

@@ -17,7 +17,8 @@ module Stepmod
       # TODO: converted_definition is not supposed to be an attribute, it is
       # supposed to be a method!
       class << self
-        def parse(definition_xml, reference_anchor:, reference_clause:, file_path:, language_code: "eng")
+        def parse(definition_xml, reference_anchor:, reference_clause:,
+file_path:, language_code: "eng")
           converted_definition = Stepmod::Utils::StepmodDefinitionConverter.convert(
             definition_xml,
             {
@@ -64,14 +65,15 @@ module Stepmod
             end
 
           term = Stepmod::Utils::Converters::Term
-            .new
-            .convert(
-              definition_xml.xpath(".//term").first
-            )
+                 .new
+                 .convert(
+                   definition_xml.xpath(".//term").first,
+                 )
 
           # [4..-1] because we want to skip the initial `=== {title}`
           designations = [
-            { "designation" => term[4..-1], "type" => "expression", "normative_status" => "preferred" },
+            { "designation" => term[4..-1], "type" => "expression",
+              "normative_status" => "preferred" },
           ]
 
           alts.each do |alt|
@@ -84,10 +86,10 @@ module Stepmod
         def definition_xml_definition(definition_xml, reference_anchor)
           # We reject the <p> that was considered an alternative term (length<=20)
           text_nodes = definition_xml
-            .xpath(".//def")
-            .first
-            .children
-            .reject { |n| n.name == "p" && n.text.length <= 20 }
+                       .xpath(".//def")
+                       .first
+                       .children
+                       .reject { |n| n.name == "p" && n.text.length <= 20 }
 
           wrapper = "<def>#{text_nodes.map(&:to_s).join}</def>"
 

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

@@ -6,12 +6,10 @@ module Stepmod
       class Blockquote < Stepmod::Utils::Converters::Base
         def convert(node, state = {})
           id = node["id"]
-          anchor = id ? "[[#{id}]]\n" : ""
           cite = node["cite"]
           attrs = cite ? "[quote, #{cite}]\n" : ""
           content = treat_children(node, state).strip
           content = ReverseAdoc.cleaner.remove_newlines(content)
-          # "\n\n> " << content.lines.to_a.join('> ') << "\n\n"
           "\n\n#{attrs}____\n" << content.lines.to_a.join("") << "\n____\n\n"
         end
       end

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

@@ -50,13 +50,13 @@ module Stepmod
         def additional_block(node)
           # Treat first `p` tag as an `alt` block, metanorma/stepmod-utils#9
           first_child_tag = node
-            .children
-            .find { |n| n.is_a?(Nokogiri::XML::Element) }
+                            .children
+                            .find { |n| n.is_a?(Nokogiri::XML::Element) }
           return unless can_transform_to_alt?(first_child_tag)
 
           result = Stepmod::Utils::Converters::Synonym
-            .new
-            .convert(first_child_tag)
+                   .new
+                   .convert(first_child_tag)
 
           first_child_tag.remove
           "#{result}\n\n"

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

@@ -5,7 +5,7 @@ module Stepmod
     module Converters
       class Dt < Stepmod::Utils::Converters::Base
         def convert(node, _state = {})
-          return "\n\n{blank}::" if node.text.strip.length.zero?
+          return "\n\n{blank}::" if node.text.strip.empty?
 
           "\n\n#{node.text}:: "
         end

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

@@ -13,18 +13,19 @@ module Stepmod
         def italic_converted(node, state)
           cloned_node = node.clone
           equations = extract_equations(cloned_node)
-          content = treat_children(cloned_node, state.merge(already_italic: true))
+          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] && state[:convert_bold_and_italics]
-            "ii(#{content.strip})"
-          elsif content.strip.empty? || state[:already_italic] || state[:equation]
-            content
-          else
-            "#{content[/^\s*/]}_#{content.strip}_#{content[/\s*$/]}"
-          end
+                      "ii(#{content.strip})"
+                    elsif content.strip.empty? || state[:already_italic] || state[:equation]
+                      content
+                    else
+                      "#{content[/^\s*/]}_#{content.strip}_#{content[/\s*$/]}"
+                    end
 
           [content, equation_content].compact.join("")
         end