coradoc 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f515fbc05baa87f58f84a59737c9818603c6e9f0fc8835cdeb9bd6be9eb39e4
-  data.tar.gz: ce51ff395a3dfb4bf77c37f6b54fe745a14a7262911df50479088d43392d4927
+  metadata.gz: e528645f0bdb38f707239ed1862dc74944dc7eba4149cf9f1243458e98591edb
+  data.tar.gz: 268acd80823a507d3a86e83bfeaef55a8145819822aac9903f0bc96cee29d55c
 SHA512:
-  metadata.gz: 3269512745aea59b9780e5df2d872af7c3f19851666868335bc4876a534e50c64df410c5257a335324e9a9e0ad573dacf00058752ee00fd4b830f2f150cadeb2
-  data.tar.gz: 00e4122ec5e234e8e7e54d3e5769e03df15ad0f9851059576dadde7de58c0e2dd87f3c18ab14283574347bda6c95536cf31ee3ce6c202ea8b4c3f0da96f3f399
+  metadata.gz: 624f718300d0877f0d610a3fbf953b324d5bfd6a73c68de30db69ddc75b45e1b396eeb5bdfdcfc7d0ecac2d50c8301d7011f118a2d23d4ac02d11c2e54e92e6a
+  data.tar.gz: 849b5851b2ca0b37313d8f7c743defbc168f698284c694c0a467536dbffd9cc10f5ec263fd2c28e1f287a926c6acbe3756c8753f6f3ae303dc61fc9678981ff1

data/lib/coradoc/element/block/core.rb

@@ -61,12 +61,13 @@ module Coradoc
 
         def type_hash
           @type_hash ||= {
-            "____" => :quote,
-            "****" => :side,
-            "----" => :source,
             "====" => :example,
             "...." => :literal,
+            "--"   => :open,
             "++++" => :pass,
+            "____" => :quote,
+            "****" => :side,
+            "----" => :source,
           }
         end
       end

data/lib/coradoc/element/block/example.rb

@@ -15,7 +15,7 @@ module Coradoc
         end
 
         def to_adoc
-          "\n\n#{gen_anchor}#{gen_title}#{gen_delimiter}\n" << gen_lines << "\n#{gen_delimiter}\n\n"
+          "\n\n#{gen_anchor}#{gen_title}#{gen_attributes}#{gen_delimiter}\n" << gen_lines << "\n#{gen_delimiter}\n\n"
         end
       end
     end

data/lib/coradoc/element/block/listing.rb

@@ -0,0 +1,21 @@
+module Coradoc
+  module Element
+    module Block
+      class Listing < Core
+        def initialize(_title, options = {})
+          @id = options.fetch(:id, nil)
+          @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
+          @lang = options.fetch(:lang, "")
+          @attributes = options.fetch(:attributes, AttributeList.new)
+          @lines = options.fetch(:lines, [])
+          @delimiter_char = "-"
+          @delimiter_len = options.fetch(:delimiter_len, 4)
+        end
+
+        def to_adoc
+          "\n\n#{gen_anchor}#{gen_attributes}\n#{gen_delimiter}\n" << gen_lines << "\n#{gen_delimiter}\n\n"
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/element/block/literal.rb

@@ -2,16 +2,18 @@ module Coradoc
   module Element
     module Block
       class Literal < Core
-        def initialize(_title, options = {})
+        def initialize(title, options = {})
+          @title = title
           @id = options.fetch(:id, nil)
           @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
+          @attributes = options.fetch(:attributes, AttributeList.new)
           @lines = options.fetch(:lines, [])
           @delimiter_char = "."
           @delimiter_len = options.fetch(:delimiter_len, 4)
         end
 
         def to_adoc
-          "\n\n#{gen_anchor}#{gen_delimiter}\n" << gen_lines << "\n#{gen_delimiter}\n\n"
+          "\n\n#{gen_anchor}#{gen_title}#{gen_attributes}#{gen_delimiter}\n" << gen_lines << "\n#{gen_delimiter}\n\n"
         end
       end
     end

data/lib/coradoc/element/block/open.rb

@@ -0,0 +1,22 @@
+module Coradoc
+  module Element
+    module Block
+      class Open < Core
+        def initialize(title, options = {})
+          @title = title
+          @id = options.fetch(:id, nil)
+          @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
+          @lang = options.fetch(:lang, "")
+          @attributes = options.fetch(:attributes, AttributeList.new)
+          @lines = options.fetch(:lines, [])
+          @delimiter_char = "-"
+          @delimiter_len = options.fetch(:delimiter_len, 2)
+        end
+
+        def to_adoc
+          "\n\n#{gen_anchor}#{gen_attributes}#{gen_delimiter}\n" << gen_lines << "\n#{gen_delimiter}\n\n"
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/element/block.rb

@@ -8,8 +8,10 @@ end
 require_relative "block/core"
 require_relative "block/example"
 require_relative "block/literal"
-require_relative "block/quote"
+require_relative "block/listing"
+require_relative "block/open"
 require_relative "block/pass"
+require_relative "block/quote"
 require_relative "block/side"
 require_relative "block/sourcecode"
 require_relative "block/reviewer_comment"

data/lib/coradoc/element/list/core.rb

@@ -19,8 +19,8 @@ module Coradoc
             m = @items.select do |i|
               i.is_a?(Coradoc::Element::ListItem) &&
                 !i.marker.nil?
-            end.first&.marker
-            @ol_count = m.size if m.is_a?(String)
+            end.first&.marker.to_s
+            @ol_count = m.size
           end
           @ol_count = 1 if @ol_count.nil?
           @attrs = options.fetch(:attrs, AttributeList.new)

data/lib/coradoc/element/list/ordered.rb

@@ -7,6 +7,7 @@ module Coradoc
         end
 
         def prefix
+          return @marker if @marker
           "." * [@ol_count, 1].max
         end
       end

data/lib/coradoc/element/list/unordered.rb

@@ -7,6 +7,7 @@ module Coradoc
         end
 
         def prefix
+          return @marker if @marker
           "*" * [@ol_count, 1].max
         end
       end

data/lib/coradoc/element/list_item.rb

@@ -1,7 +1,7 @@
 module Coradoc
   module Element
     class ListItem < Base
-      attr_accessor :marker, :id, :anchor, :content, :line_break
+      attr_accessor :marker, :id, :anchor, :content, :subitem, :line_break
 
       declare_children :content, :id, :anchor
 
@@ -10,11 +10,14 @@ module Coradoc
         @id = options.fetch(:id, nil)
         @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
         @content = content
+        @attached = options.fetch(:attached, [])
+        @nested = options.fetch(:nested, nil)
         @line_break = options.fetch(:line_break, "\n")
       end
 
       def to_adoc
-        anchor = @anchor.nil? ? "" : @anchor.to_adoc.to_s
+        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
 
@@ -24,10 +27,15 @@ module Coradoc
           if Coradoc.a_single?(subitem, Coradoc::Element::TextElement)
             subcontent = Coradoc.strip_unicode(subcontent)
           end
-          subcontent.chomp
+          subcontent
         end.compact.join("\n+\n")
-
-        " #{anchor}#{content.chomp}#{@line_break}"
+        # 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 + attach + nest
       end
     end
   end

data/lib/coradoc/element/text_element.rb

@@ -20,7 +20,7 @@ module Coradoc
         str += "(#{@id})" if @id
         str += ": "
         str += @content.inspect
-        str += " + #{@line_break.inspect}" unless line_break.empty?
+        str += " + #{@line_break.inspect}" unless line_break.to_s.empty?
         str
       end
 

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

@@ -114,6 +114,12 @@ module Coradoc::Input::HTML
           columns = row.xpath("./td | ./th")
           column_id = 0
 
+          cell_references[i] ||= []
+          cell_matrix[i] ||= []
+
+          # Empty row support: pass row object via an instance variable
+          cell_references[i].instance_variable_set(:@row_obj, row)
+
           columns.each do |cell|
             colspan = cell["colspan"]&.to_i || 1
             rowspan = cell["rowspan"]&.to_i || 1
@@ -179,7 +185,7 @@ module Coradoc::Input::HTML
           min_rows.each do |row|
             break if row.length != cpr_min
 
-            row_obj = row.last.first.parent
+            row_obj = row.last&.first&.parent || row.instance_variable_get(:@row_obj)
             doc = row_obj.document
             added_node = Nokogiri::XML::Node.new("td", doc)
             added_node["x-added"] = "x-added"

data/lib/coradoc/parser/asciidoc/attribute_list.rb

@@ -11,8 +11,13 @@ module Coradoc
           match('[^\],]').repeat(1)
         end
 
+        def named_key
+          (str('reviewer') | 
+            match('[a-zA-Z0-9_-]').repeat(1)).as(:named_key)
+        end
+
         def named_attribute
-          (match('[a-zA-Z0-9_-]').repeat(1).as(:named_key) >>
+          ( named_key >>
             str(' ').maybe >> str("=") >> str(' ').maybe >>
             match['a-zA-Z0-9_\- \"'].repeat(1).as(:named_value) >>
             str(' ').maybe
@@ -51,6 +56,7 @@ module Coradoc
         end
 
         def attribute_list(name = :attribute_list)
+          str('[').present? >>
           str('[') >> str("[").absent? >> 
           ( named_many |
             positional_one_named_many |

data/lib/coradoc/parser/asciidoc/base.rb

@@ -1,3 +1,7 @@
+require "parslet"
+require "parslet/convenience"
+
+
 require_relative "admonition"
 require_relative "attribute_list"
 require_relative "bibliography"
@@ -12,11 +16,12 @@ require_relative "paragraph"
 require_relative "section"
 require_relative "table"
 require_relative "term"
+require_relative "text"
 
 module Coradoc
   module Parser
     module Asciidoc
-      module Base
+      class Base < Parslet::Parser
         include Coradoc::Parser::Asciidoc::Admonition
         include Coradoc::Parser::Asciidoc::AttributeList
         include Coradoc::Parser::Asciidoc::Bibliography
@@ -31,141 +36,54 @@ module Coradoc
         include Coradoc::Parser::Asciidoc::Section
         include Coradoc::Parser::Asciidoc::Table
         include Coradoc::Parser::Asciidoc::Term
-
-        def space?
-          space.maybe
-        end
-
-        def space
-          str(' ').repeat(1)
-        end
-
-        def text
-          match("[^\n]").repeat(1)
-        end
-
-        def line_ending
-          str("\n")
-        end
-
-        def endline
-          newline | any.absent?
-        end
-
-        def newline
-          (str("\n") | str("\r\n")).repeat(1)
-        end
-
-        def newline_single
-          (str("\n") | str("\r\n"))
-        end
-
-        def keyword
-          (match('[a-zA-Z0-9_\-.,]') | str(".")).repeat(1)
-        end
-
-        def empty_line
-          match("^\n")
-        end
-
-        def digit
-          match("[0-9]")
-        end
-
-        def digits
-          match("[0-9]").repeat(1)
-        end
-
-        def word
-          match("[a-zA-Z0-9_-]").repeat(1)
-        end
-
-        def words
-          word >> (space? >> word).repeat
-        end
-
-        def rich_texts
-          rich_text >> (space? >> rich_text).repeat
-        end
-
-        def rich_text
-          (match("[a-zA-Z0-9_-]") | str(".") | str("*") | match("@")).repeat(1)
-        end
-
-        def email
-          word >> str("@") >> word >> str(".") >> word
-        end
-
-        def special_character
-          match("^[*:=-]") | str("[#") | str("[[")
-        end
-
-        def date
-          digit.repeat(2, 4) >> str("-") >>
-            digit.repeat(1, 2) >> str("-") >> digit.repeat(1, 2)
-        end
-
-        def attr_name
-          match("[^\t\s]").repeat(1)
+        include Coradoc::Parser::Asciidoc::Text
+
+        def rule_dispatch(rule_name, *args, **kwargs)
+          @dispatch_data = {} unless @dispatch_data
+          dispatch_key = [rule_name, args, kwargs.to_a.sort]
+          dispatch_hash = dispatch_key.hash.abs
+          unless @dispatch_data.has_key?(dispatch_hash)
+            alias_name = "#{rule_name}_#{dispatch_hash}".to_sym
+            Coradoc::Parser::Asciidoc::Base.class_exec do
+              rule(alias_name) do
+                send(rule_name, *args, **kwargs)
+              end
+            end
+            @dispatch_data[dispatch_hash] = alias_name
+          end
+          dispatch_method = @dispatch_data[dispatch_hash]
+          send(dispatch_method)
+        end
+
+        add_dispatch = true
+        with_params = true
+
+        parser_methods = (Coradoc::Parser::Asciidoc.constants - [:Base]).map{ |const|
+          Coradoc::Parser::Asciidoc.const_get(const).instance_methods
+        }.flatten.uniq
+
+        parser_methods.each do |rule_name|
+          params = Coradoc::Parser::Asciidoc::Base.instance_method(rule_name).parameters
+          if add_dispatch && params == []
+            alias_name = "alias_nondispatch_#{rule_name}".to_sym
+            Coradoc::Parser::Asciidoc::Base.class_exec do
+              alias_method alias_name, rule_name
+              rule(rule_name) do
+                send(alias_name)
+              end
+            end
+          elsif add_dispatch && with_params
+            alias_name = "alias_dispatch_#{rule_name}".to_sym
+            Coradoc::Parser::Asciidoc::Base.class_exec do
+              alias_method alias_name, rule_name
+              define_method(rule_name) do |*args, **kwargs|
+                rule_dispatch(alias_name, *args, **kwargs)
+              end
+
+            end
+          end
         end
 
-        def file_path
-          match('[^\[]').repeat(1)
-        end
-
-        def include_directive
-          (str("include::") >> 
-            file_path.as(:path) >>
-            attribute_list >>
-          (newline | str("")).as(:line_break)
-          ).as(:include)
-        end
-
-        def inline_image
-          (str("image::") >> 
-            file_path.as(:path) >>
-            attribute_list >>
-          (line_ending)
-          ).as(:inline_image)
-        end
-
-        def block_image
-          (block_id.maybe >>
-            block_title.maybe >>
-            (attribute_list >> newline).maybe >>
-            match('^i') >> str("mage::") >>
-            file_path.as(:path) >>
-            attribute_list(:attribute_list_macro) >>
-            newline.as(:line_break)
-            ).as(:block_image)
-        end
-
-        def comment_line
-          tag.absent? >>
-          (str('//') >> str("/").absent? >>
-            space? >>
-            text.as(:comment_text)
-            ).as(:comment_line)
-        end
-
-        def tag
-          (str('//') >> str('/').absent? >>
-            space? >>
-            (str('tag') | str('end')).as(:prefix) >>
-            str('::') >> str(':').absent? >>
-            match('[^\[]').repeat(1).as(:name) >>
-            attribute_list >>
-            line_ending.maybe.as(:line_break)
-            ).as(:tag)
-        end
-
-        def comment_block
-          ( str('////') >> line_ending >>
-          ((line_ending >> str('////')).absent? >> any
-            ).repeat.as(:comment_text) >> 
-          line_ending >> str('////')
-          ).as(:comment_block)
-        end
       end
     end
   end

data/lib/coradoc/parser/asciidoc/block.rb

@@ -3,77 +3,90 @@ module Coradoc
     module Asciidoc
       module Block
 
-        def block
-          sidebar_block |
-          example_block |
-          source_block |
-          quote_block |
-          pass_block
+        def block(n_deep = 3)
+          (example_block(n_deep) |
+          sidebar_block(n_deep) |
+          source_block(n_deep) |
+          quote_block(n_deep) |
+          pass_block(n_deep)).as(:block)
         end
 
-        def source_block
-          block_style("-", 2)
+        def example_block(n_deep)
+          block_style(n_deep, "=")
         end
 
-        def pass_block
-          block_style("+", 4, :pass)
+        def pass_block(n_deep)
+          block_style(n_deep, "+", 4, :pass)
         end
 
-        def source_block
-          block_style("-", 2)
+        def quote_block(n_deep)
+          block_style(n_deep, "_")
         end
 
-        def quote_block
-          block_style("_")
+        def sidebar_block(n_deep)
+          block_style(n_deep, "*")
         end
 
-        def block_content(n_deep = 2)
-          c = block_image |
-            list |
-            text_line |
-            empty_line.as(:line_break)
-          c = c | block_content(n_deep - 1) if (n_deep > 0)
-          c.repeat(1)
-        end
-
-        def sidebar_block
-          block_style("*")
-        end
-
-        def example_block
-          block_style("=")
+        def source_block(n_deep)
+          block_style(n_deep, "-", 2)
         end
 
         def block_title
-          match('^\\.') >> space.absent? >> text.as(:title) >> newline
+          str('.') >> space.absent? >> text.as(:title) >> newline
         end
 
         def block_type(type)
-          (match('^\[') >> str("[").absent? >>
+          (str("[") >> str("[").absent? >>
             str(type).as(:type) >>
             str("]")) | 
           (match('^\[') >> keyword.as(:type) >> str("]")) >> newline
         end
 
         def block_id
-          (match('^\[') >> str("[") >> str('[').absent? >> keyword.as(:id) >> str("]]") |
+          line_start? >>
+          (str("[[") >> str('[').absent? >> keyword.as(:id) >> str("]]") |
             str("[#") >> keyword.as(:id) >> str("]")) >> newline
         end
 
-        def block_style(delimiter = "*", repeater = 4, type = nil)
+        def block_content(n_deep = 3)
+          c = block_image |
+            list |
+            text_line |
+            empty_line.as(:line_break)
+          c = c | block(n_deep - 1) if (n_deep > 0)
+          c.repeat(1)
+        end
+
+        def block_delimiter
+          line_start? >> 
+          ((str("*") |
+            str("=") |
+            str("_") |
+            str("+") |
+            str("-")).repeat(4) |
+            str("-").repeat(2,2)) >>
+            newline
+        end
+
+        def block_style(n_deep = 3, delimiter = "*", repeater = 4, type = nil)
+          block_title.maybe >>
           block_id.maybe >>
+            (attribute_list >> newline ).maybe >>
           block_title.maybe >>
             newline.maybe >>
-            (attribute_list >> newline ).maybe >>
+            (line_start? >> str('[').present? >> attribute_list >> newline ).maybe >>
             block_id.maybe >>
-            (attribute_list >> newline ).maybe >>
-            str(delimiter).repeat(repeater).as(:delimiter) >> newline >>
+            (str('[').present? >> attribute_list >> newline ).maybe >>
+            line_start? >>
+            str(delimiter).repeat(repeater).capture(:delimit).as(:delimiter) >> newline >>
             if type == :pass
               (text_line | empty_line.as(:line_break)).repeat(1).as(:lines)
             else
-              block_content.as(:lines)
+              block_delimiter.absent? >> block_content(n_deep-1).as(:lines)
             end >>
-            str(delimiter).repeat(repeater) >> newline
+            line_start? >>
+            dynamic { |s,c| str(c.captures[:delimit].to_s.strip) } >> newline
+            # str(delimiter).repeat(repeater) >> str(delimiter).absent? >> newline
         end
 
       end

data/lib/coradoc/parser/asciidoc/content.rb

@@ -25,9 +25,19 @@ module Coradoc
           literal_space.maybe
         end
 
+        def list_prefix
+          (line_start? >> match('^[*\.]') >> str(' '))
+        end
+
+        def section_prefix
+          (line_start? >> match('^[=]') >> str('=').repeat(0) >> match('[^\n]'))
+        end
+
         # Text
-        def text_line(many_breaks = false)
-            tl = (asciidoc_char_with_id.absent? | text_id) >> literal_space? >>
+        def text_line(many_breaks = false)  #:zero :one :many
+            tl = #section_prefix.absent? >>
+                 # list_prefix.absent? >>
+            (asciidoc_char_with_id.absent? | text_id) >> literal_space? >>
             text.as(:text)
             if many_breaks
               tl >> line_ending.repeat(1).as(:line_break)
@@ -37,7 +47,7 @@ module Coradoc
         end
 
         def asciidoc_char
-          match('^[*_:=\-+]')
+          line_start? >> match['*_:+=\-']
         end
 
         def asciidoc_char_with_id

data/lib/coradoc/parser/asciidoc/list.rb

@@ -1,30 +1,30 @@
+# $DEBUG = true
 module Coradoc
   module Parser
     module Asciidoc
       module List
 
-        def list
-          (
-          unordered_list |
-             ordered_list # definition_list |
+        def list(nesting_level = 1)
+          ( 
+          unordered_list(nesting_level) |
+             ordered_list(nesting_level) |
+             definition_list
             ).as(:list)
         end
 
+        def list_continuation
+          line_start? >> str("+\n")
+        end
+
         def ordered_list(nesting_level = 1)
           attrs = (attribute_list >> newline).maybe
           r = olist_item(nesting_level)
-          if nesting_level <= 8
-            r = r | ordered_list(nesting_level + 1)
-          end
-          attrs >> r.repeat(1).as(:ordered)
+          attrs >> olist_item(nesting_level).present? >> r.repeat(1).as(:ordered)
         end
 
         def unordered_list(nesting_level = 1)
           attrs = (attribute_list >> newline).maybe
           r = ulist_item(nesting_level)
-          if nesting_level <= 8
-            r = r | unordered_list(nesting_level + 1)
-          end
           attrs >> r.repeat(1).as(:unordered)
         end
 
@@ -34,23 +34,57 @@ module Coradoc
           dlist_item(delimiter).absent?
         end
 
+        def list_marker(nesting_level = 1)
+          olist_marker(nesting_level) | ulist_marker(nesting_level)
+        end
+
+        def olist_marker(nesting_level = 1)
+          line_start? >> str('.' * nesting_level) >> str('.').absent?
+        end
+
         def olist_item(nesting_level = 1)
-          nl2 = nesting_level - 1
-          marker = match(/^\./)
-          marker = marker >>  str(".").repeat(nl2, nl2) if nl2 > 0
-          str("").as(:list_item) >> 
-          marker.as(:marker) >> str(".").absent? >>
-          match("\n").absent? >> space >> text_line(true)
+          item = olist_marker(nesting_level).as(:marker) >>
+          match("\n").absent? >> space >> text_line(true)# >>
+          # (list_continuation.present? >> list_continuation >> 
+          # paragraph #| example_block(n_deep: 1)
+          # ).repeat(0).as(:attached)
+
+          att = (list_continuation.present? >>
+                  list_continuation >> 
+                  (admonition_line | paragraph | block) #(n_deep: 1))
+                ).repeat(0).as(:attached)
+          item = item >> att.maybe
+
+
+          if nesting_level <= 4
+            item = item >>
+              (list_marker(nesting_level + 1).present? >>
+              list(nesting_level + 1)).repeat(0).as(:nested)#).maybe
+          end
+          olist_marker(nesting_level).present? >> item.as(:list_item)
+        end
+
+        def ulist_marker(nesting_level = 1)
+          line_start? >> str('*' * nesting_level) >> str('*').absent?
         end
 
         def ulist_item(nesting_level = 1)
-          nl2 = nesting_level - 1
-          marker = match(/^\*/)
-          marker = marker >>  str("*").repeat(nl2, nl2) if nl2 > 0
-          str("").as(:list_item) >>
-          marker.as(:marker) >> str("*").absent? >>
+          item = ulist_marker(nesting_level).as(:marker) >>
           str(' [[[').absent? >>
           match("\n").absent? >> space >> text_line(true)
+
+          att = (list_continuation.present? >>
+                  list_continuation >> 
+                  (admonition_line | paragraph | block) #(n_deep: 1))
+                ).repeat(0).as(:attached)
+          item = item >> att.maybe
+
+          if nesting_level <= 4
+            item = item >>
+              (list_marker(nesting_level + 1).present? >>
+              list(nesting_level + 1)).repeat(0).as(:nested)#).maybe
+          end
+          ulist_marker(nesting_level).present? >> item.as(:list_item)
         end
 
         def dlist_delimiter

data/lib/coradoc/parser/asciidoc/paragraph.rb

@@ -3,10 +3,22 @@ module Coradoc
     module Asciidoc
       module Paragraph
 
+        def line_not_text?
+          line_start? >>
+          attribute_list.absent? >>
+          block_delimiter.absent? >>
+          list.absent? >>
+          # list_prefix.absent? >>
+          section_id.absent? >>
+          section_prefix.absent?
+        end
+
         def paragraph_text_line
+          line_not_text? >>
           (asciidoc_char_with_id.absent? | text_id ) >>
           literal_space? >>
-          (text_formatted.as(:text) # >>
+          (line_not_text? >>
+            text_formatted.as(:text) # >>
           ) | term | term2
         end
 
@@ -14,9 +26,9 @@ module Coradoc
           ( block_id.maybe >>
             block_title.maybe >>
             (attribute_list >> newline).maybe >>
-            (paragraph_text_line.repeat(1,1) >> any.absent? |
-              (paragraph_text_line >> newline_single.as(:line_break)).repeat(1) >>
-              (paragraph_text_line.repeat(1,1)).repeat(0,1)
+            (line_not_text? >> paragraph_text_line.repeat(1,1) >> any.absent? |
+              (line_not_text? >> paragraph_text_line >> newline_single.as(:line_break)).repeat(1) >>
+              (line_not_text? >> paragraph_text_line.repeat(1,1)).repeat(0,1)
             ).as(:lines) >>
             newline.repeat(0)
           ).as(:paragraph)

data/lib/coradoc/parser/asciidoc/section.rb

@@ -14,7 +14,7 @@ module Coradoc
             comment_line |
             include_directive |
             admonition_line |
-            block.as(:block) |
+            block |
             table.as(:table) |
             highlight.as(:highlight) |
             glossaries.as(:glossaries) |
@@ -35,12 +35,14 @@ module Coradoc
 
         # Section id
         def section_id
+          line_start? >>
           (str("[[") >> keyword.as(:id) >> str("]]") |
             str("[#") >> keyword.as(:id) >> str("]")) >> newline
         end
 
         # Heading
         def section_title(level = 2, max_level = 8)
+          line_start? >>
           match("=").repeat(level, max_level).as(:level) >>
             str('=').absent? >>
             space? >> text.as(:text) >> endline.as(:line_break)

data/lib/coradoc/parser/asciidoc/term.rb

@@ -7,12 +7,14 @@ module Coradoc
         end
 
         def term
+          line_start? >>
           term_type >> str(':[') >>
           match('[^\]]').repeat(1).as(:term) >>
           str("]") >> str("\n").repeat(1).as(:line_break)
         end
 
         def term2
+          line_start? >>
           match('^\[') >> term_type >> str(']#') >>
           match('[^\#]').repeat(1).as(:term2) >> str('#') >>
           str("\n").repeat(1).as(:line_break)

data/lib/coradoc/parser/asciidoc/text.rb

@@ -0,0 +1,161 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module Text
+
+        def space?
+          space.maybe
+        end
+
+        def space
+          str(' ').repeat(1)
+        end
+
+        def text
+          match("[^\n]").repeat(1)
+        end
+
+        def line_start?
+          match('^[^\n]').present?
+        end
+
+        def line_ending
+          str("\n") #| match('[\z]')# | match('$')
+        end
+
+        def eof?
+          any.absent?
+        end
+
+        def line_end
+          str("\n") | str("\r\n") | eof?
+        end
+
+        def endline
+          newline | any.absent?
+        end
+
+        # def endline_single
+        #   newline_single | any.absent?
+        # end
+
+        def newline
+          (str("\n") | str("\r\n")).repeat(1)
+        end
+
+        def newline_single
+          (str("\n") | str("\r\n"))
+        end
+
+        def keyword
+          (match('[a-zA-Z0-9_\-.,]') | str(".")).repeat(1)
+        end
+
+        def empty_line
+          match("^\n")
+        end
+
+        def digit
+          match("[0-9]")
+        end
+
+        def digits
+          match("[0-9]").repeat(1)
+        end
+
+        def word
+          match("[a-zA-Z0-9_-]").repeat(1)
+        end
+
+        def words
+          word >> (space? >> word).repeat
+        end
+
+        def rich_texts
+          rich_text >> (space? >> rich_text).repeat
+        end
+
+        def rich_text
+          (match("[a-zA-Z0-9_-]") | str(".") | str("*") | match("@")).repeat(1)
+        end
+
+        def email
+          word >> str("@") >> word >> str(".") >> word
+        end
+
+        def special_character
+          match("^[*:=-]") | str("[#") | str("[[")
+        end
+
+        def date
+          digit.repeat(2, 4) >> str("-") >>
+            digit.repeat(1, 2) >> str("-") >> digit.repeat(1, 2)
+        end
+
+        def attr_name
+          match("[^\t\s]").repeat(1)
+        end
+
+        def file_path
+          match('[^\[]').repeat(1)
+        end
+
+        def include_directive
+          (str("include::") >> 
+            file_path.as(:path) >>
+            attribute_list >>
+          (newline | str("")).as(:line_break)
+          ).as(:include)
+        end
+
+        def inline_image
+          (str("image::") >> 
+            file_path.as(:path) >>
+            attribute_list >>
+          (line_ending)
+          ).as(:inline_image)
+        end
+
+        def block_image
+          (block_id.maybe >>
+            block_title.maybe >>
+            (attribute_list >> newline).maybe >>
+            match('^i') >> str("mage::") >>
+            file_path.as(:path) >>
+            attribute_list(:attribute_list_macro) >>
+            newline.as(:line_break)
+            ).as(:block_image)
+        end
+
+        def comment_line
+          tag.absent? >>
+          (str('//') >> str("/").absent? >>
+            space? >>
+            text.as(:comment_text)
+            ).as(:comment_line)
+        end
+
+        def tag
+          (str('//') >> str('/').absent? >>
+            space? >>
+            (str('tag') | str('end')).as(:prefix) >>
+            str('::') >> str(':').absent? >>
+            match('[^\[]').repeat(1).as(:name) >>
+            attribute_list >>
+            line_ending.maybe.as(:line_break)
+            ).as(:tag)
+        end
+
+        def comment_block
+          ( str('////') >> line_ending >>
+          ((line_ending >> str('////')).absent? >> any
+            ).repeat.as(:comment_text) >> 
+          line_ending >> str('////')
+          ).as(:comment_block)
+        end
+      end
+    end
+  end
+end
+
+

data/lib/coradoc/parser/base.rb

@@ -1,36 +1,12 @@
+require "digest"
 require "parslet"
 require "parslet/convenience"
 
-require_relative "asciidoc/attribute_list"
 require_relative "asciidoc/base"
-require_relative "asciidoc/block"
-require_relative "asciidoc/citation"
-require_relative "asciidoc/content"
-require_relative "asciidoc/document_attributes"
-require_relative "asciidoc/header"
-require_relative "asciidoc/inline"
-require_relative "asciidoc/list"
-require_relative "asciidoc/paragraph"
-require_relative "asciidoc/section"
-require_relative "asciidoc/table"
-require_relative "asciidoc/term"
 
 module Coradoc
   module Parser
-    class Base < Parslet::Parser
-      include Coradoc::Parser::Asciidoc::AttributeList
-      include Coradoc::Parser::Asciidoc::Base
-      include Coradoc::Parser::Asciidoc::Block
-      include Coradoc::Parser::Asciidoc::Citation
-      include Coradoc::Parser::Asciidoc::Content
-      include Coradoc::Parser::Asciidoc::DocumentAttributes
-      include Coradoc::Parser::Asciidoc::Header
-      include Coradoc::Parser::Asciidoc::Inline
-      include Coradoc::Parser::Asciidoc::List
-      include Coradoc::Parser::Asciidoc::Paragraph
-      include Coradoc::Parser::Asciidoc::Section
-      include Coradoc::Parser::Asciidoc::Table
-      include Coradoc::Parser::Asciidoc::Term
+    class Base < Coradoc::Parser::Asciidoc::Base
 
       root :document
       rule(:document) do
@@ -43,8 +19,8 @@ module Coradoc
           tag |
           comment_block |
           comment_line |
-          block.as(:block) |
-          section.as(:section) |
+          block |
+          section |
           include_directive |
           document_attributes |
           list |

data/lib/coradoc/transformer.rb

@@ -156,27 +156,25 @@ module Coradoc
       )
     }
 
-    rule(bold_constrained: {
-      content: simple(:text)
-    }){
+    rule(bold_constrained: sequence(:text)){
       Element::Inline::Bold.new(text, unconstrained: false)
     }
 
-    rule(bold_unconstrained: {content: simple(:text)}) {
+    rule(bold_unconstrained: sequence(:text)) {
       Element::Inline::Bold.new(text, unconstrained: true)
     }
 
-    rule(highlight_constrained: {content: simple(:text)}) {
+    rule(highlight_constrained: sequence(:text)) {
       Element::Inline::Highlight.new(text, unconstrained: false)
     }
-    rule(highlight_unconstrained: {content: simple(:text)}) {
+    rule(highlight_unconstrained: sequence(:text)) {
       Element::Inline::Highlight.new(text, unconstrained: true)
     }
 
-    rule(italic_constrained: {content: simple(:text)}) {
+    rule(italic_constrained: sequence(:text)) {
       Element::Inline::Italic.new(text, unconstrained: false)
     }
-    rule(italic_unconstrained: {content: simple(:text)}) {
+    rule(italic_unconstrained: sequence(:text)) {
       Element::Inline::Italic.new(text, unconstrained: true)
     }
 
@@ -300,25 +298,24 @@ module Coradoc
         if attribute_list
           if (attribute_list.positional == [] &&
            attribute_list.named.keys[0] == "reviewer")
-            Element::Block::ReviewerComment.new(
-              opts
-              )
+            Element::Block::ReviewerComment.new(opts)
           elsif (attribute_list.positional[0] == "sidebar" &&
             attribute_list.named == {})
-            Element::Block::Side.new(
-              opts
-            )
+            Element::Block::Side.new(opts)
+          else
+            Element::Block::Side.new(opts)
           end
         else
+          Element::Block::Side.new(opts)
         end
       elsif delimiter_c == "="
         Element::Block::Example.new(title, opts)
       elsif delimiter_c == "+"
         Element::Block::Pass.new(opts)
-      elsif delimiter_c == "-"
-        if (attribute_list.positional[0] == "quote")
-          Element::Block::Quote.new(title, opts)
-        end
+      elsif delimiter_c == "-" && delimiter.size == 2
+        Element::Block::Open.new(title, opts)
+      elsif delimiter_c == "-"&& delimiter.size >= 4
+        Element::Block::SourceCode.new(title, opts)
       elsif delimiter_c == "_"
         Element::Block::Quote.new(title, opts)
       end
@@ -379,28 +376,15 @@ module Coradoc
       Element::Table.new(title, rows, opts)
     end
 
-    rule(list_item: simple(:list_item),
-      marker: simple(:marker),
-      text: simple(:text),
-      line_break: simple(:line_break)) do
-      Element::ListItem.new(
-        text,
-        marker: marker.to_s,
-        line_break: line_break
-        )
-    end
-
-    rule(list_item: simple(:list_item),
-      marker: simple(:marker),
-      id: simple(:id),
-      text: simple(:text),
-      line_break: simple(:line_break)) do
+    rule(list_item: subtree(:list_item)) do
+      marker = list_item[:marker]
+      id = list_item[:id]
+      text = list_item[:text]
+      attached = list_item[:attached]
+      nested = list_item[:nested]
+      line_break = list_item[:line_break]
       Element::ListItem.new(
-        text,
-        id: id,
-        marker: marker.to_s,
-        line_break: line_break
-        )
+        text, id:, marker:, attached:, nested:, line_break: )
     end
 
 

data/lib/coradoc/version.rb

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

data/utils/round_trip.rb

@@ -30,7 +30,7 @@ adoc_files.each do |file_path|
     generated_adoc = Coradoc::Generator.gen_adoc(doc)
     cleaned_adoc = Coradoc::Input::HTML.cleaner.tidy(generated_adoc)
     File.open("#{file_path}.roundtrip","w"){|f| f.write(cleaned_adoc)}
-    `diff -B #{file_path} #{file_path}.roundtrip > #{file_path}.roundtrip.diff`
+    `diff -BNaur #{file_path} #{file_path}.roundtrip > #{file_path}.roundtrip.diff`
   # rescue
     # puts "unsuccessful..."
   # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marcel
@@ -293,7 +293,9 @@ files:
 - lib/coradoc/element/block.rb
 - lib/coradoc/element/block/core.rb
 - lib/coradoc/element/block/example.rb
+- lib/coradoc/element/block/listing.rb
 - lib/coradoc/element/block/literal.rb
+- lib/coradoc/element/block/open.rb
 - lib/coradoc/element/block/pass.rb
 - lib/coradoc/element/block/quote.rb
 - lib/coradoc/element/block/reviewer_comment.rb
@@ -410,6 +412,7 @@ files:
 - lib/coradoc/parser/asciidoc/section.rb
 - lib/coradoc/parser/asciidoc/table.rb
 - lib/coradoc/parser/asciidoc/term.rb
+- lib/coradoc/parser/asciidoc/text.rb
 - lib/coradoc/parser/base.rb
 - lib/coradoc/reverse_adoc.rb
 - lib/coradoc/transformer.rb