feat(parser/renderer): support for literal blocks

support for literal blocks in the form of: - [x] a paragraph starting with one or more spaces - [x] a paragraph surrounded with the `....` delimiter - [ ] a parapgrah with the `[literal]` attribute Signed-off-by: Xavier Coulon <[email protected]>
bytesparadise · Sep 24, 2017 · 90b0d38 · 90b0d38
1 parent 0891a44
commit 90b0d38
Show file tree

Hide file tree

Showing 15 changed files with 1,368 additions and 808 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/parser/asciidoc-grammar.peg b/parser/asciidoc-grammar.peg
@@ -20,7 +20,7 @@ DocumentBlock <- content:(Section / StandaloneBlock) {
     return content.(types.DocElement), nil
 }
 
-StandaloneBlock <- DocumentAttributeDeclaration / DocumentAttributeReset / List / BlockImage / DelimitedBlock / Paragraph / ElementAttribute / BlankLine //TODO: should Paragraph be the last type ?
+StandaloneBlock <- DocumentAttributeDeclaration / DocumentAttributeReset / List / BlockImage / LiteralBlock / DelimitedBlock / Paragraph / ElementAttribute / BlankLine //TODO: should Paragraph be the last type ?
 
 // ------------------------------------------
 // Front Matter
@@ -175,7 +175,7 @@ Paragraph <- attributes:(ElementAttribute)* lines:(InlineContent)+ {
 
 // an inline content element may start with and end with spaces, 
 // but it must contain at least an inline element (image, quoted text, external link, document attribute substitution, word, etc.)
-InlineContent <- elements:(WS* InlineElement WS*)+ EOL {
+InlineContent <- !FencedBlockDelimiter elements:(WS* InlineElement WS*)+ EOL {
     return types.NewInlineContent(c.text, elements.([]interface{}))
 } 
 
@@ -236,22 +236,50 @@ InlineImageMacro <- "image:" !":" path:(URL) '[' attributes:(URL_TEXT?) ']' {
     return types.NewImageMacro(c.text, path.(string), attributes)
 }
 
-// ------------------------------------------
-// Delimited Blocks
-// ------------------------------------------
+// ------------------------------------------------------------------------------------
+// Delimited Blocks (http://asciidoctor.org/docs/user-manual/#built-in-blocks-summary)
+// ------------------------------------------------------------------------------------
+DelimitedBlock <- FencedBlock 
+
+FencedBlock <- FencedBlockDelimiter WS* NEWLINE content:(FencedBlockContent) FencedBlockDelimiter WS* EOL {
+    return types.NewDelimitedBlock(types.FencedBlock, content.([]interface{}))
+}
+
+FencedBlockDelimiter <- "```"
+
+FencedBlockContent <- content:(!FencedBlockDelimiter .)* 
 
-DelimitedBlock <- SourceBlock
+// -------------------------------------------------------------------------------------
+// Literal Blocks (see http://asciidoctor.org/docs/user-manual/#literal-text-and-blocks)
+// -------------------------------------------------------------------------------------
+LiteralBlock <- ParagraphWithSpaces / ParagraphWithLiteralBlockDelimiter
 
-SourceBlock <- SourceBlockDelimiter NEWLINE content:(SourceBlockLine)*  SourceBlockDelimiter {
-    return types.NewDelimitedBlock(types.SourceBlock, content.([]interface{}))
+// paragraph indented with one or more spaces on the first line
+ParagraphWithSpaces <- spaces:(WS+) !NEWLINE content:(LiteralBlockContent) EndOfLiteralBlock {
+    // fmt.Printf("matching LiteralBlock with raw content=`%v`\n", content)
+    return types.NewLiteralBlock(spaces.([]interface{}), content.([]interface{}))
 }
 
-SourceBlockDelimiter <- "```"
+// no NEWLINE allowed between the first spaces and the content of the block
+LiteralBlockContent <- content:(!(NEWLINE BlankLine) .)+ { 
+    return content, nil
+}
+
+// a literal block ends with a blank line (or EOF)
+EndOfLiteralBlock <- NEWLINE BlankLine / NEWLINE / EOF
+
+// paragraph with the literal block delimiter (`....`)
+ParagraphWithLiteralBlockDelimiter <- LiteralBlockDelimiter WS* NEWLINE content:(LiteralBlockContent2) LiteralBlockDelimiter WS* EOL {
+    return types.NewLiteralBlock([]interface{}{}, content.([]interface{}))
+}
+
+LiteralBlockDelimiter <- "...."
+
+LiteralBlockContent2 <- content:(!LiteralBlockDelimiter .)* 
 
-SourceBlockLine <- (!EOL .)* NEWLINE
 
 // ------------------------------------------
-// Meta Elements
+// Element Attributes
 // ------------------------------------------
 ElementAttribute <- meta:(ElementLink / ElementID / ElementTitle) 
 
@@ -265,8 +293,9 @@ ElementID <- "[" WS* '#' id:(ID) WS* "]" EOL {
     return types.NewElementID(id.(string))
 }
 
-// a title attached to an element, such as a BlockImage
-ElementTitle <- "." !WS title:(!NEWLINE .)+ EOL {
+// a title attached to an element, such as a BlockImage (
+// a title starts with a single '.' followed by the value, without space in-between
+ElementTitle <- "." !"." !WS title:(!NEWLINE .)+ EOL {
     return types.NewElementTitle(title.([]interface{}))
 }
 
@@ -297,7 +326,7 @@ URL_SCHEME <- "http://" / "https://" / "ftp://" / "irc://" / "mailto:"
 
 DIGIT    <- [0-9]
 
-NEWLINE  <- "\r\n" / '\r' / '\n'
+NEWLINE  <- "\r\n" / "\r" / "\n"
 
 WS       <- ' ' / '\t' {
         return string(c.text), nil