stepmod-utils 0.6.6 → 0.6.8

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

@@ -5,7 +5,7 @@ module Stepmod
   module Utils
     module Converters
       class ModuleRefExpressDescription < Stepmod::Utils::Converters::Base
-        def convert(node, _state = {})
+        def to_coradoc(node, _state = {})
           link_end = node["linkend"].to_s.split(":")
           text = node.text.gsub(/\s/, " ").squeeze(" ").strip
 
@@ -45,7 +45,7 @@ module Stepmod
           # puts "[module_ref] #{result}"
         end
       end
-      ReverseAdoc::Converters.register :module_ref,
+      Coradoc::Input::HTML::Converters.register :module_ref,
                                        ModuleRefExpressDescription.new
     end
   end

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

@@ -4,7 +4,7 @@ module Stepmod
   module Utils
     module Converters
       class Note < Stepmod::Utils::Converters::Base
-        def convert(node, state = {})
+        def to_coradoc(node, state = {})
           # If we want to skip this node
           return "" if state[:no_notes_examples]
 
@@ -19,7 +19,7 @@ module Stepmod
           TEMPLATE
         end
       end
-      ReverseAdoc::Converters.register :note, Note.new
+      Coradoc::Input::HTML::Converters.register :note, Note.new
     end
   end
 end

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

@@ -3,53 +3,20 @@
 module Stepmod
   module Utils
     module Converters
-      class Ol < Stepmod::Utils::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)
-          children_s = treat_children(node, state.merge(
-                                              ol_count: ol_count,
-                                              tdsinglepara: true,
-                                            ))
+      class Ol < Coradoc::Input::HTML::Converters::Ol
+        LIST_TAGS = ["ol", "ul", "dir"].freeze
 
-          "\n\n#{anchor}#{attrs}#{children_s}\n"
-          # Why do we add this?
-          # res = "\n" + res if node.parent && node.parent.name == 'note'
-        end
-
-        def number_style(node)
-          case node["style"]
-          when "1" then "arabic"
-          when "A" then "upperalpha"
-          when "a" then "loweralpha"
-          when "I" then "upperroman"
-          when "i" then "lowerroman"
-          end
-        end
+        def to_coradoc(node, state = {})
+          content = super(node, state)
 
-        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
+          # Dont make early parse on nested lists
+          LIST_TAGS.include?(node.parent.name) ? content : Coradoc::Generator.gen_adoc(content) + "\n"
         end
       end
 
-      ReverseAdoc::Converters.register :ol, Ol.new
-      ReverseAdoc::Converters.register :ul, Ol.new
-      ReverseAdoc::Converters.register :dir, Ol.new
+      Ol::LIST_TAGS.each do |tag|
+        Coradoc::Input::HTML::Converters.register tag.to_sym, Ol.new
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Stepmod
   module Utils
     module Converters
       class PassThrough < Stepmod::Utils::Converters::Base
-        def convert(node, _state = {})
+        def to_coradoc(node, _state = {})
           node.to_s
         end
       end

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

@@ -4,11 +4,11 @@ module Stepmod
   module Utils
     module Converters
       class Resource < Stepmod::Utils::Converters::Base
-        def convert(node, state = {})
+        def to_coradoc(node, state = {})
           treat_children(node, state)
         end
       end
-      ReverseAdoc::Converters.register :resource, Resource.new
+      Coradoc::Input::HTML::Converters.register :resource, Resource.new
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Stepmod
   module Utils
     module Converters
       class Schema < Stepmod::Utils::Converters::Base
-        def convert(node, state = {})
+        def to_coradoc(node, state = {})
           state = state.merge(schema_name: node["name"])
           <<~TEMPLATE
             (*"#{node['name']}"
@@ -13,7 +13,7 @@ module Stepmod
           TEMPLATE
         end
       end
-      ReverseAdoc::Converters.register :schema, Schema.new
+      Coradoc::Input::HTML::Converters.register :schema, Schema.new
     end
   end
 end

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

@@ -4,11 +4,11 @@ module Stepmod
   module Utils
     module Converters
       class SchemaDiag < Stepmod::Utils::Converters::Base
-        def convert(node, state = {})
+        def to_coradoc(node, state = {})
           treat_children(node, state).strip
         end
       end
-      ReverseAdoc::Converters.register :schema_diag, SchemaDiag.new
+      Coradoc::Input::HTML::Converters.register :schema_diag, SchemaDiag.new
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Stepmod
   module Utils
     module Converters
       class StepmodExtDescription < Stepmod::Utils::Converters::Base
-        def convert(node, state = {})
+        def to_coradoc(node, state = {})
           state = state.merge(schema_name: node["linkend"])
           linkend = node["linkend"].split(".")
 
@@ -57,8 +57,7 @@ module Stepmod
           TEMPLATE
         end
       end
-      ReverseAdoc::Converters.register :ext_description,
-                                       StepmodExtDescription.new
+      Coradoc::Input::HTML::Converters.register :ext_description, StepmodExtDescription.new
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Stepmod
       class Strong < Stepmod::Utils::Converters::Base
         BLANK_CHARS = "{blank}"
 
-        def convert(node, state = {})
+        def to_coradoc(node, state = {})
           bold_converted(node, state)
         end
 
@@ -66,8 +66,8 @@ module Stepmod
         end
       end
 
-      ReverseAdoc::Converters.register :strong, Strong.new
-      ReverseAdoc::Converters.register :b,      Strong.new
+      Coradoc::Input::HTML::Converters.register :strong, Strong.new
+      Coradoc::Input::HTML::Converters.register :b,      Strong.new
     end
   end
 end

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

@@ -3,12 +3,9 @@
 module Stepmod
   module Utils
     module Converters
-      class Sub < Stepmod::Utils::Converters::Base
-        def convert(node, state = {})
-          content = treat_children(node, state)
-          return stem_notation(content) if state[:equation]
-
-          "#{content[/^\s*/]}~#{content.strip}~#{content[/\s*$/]}"
+      class Sub < Coradoc::Input::HTML::Converters::Sub
+        def to_coradoc(node, state = {})
+          state[:equation] ? stem_notation(treat_children(node, state)) : super(node, state)
         end
 
         private
@@ -18,7 +15,7 @@ module Stepmod
         end
       end
 
-      ReverseAdoc::Converters.register :sub, Sub.new
+      Coradoc::Input::HTML::Converters.register :sub, Sub.new
     end
   end
 end

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

@@ -3,12 +3,9 @@
 module Stepmod
   module Utils
     module Converters
-      class Sup < Stepmod::Utils::Converters::Base
-        def convert(node, state = {})
-          content = treat_children(node, state)
-          return stem_notation(content) if state[:equation]
-
-          "#{content[/^\s*/]}^#{content.strip}^#{content[/\s*$/]}"
+      class Sup < Coradoc::Input::HTML::Converters::Sup
+        def to_coradoc(node, state = {})
+          state[:equation] ? stem_notation(treat_children(node, state)) : super(node, state)
         end
 
         def stem_notation(content)
@@ -16,7 +13,7 @@ module Stepmod
         end
       end
 
-      ReverseAdoc::Converters.register :sup, Sup.new
+      Coradoc::Input::HTML::Converters.register :sup, Sup.new
     end
   end
 end

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

@@ -4,12 +4,12 @@ module Stepmod
   module Utils
     module Converters
       class Synonym < Stepmod::Utils::Converters::Base
-        def convert(node, _state = {})
+        def to_coradoc(node, _state = {})
           "alt:[#{node.text.strip}]"
         end
       end
 
-      ReverseAdoc::Converters.register :synonym, Synonym.new
+      Coradoc::Input::HTML::Converters.register :synonym, Synonym.new
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Stepmod
   module Utils
     module Converters
-      class Table < Stepmod::Utils::Converters::Base
+      class Table < Coradoc::Input::HTML::Converters::Table
         def self.pattern(state, id)
           if state[:schema_and_entity].nil?
             raise StandardError.new("[table]: no state given, #{id}")
@@ -13,7 +13,7 @@ module Stepmod
           "table-#{schema}-#{id}"
         end
 
-        def convert(node, state = {})
+        def to_coradoc(node, state = {})
           # If we want to skip this node
           return "" if state[:no_notes_examples]
 
@@ -72,7 +72,7 @@ module Stepmod
         end
       end
 
-      ReverseAdoc::Converters.register :table, Table.new
+      Coradoc::Input::HTML::Converters.register :table, Table.new
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Stepmod
           res.map(&:strip).reject(&:empty?).join("")
         end
 
-        def convert(node, state = {})
+        def to_coradoc(node, state = {})
           first_child = node.children.find do |child|
             child.name == "text" && !child.text.to_s.strip.empty?
           end
@@ -40,7 +40,7 @@ module Stepmod
         end
       end
 
-      ReverseAdoc::Converters.register :term, Term.new
+      Coradoc::Input::HTML::Converters.register :term, Term.new
     end
   end
 end

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

@@ -3,8 +3,8 @@
 module Stepmod
   module Utils
     module Converters
-      class Text < Stepmod::Utils::Converters::Base
-        def convert(node, state = {})
+      class Text < Coradoc::Input::HTML::Converters::Text
+        def to_coradoc(node, state = {})
           if node.text.strip.empty?
             treat_empty(node, state)
           else
@@ -14,19 +14,6 @@ module Stepmod
 
         private
 
-        def treat_empty(node, state)
-          parent = node.parent.name.to_sym
-          if %i[ol ul].include?(parent) # Otherwise the identation is broken
-            ""
-          elsif state[:tdsinglepara]
-            ""
-          elsif node.text == " "        # Regular whitespace text node
-            " "
-          else
-            ""
-          end
-        end
-
         def treat_text(node, state)
           text = node.text
           text = preserve_nbsp(text)
@@ -77,7 +64,7 @@ module Stepmod
         end
       end
 
-      ReverseAdoc::Converters.register :text, Text.new
+      Coradoc::Input::HTML::Converters.register :text, Text.new
     end
   end
 end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Stepmod
+  module Utils
+    module Converters
+      class Tr < Coradoc::Input::HTML::Converters::Tr
+        def to_coradoc(node, state = {})
+          content = super(node, state)
+          line_break = content.header ? "\n\n" : "\n"
+          Coradoc::Generator.gen_adoc(content).rstrip + line_break
+        end
+      end
+
+      Coradoc::Input::HTML::Converters.register :tr, Tr.new
+    end
+  end
+end

data/lib/stepmod/utils/smrl_description_converter.rb

@@ -2,29 +2,21 @@
 
 require "stepmod/utils/converters/base"
 require "stepmod/utils/converters/a"
-require "stepmod/utils/converters/blockquote"
-require "stepmod/utils/converters/br"
-require "stepmod/utils/converters/bypass"
-require "stepmod/utils/converters/code"
 require "stepmod/utils/converters/description"
-require "stepmod/utils/converters/drop"
 require "stepmod/utils/converters/em_express_description"
 require "stepmod/utils/converters/example"
 require "stepmod/utils/converters/express_ref_express_description"
 require "stepmod/utils/converters/ext_description"
 require "stepmod/utils/converters/ext_descriptions"
-require "stepmod/utils/converters/head"
-require "stepmod/utils/converters/hr"
-require "stepmod/utils/converters/ignore"
 require "stepmod/utils/converters/module_ref_express_description"
 require "stepmod/utils/converters/note"
-require "stepmod/utils/converters/p"
 require "stepmod/utils/converters/pass_through"
-require "stepmod/utils/converters/q"
 require "stepmod/utils/converters/strong"
 require "stepmod/utils/converters/sub"
 require "stepmod/utils/converters/sup"
 require "stepmod/utils/converters/text"
+require "stepmod/utils/converters/tr"
+require "stepmod/utils/converters/li"
 require "stepmod/utils/cleaner"
 
 module Stepmod
@@ -42,9 +34,9 @@ module Stepmod
 
         root || (return "")
 
-        ReverseAdoc.config.with(options) do
-          result = ReverseAdoc::Converters.lookup(root.name).convert(root,
-                                                                     options)
+        Coradoc::Input::HTML.config.with(options) do
+          result = Coradoc::Input::HTML::Converters.lookup(root.name).convert(root,
+                                                                              options)
           Stepmod::Utils::Cleaner.new.tidy(result)
         end
       end

data/lib/stepmod/utils/smrl_resource_converter.rb

@@ -1,33 +1,23 @@
 # frozen_string_literal: true
 
 require "stepmod/utils/converters/base"
-require "reverse_adoc/converters/bypass"
-require "reverse_adoc/converters/pass_through"
+require "coradoc/input/html/converters/bypass"
+require "coradoc/input/html/converters/pass_through"
 require "stepmod/utils/converters/a"
-require "stepmod/utils/converters/blockquote"
-require "stepmod/utils/converters/br"
-require "stepmod/utils/converters/bypass"
-require "stepmod/utils/converters/code"
 require "stepmod/utils/converters/comment"
 require "stepmod/utils/converters/dd"
 require "stepmod/utils/converters/dl"
 require "stepmod/utils/converters/dt"
-require "stepmod/utils/converters/drop"
 require "stepmod/utils/converters/example"
 require "stepmod/utils/converters/express_g"
 require "stepmod/utils/converters/figure"
 require "stepmod/utils/converters/fund_cons"
 require "stepmod/utils/converters/eqn"
-require "stepmod/utils/converters/head"
-require "stepmod/utils/converters/hr"
-require "stepmod/utils/converters/ignore"
 require "stepmod/utils/converters/introduction"
 require "stepmod/utils/converters/note"
 require "stepmod/utils/converters/ol"
-require "stepmod/utils/converters/p"
 require "stepmod/utils/converters/pass_through"
 require "stepmod/utils/converters/module_ref"
-require "stepmod/utils/converters/q"
 require "stepmod/utils/converters/resource"
 require "stepmod/utils/converters/schema_diag"
 require "stepmod/utils/converters/schema"
@@ -36,13 +26,15 @@ require "stepmod/utils/converters/sub"
 require "stepmod/utils/converters/sup"
 require "stepmod/utils/converters/table"
 require "stepmod/utils/converters/text"
+require "stepmod/utils/converters/tr"
+require "stepmod/utils/converters/li"
 require "stepmod/utils/cleaner"
 
-require "reverse_adoc/converters/img"
-require "reverse_adoc/converters/li"
-require "reverse_adoc/converters/tr"
-require "reverse_adoc/converters/td"
-require "reverse_adoc/converters/th"
+require "coradoc/input/html/converters/img"
+require "coradoc/input/html/converters/li"
+require "coradoc/input/html/converters/tr"
+require "coradoc/input/html/converters/td"
+require "coradoc/input/html/converters/th"
 
 module Stepmod
   module Utils
@@ -59,9 +51,9 @@ module Stepmod
 
         root || (return "")
 
-        ReverseAdoc.config.with(options) do
-          result = ReverseAdoc::Converters.lookup(root.name).convert(root,
-                                                                     options)
+        Coradoc::Input::HTML.config.with(options) do
+          result = Coradoc::Input::HTML::Converters.lookup(root.name).convert(root,
+                                                                              options)
 
           Stepmod::Utils::Cleaner.new.tidy(result)
         end

data/lib/stepmod/utils/stepmod_definition_converter.rb

@@ -11,32 +11,29 @@ 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/stepmod_ext_description"
 require "stepmod/utils/converters/term"
 require "stepmod/utils/converters/synonym"
-require "stepmod/utils/converters/uof"
 require "stepmod/utils/converters/figure"
 require "stepmod/utils/converters/table"
 require "stepmod/utils/cleaner"
 
-require "reverse_adoc/converters/a"
-require "reverse_adoc/converters/blockquote"
-require "reverse_adoc/converters/bypass"
-require "reverse_adoc/converters/br"
-require "reverse_adoc/converters/code"
-require "reverse_adoc/converters/drop"
-require "reverse_adoc/converters/head"
-require "reverse_adoc/converters/hr"
-require "reverse_adoc/converters/ignore"
-require "reverse_adoc/converters/li"
-require "reverse_adoc/converters/p"
-require "reverse_adoc/converters/pass_through"
-require "reverse_adoc/converters/q"
-require "reverse_adoc/converters/strong"
-require "reverse_adoc/converters/sup"
-require "reverse_adoc/converters/sub"
-require "reverse_adoc/converters/text"
+require "coradoc/input/html/converters/a"
+require "coradoc/input/html/converters/blockquote"
+require "coradoc/input/html/converters/bypass"
+require "coradoc/input/html/converters/br"
+require "coradoc/input/html/converters/code"
+require "coradoc/input/html/converters/drop"
+require "coradoc/input/html/converters/head"
+require "coradoc/input/html/converters/hr"
+require "coradoc/input/html/converters/ignore"
+require "coradoc/input/html/converters/li"
+require "coradoc/input/html/converters/pass_through"
+require "coradoc/input/html/converters/q"
+require "coradoc/input/html/converters/strong"
+require "coradoc/input/html/converters/sup"
+require "coradoc/input/html/converters/sub"
+require "coradoc/input/html/converters/text"
 
 module Stepmod
   module Utils
@@ -53,9 +50,9 @@ module Stepmod
 
         return "" unless root
 
-        ReverseAdoc.config.with(options) do
-          result = ReverseAdoc::Converters.lookup(root.name).convert(root,
-                                                                     options)
+        Coradoc::Input::HTML.config.with(options) do
+          result = Coradoc::Input::HTML::Converters.lookup(root.name).convert(root,
+                                                                              options)
           return "" unless result
 
           Stepmod::Utils::Cleaner.new.tidy(result.dup)

data/lib/stepmod/utils/terms_extractor.rb

@@ -8,7 +8,7 @@ require "expressir/express/parser"
 require "indefinite_article"
 require "pubid-iso"
 
-ReverseAdoc.config.unknown_tags = :bypass
+Coradoc::Input::HTML.config.unknown_tags = :bypass
 
 module Stepmod
   module Utils

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.6.6".freeze
+    VERSION = "0.6.8".freeze
   end
 end

data/stepmod-utils.gemspec

@@ -34,13 +34,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "down"
   spec.add_runtime_dependency "expressir"
-  spec.add_runtime_dependency "glossarist", "~> 2.0"
+  spec.add_runtime_dependency "glossarist", "~> 2.0.10"
   spec.add_runtime_dependency "indefinite_article"
   spec.add_runtime_dependency "octokit"
   spec.add_runtime_dependency "plurimath"
   spec.add_runtime_dependency "ptools"
   spec.add_runtime_dependency "pubid-iso"
-  spec.add_runtime_dependency "reverse_adoc", "~> 0.3.7"
+  spec.add_runtime_dependency "coradoc"
   spec.add_runtime_dependency "shale"
   spec.add_runtime_dependency "thor", ">= 0.20"
   spec.add_runtime_dependency "unitsml"