coradoc 1.1.6 → 1.1.7

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

@@ -2,71 +2,87 @@ module Coradoc
   module Parser
     module Asciidoc
       module AttributeList
-
         def named_attribute_name
           attribute_name
         end
 
-        def named_attribute_value
+        def named_value_noquote
           match('[^\],]').repeat(1)
         end
 
+        def named_value_single_quote
+          str("'") >>
+            match("[^']").repeat(1) >>
+            str("'")
+        end
+
+        def named_value_double_quote
+          str('"') >>
+            match('[^"]').repeat(1) >>
+            str('"')
+        end
+
+        def named_value
+          (named_value_single_quote |
+            named_value_double_quote |
+            named_value_noquote
+          ).as(:named_value)
+        end
+
         def named_key
-          (str('reviewer') | 
-            match('[a-zA-Z0-9_-]').repeat(1)).as(:named_key)
+          match("[a-zA-Z0-9_-]").repeat(1).as(:named_key)
         end
 
         def named_attribute
-          ( named_key >>
-            str(' ').maybe >> str("=") >> str(' ').maybe >>
-            match['a-zA-Z0-9_\- \"'].repeat(1).as(:named_value) >>
-            str(' ').maybe
-            ).as(:named)
+          (named_key >>
+            str(" ").maybe >> str("=") >> str(" ").maybe >>
+              named_value >>
+              str(" ").maybe
+          ).as(:named)
         end
 
         def positional_attribute
-          (match['a-zA-Z0-9_\-%'].repeat(1) >>
+          (match['a-zA-Z0-9_\-%.'].repeat(1) >>
             str("=").absent?
-            ).as(:positional)
+          ).as(:positional)
         end
 
         def named_many
-          (named_attribute.repeat(1,1) >>
+          (named_attribute.repeat(1, 1) >>
               (str(",") >> space.maybe >> named_attribute).repeat(0))
         end
 
         def positional_one_named_many
-          (positional_attribute.repeat(1,1) >>
+          (positional_attribute.repeat(1, 1) >>
             (str(",") >> space.maybe >> named_attribute).repeat(1))
         end
 
         def positional_many_named_many
-          (positional_attribute.repeat(1,1) >>
+          (positional_attribute.repeat(1, 1) >>
             (str(",") >> space.maybe >> positional_attribute).repeat(1) >>
-            (str(",") >> space.maybe>> named_attribute).repeat(1))
+            (str(",") >> space.maybe >> named_attribute).repeat(1))
         end
 
         def positional_many
-          (positional_attribute.repeat(1,1) >>
+          (positional_attribute.repeat(1, 1) >>
             (str(",") >> space.maybe >> positional_attribute).repeat(0))
         end
 
         def positional_zero_or_one
-          positional_attribute.repeat(0,1)
+          positional_attribute.repeat(0, 1)
         end
 
         def attribute_list(name = :attribute_list)
-          str('[').present? >>
-          str('[') >> str("[").absent? >> 
-          ( named_many |
-            positional_one_named_many |
-            positional_many_named_many |
-            positional_many |
-            positional_zero_or_one
-          ).as(:attribute_array).as(name) >>
-          str("]")
+          str("[").present? >>
+            str("[") >> str("[").absent? >>
+            (named_many |
+              positional_one_named_many |
+              positional_many_named_many |
+              positional_many |
+              positional_zero_or_one
+            ).as(:attribute_array).as(name) >>
+            str("]")
         end
-
       end
     end
   end

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

@@ -1,7 +1,6 @@
 require "parslet"
 require "parslet/convenience"
 
-
 require_relative "admonition"
 require_relative "attribute_list"
 require_relative "bibliography"
@@ -39,7 +38,7 @@ module Coradoc
         include Coradoc::Parser::Asciidoc::Text
 
         def rule_dispatch(rule_name, *args, **kwargs)
-          @dispatch_data = {} unless @dispatch_data
+          @dispatch_data ||= {}
           dispatch_key = [rule_name, args, kwargs.to_a.sort]
           dispatch_hash = dispatch_key.hash.abs
           unless @dispatch_data.has_key?(dispatch_hash)
@@ -58,9 +57,9 @@ module Coradoc
         add_dispatch = true
         with_params = true
 
-        parser_methods = (Coradoc::Parser::Asciidoc.constants - [:Base]).map{ |const|
+        parser_methods = (Coradoc::Parser::Asciidoc.constants - [:Base]).map do |const|
           Coradoc::Parser::Asciidoc.const_get(const).instance_methods
-        }.flatten.uniq
+        end.flatten.uniq
 
         parser_methods.each do |rule_name|
           params = Coradoc::Parser::Asciidoc::Base.instance_method(rule_name).parameters
@@ -79,11 +78,9 @@ module Coradoc
               define_method(rule_name) do |*args, **kwargs|
                 rule_dispatch(alias_name, *args, **kwargs)
               end
-
             end
           end
         end
-
       end
     end
   end

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

@@ -2,9 +2,8 @@ module Coradoc
   module Parser
     module Asciidoc
       module Bibliography
-
         def bibliography
-          (section_id.maybe >>
+          (element_id.maybe >>
           str("[bibliography]\n") >>
           str("== ") >> match("[^\n]").repeat(1).as(:title) >> str("\n") >>
           bib_entry.repeat(1).as(:entries)
@@ -12,13 +11,13 @@ module Coradoc
         end
 
         def bib_entry
-          (match("^*") >> str(' [[[') >>
+          (match("^*") >> str(" [[[") >>
             match('[^,\[\]\n]').repeat(1).as(:anchor_name) >>
-          (  str(",") >>
+          (str(",") >>
             match('[^\]\n]').repeat(1).as(:document_id)
-            ).maybe  >>
+          ).maybe >>
           str("]]]") >>
-            (text_line.repeat(0,1) >>
+            (text_line.repeat(0, 1) >>
               text_line.repeat(0)
             ).as(:ref_text).maybe >>
             line_ending.repeat(1).as(:line_break).maybe

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

@@ -2,7 +2,6 @@ module Coradoc
   module Parser
     module Asciidoc
       module Block
-
         def block(n_deep = 3)
           (example_block(n_deep) |
           sidebar_block(n_deep) |
@@ -32,20 +31,13 @@ module Coradoc
         end
 
         def block_title
-          str('.') >> space.absent? >> text.as(:title) >> newline
+          str(".") >> space.absent? >> text.as(:title) >> newline
         end
 
         def block_type(type)
-          (str("[") >> str("[").absent? >>
+          (line_start? >> str("[") >> str("[").absent? >>
             str(type).as(:type) >>
-            str("]")) | 
-          (match('^\[') >> keyword.as(:type) >> str("]")) >> newline
-        end
-
-        def block_id
-          line_start? >>
-          (str("[[") >> str('[').absent? >> keyword.as(:id) >> str("]]") |
-            str("[#") >> keyword.as(:id) >> str("]")) >> newline
+            str("]")) >> newline # |
         end
 
         def block_content(n_deep = 3)
@@ -53,42 +45,49 @@ module Coradoc
             list |
             text_line |
             empty_line.as(:line_break)
-          c = c | block(n_deep - 1) if (n_deep > 0)
+          c = c | block(n_deep - 1) if n_deep.positive?
           c.repeat(1)
         end
 
         def block_delimiter
-          line_start? >> 
-          ((str("*") |
-            str("=") |
-            str("_") |
-            str("+") |
-            str("-")).repeat(4) |
-            str("-").repeat(2,2)) >>
+          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 >>
+        def element_attributes
           block_title.maybe >>
+            element_id.maybe >>
+            (attribute_list >> newline).maybe >>
+            block_title.maybe >>
             newline.maybe >>
-            (line_start? >> str('[').present? >> attribute_list >> newline ).maybe >>
-            block_id.maybe >>
-            (str('[').present? >> attribute_list >> newline ).maybe >>
+            (attribute_list >> newline).maybe >>
+            element_id.maybe
+        end
+
+        def block_style(n_deep = 3, delimiter = "*", repeater = 4, type = nil)
+          current_delimiter = str(delimiter).repeat(repeater).capture(:delimit)
+          closing_delimiter = dynamic do |_s, c|
+            str(c.captures[:delimit].to_s.strip)
+          end
+
+          element_attributes >>
+            (line_start? >> attribute_list >> newline).maybe >>
             line_start? >>
-            str(delimiter).repeat(repeater).capture(:delimit).as(:delimiter) >> newline >>
+            current_delimiter.as(:delimiter) >> newline >>
             if type == :pass
               (text_line | empty_line.as(:line_break)).repeat(1).as(:lines)
             else
-              block_delimiter.absent? >> block_content(n_deep-1).as(:lines)
+              (closing_delimiter >> newline).absent? >> block_content(n_deep - 1).as(:lines)
             end >>
             line_start? >>
-            dynamic { |s,c| str(c.captures[:delimit].to_s.strip) } >> newline
-            # str(delimiter).repeat(repeater) >> str(delimiter).absent? >> newline
+            closing_delimiter >> newline
         end
-
       end
     end
   end

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

@@ -3,44 +3,26 @@ module Coradoc
     module Asciidoc
       module Citation
         def xref_anchor
-          match('[^,>]').repeat(1).as(:href_arg).repeat(1,1)
+          match("[^,>]").repeat(1).as(:href_arg).repeat(1, 1)
         end
 
         def xref_str
-          match('[^,>]').repeat(1).as(:text)
+          match("[^,>]").repeat(1).as(:text)
         end
 
         def xref_arg
-          (str('section') | str('paragraph') | str('clause') | str('annex') | str('table')).as(:key) >>
-          match('[ =]').as(:delimiter) >>
-          match('[^,>=]').repeat(1).as(:value)
+          (str("section") | str("paragraph") | str("clause") | str("annex") | str("table")).as(:key) >>
+            match("[ =]").as(:delimiter) >>
+            match("[^,>=]").repeat(1).as(:value)
         end
 
         def cross_reference
-          str('<<') >> xref_anchor >>
-          ( (str(',') >> xref_arg).repeat(1) |
-            (str(',') >> xref_str).repeat(1)
-            ).maybe >>
-            str('>>')
-        end
-
-        def citation_xref
-          cross_reference.as(:cross_reference) >> newline |
-          cross_reference.as(:cross_reference) >>
-            (text_line.repeat(1)
-            ).as(:comment).maybe
-        end
-
-        def citation_noxref
-          (text_line.repeat(1)
-          ).as(:comment)
-        end
-
-        def citation
-          match('^[\[]') >> str(".source]\n") >>
-          ( citation_xref |
-            citation_noxref
-          ).as(:citation)
+          (str("<<") >> xref_anchor >>
+          ((str(",") >> xref_arg).repeat(1) |
+            (str(",") >> xref_str).repeat(1)
+          ).maybe >>
+            str(">>")
+          ).as(:cross_reference)
         end
       end
     end

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

@@ -2,20 +2,6 @@ module Coradoc
   module Parser
     module Asciidoc
       module Content
-
-        def highlight
-          text_id >> newline >>
-            underline >> highlight_text >> newline
-        end
-
-        def underline
-          str("[underline]") | str("[.underline]")
-        end
-
-        def highlight_text
-          str("#") >> words.as(:text) >> str("#")
-        end
-
         def literal_space
           (match[" "] | match[' \t']).repeat(1)
         end
@@ -26,24 +12,22 @@ module Coradoc
         end
 
         def list_prefix
-          (line_start? >> match('^[*\.]') >> str(' '))
-        end
-
-        def section_prefix
-          (line_start? >> match('^[=]') >> str('=').repeat(0) >> match('[^\n]'))
+          (line_start? >>
+            (match("^[*]") >> str("*").repeat(1, 5) |
+            match('^[\.]') >> str(".").repeat(1, 5)) >>
+            str(" "))
         end
 
         # Text
-        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)
-            else
-              tl >> line_ending.as(:line_break)
-            end
+        # :zero :one :many
+        def text_line(many_breaks = false)
+          tl = (asciidoc_char_with_id.absent? | element_id_inline) >>
+            literal_space? >> text_any.as(:text)
+          if many_breaks
+            tl >> (line_ending.repeat(1).as(:line_break) | eof?)
+          else
+            tl >> (line_ending.as(:line_break) | eof?)
+          end
         end
 
         def asciidoc_char
@@ -51,11 +35,18 @@ module Coradoc
         end
 
         def asciidoc_char_with_id
-          asciidoc_char | str('[#') | str('[[')
+          asciidoc_char | str("[#") | str("[[")
         end
 
-        def text_id
-          str("[[") >> str('[').absent? >> keyword.as(:id) >> str("]]") |
+        def element_id
+          line_start? >>
+            (str("[[") >> keyword.as(:id) >> str("]]") |
+               str("[#") >> keyword.as(:id) >> str("]")
+            ) >> newline
+        end
+
+        def element_id_inline
+          str("[[") >> keyword.as(:id) >> str("]]") |
             str("[#") >> keyword.as(:id) >> str("]")
         end
 
@@ -67,7 +58,6 @@ module Coradoc
         def glossaries
           glossary.repeat(1)
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Coradoc
   module Parser
     module Asciidoc
       module DocumentAttributes
-
         def attribute_name
           match("[a-zA-Z0-9_-]").repeat(1)
         end
@@ -12,8 +11,8 @@ module Coradoc
         end
 
         def document_attributes
-          (document_attribute.repeat(1)
-            ).as(:document_attributes)
+          document_attribute.repeat(1)
+            .as(:document_attributes)
         end
 
         def document_attribute

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

@@ -2,7 +2,6 @@ module Coradoc
   module Parser
     module Asciidoc
       module Header
-
         def header
           header_title >>
             author.maybe.as(:author) >>
@@ -10,7 +9,7 @@ module Coradoc
         end
 
         def header_title
-          match("^=") >> str('=').absent? >> space? >> text.as(:title) >> newline
+          match("^=") >> str("=").absent? >> space? >> text.as(:title) >> newline
         end
 
         def author