coradoc 1.1.5 → 1.1.7

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

@@ -2,69 +2,192 @@ module Coradoc
   module Parser
     module Asciidoc
       module Inline
+        def attribute_reference
+          str("{").present? >> str("{") >>
+            match("[a-zA-Z0-9_-]").repeat(1).as(:attribute_reference) >>
+            str("}")
+        end
 
         def bold_constrained
-          (str('*') >>
-            match("[^*]").repeat(1).as(:text).repeat(1,1) >>
-             str('*')  >> str('*').absent?
-            ).as(:bold_constrained)
+          (str("*").present? >> str("*") >>
+            match("[^*]").repeat(1).as(:text).repeat(1, 1) >>
+             str("*") >> str("*").absent? >>
+             str("\n\n").absent?
+          ).as(:bold_constrained)
         end
 
         def bold_unconstrained
-          (str('**') >>
-            match("[^*\n]").repeat(1).as(:text).repeat(1,1) >>
-             str('**')
-            ).as(:bold_unconstrained)
+          (str("**").present? >> str("**") >>
+            match("[^*]").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)
+        def span_constrained
+          (attribute_list >>
+            str("#") >>
+            match("[^#]").repeat(1).as(:text) >>
+             str("#") >> str("#").absent?
+          ).as(:span_constrained)
         end
 
-        def highlight_unconstrained
-          (str('##') >>
-            match('[^#]').repeat(1).as(:text).repeat(1,1) >>
-             str('##')
-            ).as(:highlight_unconstrained)
+        def span_unconstrained
+          (attribute_list >>
+            str("##") >>
+            match("[^#]").repeat(1).as(:text) >>
+             str("##")
+          ).as(:span_unconstrained)
         end
 
         def italic_constrained
-          (str('_') >>
-            match('[^_]').repeat(1).as(:text).repeat(1,1) >>
-             str('_') >> str('_').absent?
-            ).as(:italic_constrained)
+          (str("_") >> str("_").absent? >>
+            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)
+          (str("__") >>
+            match("[^_]").repeat(1).as(:text).repeat(1, 1) >>
+             str("__")
+          ).as(:italic_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 monospace_constrained
+          (str("`") >>
+            match("[^`]").repeat(1).as(:text).repeat(1, 1) >>
+             str("`") >> str("`").absent?
+          ).as(:monospace_constrained)
+        end
+
+        def monospace_unconstrained
+          (str("``") >>
+            match("[^`]").repeat(1).as(:text).repeat(1, 1) >>
+             str("``")
+          ).as(:monospace_unconstrained)
+        end
+
+        def superscript
+          (str("^") >>
+            match("[^^]").repeat(1).as(:text).repeat(1, 1) >>
+             str("^")
+          ).as(:superscript)
+        end
+
+        def subscript
+          (str("~") >>
+            match("[^~]").repeat(1).as(:text).repeat(1, 1) >>
+             str("~")
+          ).as(:subscript)
+        end
+
+        def span
+          attribute_list >>
+            (str("#") >>
+              match("[^#]").repeat(1).as(:text) >>
+               str("#") >> str("#").absent?
+            ).as(:span)
+        end
+
+        def link
+          ((str("http").present? | str("https").present? | str("ftp").present?) >>
+            match("[A-Za-z0-9_.\\-:/&?=+,%#~;]+").repeat(1).as(:path) >>
+            (str("[") >> match("[^\\]]").repeat(1).as(:text) >> str("]")).maybe
+          ).as(:link) |
+            (str("link:").present? >> str("link:") >>
+              match("[A-Za-z0-9_.\\-:/&?=+,%#~;]+").repeat(1).as(:path) >>
+              (str("[") >> match("[^\\]]").repeat(1).as(:text) >> str("]")).maybe
+            ).as(:link)
+        end
+
+        def inline_image
+          (str("image:").present? >> str("image:") >>
+            match("[A-Za-z0-9_.\\-:/&?=+,%#~;]+").repeat(1).as(:path) >>
+            (str("[") >> match("[^\\]]").repeat(1).as(:text) >> str("]")).maybe
+          ).as(:inline_image)
+        end
+
+        def underline
+          (attribute_list >> match("\\[.underline\\]").as(:role) >>
+            str("#") >>
+            match("[^#]").repeat(1).as(:text) >>
+            str("#")
+          ).as(:underline)
+        end
+
+        def small
+          (attribute_list >> match("\\[.small\\]").as(:role) >>
+            str("#") >>
+            match("[^#]").repeat(1).as(:text) >>
+            str("#")
+          ).as(:small)
+        end
+
+        def inline_chars?
+          match('[\[*#_{<^~`]').present? |
+            str("http").present? |
+            str("https").present? |
+            str("link:").present? |
+            str("image:").present? |
+            term_type.present? |
+            str("footnote").present?
+        end
+
+        def inline
+          bold_unconstrained |
+            bold_constrained |
+            span_unconstrained |
+            span_constrained |
+            italic_unconstrained |
+            italic_constrained |
+            highlight_unconstrained |
+            highlight_constrained |
+            monospace_unconstrained |
+            monospace_constrained |
+            superscript |
+            subscript |
+            attribute_reference |
+            cross_reference |
+            term_inline |
+            term_inline2 |
+            footnote |
+            link |
+            inline_image |
+            underline |
+            small
         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)
-            )
+          # line_not_text? >>
+          (inline.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)
-           
+          (inline_chars? >> inline)
+        end
+
+        def text_any
+          (text_formatted |
+                  text_unformatted.as(:text)
+          ).repeat(2) |
+            text_formatted.repeat(1, 1) |
+            text_unformatted
         end
       end
     end

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

@@ -3,13 +3,12 @@ module Coradoc
   module Parser
     module Asciidoc
       module List
-
         def list(nesting_level = 1)
-          ( 
+          (
           unordered_list(nesting_level) |
              ordered_list(nesting_level) |
              definition_list
-            ).as(:list)
+        ).as(:list)
         end
 
         def list_continuation
@@ -30,8 +29,8 @@ module Coradoc
 
         def definition_list(delimiter = "::")
           (attribute_list >> newline).maybe >>
-          dlist_item(delimiter).as(:definition_list).repeat(1) >>
-          dlist_item(delimiter).absent?
+            dlist_item(delimiter).repeat(1).as(:definition_list) >>
+            dlist_item(delimiter).absent?
         end
 
         def list_marker(nesting_level = 1)
@@ -39,75 +38,76 @@ module Coradoc
         end
 
         def olist_marker(nesting_level = 1)
-          line_start? >> str('.' * nesting_level) >> str('.').absent?
+          line_start? >> str("." * nesting_level) >> str(".").absent?
         end
 
         def olist_item(nesting_level = 1)
           item = olist_marker(nesting_level).as(:marker) >>
-          match("\n").absent? >> space >> text_line(true)# >>
-          # (list_continuation.present? >> list_continuation >> 
+            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))
+                  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
+              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?
+          line_start? >> str("*" * nesting_level) >> str("*").absent?
         end
 
         def ulist_item(nesting_level = 1)
           item = ulist_marker(nesting_level).as(:marker) >>
-          str(' [[[').absent? >>
-          match("\n").absent? >> space >> text_line(true)
+            str(" [[[").absent? >>
+            match("\n").absent? >> space >> text_line(true)
 
           att = (list_continuation.present? >>
-                  list_continuation >> 
-                  (admonition_line | paragraph | block) #(n_deep: 1))
+                  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
+              list(nesting_level + 1)).repeat(0).as(:nested) # ).maybe
           end
           ulist_marker(nesting_level).present? >> item.as(:list_item)
         end
 
         def dlist_delimiter
           (str("::") | str(":::") | str("::::") | str(";;")
-            ).as(:delimiter)
+          ).as(:delimiter)
         end
 
-        def dlist_term(delimiter)
-          (match("[^\n:]").repeat(1) #>> empty_line.repeat(0)
-            ).as(:term) >> dlist_delimiter
+        def dlist_term(_delimiter)
+          match("[^\n:]").repeat(1) # >> empty_line.repeat(0)
+            .as(:dlist_term) >> dlist_delimiter
         end
 
         def dlist_definition
-          (text #>> empty_line.repeat(0)
-            ).as(:definition) >> line_ending >> empty_line.repeat(0)
+          text # >> empty_line.repeat(0)
+            .as(:definition) >> line_ending >> empty_line.repeat(0)
         end
 
         def dlist_item(delimiter)
           (((dlist_term(delimiter).as(:terms).repeat(1) >> line_ending >>
             empty_line.repeat(0)).repeat(1) >>
-            dlist_definition)  |
-            (dlist_term(delimiter).repeat(1,1).as(:terms) >> space >> dlist_definition)
-            ).as(:definition_list_item).repeat(1)
+            dlist_definition) |
+            (dlist_term(delimiter).repeat(1, 1).as(:terms) >> space >>
+              dlist_definition)
+          ).as(:definition_list_item)
         end
       end
     end

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

@@ -2,35 +2,44 @@ module Coradoc
   module Parser
     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?
+            (attribute_list >> newline).absent? >>
+            block_delimiter.absent? >>
+            list.absent? >>
+            list_prefix.absent? >>
+            list_continuation.absent? >>
+            element_id.absent? >>
+            section_prefix.absent?
         end
 
-        def paragraph_text_line
-          line_not_text? >>
-          (asciidoc_char_with_id.absent? | text_id ) >>
-          literal_space? >>
-          (line_not_text? >>
-            text_formatted.as(:text) # >>
-          ) | term | term2
+        # TODO: This is crazy that many_breaks can be 0, true or false!?
+        def paragraph_text_line(many_breaks = false)
+          tl = line_not_text? >>
+            (asciidoc_char_with_id.absent? |
+              element_id_inline >> literal_space? |
+              line_start? >> line_not_text?) >>
+            text_any.as(:text)
+          if many_breaks == 0
+            tl >> eof?
+          elsif many_breaks
+            tl >> (newline.as(:line_break) | eof?)
+          else
+            tl >> (newline_single.as(:line_break) | eof?)
+          end
         end
 
         def paragraph
-          ( block_id.maybe >>
+          (element_id.maybe >>
             block_title.maybe >>
             (attribute_list >> newline).maybe >>
-            (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)
+            ((paragraph_text_line(0).repeat(1, 1) >>
+                   (newline.repeat(1).as(:line_break) | eof?)) |
+              paragraph_text_line(false).repeat(1) >>
+              (paragraph_text_line(true).repeat(1, 1) >>
+                   (newline.repeat(1).as(:line_break) | eof?)).repeat(0, 1)
             ).as(:lines) >>
-            newline.repeat(0)
+            (newline.repeat(0) | eof?)
           ).as(:paragraph)
         end
 

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

@@ -2,11 +2,8 @@ module Coradoc
   module Parser
     module Asciidoc
       module Section
-
         def contents
           (
-            citation |
-            term | term2 |
             bib_entry |
             block_image |
             tag |
@@ -16,8 +13,8 @@ module Coradoc
             admonition_line |
             block |
             table.as(:table) |
-            highlight.as(:highlight) |
-            glossaries.as(:glossaries) |
+            # highlight.as(:highlight) |
+            # glossaries.as(:glossaries) |
             paragraph |
             list |
             empty_line.as(:line_break)
@@ -26,41 +23,38 @@ module Coradoc
 
         def section_block(level = 2)
           return nil if level > 8
+
           (attribute_list >> newline).maybe >>
-          section_id.maybe >>
-          (attribute_list >> newline).maybe >>
+            element_id.maybe >>
+            (attribute_list >> newline).maybe >>
             section_title(level).as(:title) >>
             contents.as(:contents).maybe
         end
 
-        # Section id
-        def section_id
-          line_start? >>
-          (str("[[") >> keyword.as(:id) >> str("]]") |
-            str("[#") >> keyword.as(:id) >> str("]")) >> newline
+        def section_prefix
+          (line_start? >> match("^[=]") >> str("=").repeat(0) >> match('[^\n]'))
         end
 
         # Heading
         def section_title(level = 2, max_level = 8)
           line_start? >>
-          match("=").repeat(level, max_level).as(:level) >>
-            str('=').absent? >>
+            match("=").repeat(level, max_level).as(:level) >>
+            str("=").absent? >>
             space? >> text.as(:text) >> endline.as(:line_break)
         end
 
         # section
         def section(level = 2)
-          r = section_block(level) 
+          r = section_block(level)
           if level < 8
             r = r >> section(level + 1).as(:section).repeat(0).as(:sections)
           end
           if level == 2
-            (r).as(:section)
+            r.as(:section)
           else
             r
           end
         end
-
       end
     end
   end

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

@@ -5,10 +5,10 @@ module Coradoc
         # include Coradoc::Parser::Asciidoc::Base
 
         def table
-          block_id.maybe >>
-          (attribute_list >> newline).maybe >>
-          block_title.maybe >>
-          (attribute_list >> newline).maybe >>
+          element_id.maybe >>
+            (attribute_list >> newline).maybe >>
+            block_title.maybe >>
+            (attribute_list >> newline).maybe >>
             str("|===") >> line_ending >>
             table_row.repeat(1).as(:rows) >>
             str("|===") >> line_ending
@@ -29,4 +29,4 @@ module Coradoc
       end
     end
   end
-end
+end

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

@@ -3,21 +3,37 @@ module Coradoc
     module Asciidoc
       module Term
         def term_type
-          (str("alt") | str("deprecated") | str("domain")).as(:term_type)
+          (str("term") |
+            str("alt") |
+            str("deprecated") |
+            str("domain")).as(:term_type)
         end
 
         def term
           line_start? >>
-          term_type >> str(':[') >>
-          match('[^\]]').repeat(1).as(:term) >>
-          str("]") >> str("\n").repeat(1).as(:line_break)
+            term_type >> str(":[") >>
+            match('[^\]]').repeat(1).as(:term) >>
+            str("]") >> str("\n").repeat(1).as(:line_break)
         end
 
-        def term2
+        def footnote
+          str("footnote:") >>
+            keyword.as(:id).maybe >>
+            str("[") >>
+            match('[^\]]').repeat(1).as(:footnote) >>
+            str("]")
+        end
+
+        def term_inline
+          term_type >> str(":[") >>
+            match('[^\]]').repeat(1).as(:term) >>
+            str("]")
+        end
+
+        def term_inline2
           line_start? >>
-          match('^\[') >> term_type >> str(']#') >>
-          match('[^\#]').repeat(1).as(:term2) >> str('#') >>
-          str("\n").repeat(1).as(:line_break)
+            match('^\[') >> term_type >> str("]#") >>
+            match('[^\#]').repeat(1).as(:term2) >> str("#")
         end
       end
     end

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

@@ -2,13 +2,12 @@ module Coradoc
   module Parser
     module Asciidoc
       module Text
-
         def space?
           space.maybe
         end
 
         def space
-          str(' ').repeat(1)
+          str(" ").repeat(1)
         end
 
         def text
@@ -20,7 +19,7 @@ module Coradoc
         end
 
         def line_ending
-          str("\n") #| match('[\z]')# | match('$')
+          str("\n") # | match('[\z]')# | match('$')
         end
 
         def eof?
@@ -101,7 +100,7 @@ module Coradoc
         end
 
         def include_directive
-          (str("include::") >> 
+          (str("include::") >>
             file_path.as(:path) >>
             attribute_list >>
           (newline | str("")).as(:line_break)
@@ -109,7 +108,7 @@ module Coradoc
         end
 
         def inline_image
-          (str("image::") >> 
+          (str("image::") >>
             file_path.as(:path) >>
             attribute_list >>
           (line_ending)
@@ -117,45 +116,43 @@ module Coradoc
         end
 
         def block_image
-          (block_id.maybe >>
+          (element_id.maybe >>
             block_title.maybe >>
             (attribute_list >> newline).maybe >>
-            match('^i') >> str("mage::") >>
+            match("^i") >> str("mage::") >>
             file_path.as(:path) >>
             attribute_list(:attribute_list_macro) >>
             newline.as(:line_break)
-            ).as(:block_image)
+          ).as(:block_image)
         end
 
         def comment_line
           tag.absent? >>
-          (str('//') >> str("/").absent? >>
-            space? >>
-            text.as(:comment_text)
+            (str("//") >> str("/").absent? >>
+              space? >>
+              text.as(:comment_text)
             ).as(:comment_line)
         end
 
         def tag
-          (str('//') >> str('/').absent? >>
+          (str("//") >> str("/").absent? >>
             space? >>
-            (str('tag') | str('end')).as(:prefix) >>
-            str('::') >> str(':').absent? >>
+            (str("tag") | str("end")).as(:prefix) >>
+            str("::") >> str(":").absent? >>
             match('[^\[]').repeat(1).as(:name) >>
             attribute_list >>
             line_ending.maybe.as(:line_break)
-            ).as(:tag)
+          ).as(:tag)
         end
 
         def comment_block
-          ( str('////') >> line_ending >>
-          ((line_ending >> str('////')).absent? >> any
-            ).repeat.as(:comment_text) >> 
-          line_ending >> str('////')
+          (str("////") >> line_ending >>
+          ((line_ending >> str("////")).absent? >> any
+          ).repeat.as(:comment_text) >>
+          line_ending >> str("////")
           ).as(:comment_block)
         end
       end
     end
   end
 end
-
-