coradoc 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e528645f0bdb38f707239ed1862dc74944dc7eba4149cf9f1243458e98591edb
-  data.tar.gz: 268acd80823a507d3a86e83bfeaef55a8145819822aac9903f0bc96cee29d55c
+  metadata.gz: 1f44a34ea3abbb6cff77d55b6516b74400db157035c2134a674ad5fe49a11f94
+  data.tar.gz: aa000ad423925a5e39f410e72e543071f5aa33e5a10c2cdefc10ee8e3bfa3c57
 SHA512:
-  metadata.gz: 624f718300d0877f0d610a3fbf953b324d5bfd6a73c68de30db69ddc75b45e1b396eeb5bdfdcfc7d0ecac2d50c8301d7011f118a2d23d4ac02d11c2e54e92e6a
-  data.tar.gz: 849b5851b2ca0b37313d8f7c743defbc168f698284c694c0a467536dbffd9cc10f5ec263fd2c28e1f287a926c6acbe3756c8753f6f3ae303dc61fc9678981ff1
+  metadata.gz: f8f0ddca5617607309d097195635f5b316b84f031c381cfe9dc8274e557beadb4d610ad990909d219e49297bdedb67034889902e7dcbcfdf2617ec578fc75f69
+  data.tar.gz: 6a98d048011b6314b2c9ae457e43f10730b0238f1329d4cae7d38494966d23b2e13a75dc4f4df1cb4938e5451b3363c5514be15aa6f1f55a4dbfb26eab6c7307

data/Gemfile

@@ -3,3 +3,14 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "codeclimate-test-reporter"
+gem "pry"
+gem "rake"
+gem "redcarpet"
+gem "rspec"
+gem "rubocop"
+gem "rubocop-performance"
+gem "simplecov"
+# gem "parallel_tests"
+# gem "stackprof"

data/README.adoc

@@ -1,6 +1,4 @@
-:sandi-metz: footnote:[http://robots.thoughtbot.com/post/50655960596/sandi-metz-rules-for-developers]
-
-= Coradoc
+= Coradoc: object-oriented AsciiDoc parser
 
 Coradoc is a modern Parser for Asciidoc document. It defines a grammar for
 AsciiDoc, and then build the Parser for that grammar.
@@ -31,12 +29,7 @@ Or install it yourself as:
 gem install coradoc
 ----
 
-== Development
 
-We are following Sandi Metz's Rules for this gem, you can read the
-description of the rules here.{sandi-metz} All new code should follow these
-rules. If you make changes in a pre-existing file that violates these rules you
-should fix the violations as part of your contribution.
 
 == Setup
 

data/coradoc.gemspec

@@ -29,23 +29,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7.0"
 
   spec.add_dependency "marcel", "~> 1.0.0"
-  spec.add_dependency "mathml2asciimath"
+  spec.add_dependency "plurimath"
+  spec.add_dependency "unitsml"
   spec.add_dependency "nokogiri", "~> 1.13"
   spec.add_dependency "oscal", "~> 0.1.1"
   spec.add_dependency "parslet"
-  spec.add_dependency "premailer", "~> 1.11.0"
   spec.add_dependency "word-to-markdown"
   spec.add_dependency "base64"
   spec.add_dependency "thor", ">= 1.3.0"
-  spec.add_development_dependency "codeclimate-test-reporter"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "redcarpet"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "simplecov"
-  # spec.add_development_dependency "parallel_tests"
-  # spec.add_development_dependency "stackprof"
-  # spec.add_runtime_dependency "thor"
 end

data/lib/coradoc/element/list_item.rb

@@ -15,26 +15,83 @@ module Coradoc
         @line_break = options.fetch(:line_break, "\n")
       end
 
+      def inline?(elem)
+        case elem
+        when Inline::HardLineBreak
+          :hardbreak
+        when ->(i){ i.class.name.to_s.include? "::Inline::" }
+          true
+        when String, TextElement, Image::InlineImage
+          true
+        else
+          false
+        end
+      end
+
       def to_adoc
         anchor = @anchor.nil? ? "" : " #{@anchor.to_adoc.to_s} "
         # text = Coradoc::Generator.gen_adoc(@content)
-        content = Array(@content).map do |subitem|
-          next if subitem.is_a? Inline::HardLineBreak
+        content = Array(@content).flatten.compact
+        out = ""
+        prev_inline = :init
+
+        # Collapse meaningless <DIV>s
+        while content.map(&:class) == [Section] && content.first.safe_to_collapse?
+          content = Array(content.first.contents)
+        end
 
+        content.each_with_index do |subitem, idx|
           subcontent = Coradoc::Generator.gen_adoc(subitem)
+
+          inline = inline?(subitem)
+          next_inline = idx+1 == content.length ? :end : inline?(content[idx+1])
+
           # Only try to postprocess elements that are text,
           # otherwise we could strip markup.
-          if Coradoc.a_single?(subitem, Coradoc::Element::TextElement)
-            subcontent = Coradoc.strip_unicode(subcontent)
+          if subitem.is_a? Coradoc::Element::TextElement
+            if [:hardbreak, :init, false].include?(prev_inline)
+              subcontent = Coradoc.strip_unicode(subcontent, only: :begin)
+            end
+            if [:hardbreak, :end, false].include?(next_inline)
+              subcontent = Coradoc.strip_unicode(subcontent, only: :end)
+            end
           end
-          subcontent
-        end.compact.join("\n+\n")
+
+          case inline
+          when true
+            if prev_inline == false
+              out += "\n+\n" + subcontent
+            else
+              out += subcontent
+            end
+          when false
+            case prev_inline
+            when :hardbreak
+              out += subcontent.strip
+            when :init
+              out += "{empty}\n+\n" + subcontent.strip
+            else
+              out += "\n+\n" + subcontent.strip
+            end
+          when :hardbreak
+            if %i[hardbreak init].include? prev_inline
+              # can't have two hard breaks in a row; can't start with a hard break
+            else
+              out += "\n+\n"
+            end
+          end
+
+          prev_inline = inline
+        end
+        out += "{empty}" if prev_inline == :hardbreak
+        out = "{empty}" if out.empty?
+
         # attach = Coradoc::Generator.gen_adoc(@attached)
         attach = @attached.map do |elem|
           "+\n" + Coradoc::Generator.gen_adoc(elem)
         end.join
         nest = Coradoc::Generator.gen_adoc(@nested)
-        out = " #{anchor}#{content}#{@line_break}"
+        out = " #{anchor}#{out}#{@line_break}"
         out + attach + nest
       end
     end

data/lib/coradoc/input/html/converters/math.rb

@@ -2,7 +2,7 @@
 # this is cheating: we're injecting MathML into Asciidoctor, but
 # Asciidoctor only understands AsciiMath or LaTeX
 
-require "mathml2asciimath"
+require "plurimath"
 
 module Coradoc::Input::HTML
   module Converters
@@ -14,7 +14,10 @@ module Coradoc::Input::HTML
 
       def convert(node, _state = {})
         stem = node.to_s.gsub(/\n/, " ")
-        stem = MathML2AsciiMath.m2a(stem) if Coradoc::Input::HTML.config.mathml2asciimath
+        if Coradoc::Input::HTML.config.mathml2asciimath
+          stem = Plurimath::Math.parse(stem, :mathml).to_asciimath
+        end
+
         unless stem.nil?
           stem = stem.gsub(/\[/, "\\[").gsub(/\]/, "\\]").gsub(
             /\(\(([^\)]+)\)\)/, "(\\1)"

data/lib/coradoc/util.rb

@@ -1,6 +1,8 @@
 module Coradoc
-  def self.strip_unicode(str)
-    str.gsub(/\A[[:space:]]+|[[:space:]]+\z/, "")
+  def self.strip_unicode(str, only: nil)
+    str = str.gsub(/\A[[:space:]]+/, "") unless only == :end
+    str = str.gsub(/[[:space:]]+\z/, "") unless only == :begin
+    str
   end
 
   def self.a_single?(obj, klass)

data/lib/coradoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coradoc
-  VERSION = "1.1.4"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: coradoc
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 - Abu Nashir
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2025-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marcel
@@ -26,7 +26,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: mathml2asciimath
+  name: plurimath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unitsml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,20 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: premailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: word-to-markdown
   requirement: !ruby/object:Gem::Requirement
@@ -137,118 +137,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Experimental AsciiDoc parser for metanorma
 email:
 - open.source@ribose.com
@@ -419,7 +307,6 @@ files:
 - lib/coradoc/util.rb
 - lib/coradoc/version.rb
 - lib/reverse_adoc.rb
-- todo.md
 - utils/parser_analyzer.rb
 - utils/round_trip.rb
 homepage: https://www.metanorma.org
@@ -428,7 +315,7 @@ licenses:
 metadata:
   homepage_uri: https://www.metanorma.org
   source_code_uri: https://github.com/metanorma/coradoc
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -444,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: AsciiDoc parser for metanorma
 test_files: []

data/todo.md

@@ -1,10 +0,0 @@
-## Metanorma Parser
-
-### Todos
-
-- Parse the ascii doc
-
-### References
-
-- https://www.rubydoc.info/gems/asciidoctor/2.0.18
-- https://docs.asciidoctor.org/asciidoctor/latest/api/convert-files/