stepmod-utils 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149a4297bcddd8785d88f316feb899f711c8ce731d91562f37b63cfa128fd686
-  data.tar.gz: 6449d7bc7071a15066e7fe24697814c3b570c0df648fba1d4fb44e1a91ec9bdf
+  metadata.gz: 4d9d95bf89fc69ea44d7924a14274ab5c82361da39fb40e795c14fea8cc87eaf
+  data.tar.gz: 6e2240c2d977787e40183bb988b4ba8db188be9e5c71da1815cc6748e503517b
 SHA512:
-  metadata.gz: e8c6c7b93e0fb7351d2c02b193221fa59d438056170b61262d662888bafddd3b4f3833e99d34188512125ab5b447c2bd999a15bcb09aa81d58443e1f48d962b7
-  data.tar.gz: 123c2187ce5f431e0e0ecbd530e5152289674f85bde2237ab0c76bb04e1d72dad52e4751bbf1a8e8d51e01c5120b9f569fa8c4605009d775a108cbd6787a8226
+  metadata.gz: ca1a8cdacd5c6798944103d428bf98b2ca7caa8e964bcfd339d1f54c5342e87d20bffe72c7e3995ffb69a1e5b10b1144f29e7ee2b8f63822e982b5058c649a03
+  data.tar.gz: de99be754e8690fa61623767a83da8704cae6e94bd089bd2acf22c89fab61b10b54d41d3d5acc790f62b7424c7398740d06c92a2e6cfc5b2ba787156e09461fc

data/lib/stepmod/utils/bibdata.rb

@@ -104,14 +104,14 @@ module Stepmod
       end
 
       def anchor
-        docid.gsub('/', '-').gsub(' ', '_')
+        docid.gsub('/', '-').gsub(' ', '_').gsub(':', '_')
       end
 
       def to_mn_adoc
         if title_en
-          "* [[[ISO#{DOCNUMBER}-#{part},#{docid}]]], _#{full_title}_"
+          "* [[[#{anchor},#{docid}]]], _#{full_title}_"
         else
-          "* [[[ISO#{DOCNUMBER}-#{part},#{docid}]]]"
+          "* [[[#{anchor},#{docid}]]]"
         end
       end
 

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

@@ -12,12 +12,7 @@ module Stepmod
 
         def treat_children(node, state)
           converted = node.children.each_with_object({}) do |child, res|
-                        content = treat(child, state)
-                                    .split("\n")
-                                    .map(&:strip)
-                                    .reject(&:empty?)
-                                    .join("\n")
-                                    .strip
+                        content = treat(child, state).strip
                         next if content.empty?
 
                         res[child] = content
@@ -25,7 +20,7 @@ module Stepmod
           previous = nil
           result = ''
           converted.each.with_index do |(child, content), i|
-            if i == 0 || inlinde_tag?(child, previous)
+            if i == 0 || !block_tag?(child, previous)
               result += " #{content}"
             else
               result += "\n\n#{content}"
@@ -35,8 +30,9 @@ module Stepmod
           result.strip
         end
 
-        def inlinde_tag?(child, previous)
-          %w[text sub i clause_ref].include?(child.name) && previous && %w[i sub text clause_ref].include?(previous.name)
+        def block_tag?(child, previous)
+          %w[ul example note alt p].include?(child.name) ||
+            (child.previous && %w[ul example note alt p].include?(child.previous.name))
         end
 
         def additional_block(node)
@@ -44,8 +40,7 @@ module Stepmod
           first_child_tag = node
                               .children
                               .find { |n| n.is_a?(Nokogiri::XML::Element) }
-          return unless first_child_tag&.name == 'p' &&
-                          defined?(Stepmod::Utils::Converters::Synonym)
+          return unless can_transform_to_alt?(first_child_tag)
 
           result = Stepmod::Utils::Converters::Synonym
                     .new
@@ -53,6 +48,19 @@ module Stepmod
           first_child_tag.remove
           "#{result}\n\n"
         end
+
+        # metanorma/stepmod-utils#18 when para is the only text doe snot transform it
+        def can_transform_to_alt?(first_child_tag)
+          return false unless first_child_tag&.name == 'p' &&
+                                defined?(Stepmod::Utils::Converters::Synonym)
+
+          next_sibling = first_child_tag.next
+          while next_sibling
+            return true if !next_sibling.text.to_s.strip.empty? && %w[p text].include?(next_sibling.name)
+            next_sibling = next_sibling.next
+          end
+          false
+        end
       end
 
       ReverseAsciidoctor::Converters.register :def, Def.new

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

@@ -5,7 +5,26 @@ module Stepmod
     module Converters
       class ModuleRef < ReverseAsciidoctor::Converters::Base
         def convert(node, _state = {})
-          " term:[#{node['linkend']}] "
+          ref = node['linkend']
+          # #23:
+          # In this case when we see this:
+
+          # <module_ref linkend="product_as_individual:3_definition">individual products</module_ref>
+          # We take the text value of the element and convert to this:
+
+          # term:[individual products]
+          if node['linkend'].split(':').length > 1
+            ref = node.text
+          end
+          " term:[#{normalized_ref(ref)}] "
+        end
+
+        private
+
+        def normalized_ref(ref)
+          return unless ref || ref.empty?
+
+          ref.squeeze(' ').strip
         end
       end
       ReverseAsciidoctor::Converters.register :module_ref, ModuleRef.new

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Stepmod
+  module Utils
+    module Converters
+      class Ol < ReverseAsciidoctor::Converters::Base
+        def convert(node, state = {})
+          id = node['id']
+          anchor = id ? "[[#{id}]]\n" : ""
+          ol_count = state.fetch(:ol_count, 0) + 1
+          attrs = ol_attrs(node)
+          res = "\n#{anchor}#{attrs}#{treat_children(node, state.merge(ol_count: ol_count))}"
+          res = "\n" + res if node.parent && node.parent.name == 'note'
+          res
+        end
+
+        def number_style(node)
+          style = case node["style"]
+                  when "1" then "arabic"
+                  when "A" then "upperalpha"
+                  when "a" then "loweralpha"
+                  when "I" then "upperroman"
+                  when "i" then "lowerroman"
+                  else
+                    nil
+                  end
+        end
+
+        def ol_attrs(node)
+          style = number_style(node)
+          reversed = "%reversed" if node["reversed"]
+          start = "start=#{node['start']}" if node["start"]
+          type = "type=#{node['type']}" if node["type"]
+          attrs = []
+          attrs << style if style
+          attrs << reversed if reversed
+          attrs << start if start
+          attrs << type if type
+          if attrs.empty?
+            ""
+          else
+            "[#{attrs.join(',')}]\n"
+          end
+        end
+      end
+
+      ReverseAsciidoctor::Converters.register :ol, Ol.new
+      ReverseAsciidoctor::Converters.register :ul, Ol.new
+      ReverseAsciidoctor::Converters.register :dir, Ol.new
+    end
+  end
+end

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

@@ -1,11 +1,25 @@
 # frozen_string_literal: true
 
+require 'stepmod/utils/converters/synonym'
+
 module Stepmod
   module Utils
     module Converters
       class Term < ReverseAsciidoctor::Converters::Base
         def convert(node, state = {})
-          "=== #{treat_children(node, state).strip}"
+          first_child = node.children.find do |child|
+                          child.name == 'text' && !child.text.to_s.strip.empty?
+                        end
+          unless first_child &&
+                  node.text.split(';').length == 2 &&
+                  defined?(Stepmod::Utils::Converters::Synonym)
+            return "=== #{treat_children(node, state).strip}"
+          end
+
+          term_def, alt = node.text.split(';')
+          alt_xml = Nokogiri::XML::Text.new(alt, Nokogiri::XML::Document.new)
+          converted_alt = Stepmod::Utils::Converters::Synonym.new.convert(alt_xml)
+          "=== #{term_def}\n\n#{converted_alt}"
         end
       end
 

data/lib/stepmod/utils/stepmod_definition_converter.rb

@@ -9,6 +9,7 @@ require 'stepmod/utils/converters/definition'
 require 'stepmod/utils/converters/em'
 require 'stepmod/utils/converters/example'
 require 'stepmod/utils/converters/note'
+require 'stepmod/utils/converters/ol'
 require 'stepmod/utils/converters/stem'
 require 'stepmod/utils/converters/term'
 require 'stepmod/utils/converters/synonym'
@@ -23,7 +24,6 @@ require 'reverse_asciidoctor/converters/head'
 require 'reverse_asciidoctor/converters/hr'
 require 'reverse_asciidoctor/converters/ignore'
 require 'reverse_asciidoctor/converters/li'
-require 'reverse_asciidoctor/converters/ol'
 require 'reverse_asciidoctor/converters/p'
 require 'reverse_asciidoctor/converters/pass_through'
 require 'reverse_asciidoctor/converters/q'

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose Inc.
@@ -86,6 +86,7 @@ files:
 - lib/stepmod/utils/converters/express_ref.rb
 - lib/stepmod/utils/converters/module_ref.rb
 - lib/stepmod/utils/converters/note.rb
+- lib/stepmod/utils/converters/ol.rb
 - lib/stepmod/utils/converters/stem.rb
 - lib/stepmod/utils/converters/synonym.rb
 - lib/stepmod/utils/converters/term.rb