feat(parser/renderer): support sidebar blocks (#182)

Fixes #139

Signed-off-by: Xavier Coulon <[email protected]>

pkg/parser/asciidoc-grammar.peg

@@ -736,19 +736,29 @@ ImageAttribute <- (!"," !"=" !"]" .)+ { // attribute is followed by "," or "]" (
 // ------------------------------------------------------------------------------------
 // Delimited Blocks (http://asciidoctor.org/docs/user-manual/#built-in-blocks-summary)
 // ------------------------------------------------------------------------------------
-DelimitedBlock <- FencedBlock / ListingBlock / ExampleBlock / CommentBlock / VerseBlock / QuoteBlock
+DelimitedBlock <- FencedBlock / ListingBlock / ExampleBlock 
+                / CommentBlock / VerseBlock / QuoteBlock 
+                / SidebarBlock
 
-BlockDelimiter <- LiteralBlockDelimiter / FencedBlockDelimiter / ListingBlockDelimiter / ExampleBlockDelimiter / CommentBlockDelimiter / QuoteBlockDelimiter
+BlockDelimiter <- LiteralBlockDelimiter / FencedBlockDelimiter / ListingBlockDelimiter 
+                / ExampleBlockDelimiter / CommentBlockDelimiter / QuoteBlockDelimiter
+                / SidebarBlockDelimiter
 
 
+// -------------------------------------------------------------------------------------
 // Fenced Blocks
+// -------------------------------------------------------------------------------------
 FencedBlockDelimiter <- "```"
 
-FencedBlock <- attributes:(ElementAttribute)* FencedBlockDelimiter WS* NEWLINE content:(List / BlockParagraph / BlankLine)* ((FencedBlockDelimiter WS* EOL) / EOF) {
+FencedBlock <- attributes:(ElementAttribute)* FencedBlockDelimiter WS* NEWLINE content:(FencedBlockContent)* ((FencedBlockDelimiter WS* EOL) / EOF) {
     return types.NewDelimitedBlock(types.Fenced, content.([]interface{}), attributes.([]interface{}), types.None)
 }
 
+FencedBlockContent <- List / BlockParagraph / BlankLine
+
+// -------------------------------------------------------------------------------------
 // Listing blocks
+// -------------------------------------------------------------------------------------
 ListingBlockDelimiter <- "----"
 
 // listing block: verbatim content
@@ -768,14 +778,15 @@ ListingBlockLineContent <- (!ListingBlockDelimiter !EOL .)* { // skip EOL in lin
     return types.NewInlineElements(string(c.text))
 }
 
+// -------------------------------------------------------------------------------------
 // Example blocks
+// -------------------------------------------------------------------------------------
 ExampleBlockDelimiter <- "===="
 
 ExampleBlock <- attributes:(ElementAttribute)* ExampleBlockDelimiter WS* NEWLINE content:(List / BlockParagraph / BlankLine)*  ((ExampleBlockDelimiter WS* EOL) / EOF) {
     return types.NewDelimitedBlock(types.Example, content.([]interface{}), attributes.([]interface{}), types.None)
 }
 
-
 // blocks content
 BlockParagraph <-  lines:(BlockParagraphLine)+ {
     return types.NewParagraph(lines.([]interface{}), nil)
@@ -790,7 +801,9 @@ BlockParagraphLine <- !(OrderedListItemPrefix)
     return line, nil
 }
 
+// -------------------------------------------------------------------------------------
 // Quote blocks
+// -------------------------------------------------------------------------------------
 QuoteBlockDelimiter <- "____" // same for verse blocks
 
 QuoteBlock <- attributes:(QuoteBlockAttributes)+ QuoteBlockDelimiter WS* NEWLINE content:(QuoteBlockContent)*  ((QuoteBlockDelimiter WS* EOL) / EOF) {
@@ -813,7 +826,11 @@ QuoteBlockContent <-
         return element, nil
     } 
 
+// -------------------------------------------------------------------------------------
 // Verse blocks
+// -------------------------------------------------------------------------------------
+// VerseBlockDelimiter: see QuoteBlockDelimiter
+
 VerseBlock <- attributes:(VerseBlockAttributes)+ QuoteBlockDelimiter WS* NEWLINE content:(VerseBlockContent)* ((QuoteBlockDelimiter WS* EOL) / EOF) {
     return types.NewDelimitedBlock(types.Verse, 
         content.([]interface{}), 
@@ -838,6 +855,21 @@ VerseBlockLineContent <- elements:(!QuoteBlockDelimiter !EOL WS* InlineElement W
     return types.NewInlineElements(elements.([]interface{}))
 }
 
+// -------------------------------------------------------------------------------------
+// Sidebars
+// -------------------------------------------------------------------------------------
+SidebarBlockDelimiter <- "****"
+
+SidebarBlock <- attributes:(ElementAttribute)* SidebarBlockDelimiter WS* NEWLINE content:(SidebarBlockContent)*  ((SidebarBlockDelimiter WS* EOL) / EOF) {
+    return types.NewDelimitedBlock(types.Sidebar, content.([]interface{}), attributes.([]interface{}), types.None)
+}
+
+SidebarBlockContent <- List / BlockParagraph / BlankLine / NonSidebarBlock
+
+NonSidebarBlock <- !SidebarBlock content:(DelimitedBlock) {
+    return content, nil
+}
+
 // -------------------------------------------------------------------------------------
 // Tables
 // -------------------------------------------------------------------------------------