coradoc 1.1.0 → 1.1.2

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

@@ -0,0 +1,67 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module AttributeList
+
+        def named_attribute_name
+          attribute_name
+        end
+
+        def named_attribute_value
+          match('[^\],]').repeat(1)
+        end
+
+        def named_attribute
+          (match('[a-zA-Z0-9_-]').repeat(1).as(:named_key) >>
+            str(' ').maybe >> str("=") >> str(' ').maybe >>
+            match['a-zA-Z0-9_\- \"'].repeat(1).as(:named_value) >>
+            str(' ').maybe
+            ).as(:named)
+        end
+
+        def positional_attribute
+          (match['a-zA-Z0-9_\-%'].repeat(1) >>
+            str("=").absent?
+            ).as(:positional)
+        end
+
+        def named_many
+          (named_attribute.repeat(1,1) >>
+              (str(",") >> space.maybe >> named_attribute).repeat(0))
+        end
+
+        def positional_one_named_many
+          (positional_attribute.repeat(1,1) >>
+            (str(",") >> space.maybe >> named_attribute).repeat(1))
+        end
+
+        def positional_many_named_many
+          (positional_attribute.repeat(1,1) >>
+            (str(",") >> space.maybe >> positional_attribute).repeat(1) >>
+            (str(",") >> space.maybe>> named_attribute).repeat(1))
+        end
+
+        def positional_many
+          (positional_attribute.repeat(1,1) >>
+            (str(",") >> space.maybe >> positional_attribute).repeat(0))
+        end
+
+        def positional_zero_or_one
+          positional_attribute.repeat(0,1)
+        end
+
+        def attribute_list(name = :attribute_list)
+          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
+end

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

@@ -1,13 +1,43 @@
+require_relative "admonition"
+require_relative "attribute_list"
+require_relative "bibliography"
+require_relative "block"
+require_relative "citation"
+require_relative "content"
+require_relative "document_attributes"
+require_relative "header"
+require_relative "inline"
+require_relative "list"
+require_relative "paragraph"
+require_relative "section"
+require_relative "table"
+require_relative "term"
+
 module Coradoc
   module Parser
     module Asciidoc
       module Base
+        include Coradoc::Parser::Asciidoc::Admonition
+        include Coradoc::Parser::Asciidoc::AttributeList
+        include Coradoc::Parser::Asciidoc::Bibliography
+        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
+
         def space?
           space.maybe
         end
 
         def space
-          match('\s').repeat(1)
+          str(' ').repeat(1)
         end
 
         def text
@@ -15,7 +45,7 @@ module Coradoc
         end
 
         def line_ending
-          match("[\n]")
+          str("\n")
         end
 
         def endline
@@ -23,11 +53,15 @@ module Coradoc
         end
 
         def newline
-          match["\r\n"].repeat(1)
+          (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)
+          (match('[a-zA-Z0-9_\-.,]') | str(".")).repeat(1)
         end
 
         def empty_line
@@ -62,22 +96,76 @@ module Coradoc
           word >> str("@") >> word >> str(".") >> word
         end
 
-        def attribute_name
-          match("[a-zA-Z0-9_-]").repeat(1)
-        end
-
-        def attribute_value
-          text | str("")
-        end
-
         def special_character
-          match("^[*_:=-]") | str("[#") | str("[[")
+          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

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

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

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

@@ -0,0 +1,82 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module Block
+
+        def block
+          sidebar_block |
+          example_block |
+          source_block |
+          quote_block |
+          pass_block
+        end
+
+        def source_block
+          block_style("-", 2)
+        end
+
+        def pass_block
+          block_style("+", 4, :pass)
+        end
+
+        def source_block
+          block_style("-", 2)
+        end
+
+        def quote_block
+          block_style("_")
+        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("=")
+        end
+
+        def block_title
+          match('^\\.') >> space.absent? >> text.as(:title) >> newline
+        end
+
+        def block_type(type)
+          (match('^\[') >> 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("]]") |
+            str("[#") >> keyword.as(:id) >> str("]")) >> newline
+        end
+
+        def block_style(delimiter = "*", repeater = 4, type = nil)
+          block_id.maybe >>
+          block_title.maybe >>
+            newline.maybe >>
+            (attribute_list >> newline ).maybe >>
+            block_id.maybe >>
+            (attribute_list >> newline ).maybe >>
+            str(delimiter).repeat(repeater).as(:delimiter) >> newline >>
+            if type == :pass
+              (text_line | empty_line.as(:line_break)).repeat(1).as(:lines)
+            else
+              block_content.as(:lines)
+            end >>
+            str(delimiter).repeat(repeater) >> newline
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module Citation
+        def xref_anchor
+          match('[^,>]').repeat(1).as(:href_arg).repeat(1,1)
+        end
+
+        def xref_str
+          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)
+        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)
+        end
+      end
+    end
+  end
+end

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

@@ -2,66 +2,6 @@ module Coradoc
   module Parser
     module Asciidoc
       module Content
-        include Coradoc::Parser::Asciidoc::Base
-
-        def paragraph
-          paragraph_meta.as(:meta).maybe >>
-            text_line.repeat(1).as(:lines)
-        end
-
-        def glossaries
-          glossary.repeat(1)
-        end
-
-        # List
-        def list
-          unordered_list.as(:unordered) |
-            definition_list.as(:definition) | ordered_list.as(:ordered)
-        end
-
-        def contents
-          (
-            block.as(:block) |
-            list.as(:list) |
-            table.as(:table) |
-            highlight.as(:highlight) |
-            glossaries.as(:glossaries) |
-            paragraph.as(:paragraph) | empty_line
-          ).repeat(1)
-        end
-
-        def block
-          sidebar_block | example_block | source_block | quote_block
-        end
-
-        def source_block
-          block_style("-", 2)
-        end
-
-        def quote_block
-          block_style("_")
-        end
-
-        def sidebar_block
-          block_style("*")
-        end
-
-        def example_block
-          block_style("=")
-        end
-
-        def block_style(delimiter = "*", repeater = 4)
-          block_title.maybe >>
-            newline.maybe >>
-            block_type.maybe >>
-            str(delimiter).repeat(repeater).as(:delimiter) >> newline >>
-            text_line.repeat(1).as(:lines) >>
-            str(delimiter).repeat(repeater) >> newline
-        end
-
-        def block_type
-          str("[") >> keyword.as(:type) >> str("]") >> newline
-        end
 
         def highlight
           text_id >> newline >>
@@ -76,27 +16,6 @@ module Coradoc
           str("#") >> words.as(:text) >> str("#")
         end
 
-        # Table
-        def table
-          block_title >>
-            str("|===") >> line_ending >>
-            table_row.repeat(1).as(:rows) >>
-            str("|===") >> line_ending
-        end
-
-        def table_row
-          (literal_space? >> str("|") >> (cell_content | empty_cell_content))
-            .repeat(1).as(:cols) >> line_ending
-        end
-
-        def empty_cell_content
-          str("|").absent? >> literal_space.as(:text)
-        end
-
-        def cell_content
-          str("|").absent? >> literal_space? >> rich_texts.as(:text)
-        end
-
         def literal_space
           (match[" "] | match[' \t']).repeat(1)
         end
@@ -106,63 +25,39 @@ module Coradoc
           literal_space.maybe
         end
 
-        def block_title
-          str(".") >> text.as(:title) >> line_ending
-        end
-
         # Text
-        def text_line
-          (asciidoc_char_with_id.absent? | text_id) >> literal_space? >>
-            text.as(:text) >> line_ending.as(:break)
+        def text_line(many_breaks = false)
+            tl = (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
         end
 
         def asciidoc_char
-          match("^[*_:=-]")
+          match('^[*_:=\-+]')
         end
 
         def asciidoc_char_with_id
-          asciidoc_char | str("[#") | str("[[")
+          asciidoc_char | str('[#') | str('[[')
         end
 
         def text_id
-          str("[[") >> keyword.as(:id) >> str("]]") |
+          str("[[") >> str('[').absent? >> keyword.as(:id) >> str("]]") |
             str("[#") >> keyword.as(:id) >> str("]")
         end
 
-        def paragraph_meta
-          str("[") >>
-            keyword.as(:key) >> str("=") >>
-            word.as(:value) >> str("]") >> newline
-        end
-
         def glossary
-          keyword.as(:key) >> str("::") >> space? >>
-            text.as(:value) >> line_ending.as(:break)
+          keyword.as(:key) >> str("::") >> (str(" ") | newline) >>
+            text.as(:value) >> line_ending.as(:line_break)
         end
 
-        def ordered_list
-          olist_item.repeat(1)
-        end
-
-        def unordered_list
-          (ulist_item >> newline.maybe).repeat(1)
-        end
-
-        def definition_list
-          dlist_item.repeat(1)
-        end
-
-        def olist_item
-          match("\.") >> space >> text_line
-        end
-
-        def ulist_item
-          match("\\*") >> space >> text_line
+        def glossaries
+          glossary.repeat(1)
         end
 
-        def dlist_item
-          str("term") >> space >> digits >> str("::") >> space >> text_line
-        end
       end
     end
   end

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

@@ -2,16 +2,23 @@ module Coradoc
   module Parser
     module Asciidoc
       module DocumentAttributes
-        include Coradoc::Parser::Asciidoc::Base
 
-        # DocumentAttributes
-        def document_attributess
-          document_attributes.repeat(1)
+        def attribute_name
+          match("[a-zA-Z0-9_-]").repeat(1)
+        end
+
+        def attribute_value
+          text | str("") >> str("\n").absent?
         end
 
         def document_attributes
+          (document_attribute.repeat(1)
+            ).as(:document_attributes)
+        end
+
+        def document_attribute
           str(":") >> attribute_name.as(:key) >> str(":") >>
-            space? >> attribute_value.as(:value) >> line_ending
+            space? >> (attribute_value | str("")).as(:value) >> line_ending
         end
       end
     end

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

@@ -1,10 +1,7 @@
-require_relative "base"
-
 module Coradoc
   module Parser
     module Asciidoc
       module Header
-        include Coradoc::Parser::Asciidoc::Base
 
         def header
           header_title >>
@@ -13,7 +10,7 @@ module Coradoc
         end
 
         def header_title
-          match("=") >> space? >> text.as(:title) >> newline
+          match("^=") >> str('=').absent? >> space? >> text.as(:title) >> newline
         end
 
         def author

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

@@ -0,0 +1,72 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module Inline
+
+        def bold_constrained
+          (str('*') >>
+            match("[^*]").repeat(1).as(:text).repeat(1,1) >>
+             str('*')  >> str('*').absent?
+            ).as(:bold_constrained)
+        end
+
+        def bold_unconstrained
+          (str('**') >>
+            match("[^*\n]").repeat(1).as(:text).repeat(1,1) >>
+             str('**')
+            ).as(:bold_unconstrained)
+        end
+
+        def highlight_constrained
+          (str('#') >>
+            match('[^#]').repeat(1).as(:text).repeat(1,1) >>
+             str('#') >> str('#').absent?
+            ).as(:highlight_constrained)
+        end
+
+        def highlight_unconstrained
+          (str('##') >>
+            match('[^#]').repeat(1).as(:text).repeat(1,1) >>
+             str('##')
+            ).as(:highlight_unconstrained)
+        end
+
+        def italic_constrained
+          (str('_') >>
+            match('[^_]').repeat(1).as(:text).repeat(1,1) >>
+             str('_') >> str('_').absent?
+            ).as(:italic_constrained)
+        end
+
+        def italic_unconstrained
+          (str('__') >>
+            match('[^_]').repeat(1).as(:text).repeat(1,1) >>
+             str('__')
+            ).as(:italic_unconstrained)
+        end
+
+        def text_unformatted
+          (admonition_line.absent? >>
+          (cross_reference.absent? |
+            bold_unconstrained.absent? |
+            bold_constrained.absent? |
+            highlight_unconstrained.absent? |
+            highlight_constrained.absent? |
+            italic_unconstrained.absent? |
+            italic_constrained.absent?) >>
+            match('[^\n]').repeat(1)
+            )
+        end
+
+        def text_formatted
+           ((cross_reference |
+            bold_unconstrained | bold_constrained |
+            highlight_unconstrained | highlight_constrained |
+            italic_unconstrained | italic_constrained )|
+            text_unformatted).repeat(1)
+           
+        end
+      end
+    end
+  end
+end